summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormailwl <mailwl@gmail.com>2016-04-09 05:46:03 +0200
committermailwl <mailwl@gmail.com>2016-04-09 18:11:02 +0200
commit2efc1c93485bb668361447161e55d04257ae3fda (patch)
treeb8f9716c58f52175d88b00411ecdb368c00fb97f
parentMerge pull request #1644 from polaris-/gdb-fixes (diff)
downloadyuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar.gz
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar.bz2
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar.lz
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar.xz
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.tar.zst
yuzu-2efc1c93485bb668361447161e55d04257ae3fda.zip
-rw-r--r--src/core/arm/dyncom/arm_dyncom_interpreter.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
index a6faf42b9..647784208 100644
--- a/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
+++ b/src/core/arm/dyncom/arm_dyncom_interpreter.cpp
@@ -4080,11 +4080,12 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
if ((inst_base->cond == ConditionCode::AL) || CondPassed(cpu, inst_base->cond)) {
unsigned int inst = inst_cream->inst;
if (BITS(inst, 20, 27) == 0x12 && BITS(inst, 4, 7) == 0x3) {
+ const u32 jump_address = cpu->Reg[inst_cream->val.Rm];
cpu->Reg[14] = (cpu->Reg[15] + cpu->GetInstructionSize());
if(cpu->TFlag)
cpu->Reg[14] |= 0x1;
- cpu->Reg[15] = cpu->Reg[inst_cream->val.Rm] & 0xfffffffe;
- cpu->TFlag = cpu->Reg[inst_cream->val.Rm] & 0x1;
+ cpu->Reg[15] = jump_address & 0xfffffffe;
+ cpu->TFlag = jump_address & 0x1;
} else {
cpu->Reg[14] = (cpu->Reg[15] + cpu->GetInstructionSize());
cpu->TFlag = 0x1;