Reviewers: Kasper Lund, Description: Fix regression caused by the generation of a shift stub during snapshot creation in a better way.
Encode whether or not the stub should use sse3 instructions in the minor key of the stub. The stubs generated during snapshot creation will have sse3 disabled, but they will not be found when sse3 is enabled. Therefore they will only affect the code generated as part of the snapshot. Please review this at http://codereview.chromium.org/172086 SVN Base: http://v8.googlecode.com/svn/branches/bleeding_edge/ Affected files: M src/ia32/codegen-ia32.h M src/ia32/codegen-ia32.cc M src/v8natives.js Index: src/v8natives.js =================================================================== --- src/v8natives.js (revision 2704) +++ src/v8natives.js (working copy) @@ -47,7 +47,7 @@ // Helper function used to install functions on objects. function InstallFunctions(object, attributes, functions) { if (functions.length >= 8) { - %OptimizeObjectForAddingMultipleProperties(object, functions.length / 2); + %OptimizeObjectForAddingMultipleProperties(object, functions.length >> 1); } for (var i = 0; i < functions.length; i += 2) { var key = functions[i]; Index: src/ia32/codegen-ia32.cc =================================================================== --- src/ia32/codegen-ia32.cc (revision 2704) +++ src/ia32/codegen-ia32.cc (working copy) @@ -6752,11 +6752,10 @@ // Reserve space for converted numbers. __ sub(Operand(esp), Immediate(2 * kPointerSize)); - bool use_sse3 = CpuFeatures::IsSupported(CpuFeatures::SSE3); - if (use_sse3) { + if (use_sse3_) { // Truncate the operands to 32-bit integers and check for // exceptions in doing so. - CpuFeatures::Scope scope(CpuFeatures::SSE3); + CpuFeatures::Scope scope(CpuFeatures::SSE3); __ fisttp_s(Operand(esp, 0 * kPointerSize)); __ fisttp_s(Operand(esp, 1 * kPointerSize)); __ fnstsw_ax(); @@ -6841,7 +6840,7 @@ // the runtime system. __ bind(&operand_conversion_failure); __ add(Operand(esp), Immediate(2 * kPointerSize)); - if (use_sse3) { + 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. Index: src/ia32/codegen-ia32.h =================================================================== --- src/ia32/codegen-ia32.h (revision 2704) +++ src/ia32/codegen-ia32.h (working copy) @@ -618,6 +618,7 @@ OverwriteMode mode, GenericBinaryFlags flags) : op_(op), mode_(mode), flags_(flags) { + use_sse3_ = CpuFeatures::IsSupported(CpuFeatures::SSE3); ASSERT(OpBits::is_valid(Token::NUM_TOKENS)); } @@ -627,6 +628,7 @@ Token::Value op_; OverwriteMode mode_; GenericBinaryFlags flags_; + bool use_sse3_; const char* GetName(); @@ -639,9 +641,10 @@ } #endif - // Minor key encoding in 16 bits FOOOOOOOOOOOOOMM. + // Minor key encoding in 16 bits FSOOOOOOOOOOOOMM. class ModeBits: public BitField<OverwriteMode, 0, 2> {}; - class OpBits: public BitField<Token::Value, 2, 13> {}; + class OpBits: public BitField<Token::Value, 2, 12> {}; + class SSE3Bits: public BitField<bool, 14, 1> {}; class FlagBits: public BitField<GenericBinaryFlags, 15, 1> {}; Major MajorKey() { return GenericBinaryOp; } @@ -649,7 +652,8 @@ // Encode the parameters in a unique 16 bit value. return OpBits::encode(op_) | ModeBits::encode(mode_) - | FlagBits::encode(flags_); + | FlagBits::encode(flags_) + | SSE3Bits::encode(use_sse3_); } void Generate(MacroAssembler* masm); }; --~--~---------~--~----~------------~-------~--~----~ v8-dev mailing list [email protected] http://groups.google.com/group/v8-dev -~----------~----~----~----~------~----~------~--~---
