| Index: src/codegen-ia32.cc
|
| ===================================================================
|
| --- src/codegen-ia32.cc (revision 1360)
|
| +++ src/codegen-ia32.cc (working copy)
|
| @@ -4507,31 +4507,44 @@
|
| FloatingPointHelper::CheckFloatOperands(masm, &call_runtime, ebx);
|
| FloatingPointHelper::LoadFloatOperands(masm, ecx);
|
|
|
| - Label non_int32_operands, non_smi_result, skip_allocation;
|
| + Label skip_allocation, non_smi_result, operand_conversion_failure;
|
| +
|
| // Reserve space for converted numbers.
|
| __ sub(Operand(esp), Immediate(2 * kPointerSize));
|
|
|
| - // Check if right operand is int32.
|
| - __ fist_s(Operand(esp, 1 * kPointerSize));
|
| - __ fild_s(Operand(esp, 1 * kPointerSize));
|
| - __ fucompp();
|
| - __ fnstsw_ax();
|
| - __ sahf();
|
| - __ j(not_zero, &non_int32_operands);
|
| - __ j(parity_even, &non_int32_operands);
|
| + bool use_sse3 = CpuFeatures::IsSupported(CpuFeatures::SSE3);
|
| + if (use_sse3) {
|
| + // Truncate the operands to 32-bit integers and check for
|
| + // exceptions in doing so.
|
| + CpuFeatures::Scope scope(CpuFeatures::SSE3);
|
| + __ fisttp_s(Operand(esp, 0 * kPointerSize));
|
| + __ fisttp_s(Operand(esp, 1 * kPointerSize));
|
| + __ fnstsw_ax();
|
| + __ test(eax, Immediate(1));
|
| + __ j(not_zero, &operand_conversion_failure);
|
| + } else {
|
| + // Check if right operand is int32.
|
| + __ fist_s(Operand(esp, 0 * kPointerSize));
|
| + __ fild_s(Operand(esp, 0 * kPointerSize));
|
| + __ fucompp();
|
| + __ fnstsw_ax();
|
| + __ sahf();
|
| + __ j(not_zero, &operand_conversion_failure);
|
| + __ j(parity_even, &operand_conversion_failure);
|
|
|
| - // Check if left operand is int32.
|
| - __ fist_s(Operand(esp, 0 * kPointerSize));
|
| - __ fild_s(Operand(esp, 0 * kPointerSize));
|
| - __ fucompp();
|
| - __ fnstsw_ax();
|
| - __ sahf();
|
| - __ j(not_zero, &non_int32_operands);
|
| - __ j(parity_even, &non_int32_operands);
|
| + // Check if left operand is int32.
|
| + __ fist_s(Operand(esp, 1 * kPointerSize));
|
| + __ fild_s(Operand(esp, 1 * kPointerSize));
|
| + __ fucompp();
|
| + __ fnstsw_ax();
|
| + __ sahf();
|
| + __ j(not_zero, &operand_conversion_failure);
|
| + __ j(parity_even, &operand_conversion_failure);
|
| + }
|
|
|
| // Get int32 operands and perform bitop.
|
| + __ pop(ecx);
|
| __ pop(eax);
|
| - __ pop(ecx);
|
| switch (op_) {
|
| case Token::BIT_OR: __ or_(eax, Operand(ecx)); break;
|
| case Token::BIT_AND: __ and_(eax, Operand(ecx)); break;
|
| @@ -4579,10 +4592,22 @@
|
| __ fstp_d(FieldOperand(eax, HeapNumber::kValueOffset));
|
| __ ret(2 * kPointerSize);
|
| }
|
| - __ bind(&non_int32_operands);
|
| - // Restore stacks and operands before calling runtime.
|
| - __ ffree(0);
|
| +
|
| + // Clear the FPU exception flag and reset the stack before calling
|
| + // the runtime system.
|
| + __ bind(&operand_conversion_failure);
|
| __ add(Operand(esp), Immediate(2 * kPointerSize));
|
| + if (use_sse3) {
|
| + // If we've used the SSE3 instructions for truncating the
|
| + // floating point values to integers and it failed, we have a
|
| + // pending #IA exception. Clear it.
|
| + __ fnclex();
|
| + } else {
|
| + // The non-SSE3 variant does early bailout if the right
|
| + // operand isn't a 32-bit integer, so we may have a single
|
| + // value on the FPU stack we need to get rid of.
|
| + __ ffree(0);
|
| + }
|
|
|
| // SHR should return uint32 - go to runtime for non-smi/negative result.
|
| if (op_ == Token::SHR) __ bind(&non_smi_result);
|
|
|