summaryrefslogtreecommitdiff
path: root/src/core/arm/interpreter
diff options
context:
space:
mode:
authorGravatar Lioncash2015-02-10 12:37:28 -0500
committerGravatar Lioncash2015-02-10 13:09:41 -0500
commit088fab743fcff848b342efd52bfccaf6ee62a72f (patch)
tree0360a62cfffaee5da99568e28cdd35f13c91aec1 /src/core/arm/interpreter
parentMerge pull request #553 from lioncash/denorm (diff)
downloadyuzu-088fab743fcff848b342efd52bfccaf6ee62a72f.tar.gz
yuzu-088fab743fcff848b342efd52bfccaf6ee62a72f.tar.xz
yuzu-088fab743fcff848b342efd52bfccaf6ee62a72f.zip
arm: Remove TRUE/FALSE defines
- Removed the Debug parameter from ARMul_State since it isn't used. - Changed ARMul_CoProInit to a void function. It always returned true.
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
47} 47}
48 48
49// Install co-processor instruction handlers in this routine. 49// Install co-processor instruction handlers in this routine.
50unsigned int ARMul_CoProInit(ARMul_State* state) 50void ARMul_CoProInit(ARMul_State* state)
51{ 51{
52 // Initialise tham all first. 52 // Initialise tham all first.
53 for (unsigned int i = 0; i < 16; i++) 53 for (unsigned int i = 0; i < 16; i++)
@@ -71,11 +71,10 @@ unsigned int ARMul_CoProInit(ARMul_State* state)
71 // No handlers below here. 71 // No handlers below here.
72 72
73 // Call all the initialisation routines. 73 // Call all the initialisation routines.
74 for (unsigned int i = 0; i < 16; i++) 74 for (unsigned int i = 0; i < 16; i++) {
75 if (state->CPInit[i]) 75 if (state->CPInit[i])
76 (state->CPInit[i]) (state); 76 (state->CPInit[i]) (state);
77 77 }
78 return TRUE;
79} 78}
80 79
81// Install co-processor finalisation routines in this routine. 80// 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()
63\***************************************************************************/ 63\***************************************************************************/
64ARMul_State* ARMul_NewState(ARMul_State* state) 64ARMul_State* ARMul_NewState(ARMul_State* state)
65{ 65{
66 unsigned i, j;
67
68 memset (state, 0, sizeof (ARMul_State)); 66 memset (state, 0, sizeof (ARMul_State));
69 67
70 state->Emulate = RUN; 68 state->Emulate = RUN;
71 for (i = 0; i < 16; i++) { 69 for (unsigned int i = 0; i < 16; i++) {
72 state->Reg[i] = 0; 70 state->Reg[i] = 0;
73 for (j = 0; j < 7; j++) 71 for (unsigned int j = 0; j < 7; j++)
74 state->RegBank[j][i] = 0; 72 state->RegBank[j][i] = 0;
75 } 73 }
76 for (i = 0; i < 7; i++) 74 for (unsigned int i = 0; i < 7; i++)
77 state->Spsr[i] = 0; 75 state->Spsr[i] = 0;
76
78 state->Mode = 0; 77 state->Mode = 0;
79 78
80 state->Debug = FALSE;
81 state->VectorCatch = 0; 79 state->VectorCatch = 0;
82 state->Aborted = FALSE; 80 state->Aborted = false;
83 state->Reseted = FALSE; 81 state->Reseted = false;
84 state->Inted = 3; 82 state->Inted = 3;
85 state->LastInted = 3; 83 state->LastInted = 3;
86 84