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

[Project64] Remove #include <Objbase.h> from RecompilerClass.cpp

This commit is contained in:
zilmar 2016-01-18 22:28:38 +11:00
parent 0f57b5d42e
commit b8c00dd5fe
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64-core/N64System/Recompiler/RecompilerClass.cpp
View File

@ -15,7 +15,6 @@
#include <Project64-core/N64System/N64Class.h> #include <Project64-core/N64System/N64Class.h>
#include <Project64-core/N64System/Interpreter/InterpreterCPU.h> #include <Project64-core/N64System/Interpreter/InterpreterCPU.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
#include <Objbase.h>
CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation) : CRecompiler::CRecompiler(CRegisters & Registers, CProfiling & Profile, bool & EndEmulation) :
m_Registers(Registers), m_Registers(Registers),
@ -36,7 +35,6 @@ CRecompiler::~CRecompiler()
void CRecompiler::Run() void CRecompiler::Run()
{ {
CoInitialize(NULL);
if (bLogX86Code()) if (bLogX86Code())
{ {
Start_x86_Log(); Start_x86_Log();
@ -57,7 +55,7 @@ void CRecompiler::Run()
#ifdef legacycode #ifdef legacycode
*g_MemoryStack = (uint32_t)(RDRAM+(_GPR[29].W[0] & 0x1FFFFFFF)); *g_MemoryStack = (uint32_t)(RDRAM+(_GPR[29].W[0] & 0x1FFFFFFF));
#endif #endif
__try __except_try()
{ {
if (g_System->LookUpMode() == FuncFind_VirtualLookup) 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); g_Notify->DisplayError(MSG_UNKNOWN_MEM_ACTION);
} }
@ -945,7 +943,7 @@ CCompiledFunc * CRecompiler::CompilerCode()
} }
CCompiledFunc * Func = new CCompiledFunc(CodeBlock); CCompiledFunc * Func = new CCompiledFunc(CodeBlock);
CCompiledFuncList::_Pairib ret = m_Functions.insert(CCompiledFuncList::value_type(Func->EnterPC(), Func)); std::pair<CCompiledFuncList::iterator, bool> ret = m_Functions.insert(CCompiledFuncList::value_type(Func->EnterPC(), Func));
if (ret.second == false) if (ret.second == false)
{ {
Func->SetNext(ret.first->second->Next()); Func->SetNext(ret.first->second->Next());
@ -1048,7 +1046,7 @@ void CRecompiler::ResetMemoryStackPos()
} }
if (m_Registers.m_GPR[29].UW[0] == 0) if (m_Registers.m_GPR[29].UW[0] == 0)
{ {
m_MemoryStack = NULL; m_MemoryStack = 0;
return; return;
} }