arm: Change some more constants into enums

src/core/arm/skyeye_common/armdefs.h

@@ -35,15 +35,20 @@
 #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
+// Signal levels
-#define HIGH 1
+enum {
-#define LOWHIGH 1
+    LOW     = 0,
-#define HIGHLOW 2
+    HIGH    = 1,
+    LOWHIGH = 1,
+    HIGHLOW = 2
+};
 
-//the define of cachetype
+// Cache types
-#define NONCACHE  0
+enum {
-#define DATACACHE  1
+    NONCACHE  = 0,
-#define INSTCACHE  2
+    DATACACHE = 1,
+    INSTCACHE = 2,
+};
 
 #define POS(i) ( (~(i)) >> 31 )
 #define NEG(i) ( (i) >> 31 )

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
+enum {
-#define NONSEQ        1
+    SEQ           = 0,
-#define PCINCEDSEQ    2
+    NONSEQ        = 1,
-#define PCINCEDNONSEQ 3
+    PCINCEDSEQ    = 2,
-#define PRIMEPIPE     4
+    PCINCEDNONSEQ = 3,
-#define RESUME        8
+    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.