ShuriZma
/
project64
mirror of https://github.com/project64/project64.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #645 from JunielKatarn/revert_639 

Revert "Merge pull request #639 from cxd4/kyles-mom"
This commit is contained in:
zilmar 2015-09-30 17:36:05 +10:00
parent e952f9c32b 47aa75ba31
commit 977f3ea2f9
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Source/Project64/N64 System/Mips/Memory Virtual Mem.cpp
View File

@ -1987,21 +1987,7 @@ void CMipsMemoryVM::ResetMemoryStack()
int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer ) int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
{ {
#if defined(_M_IX86) && defined(_WIN32) #ifdef _M_IX86
// 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
if (dwExptCode != EXCEPTION_ACCESS_VIOLATION) if (dwExptCode != EXCEPTION_ACCESS_VIOLATION)
{ {
if (bHaveDebugger()) if (bHaveDebugger())
@ -2024,7 +2010,7 @@ int CMipsMemoryVM::MemoryFilter( DWORD dwExptCode, void * lpExceptionPointer )
return EXCEPTION_EXECUTE_HANDLER; return EXCEPTION_EXECUTE_HANDLER;
} }
size_t * Reg = NULL; DWORD * Reg = NULL;
BYTE * TypePos = (unsigned char *)lpEP->ContextRecord->Eip; BYTE * TypePos = (unsigned char *)lpEP->ContextRecord->Eip;
EXCEPTION_RECORD exRec = *lpEP->ExceptionRecord; EXCEPTION_RECORD exRec = *lpEP->ExceptionRecord;