1 files changed, 7 insertions, 30 deletions

diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index 1d732fe8..6ac45c39 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           *
@@ -28,22 +29,8 @@ ARMul_State* ARMul_NewState(ARMul_State* state)
     memset(state, 0, sizeof(ARMul_State));
 
     state->Emulate = RUN;
-    for (unsigned int i = 0; i < 16; i++) {
-        state->Reg[i] = 0;
-        for (unsigned int j = 0; j < 7; j++)
-            state->RegBank[j][i] = 0;
-    }
-    for (unsigned int i = 0; i < 7; i++)
-        state->Spsr[i] = 0;
-
     state->Mode = USER32MODE;
 
-    state->VectorCatch = 0;
-    state->Aborted = false;
-    state->Reseted = false;
-    state->Inted = 3;
-    state->LastInted = 3;
-
     state->lateabtSig = HIGH;
     state->bigendSig = LOW;
 
@@ -56,15 +43,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,26 +113,20 @@ static void ResetMPCoreCP15Registers(ARMul_State* cpu)
 \***************************************************************************/
 void ARMul_Reset(ARMul_State* state)
 {
-    state->NextInstr = 0;
+    VFPInit(state);
 
     state->Reg[15] = 0;
     state->Cpsr = INTBITS | SVC32MODE;
     state->Mode = SVC32MODE;
-
     state->Bank = SVCBANK;
-    FLUSHPIPE;
 
     ResetMPCoreCP15Registers(state);
 
-    state->EndCondition = 0;
-    state->ErrorCode = 0;
-
     state->NresetSig = HIGH;
     state->NfiqSig = HIGH;
     state->NirqSig = HIGH;
     state->NtransSig = (state->Mode & 3) ? HIGH : LOW;
     state->abortSig = LOW;
-    state->AbortAddr = 1;
 
     state->NumInstrs = 0;
 }