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

[Android] Fix register set usage in CCodeSection::GenerateSectionLinkage

This commit is contained in:
zilmar 2016-12-03 07:16:47 +11:00
parent a76b636c47
commit ac0c6ff948
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -376,23 +376,22 @@ void CCodeSection::GenerateSectionLinkage()
m_RecompilerOps->SetRegWorkingSet(JumpInfo[i]->RegSet); m_RecompilerOps->SetRegWorkingSet(JumpInfo[i]->RegSet);
if (JumpInfo[i]->TargetPC <= JumpInfo[i]->JumpPC) if (JumpInfo[i]->TargetPC <= JumpInfo[i]->JumpPC)
{ {
m_RecompilerOps->UpdateCounters(JumpInfo[i]->RegSet, true, true); m_RecompilerOps->UpdateCounters(m_RecompilerOps->GetRegWorkingSet(), true, true);
if (JumpInfo[i]->PermLoop) if (JumpInfo[i]->PermLoop)
{ {
CPU_Message("PermLoop *** 3"); CPU_Message("PermLoop *** 3");
m_RecompilerOps->CompileInPermLoop(JumpInfo[i]->RegSet, JumpInfo[i]->TargetPC); m_RecompilerOps->CompileInPermLoop(m_RecompilerOps->GetRegWorkingSet(), JumpInfo[i]->TargetPC);
} }
else else
{ {
CPU_Message("CompileSystemCheck 9"); CPU_Message("CompileSystemCheck 9");
m_RecompilerOps->CompileSystemCheck(JumpInfo[i]->TargetPC, JumpInfo[i]->RegSet); m_RecompilerOps->CompileSystemCheck(JumpInfo[i]->TargetPC, m_RecompilerOps->GetRegWorkingSet());
} }
} }
else else
{ {
m_RecompilerOps->UpdateCounters(m_RecompilerOps->GetRegWorkingSet(), false, true); m_RecompilerOps->UpdateCounters(m_RecompilerOps->GetRegWorkingSet(), false, true);
} }
m_RecompilerOps->SetRegWorkingSet(JumpInfo[i]->RegSet);
m_RecompilerOps->SyncRegState(TargetSection[i]->m_RegEnter); m_RecompilerOps->SyncRegState(TargetSection[i]->m_RegEnter);
m_RecompilerOps->JumpToSection(TargetSection[i]); m_RecompilerOps->JumpToSection(TargetSection[i]);
} }