steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

vm: don't try loading Factor VM DLL anymore

release
Slava Pestov 2010-04-02 00:03:26 -04:00
parent 0faa3bcf4a
commit d9d12ab8fb
4 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vm/os-genunix.hpp
View File

@ -2,7 +2,6 @@ namespace factor
{ {
#define VM_C_API extern "C" #define VM_C_API extern "C"
#define NULL_DLL NULL
void early_init(); void early_init();
const char *vm_executable_path(); const char *vm_executable_path();

1
vm/os-macosx.hpp
View File

@ -3,7 +3,6 @@ namespace factor
#define VM_C_API extern "C" __attribute__((visibility("default"))) #define VM_C_API extern "C" __attribute__((visibility("default")))
#define FACTOR_OS_STRING "macosx" #define FACTOR_OS_STRING "macosx"
#define NULL_DLL NULL
void early_init(); void early_init();

2
vm/os-unix.cpp
View File

@ -46,7 +46,7 @@ void sleep_nanos(u64 nsec)
void factor_vm::init_ffi() void factor_vm::init_ffi()
{ {
null_dll = dlopen(NULL_DLL,RTLD_LAZY); null_dll = dlopen(NULL,RTLD_LAZY);
} }
void factor_vm::ffi_dlopen(dll *dll) void factor_vm::ffi_dlopen(dll *dll)

4
vm/os-windows-nt.hpp
View File

@ -20,7 +20,7 @@ typedef char symbol_char;
#define FACTOR_OS_STRING "winnt" #define FACTOR_OS_STRING "winnt"
#define FACTOR_DLL L"factor.dll" #define FACTOR_DLL NULL
#ifdef _MSC_VER #ifdef _MSC_VER
#define FACTOR_STDCALL(return_type) return_type __stdcall #define FACTOR_STDCALL(return_type) return_type __stdcall
@ -28,7 +28,7 @@ typedef char symbol_char;
#define FACTOR_STDCALL(return_type) __attribute__((stdcall)) return_type #define FACTOR_STDCALL(return_type) __attribute__((stdcall)) return_type
#endif #endif
FACTOR_STDCALL(LONG) exception_handler(PEXCEPTION_POINTERS pe); VM_C_API exception_handler(PEXCEPTION_RECORD e, void *frame, PCONTEXT c, void *dispatch)
// SSE traps raise these exception codes, which are defined in internal NT headers // SSE traps raise these exception codes, which are defined in internal NT headers
// but not winbase.h // but not winbase.h