From 5e663a91d873face8bd4ea78e19794366650bb05 Mon Sep 17 00:00:00 2001
From: "U-C4\\Administrator" <Administrator@c4.(none)>
Date: Sun, 23 Sep 2007 23:52:58 -0500
Subject: [PATCH] Try to get Windows NT bootstrapping with the latest compiler
 changes SEH is broken

---
 vm/os-windows-nt.c | 53 +++++++++++++++++++++++++++-------------------
 vm/os-windows.c    |  8 +------
 2 files changed, 32 insertions(+), 29 deletions(-)

diff --git a/vm/os-windows-nt.c b/vm/os-windows-nt.c
index 2a87a85223..6f816f4625 100644
--- a/vm/os-windows-nt.c
+++ b/vm/os-windows-nt.c
@@ -23,31 +23,40 @@ DEFINE_PRIMITIVE(cd)
 	SetCurrentDirectory(unbox_u16_string());
 }
 
-void seh_call(void (*func)(), exception_handler_t *handler)
+long exception_handler(PEXCEPTION_RECORD rec, void *frame, void *ctx, void *dispatch)
+{
+	CONTEXT *c = (CONTEXT*)ctx;
+	void *esp = NULL;
+	if(in_code_heap_p(c->Eip))
+		esp = (void*)c->Esp;
+	printf("ExceptionCode = 0x%08x\n", rec->ExceptionCode);
+	printf("AccessViolationCode = 0x%08x\n", EXCEPTION_ACCESS_VIOLATION);
+	printf("DivideByZeroCode1 = 0x%08x\n", EXCEPTION_FLT_DIVIDE_BY_ZERO);
+	printf("DivideByZeroCode2 = 0x%08x\n", EXCEPTION_INT_DIVIDE_BY_ZERO);
+	printf("addr=0x%08x\n", rec->ExceptionInformation[1]);
+	printf("eax=0x%08x\n", c->Eax);
+	printf("eax=0x%08x\n", c->Ebx);
+	printf("eip=0x%08x\n", c->Eip);
+	printf("esp=0x%08x\n", c->Esp);
+
+	printf("calculated esp: 0x%08x\n", esp);
+
+	if(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
+		memory_protection_error(rec->ExceptionInformation[1], esp);
+	else if(rec->ExceptionCode == EXCEPTION_FLT_DIVIDE_BY_ZERO
+			|| rec->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
+		general_error(ERROR_DIVIDE_BY_ZERO,F,F,esp);
+	else
+		signal_error(11,esp);
+	return -1; /* unreachable */
+}
+
+void c_to_factor_toplevel(CELL quot)
 {
 	exception_record_t record;
 	asm volatile("mov %%fs:0, %0" : "=r" (record.next_handler));
 	asm volatile("mov %0, %%fs:0" : : "r" (&record));
-	record.handler_func = handler;
-	func();
+	record.handler_func = exception_handler;
+	c_to_factor(quot);
 	asm volatile("mov %0, %%fs:0" : "=r" (record.next_handler));
 }
-
-long exception_handler(PEXCEPTION_RECORD rec, void *frame, void *ctx, void *dispatch)
-{
-	if(rec->ExceptionCode == EXCEPTION_ACCESS_VIOLATION)
-		memory_protection_error(
-			rec->ExceptionInformation[1],
-			native_stack_pointer());
-	else if(rec->ExceptionCode == EXCEPTION_FLT_DIVIDE_BY_ZERO
-			|| rec->ExceptionCode == EXCEPTION_INT_DIVIDE_BY_ZERO)
-		general_error(ERROR_DIVIDE_BY_ZERO,F,F,false,(void*)rec->ExceptionInformation[1]);
-	else
-		signal_error(11,(void*)rec->ExceptionInformation[1]);
-	return -1; /* unreachable */
-}
-
-void run_toplevel(void)
-{
-	seh_call(run, exception_handler);
-}
diff --git a/vm/os-windows.c b/vm/os-windows.c
index 823fd7e9d0..479f60a4fa 100644
--- a/vm/os-windows.c
+++ b/vm/os-windows.c
@@ -51,7 +51,7 @@ void ffi_dlopen (F_DLL *dll, bool error)
 	{
 		dll->dll = NULL;
 		if(error)
-			general_error(ERROR_FFI,F,
+			general_error(ERROR_FFI,F,F,
 				tag_object(get_error_message()));
 		else
 			return;
@@ -204,9 +204,3 @@ void sleep_millis(DWORD msec)
 {
     Sleep(msec);
 }
-
-void run(void)
-{
-	interpreter();
-}
-