Commit 400b62a1 authored by ager@chromium.org's avatar ager@chromium.org

Implement unary addition in the full (non-optimizing) code generator.

Review URL: http://codereview.chromium.org/555099

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@3711 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent c16974e0
......@@ -1351,6 +1351,19 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {
break;
}
case Token::ADD: {
Comment cmt(masm_, "[ UnaryOperation (ADD)");
VisitForValue(expr->expression(), kAccumulator);
Label no_conversion;
__ tst(result_register(), Operand(kSmiTagMask));
__ b(eq, &no_conversion);
__ push(r0);
__ InvokeBuiltin(Builtins::TO_NUMBER, CALL_JS);
__ bind(&no_conversion);
Apply(context_, result_register());
break;
}
default:
UNREACHABLE();
}
......
......@@ -418,17 +418,16 @@ void FullCodeGenSyntaxChecker::VisitCallRuntime(CallRuntime* expr) {
void FullCodeGenSyntaxChecker::VisitUnaryOperation(UnaryOperation* expr) {
switch (expr->op()) {
case Token::VOID:
case Token::ADD:
case Token::NOT:
case Token::TYPEOF:
case Token::VOID:
Visit(expr->expression());
break;
case Token::BIT_NOT:
BAILOUT("UnaryOperation: BIT_NOT");
case Token::DELETE:
BAILOUT("UnaryOperation: DELETE");
case Token::ADD:
BAILOUT("UnaryOperation: ADD");
case Token::SUB:
BAILOUT("UnaryOperation: SUB");
default:
......
......@@ -1457,6 +1457,19 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {
break;
}
case Token::ADD: {
Comment cmt(masm_, "[ UnaryOperation (ADD)");
VisitForValue(expr->expression(), kAccumulator);
Label no_conversion;
__ test(result_register(), Immediate(kSmiTagMask));
__ j(zero, &no_conversion);
__ push(result_register());
__ InvokeBuiltin(Builtins::TO_NUMBER, CALL_FUNCTION);
__ bind(&no_conversion);
Apply(context_, result_register());
break;
}
default:
UNREACHABLE();
}
......
......@@ -1464,6 +1464,20 @@ void FullCodeGenerator::VisitUnaryOperation(UnaryOperation* expr) {
break;
}
case Token::ADD: {
Comment cmt(masm_, "[ UnaryOperation (ADD)");
VisitForValue(expr->expression(), kAccumulator);
Label no_conversion;
Condition is_smi;
is_smi = masm_->CheckSmi(result_register());
__ j(is_smi, &no_conversion);
__ push(result_register());
__ InvokeBuiltin(Builtins::TO_NUMBER, CALL_FUNCTION);
__ bind(&no_conversion);
Apply(context_, result_register());
break;
}
default:
UNREACHABLE();
}
......
// Copyright 2009 the V8 project authors. All rights reserved.
// Redistribution and use in source and binary forms, with or without
// modification, are permitted provided that the following conditions are
// met:
//
// * Redistributions of source code must retain the above copyright
// notice, this list of conditions and the following disclaimer.
// * Redistributions in binary form must reproduce the above
// copyright notice, this list of conditions and the following
// disclaimer in the documentation and/or other materials provided
// with the distribution.
// * Neither the name of Google Inc. nor the names of its
// contributors may be used to endorse or promote products derived
// from this software without specific prior written permission.
//
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
// Test unary addition in various contexts.
// Test value context.
assertEquals(1, +'1');
assertEquals(1, +1);
assertEquals(1.12, +1.12);
assertEquals(NaN, +undefined);
assertEquals(NaN, +{});
// Test effect context.
assertEquals(1, eval("+'1'; 1"));
assertEquals(1, eval("+1; 1"));
assertEquals(1, eval("+1.12; 1"));
assertEquals(1, eval("+undefined; 1"));
assertEquals(1, eval("+{}; 1"));
// Test test context.
assertEquals(1, (+'1') ? 1 : 2);
assertEquals(1, (+1) ? 1 : 2);
assertEquals(1, (+'0') ? 2 : 1);
assertEquals(1, (+0) ? 2 : 1);
assertEquals(1, (+1.12) ? 1 : 2);
assertEquals(1, (+undefined) ? 2 : 1);
assertEquals(1, (+{}) ? 2 : 1);
// Test value/test context.
assertEquals(1, +'1' || 2);
assertEquals(1, +1 || 2);
assertEquals(1.12, +1.12 || 2);
assertEquals(2, +undefined || 2);
assertEquals(2, +{} || 2);
// Test test/value context.
assertEquals(2, +'1' && 2);
assertEquals(2, +1 && 2);
assertEquals(0, +'0' && 2);
assertEquals(0, +0 && 2);
assertEquals(2, +1.12 && 2);
assertEquals(NaN, +undefined && 2);
assertEquals(NaN, +{} && 2);
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment