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

Changed how find the next block to analysis

This commit is contained in:
zilmar 2012-10-22 04:03:32 +11:00
parent 0a84d1a0a3
commit d8d5379e2a
1 changed files with 27 additions and 78 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Source/Project64/N64 System/Recompiler/Code Block.cpp
View File

@ -167,25 +167,6 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
CurrentSection->m_EndPC = TestPC - 4; CurrentSection->m_EndPC = TestPC - 4;
CurrentSection = itr->second; CurrentSection = itr->second;
//section changed find first unprocessed section
/*for (SectionMap::iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++)
{
CCodeSection * Section = itr->second;
if (Section->m_JumpSection != NULL ||
Section->m_ContinueSection != NULL ||
Section->m_EndSection)
{
continue;
}
if (CurrentSection != Section)
{
CPU_Message("- Section %d",CurrentSection->m_SectionID);
CurrentSection = Section;
}
break;
}*/
CPU_Message("Section %d",CurrentSection->m_SectionID); CPU_Message("Section %d",CurrentSection->m_SectionID);
if (EnterSection != m_EnterSection) if (EnterSection != m_EnterSection)
{ {
@ -203,7 +184,7 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
} }
bool LikelyBranch, EndBlock, IncludeDelaySlot, PermLoop; bool LikelyBranch, EndBlock, IncludeDelaySlot, PermLoop;
DWORD TargetPC, ContinuePC, SectionCount = m_Sections.size(); DWORD TargetPC, ContinuePC;
CurrentSection->m_EndPC = TestPC; CurrentSection->m_EndPC = TestPC;
if (!AnalyzeInstruction(TestPC, TargetPC, ContinuePC, LikelyBranch, IncludeDelaySlot, EndBlock, PermLoop)) if (!AnalyzeInstruction(TestPC, TargetPC, ContinuePC, LikelyBranch, IncludeDelaySlot, EndBlock, PermLoop))
@ -275,13 +256,13 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
TestPC += IncludeDelaySlot ? 8 : 4; TestPC += IncludeDelaySlot ? 8 : 4;
if (ContinuePC == (DWORD)-1)
{
//Find the next section //Find the next section
CCodeSection * NewSection = NULL; CCodeSection * NewSection = NULL;
for (SectionMap::const_iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++) for (SectionMap::const_iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++)
{ {
if (itr->first < TestPC) if (CurrentSection->m_JumpSection != NULL ||
CurrentSection->m_ContinueSection != NULL ||
CurrentSection->m_EndSection)
{ {
continue; continue;
} }
@ -306,39 +287,6 @@ bool CCodeBlock::CreateBlockLinkage ( CCodeSection * EnterSection )
TestPC = CurrentSection->m_EnterPC; TestPC = CurrentSection->m_EnterPC;
CPU_Message("a. Section %d",CurrentSection->m_SectionID); CPU_Message("a. Section %d",CurrentSection->m_SectionID);
TestPC -= 4; TestPC -= 4;
} else {
//retest current section if we added a section
if (SectionCount != m_Sections.size())
{
CCodeSection * NewSection = NULL;
for (SectionMap::const_iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++)
{
if (itr->first > TestPC)
{
break;
}
NewSection = itr->second;
}
if (NewSection == NULL)
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
if (CurrentSection == NewSection)
{
_Notify->BreakPoint(__FILE__,__LINE__);
}
CurrentSection = NewSection;
if (CurrentSection->m_JumpSection != NULL ||
CurrentSection->m_ContinueSection != NULL ||
CurrentSection->m_EndSection)
{
break;
}
TestPC = CurrentSection->m_EnterPC;
CPU_Message("b. Section %d",CurrentSection->m_SectionID);
}
TestPC -= 4;
}
} }
for (SectionMap::iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++) for (SectionMap::iterator itr = m_SectionMap.begin(); itr != m_SectionMap.end(); itr++)
@ -433,6 +381,7 @@ bool CCodeBlock::AnalyzeInstruction ( DWORD PC, DWORD & TargetPC, DWORD & Contin
EndBlock = true; EndBlock = true;
IncludeDelaySlot = true; IncludeDelaySlot = true;
break; break;
case R4300i_SPECIAL_SYSCALL:
case R4300i_SPECIAL_BREAK: case R4300i_SPECIAL_BREAK:
EndBlock = true; EndBlock = true;
break; break;