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

ARM: Fixed dyncom to use reg15 for PC (this core doesn't use pc variable). 

- Fixes single stepping in debugger.
This commit is contained in:
bunnei 2014-11-09 17:00:59 -05:00
parent ce1125d490
commit b8e6f52419
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/core/arm/dyncom/arm_dyncom.cpp
View File

@ -60,7 +60,7 @@ void ARM_DynCom::SetPC(u32 pc) {
* @return Returns current PC * @return Returns current PC
*/ */
u32 ARM_DynCom::GetPC() const { u32 ARM_DynCom::GetPC() const {
return state->pc; return state->Reg[15];
} }
/** /**
@ -129,7 +129,7 @@ void ARM_DynCom::SaveContext(ThreadContext& ctx) {
ctx.sp = state->Reg[13]; ctx.sp = state->Reg[13];
ctx.lr = state->Reg[14]; ctx.lr = state->Reg[14];
ctx.pc = state->pc; ctx.pc = state->Reg[15];
ctx.cpsr = state->Cpsr; ctx.cpsr = state->Cpsr;
ctx.fpscr = state->VFP[1]; ctx.fpscr = state->VFP[1];