diff options
| author |  bunnei <bunneidev@gmail.com> | 2015-02-11 12:02:35 -0500 |
|---|---|---|
| committer | bunnei <bunneidev@gmail.com> | 2015-02-11 12:02:35 -0500 |
| commit | c51b23b0525d9838e34fa3e008234da658224dad (patch) | |
| tree | aa0bc7f953503ac71424f928792ff9fd641f16ac /src/core/arm/dyncom | |
| parent | 2fb1e4c9a2e45aad6c3e9408a3895369b8a8729f (diff) | |
| parent | c94c41f95ac5e465671cd3d1865bcd5b03e98d65 (diff) | |
Merge pull request #559 from lioncash/clean
arm: Some cleanup. Also fixed the initial ARM mode that is emulated.
Diffstat (limited to 'src/core/arm/dyncom')
| -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 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 |