OpenPunk/citra
1
0
Fork 0
mirror of https://github.com/citra-emu/citra.git synced 2024-11-15 07:50:07 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #556 from lioncash/clean

Browse Source 
arm: Remove TRUE/FALSE defines
This commit is contained in:
bunnei 2015-02-10 18:28:30 -05:00
commit 5b735bdeea
4 changed files with 19 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/core/arm/interpreter/armcopro.cpp
View File

@ -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. // 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. // Initialise tham all first.
for (unsigned int i = 0; i < 16; i++) for (unsigned int i = 0; i < 16; i++)
@ -71,11 +71,10 @@ unsigned int ARMul_CoProInit(ARMul_State* state)
// No handlers below here. // No handlers below here.
// Call all the initialisation routines. // 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]) if (state->CPInit[i])
(state->CPInit[i]) (state); (state->CPInit[i]) (state);
}
return TRUE;
} }
// Install co-processor finalisation routines in this routine. // Install co-processor finalisation routines in this routine.

14
src/core/arm/interpreter/arminit.cpp
View File

@ -63,24 +63,22 @@ void ARMul_EmulateInit()
\***************************************************************************/ \***************************************************************************/
ARMul_State* ARMul_NewState(ARMul_State* state) ARMul_State* ARMul_NewState(ARMul_State* state)
{ {
unsigned i, j;
memset (state, 0, sizeof (ARMul_State)); memset (state, 0, sizeof (ARMul_State));
state->Emulate = RUN; state->Emulate = RUN;
for (i = 0; i < 16; i++) { for (unsigned int i = 0; i < 16; i++) {
state->Reg[i] = 0; state->Reg[i] = 0;
for (j = 0; j < 7; j++) for (unsigned int j = 0; j < 7; j++)
state->RegBank[j][i] = 0; state->RegBank[j][i] = 0;
} }
for (i = 0; i < 7; i++) for (unsigned int i = 0; i < 7; i++)
state->Spsr[i] = 0; state->Spsr[i] = 0;
state->Mode = 0; state->Mode = 0;
state->Debug = FALSE;
state->VectorCatch = 0; state->VectorCatch = 0;
state->Aborted = FALSE; state->Aborted = false;
state->Reseted = FALSE; state->Reseted = false;
state->Inted = 3; state->Inted = 3;
state->LastInted = 3; state->LastInted = 3;

12
src/core/arm/skyeye_common/armdefs.h
View File

@ -35,11 +35,6 @@
#define BITS(s, a, b) ((s << ((sizeof(s) * 8 - 1) - b)) >> (sizeof(s) * 8 - b + a - 1)) #define BITS(s, a, b) ((s << ((sizeof(s) * 8 - 1) - b)) >> (sizeof(s) * 8 - b + a - 1))
#define BIT(s, n) ((s >> (n)) & 1) #define BIT(s, n) ((s >> (n)) & 1)
#ifndef FALSE
#define FALSE 0
#define TRUE 1
#endif
#define LOW 0 #define LOW 0
#define HIGH 1 #define HIGH 1
#define LOWHIGH 1 #define LOWHIGH 1
@ -135,7 +130,6 @@ struct ARMul_State
unsigned char* CPData[16]; // Coprocessor data unsigned char* CPData[16]; // Coprocessor data
unsigned char const* CPRegWords[16]; // Map of coprocessor register sizes unsigned char const* CPRegWords[16]; // Map of coprocessor register sizes
unsigned Debug; // Show instructions as they are executed
unsigned NresetSig; // Reset the processor unsigned NresetSig; // Reset the processor
unsigned NfiqSig; unsigned NfiqSig;
unsigned NirqSig; unsigned NirqSig;
@ -180,12 +174,12 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model)
*/ */
unsigned lateabtSig; unsigned lateabtSig;
ARMword Vector; // Synthesize aborts in cycle modes bool Aborted; // Sticky flag for aborts
ARMword Aborted; // Sticky flag for aborts bool Reseted; // Sticky flag for Reset
ARMword Reseted; // Sticky flag for Reset
ARMword Inted, LastInted; // Sticky flags for interrupts ARMword Inted, LastInted; // Sticky flags for interrupts
ARMword Base; // Extra hand for base writeback ARMword Base; // Extra hand for base writeback
ARMword AbortAddr; // To keep track of Prefetch aborts ARMword AbortAddr; // To keep track of Prefetch aborts
ARMword Vector; // Synthesize aborts in cycle modes
// For differentiating ARM core emulaiton. // For differentiating ARM core emulaiton.
bool is_v4; // Are we emulating a v4 architecture (or higher)? bool is_v4; // Are we emulating a v4 architecture (or higher)?

14
src/core/arm/skyeye_common/armemu.h
View File

@ -100,10 +100,10 @@ extern ARMword ARMul_ImmedTable[]; // Immediate DP LHS values.
extern char ARMul_BitList[]; // Number of bits in a byte table. extern char ARMul_BitList[]; // Number of bits in a byte table.
// Coprocessor support functions. // Coprocessor support functions.
extern unsigned ARMul_CoProInit (ARMul_State *); extern void ARMul_CoProInit(ARMul_State*);
extern void ARMul_CoProExit (ARMul_State *); extern void ARMul_CoProExit(ARMul_State*);
extern void ARMul_CoProAttach (ARMul_State *, unsigned, ARMul_CPInits *, extern void ARMul_CoProAttach(ARMul_State*, unsigned, ARMul_CPInits*,
ARMul_CPExits *, ARMul_LDCs *, ARMul_STCs *, ARMul_CPExits*, ARMul_LDCs*, ARMul_STCs*,
ARMul_MRCs *, ARMul_MCRs *, ARMul_MRRCs *, ARMul_MCRRs *, ARMul_MRCs*, ARMul_MCRs*, ARMul_MRRCs*, ARMul_MCRRs*,
ARMul_CDPs *, ARMul_CPReads *, ARMul_CPWrites *); ARMul_CDPs*, ARMul_CPReads*, ARMul_CPWrites*);
extern void ARMul_CoProDetach (ARMul_State *, unsigned); extern void ARMul_CoProDetach(ARMul_State*, unsigned);