summaryrefslogtreecommitdiffstats
path: root/src/core/arm/dyncom
diff options
context:
space:
mode:
authorLioncash <mathew1800@gmail.com>2015-02-12 21:04:47 +0100
committerLioncash <mathew1800@gmail.com>2015-02-13 03:50:51 +0100
commitc3211c9c802309a1b391d75934cc18cad98cdcb9 (patch)
tree3646faf4a4d689fc7c438d7142219fafe1eaa0f8 /src/core/arm/dyncom
parentMerge pull request #567 from lioncash/warn (diff)
downloadyuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar.gz
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar.bz2
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar.lz
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar.xz
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.tar.zst
yuzu-c3211c9c802309a1b391d75934cc18cad98cdcb9.zip
Diffstat (limited to '')
-rw-r--r--src/core/arm/dyncom/arm_dyncom.cpp11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp
index c4af85242..6a95ede24 100644
--- a/src/core/arm/dyncom/arm_dyncom.cpp
+++ b/src/core/arm/dyncom/arm_dyncom.cpp
@@ -19,25 +19,22 @@ ARM_DynCom::ARM_DynCom() {
state = std::unique_ptr<ARMul_State>(new ARMul_State);
ARMul_NewState(state.get());
+ ARMul_SelectProcessor(state.get(), ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop);
state->abort_model = ABORT_BASE_RESTORED;
state->cpu = (cpu_config_t*)&s_arm11_cpu_info;
- state->bigendSig = LOW;
- ARMul_SelectProcessor(state.get(), ARM_v6_Prop | ARM_v5_Prop | ARM_v5e_Prop);
+ state->bigendSig = LOW;
state->lateabtSig = LOW;
+ state->NirqSig = HIGH;
// Reset the core to initial state
- ARMul_CoProInit(state.get());
ARMul_Reset(state.get());
state->NextInstr = RESUME; // NOTE: This will be overwritten by LoadContext
state->Emulate = RUN;
- state->Reg[15] = 0x00000000;
state->Reg[13] = 0x10000000; // Set stack pointer to the top of the stack
- state->NirqSig = HIGH;
-
- VFPInit(state.get()); // Initialize the VFP
+ state->Reg[15] = 0x00000000;
}
ARM_DynCom::~ARM_DynCom() {