diff options
author | bunnei <bunneidev@gmail.com> | 2015-04-19 20:50:41 -0400 |
---|---|---|
committer | bunnei <bunneidev@gmail.com> | 2015-04-19 20:50:41 -0400 |
commit | a698e15c5dfb0ebdb6bbc377486fee2a47d6dd90 (patch) | |
tree | eb87d5ad426823d58618eb7ad8b7a2056a37e380 /src/core/arm/interpreter/arminit.cpp | |
parent | 5e55a525d879b14853f7a1cd71601d2c4076670e (diff) | |
parent | d66a12c6f6e612ba4574652a8087cd878c965b92 (diff) |
Merge pull request #703 from lioncash/cruft
dyncom: Remove unused/unnecessary VFP cruft
Diffstat (limited to 'src/core/arm/interpreter/arminit.cpp')
-rw-r--r-- | src/core/arm/interpreter/arminit.cpp | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp index 1d732fe8..6fa028f4 100644 --- a/src/core/arm/interpreter/arminit.cpp +++ b/src/core/arm/interpreter/arminit.cpp @@ -19,6 +19,7 @@ #include "core/mem_map.h" #include "core/arm/skyeye_common/armdefs.h" #include "core/arm/skyeye_common/armemu.h" +#include "core/arm/skyeye_common/vfp/vfp.h" /***************************************************************************\ * Returns a new instantiation of the ARMulator's state * @@ -56,15 +57,11 @@ ARMul_State* ARMul_NewState(ARMul_State* state) void ARMul_SelectProcessor(ARMul_State* state, unsigned properties) { - state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0; - state->is_v5 = (properties & ARM_v5_Prop) != 0; - state->is_v5e = (properties & ARM_v5e_Prop) != 0; - state->is_v6 = (properties & ARM_v6_Prop) != 0; - state->is_v7 = (properties & ARM_v7_Prop) != 0; - - // Only initialse the coprocessor support once we - // know what kind of chip we are dealing with. - ARMul_CoProInit(state); + state->is_v4 = (properties & (ARM_v4_Prop | ARM_v5_Prop)) != 0; + state->is_v5 = (properties & ARM_v5_Prop) != 0; + state->is_v5e = (properties & ARM_v5e_Prop) != 0; + state->is_v6 = (properties & ARM_v6_Prop) != 0; + state->is_v7 = (properties & ARM_v7_Prop) != 0; } // Resets certain MPCore CP15 values to their ARM-defined reset values. @@ -130,6 +127,8 @@ static void ResetMPCoreCP15Registers(ARMul_State* cpu) \***************************************************************************/ void ARMul_Reset(ARMul_State* state) { + VFPInit(state); + state->NextInstr = 0; state->Reg[15] = 0; |