vm: don't try loading Factor VM DLL anymore

diff --git a/vm/os-genunix.hpp b/vm/os-genunix.hpp
index c6123eca56396caa0dbb41284fdfc8766873a510..a40e891a6e7ae9318ec0c77acdac1416921d3322 100644 (file)
--- a/vm/os-genunix.hpp
+++ b/vm/os-genunix.hpp
@@ -2,7 +2,6 @@ namespace factor
 {
 
 #define VM_C_API extern "C"
-#define NULL_DLL NULL
 
 void early_init();
 const char *vm_executable_path();

diff --git a/vm/os-macosx.hpp b/vm/os-macosx.hpp
index 4d4499461d861819414f82019176d61dd6499a1e..27eba772159ccc6521c4bbea608263d298c1fe1e 100644 (file)
--- a/vm/os-macosx.hpp
+++ b/vm/os-macosx.hpp
@@ -3,7 +3,6 @@ namespace factor
 
 #define VM_C_API extern "C" __attribute__((visibility("default")))
 #define FACTOR_OS_STRING "macosx"
-#define NULL_DLL NULL
 
 void early_init();
 

diff --git a/vm/os-unix.cpp b/vm/os-unix.cpp
index 60ac00fb395858a7675eae920b8c9a83a9c4ee39..034dfcbf5f2f7643e93615c0177bc8eb9adad727 100644 (file)
--- a/vm/os-unix.cpp
+++ b/vm/os-unix.cpp
@@ -46,7 +46,7 @@ void sleep_nanos(u64 nsec)
 
 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)

diff --git a/vm/os-windows-nt.hpp b/vm/os-windows-nt.hpp
index c5e721c56dd3b915e1dbb2b9626b9e31c6298a35..869205b67e8ef9fd010ba6fc0f2ccbb4fecf58d7 100755 (executable)
--- a/vm/os-windows-nt.hpp
+++ b/vm/os-windows-nt.hpp
@@ -20,7 +20,7 @@ typedef char symbol_char;
 
 #define FACTOR_OS_STRING "winnt"
 
-#define FACTOR_DLL L"factor.dll"
+#define FACTOR_DLL NULL
 
 #ifdef _MSC_VER
        #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
 #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
 // but not winbase.h