citra-emu
/
citra-nightly
Archived
1
0
Fork 0
Code

dyncom: General cleanup of STM

This commit is contained in:
Lioncash 2015-03-08 21:48:35 -04:00
parent e37425b380
commit 36dab56c31
1 changed files with 14 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -5983,49 +5983,47 @@ unsigned InterpreterMainLoop(ARMul_State* state) {
inst_cream->get_addr(cpu, inst_cream->inst, addr, 0); inst_cream->get_addr(cpu, inst_cream->inst, addr, 0);
if (BIT(inst_cream->inst, 22) == 1) { if (BIT(inst_cream->inst, 22) == 1) {
for (i = 0; i < 13; i++) { for (i = 0; i < 13; i++) {
if(BIT(inst_cream->inst, i)) { if (BIT(inst_cream->inst, i)) {
Memory::Write32(addr, cpu->Reg[i]); Memory::Write32(addr, cpu->Reg[i]);
addr += 4; addr += 4;
} }
} }
if (BIT(inst_cream->inst, 13)) { if (BIT(inst_cream->inst, 13)) {
if (cpu->Mode == USER32MODE) { if (cpu->Mode == USER32MODE)
Memory::Write32(addr, cpu->Reg[i]); Memory::Write32(addr, cpu->Reg[i]);
addr += 4; else
} else {
Memory::Write32(addr, cpu->Reg_usr[0]); Memory::Write32(addr, cpu->Reg_usr[0]);
addr += 4; addr += 4;
} }
}
if (BIT(inst_cream->inst, 14)) { if (BIT(inst_cream->inst, 14)) {
if (cpu->Mode == USER32MODE) { if (cpu->Mode == USER32MODE)
Memory::Write32(addr, cpu->Reg[i]); Memory::Write32(addr, cpu->Reg[i]);
addr += 4; else
} else {
Memory::Write32(addr, cpu->Reg_usr[1]); Memory::Write32(addr, cpu->Reg_usr[1]);
addr += 4; addr += 4;
} }
}
if (BIT(inst_cream->inst, 15)) { if (BIT(inst_cream->inst, 15)) {
Memory::Write32(addr, cpu->Reg_usr[1] + 8); Memory::Write32(addr, cpu->Reg_usr[1] + 8);
} }
} else { } else {
for( i = 0; i < 15; i++ ) { for (i = 0; i < 15; i++) {
if(BIT(inst_cream->inst, i)) { if (BIT(inst_cream->inst, i)) {
if(i == Rn) if (i == Rn)
Memory::Write32(addr, old_RN); Memory::Write32(addr, old_RN);
else else
Memory::Write32(addr, cpu->Reg[i]); Memory::Write32(addr, cpu->Reg[i]);
addr += 4; addr += 4;
} }
} }
// Check PC reg // Check PC reg
if(BIT(inst_cream->inst, i)) { if (BIT(inst_cream->inst, 15))
Memory::Write32(addr, cpu->Reg_usr[1] + 8); Memory::Write32(addr, cpu->Reg_usr[1] + 8);
} }
} }
}
cpu->Reg[15] += GET_INST_SIZE(cpu); cpu->Reg[15] += GET_INST_SIZE(cpu);
INC_PC(sizeof(ldst_inst)); INC_PC(sizeof(ldst_inst));
FETCH_INST; FETCH_INST;