py: Make macro names in assemblers consistent, and tidy up a bit.

1 files changed, 34 insertions, 34 deletions

diff --git a/py/asmarm.h b/py/asmarm.h
index 7942793a2..e0c8efe1f 100644
--- a/py/asmarm.h
+++ b/py/asmarm.h
@@ -28,41 +28,41 @@
 #define ASM_ARM_PASS_COMPUTE (1)
 #define ASM_ARM_PASS_EMIT    (2)
 
-#define REG_R0  (0)
-#define REG_R1  (1)
-#define REG_R2  (2)
-#define REG_R3  (3)
-#define REG_R4  (4)
-#define REG_R5  (5)
-#define REG_R6  (6)
-#define REG_R7  (7)
-#define REG_R8  (8)
-#define REG_R9  (9)
-#define REG_R10 (10)
-#define REG_R11 (11)
-#define REG_R12 (12)
-#define REG_R13 (13)
-#define REG_R14 (14)
-#define REG_R15 (15)
-#define REG_SP  (REG_R13)
-#define REG_LR  (REG_R14)
-#define REG_PC  (REG_R15)
+#define ASM_ARM_REG_R0  (0)
+#define ASM_ARM_REG_R1  (1)
+#define ASM_ARM_REG_R2  (2)
+#define ASM_ARM_REG_R3  (3)
+#define ASM_ARM_REG_R4  (4)
+#define ASM_ARM_REG_R5  (5)
+#define ASM_ARM_REG_R6  (6)
+#define ASM_ARM_REG_R7  (7)
+#define ASM_ARM_REG_R8  (8)
+#define ASM_ARM_REG_R9  (9)
+#define ASM_ARM_REG_R10 (10)
+#define ASM_ARM_REG_R11 (11)
+#define ASM_ARM_REG_R12 (12)
+#define ASM_ARM_REG_R13 (13)
+#define ASM_ARM_REG_R14 (14)
+#define ASM_ARM_REG_R15 (15)
+#define ASM_ARM_REG_SP  (ASM_ARM_REG_R13)
+#define ASM_ARM_REG_LR  (ASM_ARM_REG_R14)
+#define ASM_ARM_REG_PC  (ASM_ARM_REG_R15)
 
-#define ARM_CC_EQ (0x0 << 28)
-#define ARM_CC_NE (0x1 << 28)
-#define ARM_CC_CS (0x2 << 28)
-#define ARM_CC_CC (0x3 << 28)
-#define ARM_CC_MI (0x4 << 28)
-#define ARM_CC_PL (0x5 << 28)
-#define ARM_CC_VS (0x6 << 28)
-#define ARM_CC_VC (0x7 << 28)
-#define ARM_CC_HI (0x8 << 28)
-#define ARM_CC_LS (0x9 << 28)
-#define ARM_CC_GE (0xa << 28)
-#define ARM_CC_LT (0xb << 28)
-#define ARM_CC_GT (0xc << 28)
-#define ARM_CC_LE (0xd << 28)
-#define ARM_CC_AL (0xe << 28)
+#define ASM_ARM_CC_EQ (0x0 << 28)
+#define ASM_ARM_CC_NE (0x1 << 28)
+#define ASM_ARM_CC_CS (0x2 << 28)
+#define ASM_ARM_CC_CC (0x3 << 28)
+#define ASM_ARM_CC_MI (0x4 << 28)
+#define ASM_ARM_CC_PL (0x5 << 28)
+#define ASM_ARM_CC_VS (0x6 << 28)
+#define ASM_ARM_CC_VC (0x7 << 28)
+#define ASM_ARM_CC_HI (0x8 << 28)
+#define ASM_ARM_CC_LS (0x9 << 28)
+#define ASM_ARM_CC_GE (0xa << 28)
+#define ASM_ARM_CC_LT (0xb << 28)
+#define ASM_ARM_CC_GT (0xc << 28)
+#define ASM_ARM_CC_LE (0xd << 28)
+#define ASM_ARM_CC_AL (0xe << 28)
 
 typedef struct _asm_arm_t asm_arm_t;