Index: src/arm/assembler-arm.h |
=================================================================== |
--- src/arm/assembler-arm.h (revision 11005) |
+++ src/arm/assembler-arm.h (working copy) |
@@ -124,25 +124,48 @@ |
int code_; |
}; |
-const Register no_reg = { -1 }; |
+// These constants are used in several locations, including static initializers |
+const int kRegister_no_reg_Code = -1; |
+const int kRegister_r0_Code = 0; |
+const int kRegister_r1_Code = 1; |
+const int kRegister_r2_Code = 2; |
+const int kRegister_r3_Code = 3; |
+const int kRegister_r4_Code = 4; |
+const int kRegister_r5_Code = 5; |
+const int kRegister_r6_Code = 6; |
+const int kRegister_r7_Code = 7; |
+const int kRegister_r8_Code = 8; |
+const int kRegister_r9_Code = 9; |
+const int kRegister_r10_Code = 10; |
+const int kRegister_fp_Code = 11; |
+const int kRegister_ip_Code = 12; |
+const int kRegister_sp_Code = 13; |
+const int kRegister_lr_Code = 14; |
+const int kRegister_pc_Code = 15; |
-const Register r0 = { 0 }; |
-const Register r1 = { 1 }; |
-const Register r2 = { 2 }; |
-const Register r3 = { 3 }; |
-const Register r4 = { 4 }; |
-const Register r5 = { 5 }; |
-const Register r6 = { 6 }; |
-const Register r7 = { 7 }; |
-const Register r8 = { 8 }; // Used as context register. |
-const Register r9 = { 9 }; // Used as lithium codegen scratch register. |
-const Register r10 = { 10 }; // Used as roots register. |
-const Register fp = { 11 }; |
-const Register ip = { 12 }; |
-const Register sp = { 13 }; |
-const Register lr = { 14 }; |
-const Register pc = { 15 }; |
+const Register no_reg = { kRegister_no_reg_Code }; |
+const Register r0 = { kRegister_r0_Code }; |
+const Register r1 = { kRegister_r1_Code }; |
+const Register r2 = { kRegister_r2_Code }; |
+const Register r3 = { kRegister_r3_Code }; |
+const Register r4 = { kRegister_r4_Code }; |
+const Register r5 = { kRegister_r5_Code }; |
+const Register r6 = { kRegister_r6_Code }; |
+const Register r7 = { kRegister_r7_Code }; |
+// Used as context register. |
+const Register r8 = { kRegister_r8_Code }; |
+// Used as lithium codegen scratch register. |
+const Register r9 = { kRegister_r9_Code }; |
+// Used as roots register. |
+const Register r10 = { kRegister_r10_Code }; |
+const Register fp = { kRegister_fp_Code }; |
+const Register ip = { kRegister_ip_Code }; |
+const Register sp = { kRegister_sp_Code }; |
+const Register lr = { kRegister_lr_Code }; |
+const Register pc = { kRegister_pc_Code }; |
+ |
+ |
// Single word VFP register. |
struct SwVfpRegister { |
bool is_valid() const { return 0 <= code_ && code_ < 32; } |