| Index: src/arm/macro-assembler-arm.h
|
| diff --git a/src/arm/macro-assembler-arm.h b/src/arm/macro-assembler-arm.h
|
| index e30096ae91e2d597455c232c3efc8780d78ed3a4..80ed85c049eb8a1a4a568b4ec3271b87ae7b47b7 100644
|
| --- a/src/arm/macro-assembler-arm.h
|
| +++ b/src/arm/macro-assembler-arm.h
|
| @@ -76,12 +76,11 @@ class MacroAssembler: public Assembler {
|
| // macro assembler.
|
| MacroAssembler(Isolate* isolate, void* buffer, int size);
|
|
|
| - // Jump, Call, and Ret pseudo instructions implementing inter-working.
|
| - void Jump(Register target, Condition cond = al);
|
| - void Jump(Address target, RelocInfo::Mode rmode, Condition cond = al);
|
| - void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
|
| +
|
| + // Returns the size of a call in instructions. Note, the value returned is
|
| + // only valid as long as no entries are added to the constant pool between
|
| + // checking the call size and emitting the actual call.
|
| static int CallSize(Register target, Condition cond = al);
|
| - void Call(Register target, Condition cond = al);
|
| int CallSize(Address target, RelocInfo::Mode rmode, Condition cond = al);
|
| int CallStubSize(CodeStub* stub,
|
| TypeFeedbackId ast_id = TypeFeedbackId::None(),
|
| @@ -90,6 +89,12 @@ class MacroAssembler: public Assembler {
|
| Address target,
|
| RelocInfo::Mode rmode,
|
| Condition cond = al);
|
| +
|
| + // Jump, Call, and Ret pseudo instructions implementing inter-working.
|
| + void Jump(Register target, Condition cond = al);
|
| + void Jump(Address target, RelocInfo::Mode rmode, Condition cond = al);
|
| + void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al);
|
| + void Call(Register target, Condition cond = al);
|
| void Call(Address target, RelocInfo::Mode rmode,
|
| Condition cond = al,
|
| TargetAddressStorageMode mode = CAN_INLINE_TARGET_ADDRESS);
|
| @@ -1354,8 +1359,8 @@ class MacroAssembler: public Assembler {
|
|
|
| // Get the location of a relocated constant (its address in the constant pool)
|
| // from its load site.
|
| - void GetRelocatedValueLocation(Register ldr_location,
|
| - Register result);
|
| + void GetRelocatedValueLocation(Register ldr_location, Register result,
|
| + Register scratch);
|
|
|
|
|
| void ClampUint8(Register output_reg, Register input_reg);
|
|
|