Revision: 5126
Author: [email protected]
Date: Fri Jul 23 04:20:59 2010
Log: Fix bug in r5123, Comparison(), by unusing results before
unconditional jump to smi comparison JumpTarget.
Review URL: http://codereview.chromium.org/3026019
http://code.google.com/p/v8/source/detail?r=5126
Modified:
/branches/bleeding_edge/src/ia32/codegen-ia32.cc
/branches/bleeding_edge/src/ia32/codegen-ia32.h
/branches/bleeding_edge/src/x64/codegen-x64.cc
/branches/bleeding_edge/src/x64/codegen-x64.h
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.cc Fri Jul 23 02:05:46
2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.cc Fri Jul 23 04:20:59
2010
@@ -1445,45 +1445,49 @@
}
-void CodeGenerator::JumpIfBothSmiUsingTypeInfo(Register left,
- Register right,
- TypeInfo left_info,
- TypeInfo right_info,
+void CodeGenerator::JumpIfBothSmiUsingTypeInfo(Result* left,
+ Result* right,
JumpTarget* both_smi) {
+ TypeInfo left_info = left->type_info();
+ TypeInfo right_info = right->type_info();
if (left_info.IsDouble() || left_info.IsString() ||
right_info.IsDouble() || right_info.IsString()) {
// We know that left and right are not both smi. Don't do any tests.
return;
}
- if (left.is(right)) {
+ if (left->reg().is(right->reg())) {
if (!left_info.IsSmi()) {
- __ test(left, Immediate(kSmiTagMask));
+ __ test(left->reg(), Immediate(kSmiTagMask));
both_smi->Branch(zero);
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(left);
+ if (FLAG_debug_code) __ AbortIfNotSmi(left->reg());
+ left->Unuse();
+ right->Unuse();
both_smi->Jump();
}
} else if (!left_info.IsSmi()) {
if (!right_info.IsSmi()) {
Result temp = allocator_->Allocate();
ASSERT(temp.is_valid());
- __ mov(temp.reg(), left);
- __ or_(temp.reg(), Operand(right));
+ __ mov(temp.reg(), left->reg());
+ __ or_(temp.reg(), Operand(right->reg()));
__ test(temp.reg(), Immediate(kSmiTagMask));
temp.Unuse();
both_smi->Branch(zero);
} else {
- __ test(left, Immediate(kSmiTagMask));
+ __ test(left->reg(), Immediate(kSmiTagMask));
both_smi->Branch(zero);
}
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(left);
+ if (FLAG_debug_code) __ AbortIfNotSmi(left->reg());
if (!right_info.IsSmi()) {
- __ test(right, Immediate(kSmiTagMask));
+ __ test(right->reg(), Immediate(kSmiTagMask));
both_smi->Branch(zero);
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(right);
+ if (FLAG_debug_code) __ AbortIfNotSmi(right->reg());
+ left->Unuse();
+ right->Unuse();
both_smi->Jump();
}
}
@@ -2780,9 +2784,7 @@
Register right_reg = right_side.reg();
// In-line check for comparing two smis.
- JumpIfBothSmiUsingTypeInfo(left_side.reg(), right_side.reg(),
- left_side.type_info(),
right_side.type_info(),
- &is_smi);
+ JumpIfBothSmiUsingTypeInfo(&left_side, &right_side, &is_smi);
if (has_valid_frame()) {
// Inline the equality check if both operands can't be a NaN. If
both
=======================================
--- /branches/bleeding_edge/src/ia32/codegen-ia32.h Fri Jul 23 02:05:46 2010
+++ /branches/bleeding_edge/src/ia32/codegen-ia32.h Fri Jul 23 04:20:59 2010
@@ -524,10 +524,8 @@
// advantage of TypeInfo to skip unneeded checks.
// Allocates a temporary register, possibly spilling from the frame,
// if it needs to check both left and right.
- void JumpIfBothSmiUsingTypeInfo(Register left,
- Register right,
- TypeInfo left_info,
- TypeInfo right_info,
+ void JumpIfBothSmiUsingTypeInfo(Result* left,
+ Result* right,
JumpTarget* both_smi);
// Emits code sequence that jumps to deferred code if the inputs
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Jul 23 02:05:46 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc Fri Jul 23 04:20:59 2010
@@ -1201,40 +1201,44 @@
}
-void CodeGenerator::JumpIfBothSmiUsingTypeInfo(Register left,
- Register right,
- TypeInfo left_info,
- TypeInfo right_info,
+void CodeGenerator::JumpIfBothSmiUsingTypeInfo(Result* left,
+ Result* right,
JumpTarget* both_smi) {
+ TypeInfo left_info = left->type_info();
+ TypeInfo right_info = right->type_info();
if (left_info.IsDouble() || left_info.IsString() ||
right_info.IsDouble() || right_info.IsString()) {
// We know that left and right are not both smi. Don't do any tests.
return;
}
- if (left.is(right)) {
+ if (left->reg().is(right->reg())) {
if (!left_info.IsSmi()) {
- Condition is_smi = masm()->CheckSmi(left);
+ Condition is_smi = masm()->CheckSmi(left->reg());
both_smi->Branch(is_smi);
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(left);
+ if (FLAG_debug_code) __ AbortIfNotSmi(left->reg());
+ left->Unuse();
+ right->Unuse();
both_smi->Jump();
}
} else if (!left_info.IsSmi()) {
if (!right_info.IsSmi()) {
- Condition is_smi = masm()->CheckBothSmi(left, right);
+ Condition is_smi = masm()->CheckBothSmi(left->reg(), right->reg());
both_smi->Branch(is_smi);
} else {
- Condition is_smi = masm()->CheckSmi(left);
+ Condition is_smi = masm()->CheckSmi(left->reg());
both_smi->Branch(is_smi);
}
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(left);
+ if (FLAG_debug_code) __ AbortIfNotSmi(left->reg());
if (!right_info.IsSmi()) {
- Condition is_smi = masm()->CheckSmi(right);
+ Condition is_smi = masm()->CheckSmi(right->reg());
both_smi->Branch(is_smi);
} else {
- if (FLAG_debug_code) __ AbortIfNotSmi(right);
+ if (FLAG_debug_code) __ AbortIfNotSmi(right->reg());
+ left->Unuse();
+ right->Unuse();
both_smi->Jump();
}
}
@@ -2283,9 +2287,7 @@
Register right_reg = right_side.reg();
// In-line check for comparing two smis.
- JumpIfBothSmiUsingTypeInfo(left_side.reg(), right_side.reg(),
- left_side.type_info(),
right_side.type_info(),
- &is_smi);
+ JumpIfBothSmiUsingTypeInfo(&left_side, &right_side, &is_smi);
if (has_valid_frame()) {
// Inline the equality check if both operands can't be a NaN. If
both
=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.h Fri Jul 23 02:05:46 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.h Fri Jul 23 04:20:59 2010
@@ -495,10 +495,8 @@
// Emits code sequence that jumps to a JumpTarget if the inputs
// are both smis. Cannot be in MacroAssembler because it takes
// advantage of TypeInfo to skip unneeded checks.
- void JumpIfBothSmiUsingTypeInfo(Register left,
- Register right,
- TypeInfo left_info,
- TypeInfo right_info,
+ void JumpIfBothSmiUsingTypeInfo(Result* left,
+ Result* right,
JumpTarget* both_smi);
// Emits code sequence that jumps to deferred code if the input
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
