Commit b0b10ec7 authored by plind44@gmail.com's avatar plind44@gmail.com

MIPS: Fixed flooring division by a power of 2, once again...

Port r21769 (52e191b)

Original commit message:
Avoid right shifts by zero bits: On ARM it actually means shifting by
32 bits (correctness issue) and on other platforms they are useless
(performance issue). This is fix for the fix in r20544.

BUG=v8:3259
LOG=y
R=plind44@gmail.com

Review URL: https://codereview.chromium.org/322403006

Patch from Balazs Kilvady <kilvadyb@homejinni.com>.

git-svn-id: https://v8.googlecode.com/svn/branches/bleeding_edge@21780 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent 4e336430
...@@ -1309,8 +1309,8 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { ...@@ -1309,8 +1309,8 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
Register dividend = ToRegister(instr->dividend()); Register dividend = ToRegister(instr->dividend());
Register result = ToRegister(instr->result()); Register result = ToRegister(instr->result());
int32_t divisor = instr->divisor(); int32_t divisor = instr->divisor();
Register scratch = scratch0(); Register scratch = result.is(dividend) ? scratch0() : dividend;
ASSERT(!scratch.is(dividend)); ASSERT(!result.is(dividend) || !scratch.is(dividend));
// If the divisor is 1, return the dividend. // If the divisor is 1, return the dividend.
if (divisor == 1) { if (divisor == 1) {
...@@ -1328,6 +1328,8 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { ...@@ -1328,6 +1328,8 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
// If the divisor is negative, we have to negate and handle edge cases. // If the divisor is negative, we have to negate and handle edge cases.
if (instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) { if (instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
// divident can be the same register as result so save the value of it
// for checking overflow.
__ Move(scratch, dividend); __ Move(scratch, dividend);
} }
__ Subu(result, zero_reg, dividend); __ Subu(result, zero_reg, dividend);
...@@ -1335,16 +1337,18 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { ...@@ -1335,16 +1337,18 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
DeoptimizeIf(eq, instr->environment(), result, Operand(zero_reg)); DeoptimizeIf(eq, instr->environment(), result, Operand(zero_reg));
} }
// If the negation could not overflow, simply shifting is OK.
if (!instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
__ sra(result, dividend, shift);
return;
}
// Dividing by -1 is basically negation, unless we overflow. // Dividing by -1 is basically negation, unless we overflow.
__ Xor(at, scratch, result); __ Xor(at, scratch, result);
if (divisor == -1) { if (divisor == -1) {
DeoptimizeIf(ge, instr->environment(), at, Operand(zero_reg)); if (instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
DeoptimizeIf(ge, instr->environment(), at, Operand(zero_reg));
}
return;
}
// If the negation could not overflow, simply shifting is OK.
if (!instr->hydrogen()->CheckFlag(HValue::kLeftCanBeMinInt)) {
__ sra(result, result, shift);
return; return;
} }
...@@ -1353,7 +1357,7 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) { ...@@ -1353,7 +1357,7 @@ void LCodeGen::DoFlooringDivByPowerOf2I(LFlooringDivByPowerOf2I* instr) {
__ li(result, Operand(kMinInt / divisor)); __ li(result, Operand(kMinInt / divisor));
__ Branch(&done); __ Branch(&done);
__ bind(&no_overflow); __ bind(&no_overflow);
__ sra(result, dividend, shift); __ sra(result, result, shift);
__ bind(&done); __ bind(&done);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment