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

[Project64] Remove windows.h from CodeSection.cpp

This commit is contained in:
zilmar 2016-01-18 22:04:49 +11:00
parent 9bdea7da40
commit b173fbb642
1 changed files with 171 additions and 170 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/Project64-core/N64System/Recompiler/CodeSection.cpp
View File

@ -20,7 +20,6 @@
#include <Project64-core/N64System/Recompiler/LoopAnalysis.h> #include <Project64-core/N64System/Recompiler/LoopAnalysis.h>
#include <Project64-core/N64System/Recompiler/SectionInfo.h> #include <Project64-core/N64System/Recompiler/SectionInfo.h>
#include <Project64-core/ExceptionHandler.h> #include <Project64-core/ExceptionHandler.h>
#include <Windows.h>
void InPermLoop(); void InPermLoop();
@ -31,7 +30,9 @@ static bool DelaySlotEffectsJump(uint32_t JumpPC)
OPCODE Command; OPCODE Command;
if (!g_MMU->LW_VAddr(JumpPC, Command.Hex)) if (!g_MMU->LW_VAddr(JumpPC, Command.Hex))
{
return true; return true;
}
switch (Command.op) switch (Command.op)
{ {
@ -109,21 +110,21 @@ static bool DelaySlotEffectsJump(uint32_t JumpPC)
} }
CCodeSection::CCodeSection(CCodeBlock * CodeBlock, uint32_t EnterPC, uint32_t ID, bool LinkAllowed) : CCodeSection::CCodeSection(CCodeBlock * CodeBlock, uint32_t EnterPC, uint32_t ID, bool LinkAllowed) :
m_BlockInfo(CodeBlock), m_BlockInfo(CodeBlock),
m_SectionID(ID), m_SectionID(ID),
m_EnterPC(EnterPC), m_EnterPC(EnterPC),
m_EndPC((uint32_t)-1), m_EndPC((uint32_t)-1),
m_ContinueSection(NULL), m_ContinueSection(NULL),
m_JumpSection(NULL), m_JumpSection(NULL),
m_EndSection(false), m_EndSection(false),
m_LinkAllowed(LinkAllowed), m_LinkAllowed(LinkAllowed),
m_Test(0), m_Test(0),
m_Test2(0), m_Test2(0),
m_CompiledLocation(NULL), m_CompiledLocation(NULL),
m_InLoop(false), m_InLoop(false),
m_DelaySlot(false) m_DelaySlot(false)
{ {
CPU_Message(__FUNCTION__ ": ID %d EnterPC 0x%08X", ID, EnterPC); CPU_Message("%s: ID %d EnterPC 0x%08X", __FUNCTION__, ID, EnterPC);
} }
CCodeSection::~CCodeSection() CCodeSection::~CCodeSection()
@ -1035,14 +1036,14 @@ bool CCodeSection::GenerateX86Code(uint32_t Test)
do do
{ {
__try __except_try()
{ {
if (!g_MMU->LW_VAddr(m_CompilePC, m_Opcode.Hex)) if (!g_MMU->LW_VAddr(m_CompilePC, m_Opcode.Hex))
{ {
g_Notify->FatalError(GS(MSG_FAIL_LOAD_WORD)); g_Notify->FatalError(GS(MSG_FAIL_LOAD_WORD));
} }
} }
__except (g_MMU->MemoryFilter(GetExceptionCode(), GetExceptionInformation())) __except_catch()
{ {
g_Notify->FatalError(GS(MSG_UNKNOWN_MEM_ACTION)); g_Notify->FatalError(GS(MSG_UNKNOWN_MEM_ACTION));
} }
@ -1659,7 +1660,7 @@ void CCodeSection::UnlinkParent(CCodeSection * Parent, bool ContinueSection)
return; return;
} }
CPU_Message(__FUNCTION__ ": Section %d Parent: %d ContinueSection = %s", m_SectionID, Parent->m_SectionID, ContinueSection ? "Yes" : "No"); CPU_Message("%s: Section %d Parent: %d ContinueSection = %s", __FUNCTION__, m_SectionID, Parent->m_SectionID, ContinueSection ? "Yes" : "No");
if (Parent->m_ContinueSection == this && Parent->m_JumpSection == this) if (Parent->m_ContinueSection == this && Parent->m_JumpSection == this)
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);