Index: src/x64/macro-assembler-x64.cc |
diff --git a/src/x64/macro-assembler-x64.cc b/src/x64/macro-assembler-x64.cc |
index 2ee506d7c3021d8f61cca1788ee0f228d75aec19..18b975100ba9b48c30fc27b992d5057a23f6041d 100644 |
--- a/src/x64/macro-assembler-x64.cc |
+++ b/src/x64/macro-assembler-x64.cc |
@@ -2415,7 +2415,7 @@ void MacroAssembler::PushTryHandler(CodeLocation try_location, |
} |
// Save the current handler. |
Operand handler_operand = |
- ExternalOperand(ExternalReference(Isolate::k_handler_address, isolate())); |
+ ExternalOperand(ExternalReference(Isolate::kHandlerAddress, isolate())); |
push(handler_operand); |
// Link this handler. |
movq(handler_operand, rsp); |
@@ -2426,7 +2426,7 @@ void MacroAssembler::PopTryHandler() { |
ASSERT_EQ(0, StackHandlerConstants::kNextOffset); |
// Unlink this handler. |
Operand handler_operand = |
- ExternalOperand(ExternalReference(Isolate::k_handler_address, isolate())); |
+ ExternalOperand(ExternalReference(Isolate::kHandlerAddress, isolate())); |
pop(handler_operand); |
// Remove the remaining fields. |
addq(rsp, Immediate(StackHandlerConstants::kSize - kPointerSize)); |
@@ -2446,7 +2446,7 @@ void MacroAssembler::Throw(Register value) { |
movq(rax, value); |
} |
- ExternalReference handler_address(Isolate::k_handler_address, isolate()); |
+ ExternalReference handler_address(Isolate::kHandlerAddress, isolate()); |
Operand handler_operand = ExternalOperand(handler_address); |
movq(rsp, handler_operand); |
// get next in chain |
@@ -2482,7 +2482,7 @@ void MacroAssembler::ThrowUncatchable(UncatchableExceptionType type, |
movq(rax, value); |
} |
// Fetch top stack handler. |
- ExternalReference handler_address(Isolate::k_handler_address, isolate()); |
+ ExternalReference handler_address(Isolate::kHandlerAddress, isolate()); |
Load(rsp, handler_address); |
// Unwind the handlers until the ENTRY handler is found. |
@@ -2505,12 +2505,12 @@ void MacroAssembler::ThrowUncatchable(UncatchableExceptionType type, |
if (type == OUT_OF_MEMORY) { |
// Set external caught exception to false. |
ExternalReference external_caught( |
- Isolate::k_external_caught_exception_address, isolate()); |
+ Isolate::kExternalCaughtExceptionAddress, isolate()); |
Set(rax, static_cast<int64_t>(false)); |
Store(external_caught, rax); |
// Set pending exception and rax to out of memory exception. |
- ExternalReference pending_exception(Isolate::k_pending_exception_address, |
+ ExternalReference pending_exception(Isolate::kPendingExceptionAddress, |
isolate()); |
movq(rax, Failure::OutOfMemoryException(), RelocInfo::NONE); |
Store(pending_exception, rax); |
@@ -3041,8 +3041,8 @@ void MacroAssembler::EnterExitFramePrologue(bool save_rax) { |
movq(r14, rax); // Backup rax in callee-save register. |
} |
- Store(ExternalReference(Isolate::k_c_entry_fp_address, isolate()), rbp); |
- Store(ExternalReference(Isolate::k_context_address, isolate()), rsi); |
+ Store(ExternalReference(Isolate::kCEntryFPAddress, isolate()), rbp); |
+ Store(ExternalReference(Isolate::kContextAddress, isolate()), rsi); |
} |
@@ -3132,7 +3132,7 @@ void MacroAssembler::LeaveApiExitFrame() { |
void MacroAssembler::LeaveExitFrameEpilogue() { |
// Restore current context from top and clear it in debug mode. |
- ExternalReference context_address(Isolate::k_context_address, isolate()); |
+ ExternalReference context_address(Isolate::kContextAddress, isolate()); |
Operand context_operand = ExternalOperand(context_address); |
movq(rsi, context_operand); |
#ifdef DEBUG |
@@ -3140,7 +3140,7 @@ void MacroAssembler::LeaveExitFrameEpilogue() { |
#endif |
// Clear the top frame. |
- ExternalReference c_entry_fp_address(Isolate::k_c_entry_fp_address, |
+ ExternalReference c_entry_fp_address(Isolate::kCEntryFPAddress, |
isolate()); |
Operand c_entry_fp_operand = ExternalOperand(c_entry_fp_address); |
movq(c_entry_fp_operand, Immediate(0)); |