Index: src/arm/macro-assembler-arm.cc |
diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc |
index 907548d4588bdc2123a943a8da9755ef44a8eed7..2189b37eacc3ee55a23d50359846446c668fa2ec 100644 |
--- a/src/arm/macro-assembler-arm.cc |
+++ b/src/arm/macro-assembler-arm.cc |
@@ -1101,11 +1101,12 @@ void MacroAssembler::VmovLow(DwVfpRegister dst, Register src) { |
vmov(dst, VmovIndexLo, src); |
} |
} |
-void MacroAssembler::PairLsl(Register dst_low, Register dst_high, |
+void MacroAssembler::LslPair(Register dst_low, Register dst_high, |
Register src_low, Register src_high, |
Register scratch, Register shift) { |
- DCHECK(!AreAliased(dst_low, src_high, shift)); |
- DCHECK(!AreAliased(dst_high, src_low, shift)); |
+ DCHECK(!AreAliased(dst_high, src_low)); |
+ DCHECK(!AreAliased(dst_high, shift)); |
+ |
Label less_than_32; |
Label done; |
cmp_raw_immediate(shift, 32); |
@@ -1124,10 +1125,9 @@ void MacroAssembler::PairLsl(Register dst_low, Register dst_high, |
bind(&done); |
} |
-void MacroAssembler::PairLsl(Register dst_low, Register dst_high, |
+void MacroAssembler::LslPair(Register dst_low, Register dst_high, |
Register src_low, Register src_high, |
uint32_t shift) { |
- DCHECK(!AreAliased(dst_low, src_high)); |
DCHECK(!AreAliased(dst_high, src_low)); |
Label less_than_32; |
Label done; |
@@ -1136,8 +1136,8 @@ void MacroAssembler::PairLsl(Register dst_low, Register dst_high, |
lsl(dst_high, src_low, Operand(shift)); |
mov(dst_low, Operand(0)); |
} else if (shift == 0) { |
- Move(dst_low, src_low); |
Move(dst_high, src_high); |
+ Move(dst_low, src_low); |
} else { |
lsl(dst_high, src_high, Operand(shift)); |
orr(dst_high, dst_high, Operand(src_low, LSR, 32 - shift)); |