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

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.cpp (modified) (2 diffs)

trunk/Source/JavaScriptCore/jit/JIT.cpp

@@ -104 +104 @@
 
 #if ENABLE(DFG_JIT)
-void JIT::emitOptimizationCheck(OptimizationCheckKind kind)
+void JIT::emitEnterOptimizationCheck()
 {
     if (!canBeOptimized())
         return;
-    
-    Jump skipOptimize = branchAdd32(Signed, TrustedImm32(kind == LoopOptimizationCheck ? Options::executionCounterIncrementForLoop() : Options::executionCounterIncrementForReturn()), AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter()));
+
+    Jump skipOptimize = branchAdd32(Signed, TrustedImm32(Options::executionCounterIncrementForReturn()), AbsoluteAddress(m_codeBlock->addressOfJITExecuteCounter()));
     JITStubCall stubCall(this, cti_optimize);
     stubCall.addArgument(TrustedImm32(m_bytecodeOffset));
-    if (kind == EnterOptimizationCheck)
-        ASSERT(!m_bytecodeOffset);
+    ASSERT(!m_bytecodeOffset);
     stubCall.call();
     skipOptimize.link(this);
 }
 #endif
-
-void JIT::emitWatchdogTimerCheck()
-{
-    if (!m_vm->watchdog.isEnabled())
-        return;
-
-    Jump skipCheck = branchTest8(Zero, AbsoluteAddress(m_vm->watchdog.timerDidFireAddress()));
-    JITStubCall stubCall(this, cti_handle_watchdog_timer);
-    stubCall.call();
-    skipCheck.link(this);
-}
 
 #define NEXT_OPCODE(name) \
@@ -474 +462 @@
         DEFINE_SLOWCASE_OP(op_jngreatereq)
         DEFINE_SLOWCASE_OP(op_jtrue)
+        DEFINE_SLOWCASE_OP(op_loop_hint)
         DEFINE_SLOWCASE_OP(op_lshift)
         DEFINE_SLOWCASE_OP(op_mod)