| Index: src/arm/assembler-arm-inl.h
|
| ===================================================================
|
| --- src/arm/assembler-arm-inl.h (revision 3070)
|
| +++ src/arm/assembler-arm-inl.h (working copy)
|
| @@ -110,7 +110,7 @@
|
|
|
|
|
| Address RelocInfo::call_address() {
|
| - ASSERT(IsCallInstruction());
|
| + ASSERT(IsPatchedReturnSequence());
|
| // The 2 instructions offset assumes patched return sequence.
|
| ASSERT(IsJSReturn(rmode()));
|
| return Memory::Address_at(pc_ + 2 * Assembler::kInstrSize);
|
| @@ -118,7 +118,7 @@
|
|
|
|
|
| void RelocInfo::set_call_address(Address target) {
|
| - ASSERT(IsCallInstruction());
|
| + ASSERT(IsPatchedReturnSequence());
|
| // The 2 instructions offset assumes patched return sequence.
|
| ASSERT(IsJSReturn(rmode()));
|
| Memory::Address_at(pc_ + 2 * Assembler::kInstrSize) = target;
|
| @@ -131,7 +131,7 @@
|
|
|
|
|
| Object** RelocInfo::call_object_address() {
|
| - ASSERT(IsCallInstruction());
|
| + ASSERT(IsPatchedReturnSequence());
|
| // The 2 instructions offset assumes patched return sequence.
|
| ASSERT(IsJSReturn(rmode()));
|
| return reinterpret_cast<Object**>(pc_ + 2 * Assembler::kInstrSize);
|
| @@ -143,7 +143,7 @@
|
| }
|
|
|
|
|
| -bool RelocInfo::IsCallInstruction() {
|
| +bool RelocInfo::IsPatchedReturnSequence() {
|
| // On ARM a "call instruction" is actually two instructions.
|
| // mov lr, pc
|
| // ldr pc, [pc, #XXX]
|
|
|