Revision: 24659
Author: [email protected]
Date: Thu Oct 16 11:29:31 2014 UTC
Log: Fix x64 after r24656.
[email protected]
Review URL: https://codereview.chromium.org/655383003
https://code.google.com/p/v8/source/detail?r=24659
Modified:
/branches/bleeding_edge/src/compiler/pipeline.cc
/branches/bleeding_edge/src/compiler/simplified-lowering.cc
/branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc
=======================================
--- /branches/bleeding_edge/src/compiler/pipeline.cc Thu Oct 16 10:50:21
2014 UTC
+++ /branches/bleeding_edge/src/compiler/pipeline.cc Thu Oct 16 11:29:31
2014 UTC
@@ -319,8 +319,8 @@
ValueNumberingReducer vn_reducer(zone());
SimplifiedOperatorReducer simple_reducer(&jsgraph);
GraphReducer graph_reducer(&graph);
+ graph_reducer.AddReducer(&vn_reducer);
graph_reducer.AddReducer(&simple_reducer);
- graph_reducer.AddReducer(&vn_reducer);
graph_reducer.ReduceGraph();
VerifyAndPrintGraph(&graph, "Lowered simplified");
@@ -333,11 +333,13 @@
SourcePosition::Unknown());
Linkage linkage(info());
ValueNumberingReducer vn_reducer(zone());
+ SimplifiedOperatorReducer simple_reducer(&jsgraph);
ChangeLowering lowering(&jsgraph, &linkage);
MachineOperatorReducer mach_reducer(&jsgraph);
GraphReducer graph_reducer(&graph);
// TODO(titzer): Figure out if we should run all reducers at once
here.
graph_reducer.AddReducer(&vn_reducer);
+ graph_reducer.AddReducer(&simple_reducer);
graph_reducer.AddReducer(&lowering);
graph_reducer.AddReducer(&mach_reducer);
graph_reducer.ReduceGraph();
=======================================
--- /branches/bleeding_edge/src/compiler/simplified-lowering.cc Tue Oct 14
08:59:27 2014 UTC
+++ /branches/bleeding_edge/src/compiler/simplified-lowering.cc Thu Oct 16
11:29:31 2014 UTC
@@ -726,7 +726,7 @@
}
case IrOpcode::kWord32Shr:
// We output unsigned int32 for shift right because JavaScript.
- return VisitBinop(node, kRepWord32, kRepWord32 | kTypeUint32);
+ return VisitBinop(node, kMachUint32, kMachUint32);
case IrOpcode::kWord32And:
case IrOpcode::kWord32Or:
case IrOpcode::kWord32Xor:
=======================================
--- /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Wed Oct
15 09:05:40 2014 UTC
+++ /branches/bleeding_edge/src/compiler/x64/code-generator-x64.cc Thu Oct
16 11:29:31 2014 UTC
@@ -447,10 +447,11 @@
break;
case kSSEUint32ToFloat64:
if (instr->InputAt(0)->IsRegister()) {
- __ cvtqsi2sd(i.OutputDoubleRegister(), i.InputRegister(0));
+ __ movl(kScratchRegister, i.InputRegister(0));
} else {
- __ cvtqsi2sd(i.OutputDoubleRegister(), i.InputOperand(0));
+ __ movl(kScratchRegister, i.InputOperand(0));
}
+ __ cvtqsi2sd(i.OutputDoubleRegister(), kScratchRegister);
break;
case kX64Movsxbl:
__ movsxbl(i.OutputRegister(), i.MemoryOperand());
--
--
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.
