Revision: 4906
Author: [email protected]
Date: Mon Jun 21 05:39:37 2010
Log: X64: Fix bug in LoadSSE2NumberOperands. It can be called with two smis!
Remove some unused labels.

Review URL: http://codereview.chromium.org/2861011
http://code.google.com/p/v8/source/detail?r=4906

Modified:
 /branches/bleeding_edge/src/x64/codegen-x64.cc

=======================================
--- /branches/bleeding_edge/src/x64/codegen-x64.cc      Mon Jun 21 04:21:36 2010
+++ /branches/bleeding_edge/src/x64/codegen-x64.cc      Mon Jun 21 05:39:37 2010
@@ -9932,13 +9932,6 @@


 void FloatingPointHelper::LoadSSE2NumberOperands(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);
-  }
   Label load_smi_rdx, load_nonsmi_rax, load_smi_rax, done;
   // Load operand in rdx into xmm0.
   __ JumpIfSmi(rdx, &load_smi_rdx);
@@ -9952,7 +9945,7 @@
   __ bind(&load_smi_rdx);
   __ SmiToInteger32(kScratchRegister, rdx);
   __ cvtlsi2sd(xmm0, kScratchRegister);
-  __ jmp(&load_nonsmi_rax);
+  __ JumpIfNotSmi(rax, &load_nonsmi_rax);

   __ bind(&load_smi_rax);
   __ SmiToInteger32(kScratchRegister, rax);
@@ -10058,8 +10051,6 @@
   Label done;
   Label rax_is_object;
   Label rdx_is_object;
-  Label rax_is_smi;
-  Label rdx_is_smi;

   __ JumpIfNotSmi(rdx, &rdx_is_object);
   __ SmiToInteger32(rdx, rdx);
@@ -10071,7 +10062,6 @@
   __ 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);

--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev

Reply via email to