Changeset 36282 in webkit for trunk/JavaScriptCore/VM/CTI.cpp

Timestamp:

Sep 8, 2008, 9:43:25 PM (17 years ago)

Author:

[email protected]

Message:

Fix codegen for slow script dialog.

Reviewed by Mark Rowe

Correct error in timeout logic where execution tick count would
be reset to incorrect value due to incorrect offset and indirection.
Codegen for the slow script dialog was factored out into a separate
method (emitSlowScriptCheck) rather than having multiple copies of
the same code. Also added calls to generate slow script checks
for loop_if_less and loop_if_true opcodes.

File:

• trunk/JavaScriptCore/VM/CTI.cpp (modified) (6 diffs)

trunk/JavaScriptCore/VM/CTI.cpp

@@ -443 +443 @@
 }
 
+void CTI::emitSlowScriptCheck(unsigned opcodeIndex)
+{
+    m_jit.emitSubl_i8r(1, MacroAssembler::esi);
+    MacroAssembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
+    emitCall(opcodeIndex, Machine::cti_timeout_check);
+
+    emitGetCTIParam(CTI_ARGS_exec, MacroAssembler::ecx);
+    m_jit.emitMovl_mr(OBJECT_OFFSET(ExecState, m_globalData), MacroAssembler::ecx, MacroAssembler::ecx);
+    m_jit.emitMovl_mr(OBJECT_OFFSET(JSGlobalData, machine), MacroAssembler::ecx, MacroAssembler::ecx);
+    m_jit.emitMovl_mr(OBJECT_OFFSET(Machine, m_ticksUntilNextTimeoutCheck), MacroAssembler::ecx, MacroAssembler::esi);
+    m_jit.link(skipTimeout, m_jit.label());
+}
+
 void CTI::privateCompileMainPass()
 {
@@ -530 +543 @@
         }
         case op_loop: {
-            m_jit.emitSubl_i8r(1, MacroAssembler::esi);
-            MacroAssembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
-            emitCall(i, Machine::cti_timeout_check);
-
-            emitGetCTIParam(CTI_ARGS_exec, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(ExecState, m_globalData) + OBJECT_OFFSET(JSGlobalData, machine), MacroAssembler::ecx, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(Machine, m_ticksUntilNextTimeoutCheck), MacroAssembler::ecx, MacroAssembler::esi);
-            m_jit.link(skipTimeout, m_jit.label());
+            emitSlowScriptCheck(i);
 
             unsigned target = instruction[i + 1].u.operand;
@@ -545 +551 @@
         }
         case op_loop_if_less: {
-            m_jit.emitSubl_i8r(1, MacroAssembler::esi);
-            MacroAssembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
-            emitCall(i, Machine::cti_timeout_check);
-
-            emitGetCTIParam(CTI_ARGS_exec, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(ExecState, m_globalData) + OBJECT_OFFSET(JSGlobalData, machine), MacroAssembler::ecx, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(Machine, m_ticksUntilNextTimeoutCheck), MacroAssembler::ecx, MacroAssembler::esi);
-            m_jit.link(skipTimeout, m_jit.label());
+            emitSlowScriptCheck(i);
 
             unsigned target = instruction[i + 3].u.operand;
@@ -750 +749 @@
         CTI_COMPILE_BINARY_OP(op_lesseq)
         case op_loop_if_true: {
-            m_jit.emitSubl_i8r(1, MacroAssembler::esi);
-            MacroAssembler::JmpSrc skipTimeout = m_jit.emitUnlinkedJne();
-            emitCall(i, Machine::cti_timeout_check);
-
-            emitGetCTIParam(CTI_ARGS_exec, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(ExecState, m_globalData) + OBJECT_OFFSET(JSGlobalData, machine), MacroAssembler::ecx, MacroAssembler::ecx);
-            m_jit.emitMovl_mr(OBJECT_OFFSET(Machine, m_ticksUntilNextTimeoutCheck), MacroAssembler::ecx, MacroAssembler::esi);
-            m_jit.link(skipTimeout, m_jit.label());
+            emitSlowScriptCheck(i);
 
             unsigned target = instruction[i + 2].u.operand;
@@ -1371 +1363 @@
         }
         case op_loop_if_less: {
+            emitSlowScriptCheck(i);
+
             unsigned target = instruction[i + 3].u.operand;
             JSValue* src2imm = getConstantImmediateNumericArg(instruction[i + 2].u.operand);
@@ -1419 +1413 @@
         }
         case op_loop_if_true: {
+            emitSlowScriptCheck(i);
+
             m_jit.link(iter->from, m_jit.label());
             emitPutArg(MacroAssembler::eax, 0);