Revision: 5529
Author: [email protected]
Date: Mon Sep 27 00:24:01 2010
Log: Fix error in x64 inlined optimized shift operators.
Review URL: http://codereview.chromium.org/3496007
http://code.google.com/p/v8/source/detail?r=5529
Modified:
/branches/bleeding_edge/src/x64/codegen-x64.cc
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Sep 24 00:53:59 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Mon Sep 27 00:24:01 2010
@@ -1350,11 +1350,14 @@
overwrite_mode);
Label do_op;
+ // Left operand must be unchanged in left->reg() for deferred code.
+ // Left operand is in answer.reg(), possibly converted to int32, for
+ // inline code.
+ __ movq(answer.reg(), left->reg());
if (right_type_info.IsSmi()) {
if (FLAG_debug_code) {
__ AbortIfNotSmi(right->reg());
}
- __ movq(answer.reg(), left->reg());
// If left is not known to be a smi, check if it is.
// If left is not known to be a number, and it isn't a smi, check if
// it is a HeapNumber.
@@ -1371,7 +1374,7 @@
FieldOperand(answer.reg(), HeapNumber::kValueOffset));
// Branch if we might have overflowed.
// (False negative for Smi::kMinValue)
- __ cmpq(answer.reg(), Immediate(0x80000000));
+ __ cmpl(answer.reg(), Immediate(0x80000000));
deferred->Branch(equal);
// TODO(lrn): Inline shifts on int32 here instead of first
smi-tagging.
__ Integer32ToSmi(answer.reg(), answer.reg());
@@ -1390,18 +1393,18 @@
// Perform the operation.
switch (op) {
case Token::SAR:
- __ SmiShiftArithmeticRight(answer.reg(), left->reg(), rcx);
+ __ SmiShiftArithmeticRight(answer.reg(), answer.reg(), rcx);
break;
case Token::SHR: {
__ SmiShiftLogicalRight(answer.reg(),
- left->reg(),
- rcx,
- deferred->entry_label());
+ answer.reg(),
+ rcx,
+ deferred->entry_label());
break;
}
case Token::SHL: {
__ SmiShiftLeft(answer.reg(),
- left->reg(),
+ answer.reg(),
rcx);
break;
}
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
