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

[Android[ void CArmRecompilerOps::SPECIAL_JR()

This commit is contained in:
zilmar 2016-10-01 20:52:33 +10:00
parent 75fba4be38
commit 8f6ca9c15a
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Source/Project64-core/N64System/Recompiler/Arm/ArmRecompilerOps.cpp
View File

@ -2466,17 +2466,23 @@ void CArmRecompilerOps::SPECIAL_JR()
if (DelaySlotEffectsCompare(m_CompilePC, m_Opcode.rs, 0)) if (DelaySlotEffectsCompare(m_CompilePC, m_Opcode.rs, 0))
{ {
if (IsKnown(m_Opcode.rs)) ArmReg PCTempReg = m_RegWorkingSet.Map_TempReg(Arm_Any, -1, false);
MoveConstToArmReg(PCTempReg, (uint32_t)_PROGRAM_COUNTER, "PROGRAM_COUNTER");
if (IsConst(m_Opcode.rs))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
return; }
else if (IsMapped(m_Opcode.rs))
{
StoreArmRegToArmRegPointer(GetMipsRegMapLo(m_Opcode.rs), PCTempReg, 0);
} }
else else
{ {
MoveVariableToArmReg(&_GPR[m_Opcode.rs].UW[0], CRegName::GPR_Lo[m_Opcode.rs], Arm_R0); ArmReg ValueTempReg = m_RegWorkingSet.Map_TempReg(Arm_Any, m_Opcode.rs, false);
MoveConstToArmReg(Arm_R1, (uint32_t)_PROGRAM_COUNTER, "PROGRAM_COUNTER"); StoreArmRegToArmRegPointer(ValueTempReg, PCTempReg, 0);
StoreArmRegToArmRegPointer(Arm_R0, Arm_R1, 0); m_RegWorkingSet.SetArmRegProtected(ValueTempReg,false);
} }
m_RegWorkingSet.SetArmRegProtected(PCTempReg,false);
} }
m_NextInstruction = DO_DELAY_SLOT; m_NextInstruction = DO_DELAY_SLOT;
} }
@ -2489,17 +2495,23 @@ void CArmRecompilerOps::SPECIAL_JR()
else else
{ {
UpdateCounters(m_RegWorkingSet, true, true); UpdateCounters(m_RegWorkingSet, true, true);
if (IsKnown(m_Opcode.rs)) ArmReg PCTempReg = m_RegWorkingSet.Map_TempReg(Arm_Any, -1, false);
MoveConstToArmReg(PCTempReg, (uint32_t)_PROGRAM_COUNTER, "PROGRAM_COUNTER");
if (IsConst(m_Opcode.rs))
{ {
g_Notify->BreakPoint(__FILE__, __LINE__); g_Notify->BreakPoint(__FILE__, __LINE__);
return; }
else if (IsMapped(m_Opcode.rs))
{
StoreArmRegToArmRegPointer(GetMipsRegMapLo(m_Opcode.rs), PCTempReg, 0);
} }
else else
{ {
MoveVariableToArmReg(&_GPR[m_Opcode.rs].UW[0], CRegName::GPR_Lo[m_Opcode.rs], Arm_R0); ArmReg ValueTempReg = m_RegWorkingSet.Map_TempReg(Arm_Any, m_Opcode.rs, false);
MoveConstToArmReg(Arm_R1, (uint32_t)_PROGRAM_COUNTER, "PROGRAM_COUNTER"); StoreArmRegToArmRegPointer(ValueTempReg, PCTempReg, 0);
StoreArmRegToArmRegPointer(Arm_R0, Arm_R1, 0); m_RegWorkingSet.SetArmRegProtected(ValueTempReg,false);
} }
m_RegWorkingSet.SetArmRegProtected(PCTempReg,false);
CompileExit((uint32_t)-1, (uint32_t)-1, m_RegWorkingSet, CExitInfo::Normal); CompileExit((uint32_t)-1, (uint32_t)-1, m_RegWorkingSet, CExitInfo::Normal);
if (m_Section->m_JumpSection) if (m_Section->m_JumpSection)
{ {