Index: src/arm/code-stubs-arm.cc |
diff --git a/src/arm/code-stubs-arm.cc b/src/arm/code-stubs-arm.cc |
index c310da88bc03815e53f46a3a461f5ec13eb2f0fe..7fd2fe65824f9d8aa290d73fa975201b6eb8c355 100644 |
--- a/src/arm/code-stubs-arm.cc |
+++ b/src/arm/code-stubs-arm.cc |
@@ -3432,7 +3432,7 @@ void CEntryStub::GenerateCore(MacroAssembler* masm, |
// Retrieve the pending exception and clear the variable. |
__ mov(ip, Operand(ExternalReference::the_hole_value_location(isolate))); |
__ ldr(r3, MemOperand(ip)); |
- __ mov(ip, Operand(ExternalReference(Isolate::k_pending_exception_address, |
+ __ mov(ip, Operand(ExternalReference(Isolate::kPendingExceptionAddress, |
isolate))); |
__ ldr(r0, MemOperand(ip)); |
__ str(r3, MemOperand(ip)); |
@@ -3567,7 +3567,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
__ mov(r7, Operand(Smi::FromInt(marker))); |
__ mov(r6, Operand(Smi::FromInt(marker))); |
__ mov(r5, |
- Operand(ExternalReference(Isolate::k_c_entry_fp_address, isolate))); |
+ Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate))); |
__ ldr(r5, MemOperand(r5)); |
__ Push(r8, r7, r6, r5); |
@@ -3576,7 +3576,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// If this is the outermost JS call, set js_entry_sp value. |
Label non_outermost_js; |
- ExternalReference js_entry_sp(Isolate::k_js_entry_sp_address, isolate); |
+ ExternalReference js_entry_sp(Isolate::kJSEntrySPAddress, isolate); |
__ mov(r5, Operand(ExternalReference(js_entry_sp))); |
__ ldr(r6, MemOperand(r5)); |
__ cmp(r6, Operand::Zero()); |
@@ -3597,7 +3597,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// exception field in the JSEnv and return a failure sentinel. |
// Coming in here the fp will be invalid because the PushTryHandler below |
// sets it to 0 to signal the existence of the JSEntry frame. |
- __ mov(ip, Operand(ExternalReference(Isolate::k_pending_exception_address, |
+ __ mov(ip, Operand(ExternalReference(Isolate::kPendingExceptionAddress, |
isolate))); |
__ str(r0, MemOperand(ip)); |
__ mov(r0, Operand(reinterpret_cast<int32_t>(Failure::Exception()))); |
@@ -3615,7 +3615,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// Clear any pending exceptions. |
__ mov(ip, Operand(ExternalReference::the_hole_value_location(isolate))); |
__ ldr(r5, MemOperand(ip)); |
- __ mov(ip, Operand(ExternalReference(Isolate::k_pending_exception_address, |
+ __ mov(ip, Operand(ExternalReference(Isolate::kPendingExceptionAddress, |
isolate))); |
__ str(r5, MemOperand(ip)); |
@@ -3662,7 +3662,7 @@ void JSEntryStub::GenerateBody(MacroAssembler* masm, bool is_construct) { |
// Restore the top frame descriptors from the stack. |
__ pop(r3); |
__ mov(ip, |
- Operand(ExternalReference(Isolate::k_c_entry_fp_address, isolate))); |
+ Operand(ExternalReference(Isolate::kCEntryFPAddress, isolate))); |
__ str(r3, MemOperand(ip)); |
// Reset the stack to the callee saved registers. |
@@ -4534,7 +4534,7 @@ void RegExpExecStub::Generate(MacroAssembler* masm) { |
// TODO(592): Rerunning the RegExp to get the stack overflow exception. |
__ mov(r1, Operand(ExternalReference::the_hole_value_location(isolate))); |
__ ldr(r1, MemOperand(r1, 0)); |
- __ mov(r2, Operand(ExternalReference(Isolate::k_pending_exception_address, |
+ __ mov(r2, Operand(ExternalReference(Isolate::kPendingExceptionAddress, |
isolate))); |
__ ldr(r0, MemOperand(r2, 0)); |
__ cmp(r0, r1); |