summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-02-11 16:49:48 +0100
committerLioncash <mathew1800@gmail.com>2015-02-11 16:49:55 +0100
commitc94c41f95ac5e465671cd3d1865bcd5b03e98d65 (patch)
tree5a3675b5c8e70b316193761a0b27093b255352d2
parentarm: Change some more constants into enums (diff)
downloadyuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar.gz
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar.bz2
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar.lz
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar.xz
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.tar.zst
yuzu-c94c41f95ac5e465671cd3d1865bcd5b03e98d65.zip
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp4
-rw-r--r--src/core/arm/interpreter/arminit.cpp2
-rw-r--r--src/core/arm/skyeye_common/armdefs.h7
3 files changed, 10 insertions, 3 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
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index 7b502e240..b7dd5e38d 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -74,7 +74,7 @@ ARMul_State* ARMul_NewState(ARMul_State* state)
for (unsigned int i = 0; i < 7; i++)
state->Spsr[i] = 0;
- state->Mode = 0;
+ state->Mode = USER32MODE;
state->VectorCatch = 0;
state->Aborted = false;
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h
index 97a341767..0de40f647 100644
--- a/src/core/arm/skyeye_common/armdefs.h
+++ b/src/core/arm/skyeye_common/armdefs.h
@@ -50,6 +50,13 @@ enum {
INSTCACHE = 2,
};
+// Abort models
+enum {
+ ABORT_BASE_RESTORED = 0,
+ ABORT_EARLY = 1,
+ ABORT_BASE_UPDATED = 2
+};
+
#define POS(i) ( (~(i)) >> 31 )
#define NEG(i) ( (i) >> 31 )