octo/yuzu-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #2004 from MerryMage/stm

Browse Source 
Dyncom: Correct implementation of STM for R15
This commit is contained in:
Yuri Kunde Schlesner
2016-08-14 15:17:32 -07:00
committed by GitHub
parent 3c3a6cb2af 50407a8dc8
commit c3c6ac38e0
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/arm/dyncom/arm_dyncom_interpreter.cpp
View File

@@ -3228,7 +3228,7 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
addr += 4; addr += 4;
} }
if (BIT(inst_cream->inst, 15)) { if (BIT(inst_cream->inst, 15)) {
cpu->WriteMemory32(addr, cpu->Reg_usr[1] + 8); cpu->WriteMemory32(addr, cpu->Reg[15] + 8);
} }
} else { } else {
for (int i = 0; i < 15; i++) { for (int i = 0; i < 15; i++) {
@@ -3243,8 +3243,9 @@ unsigned InterpreterMainLoop(ARMul_State* cpu) {
} }
// Check PC reg // Check PC reg
if (BIT(inst_cream->inst, 15)) if (BIT(inst_cream->inst, 15)) {
cpu->WriteMemory32(addr, cpu->Reg_usr[1] + 8); cpu->WriteMemory32(addr, cpu->Reg[15] + 8);
}
} }
} }
cpu->Reg[15] += cpu->GetInstructionSize(); cpu->Reg[15] += cpu->GetInstructionSize();