keep a map of thread ids to vm pointers. use this to look up the correct VM to handle mach exceptions on os x

vm/factor.cpp

@@ -4,6 +4,7 @@ namespace factor
 {
 
 factor_vm *vm;
+unordered_map<THREADHANDLE, factor_vm*> thread_vms;
 
 void init_globals()
 {
@@ -221,11 +222,19 @@ struct startargs {
 	vm_char **argv;
 };
 
-// arg must be new'ed because we're going to delete it!
-void* start_standalone_factor_thread(void *arg) 
+factor_vm * new_factor_vm()
 {
 	factor_vm *newvm = new factor_vm;
 	register_vm_with_thread(newvm);
+	thread_vms[thread_id()] = newvm;
+
+	return newvm;
+}
+
+// arg must be new'ed because we're going to delete it!
+void* start_standalone_factor_thread(void *arg) 
+{
+	factor_vm *newvm = new_factor_vm();
 	startargs *args = (startargs*) arg;
 	int argc = args->argc; vm_char **argv = args->argv;
 	delete args;
@@ -235,9 +244,8 @@ void* start_standalone_factor_thread(void *arg)
 
 VM_C_API void start_standalone_factor(int argc, vm_char **argv)
 {
-	factor_vm *newvm = new factor_vm;
+	factor_vm *newvm = new_factor_vm();
 	vm = newvm;
-	register_vm_with_thread(newvm);
 	return newvm->start_standalone_factor(argc,argv);
 }
 

vm/mach_signal.cpp

@@ -68,13 +68,19 @@ void factor_vm::call_fault_handler(
 	}
 }
 
-static void call_fault_handler(exception_type_t exception,
+static void call_fault_handler(
+	mach_port_t thread,
+	exception_type_t exception,
 	exception_data_type_t code,
 	MACH_EXC_STATE_TYPE *exc_state,
 	MACH_THREAD_STATE_TYPE *thread_state,
 	MACH_FLOAT_STATE_TYPE *float_state)
 {
-	SIGNAL_VM_PTR()->call_fault_handler(exception,code,exc_state,thread_state,float_state);
+	THREADHANDLE thread_id = pthread_from_mach_thread_np(thread);
+	assert(thread_id);
+	unordered_map<THREADHANDLE, factor_vm*>::const_iterator vm = thread_vms.find(thread_id);
+	if (vm != thread_vms.end())
+	    vm->second->call_fault_handler(exception,code,exc_state,thread_state,float_state);
 }
 
 /* Handle an exception by invoking the user's fault handler and/or forwarding
@@ -128,7 +134,7 @@ catch_exception_raise (mach_port_t exception_port,
 
 	/* Modify registers so to have the thread resume executing the
 	fault handler */
-	call_fault_handler(exception,code[0],&exc_state,&thread_state,&float_state);
+	call_fault_handler(thread,exception,code[0],&exc_state,&thread_state,&float_state);
 
 	/* Set the faulting thread's register contents..
 	

vm/os-unix.hpp

@@ -45,7 +45,7 @@ typedef char symbol_char;
 typedef pthread_t THREADHANDLE;
 
 THREADHANDLE start_thread(void *(*start_routine)(void *),void *args);
-pthread_t thread_id();
+inline static THREADHANDLE thread_id() { return pthread_self(); }
 
 void unix_init_signals();
 void signal_handler(int signal, siginfo_t* siginfo, void* uap);

vm/os-windows-nt.hpp

@@ -29,6 +29,7 @@ FACTOR_STDCALL LONG exception_handler(PEXCEPTION_POINTERS pe);
 typedef HANDLE THREADHANDLE;
 
 THREADHANDLE start_thread(void *(*start_routine)(void *),void *args);
+inline static THREADHANDLE thread_id() { return GetCurrentThread(); }
 
 void init_platform_globals();
 struct factor_vm;

vm/vm.hpp

@@ -796,4 +796,6 @@ struct factor_vm
   #define SIGNAL_VM_PTR() tls_vm()
 #endif
 
+extern unordered_map<THREADHANDLE, factor_vm*> thread_vms;
+
 }