AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

MIPS: Tweaked FlooringDiv back to TruncatingDiv again.

Browse Source 
Port r20048 (8953785)

Original commit message:
This is a first step towards getting the flooring division by a
constant working again (which will be a separate CL).

BUG=
R=plind44@gmail.com

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

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@20082 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
plind44@gmail.com 2014-03-19 15:27:38 +00:00
parent f09f99fd09
commit b2b2799d5c
3 changed files with 12 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/mips/lithium-codegen-mips.cc
View File

@ -1111,9 +1111,7 @@ void LCodeGen::DoModByConstI(LModByConstI* instr) {
return; return;
} }
__ FlooringDiv(result, dividend, Abs(divisor)); __ TruncatingDiv(result, dividend, Abs(divisor));
__ srl(at, dividend, 31);
__ Addu(result, result, at);
__ Mul(result, result, Operand(Abs(divisor))); __ Mul(result, result, Operand(Abs(divisor)));
__ Subu(result, dividend, Operand(result)); __ Subu(result, dividend, Operand(result));
@ -1230,9 +1228,7 @@ void LCodeGen::DoDivByConstI(LDivByConstI* instr) {
DeoptimizeIf(eq, instr->environment(), dividend, Operand(zero_reg)); DeoptimizeIf(eq, instr->environment(), dividend, Operand(zero_reg));
} }
__ FlooringDiv(result, dividend, Abs(divisor)); __ TruncatingDiv(result, dividend, Abs(divisor));
__ srl(at, dividend, 31);
__ Addu(result, result, Operand(at));
if (divisor < 0) __ Subu(result, zero_reg, result); if (divisor < 0) __ Subu(result, zero_reg, result);
if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) { if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
@ -1371,7 +1367,8 @@ void LCodeGen::DoFlooringDivByConstI(LFlooringDivByConstI* instr) {
DeoptimizeIf(eq, instr->environment(), dividend, Operand(zero_reg)); DeoptimizeIf(eq, instr->environment(), dividend, Operand(zero_reg));
} }
__ FlooringDiv(result, dividend, divisor); // TODO(svenpanne) Add correction terms.
__ TruncatingDiv(result, dividend, divisor);
} }

12
src/mips/macro-assembler-mips.cc
View File

@ -5723,9 +5723,9 @@ void CodePatcher::ChangeBranchCondition(Condition cond) {
} }
void MacroAssembler::FlooringDiv(Register result, void MacroAssembler::TruncatingDiv(Register result,
Register dividend, Register dividend,
int32_t divisor) { int32_t divisor) {
ASSERT(!dividend.is(result)); ASSERT(!dividend.is(result));
ASSERT(!dividend.is(at)); ASSERT(!dividend.is(at));
ASSERT(!result.is(at)); ASSERT(!result.is(at));
@ -5739,9 +5739,9 @@ void MacroAssembler::FlooringDiv(Register result,
if (divisor < 0 && ms.multiplier() > 0) { if (divisor < 0 && ms.multiplier() > 0) {
Subu(result, result, Operand(dividend)); Subu(result, result, Operand(dividend));
} }
if (ms.shift() > 0) { if (ms.shift() > 0) sra(result, result, ms.shift());
sra(result, result, ms.shift()); srl(at, dividend, 31);
} Addu(result, result, Operand(at));
} }

4
src/mips/macro-assembler-mips.h
View File

@ -1304,9 +1304,9 @@ const Operand& rt = Operand(zero_reg), BranchDelaySlot bd = PROTECT
return code_object_; return code_object_;
} }
// Emit code for a flooring division by a constant. The dividend register is // Emit code for a truncating division by a constant. The dividend register is
// unchanged and at gets clobbered. Dividend and result must be different. // unchanged and at gets clobbered. Dividend and result must be different.
void FlooringDiv(Register result, Register dividend, int32_t divisor); void TruncatingDiv(Register result, Register dividend, int32_t divisor);
// ------------------------------------------------------------------------- // -------------------------------------------------------------------------
// StatsCounter support. // StatsCounter support.