Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 5f6076b41dfbd1bf726930aa129b4b63a1b51361..76c63e723179ab689e52a0c9c3e80e1b9962cc01 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -59,8 +59,9 @@ void MacroAssembler::Jump(Register target, Condition cond) { |
void MacroAssembler::Jump(intptr_t target, RelocInfo::Mode rmode, |
Condition cond) { |
- mov(ip, Operand(target, rmode)); |
- bx(ip, cond); |
+ // 'target' is always generated ARM code, never THUMB code. |
ulan
2013/12/12 09:42:16
Maybe assert that rmode is not external reference.
Rodolph Perfetta
2013/12/12 09:50:30
on armv5t and above this will interwork properly,
Benedikt Meurer
2013/12/12 12:23:51
Done.
Benedikt Meurer
2013/12/12 12:23:51
Done.
|
+ ASSERT_EQ(0, target & 0x3); |
+ mov(pc, Operand(target, rmode), LeaveCC, cond); |
} |