Revision: 20048
Author: [email protected]
Date: Wed Mar 19 07:01:08 2014 UTC
Log: Tweaked FlooringDiv back to TruncatingDiv again.
This is a first step towards getting the flooring division by a
constant working again (which will be a separate CL).
[email protected]
Review URL: https://codereview.chromium.org/197873029
http://code.google.com/p/v8/source/detail?r=20048
Modified:
/branches/bleeding_edge/src/a64/lithium-codegen-a64.cc
/branches/bleeding_edge/src/a64/macro-assembler-a64.cc
/branches/bleeding_edge/src/a64/macro-assembler-a64.h
/branches/bleeding_edge/src/arm/lithium-codegen-arm.cc
/branches/bleeding_edge/src/arm/macro-assembler-arm.cc
/branches/bleeding_edge/src/arm/macro-assembler-arm.h
/branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc
/branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc
/branches/bleeding_edge/src/ia32/macro-assembler-ia32.h
/branches/bleeding_edge/src/x64/lithium-codegen-x64.cc
/branches/bleeding_edge/src/x64/macro-assembler-x64.cc
/branches/bleeding_edge/src/x64/macro-assembler-x64.h
=======================================
--- /branches/bleeding_edge/src/a64/lithium-codegen-a64.cc Tue Mar 18
15:01:55 2014 UTC
+++ /branches/bleeding_edge/src/a64/lithium-codegen-a64.cc Wed Mar 19
07:01:08 2014 UTC
@@ -2679,8 +2679,7 @@
DeoptimizeIfZero(dividend, instr->environment());
}
- __ FlooringDiv(result, dividend, Abs(divisor));
- __ Add(result, result, Operand(dividend, LSR, 31));
+ __ TruncatingDiv(result, dividend, Abs(divisor));
if (divisor < 0) __ Neg(result, result);
if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
@@ -3895,7 +3894,8 @@
DeoptimizeIf(eq, instr->environment());
}
- __ FlooringDiv(result, dividend, divisor);
+ // TODO(svenpanne) Add correction terms.
+ __ TruncatingDiv(result, dividend, divisor);
}
@@ -4168,8 +4168,7 @@
return;
}
- __ FlooringDiv(result, dividend, Abs(divisor));
- __ Add(result, result, Operand(dividend, LSR, 31));
+ __ TruncatingDiv(result, dividend, Abs(divisor));
__ Sxtw(dividend.X(), dividend);
__ Mov(temp, Abs(divisor));
__ Smsubl(result.X(), result, temp, dividend.X());
=======================================
--- /branches/bleeding_edge/src/a64/macro-assembler-a64.cc Tue Mar 18
15:01:55 2014 UTC
+++ /branches/bleeding_edge/src/a64/macro-assembler-a64.cc Wed Mar 19
07:01:08 2014 UTC
@@ -5072,9 +5072,9 @@
#endif
-void MacroAssembler::FlooringDiv(Register result,
- Register dividend,
- int32_t divisor) {
+void MacroAssembler::TruncatingDiv(Register result,
+ Register dividend,
+ int32_t divisor) {
ASSERT(!AreAliased(result, dividend));
ASSERT(result.Is32Bits() && dividend.Is32Bits());
MultiplierAndShift ms(divisor);
@@ -5084,6 +5084,7 @@
if (divisor > 0 && ms.multiplier() < 0) Add(result, result, dividend);
if (divisor < 0 && ms.multiplier() > 0) Sub(result, result, dividend);
if (ms.shift() > 0) Asr(result, result, ms.shift());
+ Add(result, result, Operand(dividend, LSR, 31));
}
=======================================
--- /branches/bleeding_edge/src/a64/macro-assembler-a64.h Tue Mar 18
15:01:55 2014 UTC
+++ /branches/bleeding_edge/src/a64/macro-assembler-a64.h Wed Mar 19
07:01:08 2014 UTC
@@ -1692,9 +1692,9 @@
void LoadContext(Register dst, int context_chain_length);
- // 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. 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
=======================================
--- /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Tue Mar 18
13:29:29 2014 UTC
+++ /branches/bleeding_edge/src/arm/lithium-codegen-arm.cc Wed Mar 19
07:01:08 2014 UTC
@@ -1161,8 +1161,7 @@
return;
}
- __ FlooringDiv(result, dividend, Abs(divisor));
- __ add(result, result, Operand(dividend, LSR, 31));
+ __ TruncatingDiv(result, dividend, Abs(divisor));
__ mov(ip, Operand(Abs(divisor)));
__ smull(result, ip, result, ip);
__ sub(result, dividend, result, SetCC);
@@ -1349,8 +1348,7 @@
DeoptimizeIf(eq, instr->environment());
}
- __ FlooringDiv(result, dividend, Abs(divisor));
- __ add(result, result, Operand(dividend, LSR, 31));
+ __ TruncatingDiv(result, dividend, Abs(divisor));
if (divisor < 0) __ rsb(result, result, Operand::Zero());
if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
@@ -1509,7 +1507,8 @@
DeoptimizeIf(eq, instr->environment());
}
- __ FlooringDiv(result, dividend, divisor);
+ // TODO(svenpanne) Add correction terms.
+ __ TruncatingDiv(result, dividend, divisor);
}
=======================================
--- /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/arm/macro-assembler-arm.cc Wed Mar 19
07:01:08 2014 UTC
@@ -4055,9 +4055,9 @@
}
-void MacroAssembler::FlooringDiv(Register result,
- Register dividend,
- int32_t divisor) {
+void MacroAssembler::TruncatingDiv(Register result,
+ Register dividend,
+ int32_t divisor) {
ASSERT(!dividend.is(result));
ASSERT(!dividend.is(ip));
ASSERT(!result.is(ip));
@@ -4071,6 +4071,7 @@
sub(result, result, Operand(dividend));
}
if (ms.shift() > 0) mov(result, Operand(result, ASR, ms.shift()));
+ add(result, result, Operand(dividend, LSR, 31));
}
=======================================
--- /branches/bleeding_edge/src/arm/macro-assembler-arm.h Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/arm/macro-assembler-arm.h Wed Mar 19
07:01:08 2014 UTC
@@ -1152,9 +1152,9 @@
}
- // 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 ip 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
=======================================
--- /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Tue Mar 18
13:29:29 2014 UTC
+++ /branches/bleeding_edge/src/ia32/lithium-codegen-ia32.cc Wed Mar 19
07:01:08 2014 UTC
@@ -1414,10 +1414,7 @@
return;
}
- __ FlooringDiv(dividend, Abs(divisor));
- __ mov(eax, dividend);
- __ shr(eax, 31);
- __ add(edx, eax);
+ __ TruncatingDiv(dividend, Abs(divisor));
__ imul(edx, edx, Abs(divisor));
__ mov(eax, dividend);
__ sub(eax, edx);
@@ -1544,10 +1541,7 @@
DeoptimizeIf(zero, instr->environment());
}
- __ FlooringDiv(dividend, Abs(divisor));
- __ mov(eax, dividend);
- __ shr(eax, 31);
- __ add(edx, eax);
+ __ TruncatingDiv(dividend, Abs(divisor));
if (divisor < 0) __ neg(edx);
if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
@@ -1671,7 +1665,8 @@
DeoptimizeIf(zero, instr->environment());
}
- __ FlooringDiv(dividend, divisor);
+ // TODO(svenpanne) Add correction terms.
+ __ TruncatingDiv(dividend, divisor);
}
=======================================
--- /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/ia32/macro-assembler-ia32.cc Wed Mar 19
07:01:08 2014 UTC
@@ -3627,7 +3627,7 @@
}
-void MacroAssembler::FlooringDiv(Register dividend, int32_t divisor) {
+void MacroAssembler::TruncatingDiv(Register dividend, int32_t divisor) {
ASSERT(!dividend.is(eax));
ASSERT(!dividend.is(edx));
MultiplierAndShift ms(divisor);
@@ -3636,6 +3636,9 @@
if (divisor > 0 && ms.multiplier() < 0) add(edx, dividend);
if (divisor < 0 && ms.multiplier() > 0) sub(edx, dividend);
if (ms.shift() > 0) sar(edx, ms.shift());
+ mov(eax, dividend);
+ shr(eax, 31);
+ add(edx, eax);
}
=======================================
--- /branches/bleeding_edge/src/ia32/macro-assembler-ia32.h Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/ia32/macro-assembler-ia32.h Wed Mar 19
07:01:08 2014 UTC
@@ -862,9 +862,9 @@
// Insert code to verify that the x87 stack has the specified depth (0-7)
void VerifyX87StackDepth(uint32_t depth);
- // 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, the result is in edx, and eax gets clobbered.
- void FlooringDiv(Register dividend, int32_t divisor);
+ void TruncatingDiv(Register dividend, int32_t divisor);
//
---------------------------------------------------------------------------
// StatsCounter support
=======================================
--- /branches/bleeding_edge/src/x64/lithium-codegen-x64.cc Tue Mar 18
13:29:29 2014 UTC
+++ /branches/bleeding_edge/src/x64/lithium-codegen-x64.cc Wed Mar 19
07:01:08 2014 UTC
@@ -1033,10 +1033,7 @@
return;
}
- __ FlooringDiv(dividend, Abs(divisor));
- __ movl(rax, dividend);
- __ shrl(rax, Immediate(31));
- __ addl(rdx, rax);
+ __ TruncatingDiv(dividend, Abs(divisor));
__ imull(rdx, rdx, Immediate(Abs(divisor)));
__ movl(rax, dividend);
__ subl(rax, rdx);
@@ -1163,7 +1160,8 @@
DeoptimizeIf(zero, instr->environment());
}
- __ FlooringDiv(dividend, divisor);
+ // TODO(svenpanne) Add correction terms.
+ __ TruncatingDiv(dividend, divisor);
}
@@ -1222,10 +1220,7 @@
DeoptimizeIf(zero, instr->environment());
}
- __ FlooringDiv(dividend, Abs(divisor));
- __ movl(rax, dividend);
- __ shrl(rax, Immediate(31));
- __ addl(rdx, rax);
+ __ TruncatingDiv(dividend, Abs(divisor));
if (divisor < 0) __ neg(rdx);
if (!hdiv->CheckFlag(HInstruction::kAllUsesTruncatingToInt32)) {
=======================================
--- /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/x64/macro-assembler-x64.cc Wed Mar 19
07:01:08 2014 UTC
@@ -4992,7 +4992,7 @@
}
-void MacroAssembler::FlooringDiv(Register dividend, int32_t divisor) {
+void MacroAssembler::TruncatingDiv(Register dividend, int32_t divisor) {
ASSERT(!dividend.is(rax));
ASSERT(!dividend.is(rdx));
MultiplierAndShift ms(divisor);
@@ -5001,6 +5001,9 @@
if (divisor > 0 && ms.multiplier() < 0) addl(rdx, dividend);
if (divisor < 0 && ms.multiplier() > 0) subl(rdx, dividend);
if (ms.shift() > 0) sarl(rdx, Immediate(ms.shift()));
+ movl(rax, dividend);
+ shrl(rax, Immediate(31));
+ addl(rdx, rax);
}
=======================================
--- /branches/bleeding_edge/src/x64/macro-assembler-x64.h Mon Mar 17
13:55:22 2014 UTC
+++ /branches/bleeding_edge/src/x64/macro-assembler-x64.h Wed Mar 19
07:01:08 2014 UTC
@@ -1367,9 +1367,9 @@
Register filler);
- // 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, the result is in rdx, and rax gets clobbered.
- void FlooringDiv(Register dividend, int32_t divisor);
+ void TruncatingDiv(Register dividend, int32_t divisor);
//
---------------------------------------------------------------------------
// StatsCounter support
--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
---
You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
For more options, visit https://groups.google.com/d/optout.
