Changeset 84182 in webkit for trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h

Timestamp:

Apr 18, 2011, 2:08:28 PM (14 years ago)

Author:

[email protected]

Message:

Bug 58817 - DFG JIT - if speculative compilation fails, throw away code.

Reviewed by Geoff Garen.

If we detect a logical conflict, throw away generated code,
and only compile through the NonSpeculativeJIT.

• assembler/AbstractMacroAssembler.h:

(JSC::AbstractMacroAssembler::rewindToLabel):

• assembler/AssemblerBuffer.h:

(JSC::AssemblerBuffer::rewindToOffset):

• assembler/MacroAssemblerX86Common.h:

(JSC::MacroAssemblerX86Common::branchAdd32):
(JSC::MacroAssemblerX86Common::branchSub32):

• assembler/X86Assembler.h:

(JSC::X86Assembler::rewindToLabel):
(JSC::X86Assembler::X86InstructionFormatter::rewindToLabel):

• dfg/DFGJITCompiler.cpp:

(JSC::DFG::JITCompiler::linkSpeculationChecks):
(JSC::DFG::JITCompiler::compileFunction):

• dfg/DFGNode.h:
• dfg/DFGNonSpeculativeJIT.cpp:

(JSC::DFG::NonSpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT.cpp:

(JSC::DFG::SpeculativeJIT::compile):

• dfg/DFGSpeculativeJIT.h:

(JSC::DFG::SpeculationCheckIndexIterator::SpeculationCheckIndexIterator):

File:

• trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/assembler/MacroAssemblerX86Common.h

@@ -1005 +1005 @@
     }
 
-    Jump branchAdd32(Condition cond, TrustedImm32 imm, RegisterID src, RegisterID dest)
+    Jump branchAdd32(Condition cond, RegisterID src, TrustedImm32 imm, RegisterID dest)
     {
         move(src, dest);
@@ -1080 +1080 @@
         ASSERT(src1 == dest || src2 != dest);
 
+        move(src1, dest);
+        return branchSub32(cond, src2, dest);
+    }
+
+    Jump branchSub32(Condition cond, RegisterID src1, TrustedImm32 src2, RegisterID dest)
+    {
         move(src1, dest);
         return branchSub32(cond, src2, dest);