diff options
author | bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-07-25 23:12:34 -0400 |
commit | 392c7feba0cd152e46ffbe6089def35082fa2692 (patch) | |
tree | d959d1751d99a6f5307b45d04e46c19c53d5efc2 /src/core/arm/dyncom/arm_dyncom.cpp | |
parent | 453764aefc3b822d08dae3642fab83ea1adf2bc8 (diff) | |
parent | 03213f893e7f2cbd692144334ac72d9138fd5e70 (diff) |
Merge pull request #990 from lioncash/arm
dyncom: General cleanup
Diffstat (limited to 'src/core/arm/dyncom/arm_dyncom.cpp')
-rw-r--r-- | src/core/arm/dyncom/arm_dyncom.cpp | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/src/core/arm/dyncom/arm_dyncom.cpp b/src/core/arm/dyncom/arm_dyncom.cpp index 529c4ac7..a51a3acf 100644 --- a/src/core/arm/dyncom/arm_dyncom.cpp +++ b/src/core/arm/dyncom/arm_dyncom.cpp @@ -6,7 +6,8 @@ #include "common/make_unique.h" -#include "core/arm/skyeye_common/armdefs.h" +#include "core/arm/skyeye_common/armstate.h" +#include "core/arm/skyeye_common/armsupp.h" #include "core/arm/skyeye_common/vfp/vfp.h" #include "core/arm/dyncom/arm_dyncom.h" @@ -19,18 +20,8 @@ ARM_DynCom::ARM_DynCom(PrivilegeMode initial_mode) { state = Common::make_unique<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->bigendSig = LOW; - state->lateabtSig = LOW; - state->NirqSig = HIGH; - // Reset the core to initial state ARMul_Reset(state.get()); - state->Emulate = RUN; // Switch to the desired privilege mode. switch_mode(state.get(), initial_mode); |