diff options
Diffstat (limited to 'src/core/arm/skyeye_common')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 12 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armemu.h | 14 |
2 files changed, 10 insertions, 16 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 778868783..ff9296e0f 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -35,11 +35,6 @@ #define BITS(s, a, b) ((s << ((sizeof(s) * 8 - 1) - b)) >> (sizeof(s) * 8 - b + a - 1)) #define BIT(s, n) ((s >> (n)) & 1) -#ifndef FALSE -#define FALSE 0 -#define TRUE 1 -#endif - #define LOW 0 #define HIGH 1 #define LOWHIGH 1 @@ -135,7 +130,6 @@ struct ARMul_State unsigned char* CPData[16]; // Coprocessor data unsigned char const* CPRegWords[16]; // Map of coprocessor register sizes - unsigned Debug; // Show instructions as they are executed unsigned NresetSig; // Reset the processor unsigned NfiqSig; unsigned NirqSig; @@ -180,12 +174,12 @@ So, if lateabtSig=1, then it means Late Abort Model(Base Updated Abort Model) */ unsigned lateabtSig; - ARMword Vector; // Synthesize aborts in cycle modes - ARMword Aborted; // Sticky flag for aborts - ARMword Reseted; // Sticky flag for Reset + bool Aborted; // Sticky flag for aborts + bool Reseted; // Sticky flag for Reset ARMword Inted, LastInted; // Sticky flags for interrupts ARMword Base; // Extra hand for base writeback ARMword AbortAddr; // To keep track of Prefetch aborts + ARMword Vector; // Synthesize aborts in cycle modes // For differentiating ARM core emulaiton. bool is_v4; // Are we emulating a v4 architecture (or higher)? diff --git a/src/core/arm/skyeye_common/armemu.h b/src/core/arm/skyeye_common/armemu.h index 6071d447b..beee54c9a 100644 --- a/src/core/arm/skyeye_common/armemu.h +++ b/src/core/arm/skyeye_common/armemu.h @@ -100,10 +100,10 @@ extern ARMword ARMul_ImmedTable[]; // Immediate DP LHS values. extern char ARMul_BitList[]; // Number of bits in a byte table. // Coprocessor support functions. -extern unsigned ARMul_CoProInit (ARMul_State *); -extern void ARMul_CoProExit (ARMul_State *); -extern void ARMul_CoProAttach (ARMul_State *, unsigned, ARMul_CPInits *, - ARMul_CPExits *, ARMul_LDCs *, ARMul_STCs *, - ARMul_MRCs *, ARMul_MCRs *, ARMul_MRRCs *, ARMul_MCRRs *, - ARMul_CDPs *, ARMul_CPReads *, ARMul_CPWrites *); -extern void ARMul_CoProDetach (ARMul_State *, unsigned); +extern void ARMul_CoProInit(ARMul_State*); +extern void ARMul_CoProExit(ARMul_State*); +extern void ARMul_CoProAttach(ARMul_State*, unsigned, ARMul_CPInits*, + ARMul_CPExits*, ARMul_LDCs*, ARMul_STCs*, + ARMul_MRCs*, ARMul_MCRs*, ARMul_MRRCs*, ARMul_MCRRs*, + ARMul_CDPs*, ARMul_CPReads*, ARMul_CPWrites*); +extern void ARMul_CoProDetach(ARMul_State*, unsigned); |