Reviewers: Lasse Reichstein,
Description:
Remove not-both-smis optimization on
FloatingPointHelper::LoadNumbersAsIntegers
on X64 platform.
Please review this at http://codereview.chromium.org/2861031/show
SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/
Affected files:
M src/x64/codegen-x64.cc
Index: src/x64/codegen-x64.cc
===================================================================
--- src/x64/codegen-x64.cc (revision 4957)
+++ src/x64/codegen-x64.cc (working copy)
@@ -6519,7 +6519,7 @@
void DeferredInlineBinaryOperation::Generate() {
Label done;
if ((op_ == Token::ADD)
- || (op_ ==Token::SUB)
+ || (op_ == Token::SUB)
|| (op_ == Token::MUL)
|| (op_ == Token::DIV)) {
Label call_runtime;
@@ -10031,20 +10031,15 @@
// Input: rdx, rax are the left and right objects of a bit op.
// Output: rax, rcx are left and right integers for a bit op.
void FloatingPointHelper::LoadNumbersAsIntegers(MacroAssembler* masm) {
- if (FLAG_debug_code) {
- // Both arguments can not be smis. That case is handled by smi-only
code.
- Label ok;
- __ JumpIfNotBothSmi(rax, rdx, &ok);
- __ Abort("Both arguments smi but not handled by smi-code.");
- __ bind(&ok);
- }
// Check float operands.
Label done;
+ Label rax_is_smi;
Label rax_is_object;
Label rdx_is_object;
__ JumpIfNotSmi(rdx, &rdx_is_object);
__ SmiToInteger32(rdx, rdx);
+ __ JumpIfSmi(rax, &rax_is_smi);
__ bind(&rax_is_object);
IntegerConvert(masm, rcx, rax); // Uses rdi, rcx and rbx.
@@ -10053,6 +10048,7 @@
__ bind(&rdx_is_object);
IntegerConvert(masm, rdx, rdx); // Uses rdi, rcx and rbx.
__ JumpIfNotSmi(rax, &rax_is_object);
+ __ bind(&rax_is_smi);
__ SmiToInteger32(rcx, rax);
__ bind(&done);
@@ -10437,7 +10433,6 @@
Label not_floats;
// rax: y
// rdx: x
- ASSERT(!static_operands_type_.IsSmi());
if (static_operands_type_.IsNumber()) {
if (FLAG_debug_code) {
// Assert at runtime that inputs are only numbers.
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
