Revision: 3636
Author: [email protected]
Date: Mon Jan 18 08:23:24 2010
Log: Fix a bug in the short-circuit logical operations in the toplevel
code generator.
Review URL: http://codereview.chromium.org/542105
http://code.google.com/p/v8/source/detail?r=3636
Modified:
/branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc
/branches/bleeding_edge/src/x64/fast-codegen-x64.cc
/branches/bleeding_edge/src/x64/virtual-frame-x64.h
=======================================
--- /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Mon Jan 18
06:04:55 2010
+++ /branches/bleeding_edge/src/ia32/fast-codegen-ia32.cc Mon Jan 18
08:23:24 2010
@@ -214,17 +214,24 @@
}
break;
- case Expression::kValueTest:
- case Expression::kTestValue:
- // Push an extra copy of the value in case it's needed.
- __ push(reg);
- // Fall through.
-
case Expression::kTest:
// For simplicity we always test the accumulator register.
if (!reg.is(result_register())) __ mov(result_register(), reg);
DoTest(context);
break;
+
+ case Expression::kValueTest:
+ case Expression::kTestValue:
+ if (!reg.is(result_register())) __ mov(result_register(), reg);
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
+ DoTest(context);
+ break;
}
}
@@ -251,6 +258,7 @@
}
case Expression::kTest:
+ // For simplicity we always test the accumulator register.
Move(result_register(), slot);
DoTest(context);
break;
@@ -258,7 +266,13 @@
case Expression::kValueTest:
case Expression::kTestValue:
Move(result_register(), slot);
- __ push(result_register());
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -285,6 +299,7 @@
break;
case Expression::kTest:
+ // For simplicity we always test the accumulator register.
__ mov(result_register(), lit->handle());
DoTest(context);
break;
@@ -292,7 +307,13 @@
case Expression::kValueTest:
case Expression::kTestValue:
__ mov(result_register(), lit->handle());
- __ push(result_register());
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -319,13 +340,21 @@
break;
case Expression::kTest:
+ // For simplicity we always test the accumulator register.
__ pop(result_register());
DoTest(context);
break;
case Expression::kValueTest:
case Expression::kTestValue:
- __ mov(result_register(), Operand(esp, 0));
+ switch (location_) {
+ case kAccumulator:
+ __ pop(result_register());
+ break;
+ case kStack:
+ __ mov(result_register(), Operand(esp, 0));
+ break;
+ }
DoTest(context);
break;
}
@@ -359,6 +388,7 @@
break;
case Expression::kTest:
+ // For simplicity we always test the accumulator register.
__ Drop(count);
if (!reg.is(result_register())) __ mov(result_register(), reg);
DoTest(context);
@@ -366,9 +396,17 @@
case Expression::kValueTest:
case Expression::kTestValue:
- if (count > 1) __ Drop(count - 1);
- if (!reg.is(result_register())) __ mov(result_register(), reg);
- __ mov(Operand(esp, 0), result_register());
+ switch (location_) {
+ case kAccumulator:
+ __ Drop(count);
+ if (!reg.is(result_register())) __ mov(result_register(), reg);
+ break;
+ case kStack:
+ if (count > 1) __ Drop(count - 1);
+ __ mov(result_register(), reg);
+ __ mov(Operand(esp, 0), result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -440,18 +478,44 @@
void FastCodeGenerator::DoTest(Expression::Context context) {
- // The value to test is in the accumulator, and duplicated on the stack
if
- // necessary (for value/test and test/value contexts).
+ // The value to test is in the accumulator. If the value might be needed
+ // on the stack (value/test and test/value contexts with a stack location
+ // desired), then the value is already duplicated on the stack.
ASSERT_NE(NULL, true_label_);
ASSERT_NE(NULL, false_label_);
- // If there is a value on the stack, use a discard label for the
- // value-is-unneeded branch in the inlined part of the test.
+ // In value/test and test/value expression contexts with stack as the
+ // desired location, there is already an extra value on the stack. Use a
+ // label to discard it if unneeded.
Label discard;
- Label* if_true =
- (context == Expression::kTestValue) ? &discard : true_label_;
- Label* if_false =
- (context == Expression::kValueTest) ? &discard : false_label_;
+ Label* if_true = true_label_;
+ Label* if_false = false_label_;
+ switch (context) {
+ case Expression::kUninitialized:
+ case Expression::kEffect:
+ case Expression::kValue:
+ UNREACHABLE();
+ case Expression::kTest:
+ break;
+ case Expression::kValueTest:
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ if_false = &discard;
+ break;
+ }
+ break;
+ case Expression::kTestValue:
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ if_true = &discard;
+ break;
+ }
+ break;
+ }
// Emit the inlined tests assumed by the stub.
__ cmp(result_register(), Factory::undefined_value());
@@ -465,6 +529,34 @@
__ j(zero, if_false);
__ test(result_register(), Immediate(kSmiTagMask));
__ j(zero, if_true);
+
+ // Save a copy of the value if it may be needed and isn't already saved.
+ switch (context) {
+ case Expression::kUninitialized:
+ case Expression::kEffect:
+ case Expression::kValue:
+ UNREACHABLE();
+ case Expression::kTest:
+ break;
+ case Expression::kValueTest:
+ switch (location_) {
+ case kAccumulator:
+ __ push(result_register());
+ break;
+ case kStack:
+ break;
+ }
+ break;
+ case Expression::kTestValue:
+ switch (location_) {
+ case kAccumulator:
+ __ push(result_register());
+ break;
+ case kStack:
+ break;
+ }
+ break;
+ }
// Call the ToBoolean stub for all other cases.
ToBooleanStub stub;
=======================================
--- /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Mon Jan 18 06:04:55
2010
+++ /branches/bleeding_edge/src/x64/fast-codegen-x64.cc Mon Jan 18 08:23:24
2010
@@ -221,17 +221,24 @@
}
break;
- case Expression::kValueTest:
- case Expression::kTestValue:
- // Push an extra copy of the value in case it's needed.
- __ push(reg);
- // Fall through.
-
case Expression::kTest:
// For simplicity we always test the accumulator register.
if (!reg.is(result_register())) __ movq(result_register(), reg);
DoTest(context);
break;
+
+ case Expression::kValueTest:
+ case Expression::kTestValue:
+ if (!reg.is(result_register())) __ movq(result_register(), reg);
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
+ DoTest(context);
+ break;
}
}
@@ -265,7 +272,13 @@
case Expression::kValueTest:
case Expression::kTestValue:
Move(result_register(), slot);
- __ push(result_register());
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -298,7 +311,13 @@
case Expression::kValueTest:
case Expression::kTestValue:
__ Move(result_register(), lit->handle());
- __ push(result_register());
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ __ push(result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -331,7 +350,14 @@
case Expression::kValueTest:
case Expression::kTestValue:
- __ movq(result_register(), Operand(rsp, 0));
+ switch (location_) {
+ case kAccumulator:
+ __ pop(result_register());
+ break;
+ case kStack:
+ __ movq(result_register(), Operand(rsp, 0));
+ break;
+ }
DoTest(context);
break;
}
@@ -372,9 +398,17 @@
case Expression::kValueTest:
case Expression::kTestValue:
- if (count > 1) __ Drop(count - 1);
- if (!reg.is(result_register())) __ movq(result_register(), reg);
- __ movq(Operand(rsp, 0), result_register());
+ switch (location_) {
+ case kAccumulator:
+ __ Drop(count);
+ if (!reg.is(result_register())) __ movq(result_register(), reg);
+ break;
+ case kStack:
+ if (count > 1) __ Drop(count - 1);
+ __ movq(result_register(), reg);
+ __ movq(Operand(rsp, 0), result_register());
+ break;
+ }
DoTest(context);
break;
}
@@ -446,18 +480,44 @@
void FastCodeGenerator::DoTest(Expression::Context context) {
- // The value to test is in the accumulator, and duplicated on the stack
if
- // necessary (for value/test and test/value contexts).
+ // The value to test is in the accumulator. If the value might be needed
+ // on the stack (value/test and test/value contexts with a stack location
+ // desired), then the value is already duplicated on the stack.
ASSERT_NE(NULL, true_label_);
ASSERT_NE(NULL, false_label_);
- // If there is a value on the stack, use a discard label for the
- // value-is-unneeded branch in the inlined part of the test.
+ // In value/test and test/value expression contexts with stack as the
+ // desired location, there is already an extra value on the stack. Use a
+ // label to discard it if unneeded.
Label discard;
- Label* if_true =
- (context == Expression::kTestValue) ? &discard : true_label_;
- Label* if_false =
- (context == Expression::kValueTest) ? &discard : false_label_;
+ Label* if_true = true_label_;
+ Label* if_false = false_label_;
+ switch (context) {
+ case Expression::kUninitialized:
+ case Expression::kEffect:
+ case Expression::kValue:
+ UNREACHABLE();
+ case Expression::kTest:
+ break;
+ case Expression::kValueTest:
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ if_false = &discard;
+ break;
+ }
+ break;
+ case Expression::kTestValue:
+ switch (location_) {
+ case kAccumulator:
+ break;
+ case kStack:
+ if_true = &discard;
+ break;
+ }
+ break;
+ }
// Emit the inlined tests assumed by the stub.
__ CompareRoot(result_register(), Heap::kUndefinedValueRootIndex);
@@ -471,6 +531,34 @@
__ j(equal, if_false);
Condition is_smi = masm_->CheckSmi(result_register());
__ j(is_smi, if_true);
+
+ // Save a copy of the value if it may be needed and isn't already saved.
+ switch (context) {
+ case Expression::kUninitialized:
+ case Expression::kEffect:
+ case Expression::kValue:
+ UNREACHABLE();
+ case Expression::kTest:
+ break;
+ case Expression::kValueTest:
+ switch (location_) {
+ case kAccumulator:
+ __ push(result_register());
+ break;
+ case kStack:
+ break;
+ }
+ break;
+ case Expression::kTestValue:
+ switch (location_) {
+ case kAccumulator:
+ __ push(result_register());
+ break;
+ case kStack:
+ break;
+ }
+ break;
+ }
// Call the ToBoolean stub for all other cases.
ToBooleanStub stub;
=======================================
--- /branches/bleeding_edge/src/x64/virtual-frame-x64.h Wed Dec 23 07:06:21
2009
+++ /branches/bleeding_edge/src/x64/virtual-frame-x64.h Mon Jan 18 08:23:24
2010
@@ -343,7 +343,7 @@
// of the frame. Key and receiver are not dropped.
Result CallKeyedStoreIC();
- // Call call IC. Arguments, reciever, and function name are found
+ // Call call IC. Arguments, receiver, and function name are found
// on top of the frame. Function name slot is not dropped. The
// argument count does not include the receiver.
Result CallCallIC(RelocInfo::Mode mode, int arg_count, int loop_nesting);
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
