Index: src/x64/code-stubs-x64.cc |
=================================================================== |
--- src/x64/code-stubs-x64.cc (revision 7379) |
+++ src/x64/code-stubs-x64.cc (working copy) |
@@ -1062,6 +1062,9 @@ |
case TRBinaryOpIC::HEAP_NUMBER: |
GenerateHeapNumberStub(masm); |
break; |
+ case TRBinaryOpIC::ODDBALL: |
+ GenerateOddballStub(masm); |
+ break; |
case TRBinaryOpIC::STRING: |
GenerateStringStub(masm); |
break; |
@@ -1438,6 +1441,39 @@ |
} |
+void TypeRecordingBinaryOpStub::GenerateOddballStub(MacroAssembler* masm) { |
+ Label call_runtime; |
+ |
+ if (op_ == Token::ADD) { |
+ // Handle string addition here, because it is the only operation |
+ // that does not do a ToNumber conversion on the operands. |
+ GenerateStringAddCode(masm); |
+ } |
+ |
+ // Convert odd ball arguments to numbers. |
+ NearLabel check, done; |
+ __ Cmp(rdx, FACTORY->undefined_value()); |
Erik Corry
2011/03/28 15:15:24
CompareRoot and LoadRoot.
fschneider
2011/03/28 16:28:59
Done.
|
+ __ j(not_equal, &check); |
+ if (Token::IsBitOp(op_)) { |
+ __ xor_(rdx, rdx); |
+ } else { |
+ __ Move(rdx, FACTORY->nan_value()); |
+ } |
+ __ jmp(&done); |
+ __ bind(&check); |
+ __ Cmp(rax, FACTORY->undefined_value()); |
+ __ j(not_equal, &done); |
+ if (Token::IsBitOp(op_)) { |
+ __ xor_(rax, rax); |
+ } else { |
+ __ Move(rax, FACTORY->nan_value()); |
+ } |
+ __ bind(&done); |
+ |
+ GenerateHeapNumberStub(masm); |
+} |
+ |
+ |
void TypeRecordingBinaryOpStub::GenerateHeapNumberStub(MacroAssembler* masm) { |
Label gc_required, not_number; |
GenerateFloatingPointCode(masm, &gc_required, ¬_number); |