Index: src/arm/macro-assembler-arm.h |
=================================================================== |
--- src/arm/macro-assembler-arm.h (revision 8479) |
+++ src/arm/macro-assembler-arm.h (working copy) |
@@ -90,20 +90,20 @@ |
// Jump, Call, and Ret pseudo instructions implementing inter-working. |
void Jump(Register target, Condition cond = al); |
- void Jump(byte* target, RelocInfo::Mode rmode, Condition cond = al); |
+ void Jump(Address target, RelocInfo::Mode rmode, Condition cond = al); |
void Jump(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al); |
int CallSize(Register target, Condition cond = al); |
void Call(Register target, Condition cond = al); |
- int CallSize(byte* target, RelocInfo::Mode rmode, Condition cond = al); |
- void Call(byte* target, RelocInfo::Mode rmode, Condition cond = al); |
- int CallSize(Handle<Code> code, RelocInfo::Mode rmode, Condition cond = al); |
+ int CallSize(Address target, RelocInfo::Mode rmode, Condition cond = al); |
+ void Call(Address target, RelocInfo::Mode rmode, Condition cond = al); |
+ int CallSize(Handle<Code> code, |
+ RelocInfo::Mode rmode = RelocInfo::CODE_TARGET, |
+ unsigned ast_id = kNoASTId, |
+ Condition cond = al); |
void Call(Handle<Code> code, |
- RelocInfo::Mode rmode, |
+ RelocInfo::Mode rmode = RelocInfo::CODE_TARGET, |
+ unsigned ast_id = kNoASTId, |
Condition cond = al); |
- void CallWithAstId(Handle<Code> code, |
- RelocInfo::Mode rmode, |
- unsigned ast_id, |
- Condition cond = al); |
void Ret(Condition cond = al); |
// Emit code to discard a non-negative number of pointer-sized elements |
@@ -1036,10 +1036,6 @@ |
int num_double_arguments); |
void Jump(intptr_t target, RelocInfo::Mode rmode, Condition cond = al); |
- int CallSize(intptr_t target, RelocInfo::Mode rmode, Condition cond = al); |
- void Call(intptr_t target, |
- RelocInfo::Mode rmode, |
- Condition cond = al); |
// Helper functions for generating invokes. |
void InvokePrologue(const ParameterCount& expected, |