summaryrefslogtreecommitdiffstats
path: root/src/core/arm/interpreter
diff options
context:
space:
mode:
Diffstat (limited to 'src/core/arm/interpreter')
-rw-r--r--src/core/arm/interpreter/armcopro.cpp7
-rw-r--r--src/core/arm/interpreter/arminit.cpp14
2 files changed, 9 insertions, 12 deletions
diff --git a/src/core/arm/interpreter/armcopro.cpp b/src/core/arm/interpreter/armcopro.cpp
index bb9ca98fe..4ae0c52e4 100644
--- a/src/core/arm/interpreter/armcopro.cpp
+++ b/src/core/arm/interpreter/armcopro.cpp
@@ -47,7 +47,7 @@ static unsigned int NoCoPro5W(ARMul_State* state, unsigned int a, ARMword b, ARM
}
// Install co-processor instruction handlers in this routine.
-unsigned int ARMul_CoProInit(ARMul_State* state)
+void ARMul_CoProInit(ARMul_State* state)
{
// Initialise tham all first.
for (unsigned int i = 0; i < 16; i++)
@@ -71,11 +71,10 @@ unsigned int ARMul_CoProInit(ARMul_State* state)
// No handlers below here.
// Call all the initialisation routines.
- for (unsigned int i = 0; i < 16; i++)
+ for (unsigned int i = 0; i < 16; i++) {
if (state->CPInit[i])
(state->CPInit[i]) (state);
-
- return TRUE;
+ }
}
// Install co-processor finalisation routines in this routine.
diff --git a/src/core/arm/interpreter/arminit.cpp b/src/core/arm/interpreter/arminit.cpp
index a52d14960..7b502e240 100644
--- a/src/core/arm/interpreter/arminit.cpp
+++ b/src/core/arm/interpreter/arminit.cpp
@@ -63,24 +63,22 @@ void ARMul_EmulateInit()
\***************************************************************************/
ARMul_State* ARMul_NewState(ARMul_State* state)
{
- unsigned i, j;
-
memset (state, 0, sizeof (ARMul_State));
state->Emulate = RUN;
- for (i = 0; i < 16; i++) {
+ for (unsigned int i = 0; i < 16; i++) {
state->Reg[i] = 0;
- for (j = 0; j < 7; j++)
+ for (unsigned int j = 0; j < 7; j++)
state->RegBank[j][i] = 0;
}
- for (i = 0; i < 7; i++)
+ for (unsigned int i = 0; i < 7; i++)
state->Spsr[i] = 0;
+
state->Mode = 0;
- state->Debug = FALSE;
state->VectorCatch = 0;
- state->Aborted = FALSE;
- state->Reseted = FALSE;
+ state->Aborted = false;
+ state->Reseted = false;
state->Inted = 3;
state->LastInted = 3;