| Index: src/arm/macro-assembler-arm.cc
|
| diff --git a/src/arm/macro-assembler-arm.cc b/src/arm/macro-assembler-arm.cc
|
| index 88422ef09867348685827e09c3e5df014315d315..9294a8c7c6e10587120776f6b472eb2b79ffdc0f 100644
|
| --- a/src/arm/macro-assembler-arm.cc
|
| +++ b/src/arm/macro-assembler-arm.cc
|
| @@ -4071,21 +4071,22 @@ void MacroAssembler::TruncatingDiv(Register result,
|
| DCHECK(!dividend.is(ip));
|
| DCHECK(!result.is(ip));
|
| base::MagicNumbersForDivision<uint32_t> mag =
|
| - base::SignedDivisionByConstant(static_cast<uint32_t>(divisor));
|
| + base::SignedDivisionByConstant(bit_cast<uint32_t>(divisor));
|
| mov(ip, Operand(mag.multiplier));
|
| - smull(ip, result, dividend, ip);
|
| - bool neg = (mag.multiplier & (static_cast<uint32_t>(1) << 31)) != 0;
|
| + bool neg = (mag.multiplier & (1U << 31)) != 0;
|
| if (divisor > 0 && neg) {
|
| - add(result, result, Operand(dividend));
|
| - }
|
| - if (divisor < 0 && !neg && mag.multiplier > 0) {
|
| - sub(result, result, Operand(dividend));
|
| + smmla(result, dividend, ip, dividend);
|
| + } else {
|
| + smmul(result, dividend, ip);
|
| + if (divisor < 0 && !neg && mag.multiplier > 0) {
|
| + sub(result, result, Operand(dividend));
|
| + }
|
| }
|
| if (mag.shift > 0) mov(result, Operand(result, ASR, mag.shift));
|
| add(result, result, Operand(dividend, LSR, 31));
|
| }
|
|
|
| -
|
| -} } // namespace v8::internal
|
| +} // namespace internal
|
| +} // namespace v8
|
|
|
| #endif // V8_TARGET_ARCH_ARM
|
|
|