diff options
| author |  Lioncash <mathew1800@gmail.com> | 2015-02-10 12:37:28 -0500 |
|---|---|---|
| committer | Lioncash <mathew1800@gmail.com> | 2015-02-10 13:09:41 -0500 |
| commit | 088fab743fcff848b342efd52bfccaf6ee62a72f (patch) | |
| tree | 0360a62cfffaee5da99568e28cdd35f13c91aec1 /src/core/arm/skyeye_common/armdefs.h | |
| parent | 67db6aa4ce1f57f7d99406c8924ed41e74d36dbe (diff) | |
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/skyeye_common/armdefs.h')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 12 |
1 files changed, 3 insertions, 9 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index 77886878..ff9296e0 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)? |