Revision: 5540
Author: [email protected]
Date: Tue Sep 28 00:38:12 2010
Log: Patch fix in revision 5529 to 2.2 branch, fixing an error in optimized
shift operations on 64-bit V8.
Review URL: http://codereview.chromium.org/3387023
http://code.google.com/p/v8/source/detail?r=5540
Modified:
/branches/2.2/src/version.cc
/branches/2.2/src/x64/codegen-x64.cc
=======================================
--- /branches/2.2/src/version.cc Fri Sep 17 06:27:57 2010
+++ /branches/2.2/src/version.cc Tue Sep 28 00:38:12 2010
@@ -35,7 +35,7 @@
#define MAJOR_VERSION 2
#define MINOR_VERSION 2
#define BUILD_NUMBER 24
-#define PATCH_LEVEL 24
+#define PATCH_LEVEL 25
#define CANDIDATE_VERSION false
// Define SONAME to have the SCons build the put a specific SONAME into the
=======================================
--- /branches/2.2/src/x64/codegen-x64.cc Mon Aug 9 23:39:13 2010
+++ /branches/2.2/src/x64/codegen-x64.cc Tue Sep 28 00:38:12 2010
@@ -1368,11 +1368,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.
@@ -1389,7 +1392,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());
@@ -1408,18 +1411,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
