diff options
Diffstat (limited to 'src/core/arm/skyeye_common')
| -rw-r--r-- | src/core/arm/skyeye_common/armdefs.h | 48 | ||||
| -rw-r--r-- | src/core/arm/skyeye_common/armemu.h | 28 |
2 files changed, 36 insertions, 40 deletions
diff --git a/src/core/arm/skyeye_common/armdefs.h b/src/core/arm/skyeye_common/armdefs.h index ff9296e0f..012c43c61 100644 --- a/src/core/arm/skyeye_common/armdefs.h +++ b/src/core/arm/skyeye_common/armdefs.h @@ -35,15 +35,27 @@ #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 LOW 0 -#define HIGH 1 -#define LOWHIGH 1 -#define HIGHLOW 2 +// Signal levels +enum { + LOW = 0, + HIGH = 1, + LOWHIGH = 1, + HIGHLOW = 2 +}; + +// Cache types +enum { + NONCACHE = 0, + DATACACHE = 1, + INSTCACHE = 2, +}; -//the define of cachetype -#define NONCACHE 0 -#define DATACACHE 1 -#define INSTCACHE 2 +// Abort models +enum { + ABORT_BASE_RESTORED = 0, + ABORT_EARLY = 1, + ABORT_BASE_UPDATED = 2 +}; #define POS(i) ( (~(i)) >> 31 ) #define NEG(i) ( (i) >> 31 ) @@ -137,8 +149,6 @@ struct ARMul_State unsigned abortSig; unsigned NtransSig; unsigned bigendSig; - unsigned prog32Sig; - unsigned data32Sig; unsigned syscallSig; /* 2004-05-09 chy @@ -215,7 +225,6 @@ typedef ARMul_State arm_core_t; \***************************************************************************/ enum { - ARM_Fix26_Prop = 0x01, ARM_Nexec_Prop = 0x02, ARM_Debug_Prop = 0x10, ARM_Isync_Prop = ARM_Debug_Prop, @@ -230,19 +239,6 @@ enum { ARM_iWMMXt_Prop = 0x800, ARM_PXA27X_Prop = 0x1000, ARM_v7_Prop = 0x2000, - - // ARM2 family - ARM2 = ARM_Fix26_Prop, - ARM2as = ARM2, - ARM61 = ARM2, - ARM3 = ARM2, - - // ARM6 family - ARM6 = ARM_Lock_Prop, - ARM60 = ARM6, - ARM600 = ARM6, - ARM610 = ARM6, - ARM620 = ARM6 }; /***************************************************************************\ @@ -275,10 +271,6 @@ enum { \***************************************************************************/ enum { - USER26MODE = 0, - FIQ26MODE = 1, - IRQ26MODE = 2, - SVC26MODE = 3, USER32MODE = 16, FIQ32MODE = 17, IRQ32MODE = 18, diff --git a/src/core/arm/skyeye_common/armemu.h b/src/core/arm/skyeye_common/armemu.h index beee54c9a..5d4c06837 100644 --- a/src/core/arm/skyeye_common/armemu.h +++ b/src/core/arm/skyeye_common/armemu.h @@ -76,24 +76,28 @@ #define R15MODE (state->Reg[15] & R15MODEBITS) // Different ways to start the next instruction. -#define SEQ 0 -#define NONSEQ 1 -#define PCINCEDSEQ 2 -#define PCINCEDNONSEQ 3 -#define PRIMEPIPE 4 -#define RESUME 8 +enum { + SEQ = 0, + NONSEQ = 1, + PCINCEDSEQ = 2, + PCINCEDNONSEQ = 3, + PRIMEPIPE = 4, + RESUME = 8 +}; + +// Values for Emulate. +enum { + STOP = 0, // Stop + CHANGEMODE = 1, // Change mode + ONCE = 2, // Execute just one interation + RUN = 3 // Continuous execution +}; #define FLUSHPIPE state->NextInstr |= PRIMEPIPE // Macro to rotate n right by b bits. #define ROTATER(n, b) (((n) >> (b)) | ((n) << (32 - (b)))) -// Values for Emulate. -#define STOP 0 // stop -#define CHANGEMODE 1 // change mode -#define ONCE 2 // execute just one interation -#define RUN 3 // continuous execution - // Stuff that is shared across modes. extern unsigned ARMul_MultTable[]; // Number of I cycles for a mult. extern ARMword ARMul_ImmedTable[]; // Immediate DP LHS values. |