OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-12-19 16:21:05 +00:00
Code Issues Projects Releases Wiki Activity

arm: fixed bug in how thread context switch occurs with SkyEye

Browse Source
This commit is contained in:
bunnei 2014-06-05 00:20:11 -04:00
parent 870c6146e7
commit 9ece9da50d
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/arm/interpreter/arm_interpreter.cpp
View File

@ -118,6 +118,9 @@ void ARM_Interpreter::SaveContext(ThreadContext& ctx) {
ctx.fpscr = state->VFP[1]; ctx.fpscr = state->VFP[1];
ctx.fpexc = state->VFP[2]; ctx.fpexc = state->VFP[2];
ctx.reg_15 = state->Reg[15];
ctx.mode = state->NextInstr;
} }
/** /**
@ -137,8 +140,8 @@ void ARM_Interpreter::LoadContext(const ThreadContext& ctx) {
state->VFP[1] = ctx.fpscr; state->VFP[1] = ctx.fpscr;
state->VFP[2] = ctx.fpexc; state->VFP[2] = ctx.fpexc;
state->Reg[15] = ctx.pc; state->Reg[15] = ctx.reg_15;
state->NextInstr = RESUME; state->NextInstr = ctx.mode;
} }
/// Prepare core for thread reschedule (if needed to correctly handle state) /// Prepare core for thread reschedule (if needed to correctly handle state)

4
src/core/hle/svc.h
View File

@ -29,6 +29,10 @@ struct ThreadContext {
u32 fpu_registers[32]; u32 fpu_registers[32];
u32 fpscr; u32 fpscr;
u32 fpexc; u32 fpexc;
// These are not part of native ThreadContext, but needed by emu
u32 reg_15;
u32 mode;
}; };
enum ResetType { enum ResetType {