Commit 324a6df3 authored by lrn@chromium.org's avatar lrn@chromium.org

X64: Fix bug in LoadSSE2NumberOperands. It can be called with two smis!

Remove some unused labels.

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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@4906 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
parent ed559488
...@@ -9932,13 +9932,6 @@ void FloatingPointHelper::LoadSSE2SmiOperands(MacroAssembler* masm) { ...@@ -9932,13 +9932,6 @@ void FloatingPointHelper::LoadSSE2SmiOperands(MacroAssembler* masm) {
void FloatingPointHelper::LoadSSE2NumberOperands(MacroAssembler* masm) { 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; Label load_smi_rdx, load_nonsmi_rax, load_smi_rax, done;
// Load operand in rdx into xmm0. // Load operand in rdx into xmm0.
__ JumpIfSmi(rdx, &load_smi_rdx); __ JumpIfSmi(rdx, &load_smi_rdx);
...@@ -9952,7 +9945,7 @@ void FloatingPointHelper::LoadSSE2NumberOperands(MacroAssembler* masm) { ...@@ -9952,7 +9945,7 @@ void FloatingPointHelper::LoadSSE2NumberOperands(MacroAssembler* masm) {
__ bind(&load_smi_rdx); __ bind(&load_smi_rdx);
__ SmiToInteger32(kScratchRegister, rdx); __ SmiToInteger32(kScratchRegister, rdx);
__ cvtlsi2sd(xmm0, kScratchRegister); __ cvtlsi2sd(xmm0, kScratchRegister);
__ jmp(&load_nonsmi_rax); __ JumpIfNotSmi(rax, &load_nonsmi_rax);
__ bind(&load_smi_rax); __ bind(&load_smi_rax);
__ SmiToInteger32(kScratchRegister, rax); __ SmiToInteger32(kScratchRegister, rax);
...@@ -10058,8 +10051,6 @@ void FloatingPointHelper::LoadNumbersAsIntegers(MacroAssembler* masm) { ...@@ -10058,8 +10051,6 @@ void FloatingPointHelper::LoadNumbersAsIntegers(MacroAssembler* masm) {
Label done; Label done;
Label rax_is_object; Label rax_is_object;
Label rdx_is_object; Label rdx_is_object;
Label rax_is_smi;
Label rdx_is_smi;
__ JumpIfNotSmi(rdx, &rdx_is_object); __ JumpIfNotSmi(rdx, &rdx_is_object);
__ SmiToInteger32(rdx, rdx); __ SmiToInteger32(rdx, rdx);
...@@ -10071,7 +10062,6 @@ void FloatingPointHelper::LoadNumbersAsIntegers(MacroAssembler* masm) { ...@@ -10071,7 +10062,6 @@ void FloatingPointHelper::LoadNumbersAsIntegers(MacroAssembler* masm) {
__ bind(&rdx_is_object); __ bind(&rdx_is_object);
IntegerConvert(masm, rdx, rdx); // Uses rdi, rcx and rbx. IntegerConvert(masm, rdx, rdx); // Uses rdi, rcx and rbx.
__ JumpIfNotSmi(rax, &rax_is_object); __ JumpIfNotSmi(rax, &rax_is_object);
__ bind(&rax_is_smi);
__ SmiToInteger32(rcx, rax); __ SmiToInteger32(rcx, rax);
__ bind(&done); __ bind(&done);
......
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