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

Loop Analysis: Fix up some breakpoint warnings

This commit is contained in:
zilmar 2013-02-03 11:51:13 +11:00
parent 4b2aa5a09f
commit 8e2ea1f674
1 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Source/Project64/N64 System/Recompiler/Loop Analysis.cpp
View File

@ -268,10 +268,13 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
{ {
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
} }
if (Section->m_Jump.TargetPC != m_PC + 4) if (Section->m_Jump.TargetPC != m_PC + 4 &&
Section->m_JumpSection != NULL &&
Section->m_Jump.TargetPC != (DWORD)-1)
{ {
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
} }
/*if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4) /*if (Section->m_Jump.TargetPC != m_PC + ((short)m_Command.offset << 2) + 4)
{ {
g_Notify->BreakPoint(__FILE__,__LINE__); g_Notify->BreakPoint(__FILE__,__LINE__);
@ -713,7 +716,10 @@ bool LoopAnalysis::CheckLoopRegisterUsage( CCodeSection * Section)
if (Section->m_DelaySlot) if (Section->m_DelaySlot)
{ {
if (m_NextInstruction != NORMAL) { g_Notify->BreakPoint(__FILE__,__LINE__); } if (m_NextInstruction != NORMAL && m_NextInstruction != END_BLOCK)
{
g_Notify->BreakPoint(__FILE__,__LINE__);
}
m_NextInstruction = END_BLOCK; m_NextInstruction = END_BLOCK;
SetJumpRegSet(Section,m_Reg); SetJumpRegSet(Section,m_Reg);
} else { } else {