From 68668bb4e2237dfb1e1f594763be401271c96396 Mon Sep 17 00:00:00 2001
From: gbeauche <>
Date: Sun, 20 Jan 2008 17:09:34 +0000
Subject: [PATCH] Add support for Windows/ia64.

---
 BasiliskII/src/Unix/sigsegv.cpp | 11 +++++------
 1 file changed, 5 insertions(+), 6 deletions(-)

diff --git a/BasiliskII/src/Unix/sigsegv.cpp b/BasiliskII/src/Unix/sigsegv.cpp
index 24f63a7d..99b0e86e 100644
--- a/BasiliskII/src/Unix/sigsegv.cpp
+++ b/BasiliskII/src/Unix/sigsegv.cpp
@@ -578,24 +578,23 @@ static sigsegv_address_t get_fault_address(struct sigcontext *scp)
 #include <windows.h>
 #include <winerror.h>
 
-#if defined(_M_IX86)
 #define SIGSEGV_FAULT_HANDLER_ARGLIST	EXCEPTION_POINTERS *ExceptionInfo
 #define SIGSEGV_FAULT_HANDLER_ARGS		ExceptionInfo
 #define SIGSEGV_FAULT_ADDRESS			ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
 #define SIGSEGV_CONTEXT_REGS			ExceptionInfo->ContextRecord
+#if defined(_M_IX86)
 #define SIGSEGV_FAULT_INSTRUCTION		SIGSEGV_CONTEXT_REGS->Eip
 #define SIGSEGV_REGISTER_FILE			((SIGSEGV_REGISTER_TYPE *)&SIGSEGV_CONTEXT_REGS->Edi)
 #define SIGSEGV_SKIP_INSTRUCTION		ix86_skip_instruction
 #endif
 #if defined(_M_X64)
-#define SIGSEGV_FAULT_HANDLER_ARGLIST	EXCEPTION_POINTERS *ExceptionInfo
-#define SIGSEGV_FAULT_HANDLER_ARGS		ExceptionInfo
-#define SIGSEGV_FAULT_ADDRESS			ExceptionInfo->ExceptionRecord->ExceptionInformation[1]
-#define SIGSEGV_CONTEXT_REGS			ExceptionInfo->ContextRecord
 #define SIGSEGV_FAULT_INSTRUCTION		SIGSEGV_CONTEXT_REGS->Rip
 #define SIGSEGV_REGISTER_FILE			((SIGSEGV_REGISTER_TYPE *)&SIGSEGV_CONTEXT_REGS->Rax)
 #define SIGSEGV_SKIP_INSTRUCTION		ix86_skip_instruction
 #endif
+#if defined(_M_IA64)
+#define SIGSEGV_FAULT_INSTRUCTION		SIGSEGV_CONTEXT_REGS->StIIP
+#endif
 #endif
 
 #if HAVE_MACH_EXCEPTIONS
@@ -2984,7 +2983,7 @@ static LONG WINAPI main_exception_filter(EXCEPTION_POINTERS *ExceptionInfo)
 {
 	if (sigsegv_fault_handler != NULL
 		&& ExceptionInfo->ExceptionRecord->ExceptionCode == EXCEPTION_ACCESS_VIOLATION
-		&& ExceptionInfo->ExceptionRecord->NumberParameters == 2
+		&& ExceptionInfo->ExceptionRecord->NumberParameters >= 2
 		&& handle_badaccess(ExceptionInfo))
 		return EXCEPTION_CONTINUE_EXECUTION;