summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorbunnei <bunneidev@gmail.com>2015-02-11 18:02:35 +0100
committerbunnei <bunneidev@gmail.com>2015-02-11 18:02:35 +0100
commitc51b23b0525d9838e34fa3e008234da658224dad (patch)
treeaa0bc7f953503ac71424f928792ff9fd641f16ac /src/core/arm/dyncom
parentMerge pull request #500 from archshift/assert (diff)
parentarm: Get rid of some magic constants. Specify proper ARM mode. (diff)
downloadyuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.gz
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.bz2
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.lz
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.xz
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.tar.zst
yuzu-c51b23b0525d9838e34fa3e008234da658224dad.zip
Diffstat (limited to 'src/core/arm/dyncom')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp4
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 68fddc94f..1977112dd 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