From c94c41f95ac5e465671cd3d1865bcd5b03e98d65 Mon Sep 17 00:00:00 2001 From: Lioncash Date: Wed, 11 Feb 2015 10:49:48 -0500 Subject: arm: Get rid of some magic constants. Specify proper ARM mode. Initially, we were starting the emulator in USER26MODE, which is incorrect, this should be USER32MODE. --- src/core/arm/dyncom/arm_dyncom.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/core/arm/dyncom/arm_dyncom.cpp') diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 68fddc94..1977112d 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -23,7 +23,7 @@ ARM_DynCom::ARM_DynCom() { ARMul_NewState((ARMul_State*)state.get()); - state->abort_model = 0; + state->abort_model = ABORT_BASE_RESTORED; state->cpu = (cpu_config_t*)&s_arm11_cpu_info; state->bigendSig = LOW; @@ -34,7 +34,7 @@ ARM_DynCom::ARM_DynCom() { ARMul_CoProInit(state.get()); ARMul_Reset(state.get()); state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext - state->Emulate = 3; + state->Emulate = RUN; state->Reg[15] = 0x00000000; state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack -- cgit v1.2.3