Changeset 148893 in webkit for trunk/Source/JavaScriptCore/jit/JIT.h

Timestamp:

Apr 22, 2013, 10:37:29 AM (12 years ago)

Author:

[email protected]

Message:

Change baseline JIT watchdog timer check to use the proper fast slow path
infrastructure.
​https://bugs.webkit.org/show_bug.cgi?id=114963.

Reviewed by Oliver Hunt.

SH4 parts contributed by Julien Brianceau.

• assembler/ARMAssembler.h:
• assembler/MacroAssemblerARM.h:
• assembler/MacroAssemblerARMv7.h:
• assembler/MacroAssemblerMIPS.h:

(JSC::MacroAssemblerMIPS::branchAdd32):

• assembler/MacroAssemblerSH4.h:

(JSC::MacroAssemblerSH4::branchAdd32):

• assembler/MacroAssemblerX86Common.h:
• assembler/SH4Assembler.h:
• jit/JIT.cpp:

(JSC::JIT::emitEnterOptimizationCheck):
(JSC::JIT::privateCompileSlowCases):

• jit/JIT.h:

(JSC::JIT::emitEnterOptimizationCheck):

• jit/JITOpcodes.cpp:

(JSC::JIT::emit_op_loop_hint):
(JSC::JIT::emitSlow_op_loop_hint):
(JSC::JIT::emit_op_enter):

• jit/JITOpcodes32_64.cpp:

(JSC::JIT::emit_op_enter):

File:

• trunk/Source/JavaScriptCore/jit/JIT.h (modified) (3 diffs)

trunk/Source/JavaScriptCore/jit/JIT.h

@@ -781 +781 @@
         void emitSlow_op_jngreatereq(Instruction*, Vector<SlowCaseEntry>::iterator&);
         void emitSlow_op_jtrue(Instruction*, Vector<SlowCaseEntry>::iterator&);
+        void emitSlow_op_loop_hint(Instruction*, Vector<SlowCaseEntry>::iterator&);
         void emitSlow_op_lshift(Instruction*, Vector<SlowCaseEntry>::iterator&);
         void emitSlow_op_mod(Instruction*, Vector<SlowCaseEntry>::iterator&);
@@ -853 +854 @@
         void emitLoadCharacterString(RegisterID src, RegisterID dst, JumpList& failures);
         
-        enum OptimizationCheckKind { LoopOptimizationCheck, EnterOptimizationCheck };
 #if ENABLE(DFG_JIT)
-        void emitOptimizationCheck(OptimizationCheckKind);
-#else
-        void emitOptimizationCheck(OptimizationCheckKind) { }
-#endif
-        void emitWatchdogTimerCheck();
+        void emitEnterOptimizationCheck();
+#else
+        void emitEnterOptimizationCheck() { }
+#endif
 
 #ifndef NDEBUG
@@ -945 +944 @@
     } JIT_CLASS_ALIGNMENT;
 
-    inline void JIT::emit_op_loop_hint(Instruction*)
-    {
-        emitWatchdogTimerCheck();
-        emitOptimizationCheck(LoopOptimizationCheck);
-    }
-
 } // namespace JSC