Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 613a1f69f13a8923878b7e5b089d3de96a303d9d..77c14aa77ad862d7842fcd5a02cb747dba8e3f3f 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -760,9 +760,9 @@ void MacroAssembler::EnterExitFrame(bool save_doubles, int stack_space) { |
str(ip, MemOperand(fp, ExitFrameConstants::kCodeOffset)); |
// Save the frame pointer and the context in top. |
- mov(ip, Operand(ExternalReference(Isolate::k_c_entry_fp_address, isolate()))); |
+ mov(ip, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate()))); |
str(fp, MemOperand(ip)); |
- mov(ip, Operand(ExternalReference(Isolate::k_context_address, isolate()))); |
+ mov(ip, Operand(ExternalReference(Isolate::kContextAddress, isolate()))); |
str(cp, MemOperand(ip)); |
// Optionally save all double registers. |
@@ -838,11 +838,11 @@ void MacroAssembler::LeaveExitFrame(bool save_doubles, |
// Clear top frame. |
mov(r3, Operand(0, RelocInfo::NONE)); |
- mov(ip, Operand(ExternalReference(Isolate::k_c_entry_fp_address, isolate()))); |
+ mov(ip, Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate()))); |
str(r3, MemOperand(ip)); |
// Restore current context from top and clear it in debug mode. |
- mov(ip, Operand(ExternalReference(Isolate::k_context_address, isolate()))); |
+ mov(ip, Operand(ExternalReference(Isolate::kContextAddress, isolate()))); |
ldr(cp, MemOperand(ip)); |
#ifdef DEBUG |
str(r3, MemOperand(ip)); |
@@ -1118,7 +1118,7 @@ void MacroAssembler::PushTryHandler(CodeLocation try_location, |
} |
stm(db_w, sp, r3.bit() | cp.bit() | fp.bit() | lr.bit()); |
// Save the current handler as the next handler. |
- mov(r3, Operand(ExternalReference(Isolate::k_handler_address, isolate()))); |
+ mov(r3, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
ldr(r1, MemOperand(r3)); |
push(r1); |
// Link this handler as the new current one. |
@@ -1134,7 +1134,7 @@ void MacroAssembler::PushTryHandler(CodeLocation try_location, |
mov(r7, Operand(0, RelocInfo::NONE)); // NULL frame pointer. |
stm(db_w, sp, r5.bit() | r6.bit() | r7.bit() | lr.bit()); |
// Save the current handler as the next handler. |
- mov(r7, Operand(ExternalReference(Isolate::k_handler_address, isolate()))); |
+ mov(r7, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
ldr(r6, MemOperand(r7)); |
push(r6); |
// Link this handler as the new current one. |
@@ -1146,7 +1146,7 @@ void MacroAssembler::PushTryHandler(CodeLocation try_location, |
void MacroAssembler::PopTryHandler() { |
STATIC_ASSERT(StackHandlerConstants::kNextOffset == 0); |
pop(r1); |
- mov(ip, Operand(ExternalReference(Isolate::k_handler_address, isolate()))); |
+ mov(ip, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
add(sp, sp, Operand(StackHandlerConstants::kSize - kPointerSize)); |
str(r1, MemOperand(ip)); |
} |
@@ -1166,7 +1166,7 @@ void MacroAssembler::Throw(Register value) { |
} |
// Drop the sp to the top of the handler. |
- mov(r3, Operand(ExternalReference(Isolate::k_handler_address, isolate()))); |
+ mov(r3, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
ldr(sp, MemOperand(r3)); |
// Restore the next handler. |
@@ -1206,7 +1206,7 @@ void MacroAssembler::ThrowUncatchable(UncatchableExceptionType type, |
} |
// Drop sp to the top stack handler. |
- mov(r3, Operand(ExternalReference(Isolate::k_handler_address, isolate()))); |
+ mov(r3, Operand(ExternalReference(Isolate::kHandlerAddress, isolate()))); |
ldr(sp, MemOperand(r3)); |
// Unwind the handlers until the ENTRY handler is found. |
@@ -1230,7 +1230,7 @@ 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()); |
mov(r0, Operand(false, RelocInfo::NONE)); |
mov(r2, Operand(external_caught)); |
str(r0, MemOperand(r2)); |
@@ -1238,7 +1238,7 @@ void MacroAssembler::ThrowUncatchable(UncatchableExceptionType type, |
// Set pending exception and r0 to out of memory exception. |
Failure* out_of_memory = Failure::OutOfMemoryException(); |
mov(r0, Operand(reinterpret_cast<int32_t>(out_of_memory))); |
- mov(r2, Operand(ExternalReference(Isolate::k_pending_exception_address, |
+ mov(r2, Operand(ExternalReference(Isolate::kPendingExceptionAddress, |
isolate()))); |
str(r0, MemOperand(r2)); |
} |