From 47aa75ba31dcf9c8f92a6a96c38acaa7abcd2a8b Mon Sep 17 00:00:00 2001
From: "Julio C. Rocha" <julio@rochsquadron.net>
Date: Wed, 30 Sep 2015 00:01:03 -0700
Subject: [PATCH] Revert "Merge pull request #639 from cxd4/kyles-mom"

This reverts commit f9c177f44ac9d2bfb43d94a3051fd4931073489d, reversing
changes made to 63ea387bcf74f245ee377d76f64ce96eda61c366.
---
 .../N64 System/Mips/Memory Virtual Mem.cpp     | 18 ++----------------
 1 file changed, 2 insertions(+), 16 deletions(-)

diff --git a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
index d9b5d556e..c21d5abca 100644
--- a/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
+++ b/Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp	
@@ -1987,21 +1987,7 @@ void CMipsMemoryVM::ResetMemoryStack()
 
 int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer ) 
 {
-#if defined(_M_IX86) && defined(_WIN32)
-// to do:  Remove the _M_IX86 criteria.  This can compile on 64-bit Windows.
-
-#ifdef _WIN64
-#define Eax     Rax
-#define Ebx     Rbx
-#define Ecx     Rcx
-#define Edx     Rdx
-#define Esp     Rsp
-#define Ebp     Rbp
-#define Esi     Rsi
-#define Edi     Rdi
-
-#define Eip     Rip
-#endif
+#ifdef _M_IX86
 	if (dwExptCode != EXCEPTION_ACCESS_VIOLATION) 
 	{
 		if (bHaveDebugger())
@@ -2024,7 +2010,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
 		return EXCEPTION_EXECUTE_HANDLER; 
 	}
 
-	size_t * Reg = NULL;
+	DWORD * Reg = NULL;
 	
 	BYTE * TypePos = (unsigned char *)lpEP->ContextRecord->Eip;
 	EXCEPTION_RECORD exRec = *lpEP->ExceptionRecord;