diff --git a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp index a0b3e8adf..e85867ef3 100644 --- a/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp +++ b/Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp @@ -15,7 +15,6 @@ #include #include #include -#include CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation) : m_Registers(Registers), @@ -36,7 +35,6 @@ CRecompiler::~CRecompiler() void CRecompiler::Run() { - CoInitialize(NULL); if (bLogX86Code()) { Start_x86_Log(); @@ -57,7 +55,7 @@ void CRecompiler::Run() #ifdef legacycode *g_MemoryStack = (uint32_t)(RDRAM+(_GPR[29].W[0] & 0x1FFFFFFF)); #endif - __try + __except_try() { if (g_System->LookUpMode() == FuncFind_VirtualLookup) { @@ -100,7 +98,7 @@ void CRecompiler::Run() } } } - __except (g_MMU->MemoryFilter(GetExceptionCode(), GetExceptionInformation())) + __except_catch() { g_Notify->DisplayError(MSG_UNKNOWN_MEM_ACTION); } @@ -945,7 +943,7 @@ CCompiledFunc * CRecompiler::CompilerCode() } CCompiledFunc * Func = new CCompiledFunc(CodeBlock); - CCompiledFuncList::_Pairib ret = m_Functions.insert(CCompiledFuncList::value_type(Func->EnterPC(), Func)); + std::pair ret = m_Functions.insert(CCompiledFuncList::value_type(Func->EnterPC(), Func)); if (ret.second == false) { Func->SetNext(ret.first->second->Next()); @@ -1048,7 +1046,7 @@ void CRecompiler::ResetMemoryStackPos() } if (m_Registers.m_GPR[29].UW[0] == 0) { - m_MemoryStack = NULL; + m_MemoryStack = 0; return; }