Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 3ee3aadd9e78b452080c4d4b45b7949eb446bccd..4b2c8dc416ce30db0e40df330999e1d9b98c52a8 100644 |
--- a/src/x64/macro-assembler-x64.cc |
+++ b/src/x64/macro-assembler-x64.cc |
@@ -799,8 +799,15 @@ void MacroAssembler::GetBuiltinEntry(Register target, Builtins::JavaScript id) { |
} |
-static const Register saved_regs[] = |
- { rax, rcx, rdx, rbx, rbp, rsi, rdi, r8, r9, r10, r11 }; |
+#define REG(Name) { kRegister ## Name ## Code } |
+ |
+static const Register saved_regs[] = { |
+ REG(Rax), REG(Rcx), REG(Rdx), REG(Rbx), REG(Rbp), REG(Rsi), REG(Rdi), REG(R8), |
+ REG(R9), REG(R10), REG(R11) |
+}; |
+ |
+#undef REG |
+ |
static const int kNumberOfSavedRegs = sizeof(saved_regs) / sizeof(Register); |
@@ -2418,7 +2425,8 @@ void MacroAssembler::Dropad() { |
// Order general registers are pushed by Pushad: |
// rax, rcx, rdx, rbx, rsi, rdi, r8, r9, r11, r14, r15. |
-int MacroAssembler::kSafepointPushRegisterIndices[Register::kNumRegisters] = { |
+const int |
+MacroAssembler::kSafepointPushRegisterIndices[Register::kNumRegisters] = { |
0, |
1, |
2, |