diff options
| author |  bunnei | 2014-11-09 17:00:59 -0500 |
|---|---|---|
| committer | bunnei | 2014-11-11 19:54:18 -0500 |
| commit | b8e6f52419816a7afa6629c401c23faf8ae8ae67 (patch) | |
| tree | 6caa9a609493f968b2a9f744f78b9aba8b887f6e /src/core | |
| parent | Core: Changed RunLoop iterations to 1000 (slightly better performance). (diff) | |
| download | yuzu-b8e6f52419816a7afa6629c401c23faf8ae8ae67.tar.gz yuzu-b8e6f52419816a7afa6629c401c23faf8ae8ae67.tar.xz yuzu-b8e6f52419816a7afa6629c401c23faf8ae8ae67.zip | |
ARM: Fixed dyncom to use reg15 for PC (this core doesn't use pc variable).
- Fixes single stepping in debugger.
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 0b5dcccb9..a3ed3e31e 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp | |||
| @@ -60,7 +60,7 @@ void ARM_DynCom::SetPC(u32 pc) { | |||
| 60 | * @return Returns current PC | 60 | * @return Returns current PC |
| 61 | */ | 61 | */ |
| 62 | u32 ARM_DynCom::GetPC() const { | 62 | u32 ARM_DynCom::GetPC() const { |
| 63 | return state->pc; | 63 | return state->Reg[15]; |
| 64 | } | 64 | } |
| 65 | 65 | ||
| 66 | /** | 66 | /** |
| @@ -129,7 +129,7 @@ void ARM_DynCom::SaveContext(ThreadContext& ctx) { | |||
| 129 | 129 | ||
| 130 | ctx.sp = state->Reg[13]; | 130 | ctx.sp = state->Reg[13]; |
| 131 | ctx.lr = state->Reg[14]; | 131 | ctx.lr = state->Reg[14]; |
| 132 | ctx.pc = state->pc; | 132 | ctx.pc = state->Reg[15]; |
| 133 | ctx.cpsr = state->Cpsr; | 133 | ctx.cpsr = state->Cpsr; |
| 134 | 134 | ||
| 135 | ctx.fpscr = state->VFP[1]; | 135 | ctx.fpscr = state->VFP[1]; |