Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 2118886e956fc83c1923c61931a58cdc48e4ad6a..f7db250f9ec64b11dab52563cb93baf28c432e2c 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, |