Index: src/mips/lithium-codegen-mips.cc |
diff --git a/src/mips/lithium-codegen-mips.cc b/src/mips/lithium-codegen-mips.cc |
index 0dffd608b5071ed94b8e430c36f61009909f9ab4..9fd2605b892c4f45801080486273066a9771fe15 100644 |
--- a/src/mips/lithium-codegen-mips.cc |
+++ b/src/mips/lithium-codegen-mips.cc |
@@ -27,6 +27,7 @@ |
#include "src/v8.h" |
+#include "src/base/bits.h" |
#include "src/code-stubs.h" |
#include "src/hydrogen-osr.h" |
#include "src/mips/lithium-codegen-mips.h" |
@@ -1201,7 +1202,7 @@ void LCodeGen::DoDivByPowerOf2I(LDivByPowerOf2I* instr) { |
Register dividend = ToRegister(instr->dividend()); |
int32_t divisor = instr->divisor(); |
Register result = ToRegister(instr->result()); |
- DCHECK(divisor == kMinInt || IsPowerOf2(Abs(divisor))); |
+ DCHECK(divisor == kMinInt || base::bits::IsPowerOfTwo32(Abs(divisor))); |
DCHECK(!result.is(dividend)); |
// Check for (0 / -x) that will produce negative zero. |
@@ -1514,18 +1515,18 @@ void LCodeGen::DoMulI(LMulI* instr) { |
int32_t mask = constant >> 31; |
uint32_t constant_abs = (constant + mask) ^ mask; |
- if (IsPowerOf2(constant_abs)) { |
+ if (base::bits::IsPowerOfTwo32(constant_abs)) { |
int32_t shift = WhichPowerOf2(constant_abs); |
__ sll(result, left, shift); |
// Correct the sign of the result if the constant is negative. |
if (constant < 0) __ Subu(result, zero_reg, result); |
- } else if (IsPowerOf2(constant_abs - 1)) { |
+ } else if (base::bits::IsPowerOfTwo32(constant_abs - 1)) { |
int32_t shift = WhichPowerOf2(constant_abs - 1); |
__ sll(scratch, left, shift); |
__ Addu(result, scratch, left); |
// Correct the sign of the result if the constant is negative. |
if (constant < 0) __ Subu(result, zero_reg, result); |
- } else if (IsPowerOf2(constant_abs + 1)) { |
+ } else if (base::bits::IsPowerOfTwo32(constant_abs + 1)) { |
int32_t shift = WhichPowerOf2(constant_abs + 1); |
__ sll(scratch, left, shift); |
__ Subu(result, scratch, left); |
@@ -5100,8 +5101,8 @@ void LCodeGen::DoCheckInstanceType(LCheckInstanceType* instr) { |
uint8_t tag; |
instr->hydrogen()->GetCheckMaskAndTag(&mask, &tag); |
- if (IsPowerOf2(mask)) { |
- DCHECK(tag == 0 || IsPowerOf2(tag)); |
+ if (base::bits::IsPowerOfTwo32(mask)) { |
+ DCHECK(tag == 0 || base::bits::IsPowerOfTwo32(tag)); |
__ And(at, scratch, mask); |
DeoptimizeIf(tag == 0 ? ne : eq, instr->environment(), |
at, Operand(zero_reg)); |