Changeset 33483 in webkit

Timestamp:

May 15, 2008 2:31:48 AM (16 years ago)

Author:

oliver@apple.com

Message:

Bug 18626: SQUIRRELFISH: support the "slow script" dialog
<​https://bugs.webkit.org/show_bug.cgi?id=18626>

Reviewed by Maciej

Support the slow script dialog for for(;;), while, and do..while
loops.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeBlock.cpp (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (1 diff)
• VM/CodeGenerator.h (modified) (1 diff)
• VM/ExceptionHelpers.cpp (modified) (1 diff)
• VM/ExceptionHelpers.h (modified) (1 diff)
• VM/Machine.cpp (modified) (3 diffs)
• VM/Opcode.h (modified) (1 diff)
• kjs/interpreter.cpp (modified) (1 diff)
• kjs/nodes.cpp (modified) (3 diffs)
• kjs/object.h (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-15  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Bug 18626: SQUIRRELFISH: support the "slow script" dialog
+        <https://bugs.webkit.org/show_bug.cgi?id=18626>
+
+        Support the slow script dialog for for(;;), while, and do..while
+        loops.
+
+        * VM/CodeBlock.cpp:
+        (KJS::CodeBlock::dump):
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::emitLoopIfTrue):
+        * VM/CodeGenerator.h:
+        * VM/ExceptionHelpers.cpp:
+        (KJS::InterruptedExecutionError::isWatchdogException):
+        (KJS::createInterruptedExecutionException):
+        * VM/ExceptionHelpers.h:
+        * VM/Machine.cpp:
+        (KJS::Machine::throwException):
+        (KJS::Machine::privateExecute):
+        * VM/Opcode.h:
+        * kjs/interpreter.cpp:
+        (KJS::Interpreter::evaluate):
+        * kjs/nodes.cpp:
+        (KJS::DoWhileNode::emitCode):
+        (KJS::WhileNode::emitCode):
+        (KJS::ForNode::emitCode):
+        * kjs/object.h:
+
 2008-05-15  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/CodeBlock.cpp

@@ -427 +427 @@
             break;
         }
+        case op_loop_if_true: {
+            printConditionalJump(begin, it, location, "loop_if_true");
+            break;
+        }
         case op_jfalse: {
             printConditionalJump(begin, it, location, "jfalse");

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.cpp

@@ -378 +378 @@
 }
 
+PassRefPtr<LabelID> CodeGenerator::emitLoopIfTrue(RegisterID* cond, LabelID* target)
+{
+    instructions().append(machine().getOpcode(op_loop_if_true));
+    instructions().append(cond->index());
+    instructions().append(target->offsetFrom(instructions().size()));
+    return target;
+}
+
 PassRefPtr<LabelID> CodeGenerator::emitJumpIfTrue(RegisterID* cond, LabelID* target)
 {

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.h

@@ -221 +221 @@
         PassRefPtr<LabelID> emitLabel(LabelID*);
         PassRefPtr<LabelID> emitJump(LabelID* target);
+        PassRefPtr<LabelID> emitLoopIfTrue(RegisterID* cond, LabelID* target);
         PassRefPtr<LabelID> emitJumpIfTrue(RegisterID* cond, LabelID* target);
         PassRefPtr<LabelID> emitJumpIfFalse(RegisterID* cond, LabelID* target);

branches/squirrelfish/JavaScriptCore/VM/ExceptionHelpers.cpp

@@ -74 +74 @@
 }
 
+class InterruptedExecutionError : public JSObject {
+public:
+    virtual bool isWatchdogException() const { return true; }
+};
+
+JSValue* createInterruptedExecutionException(ExecState*)
+{
+    return new InterruptedExecutionError;
+}
+
 JSValue* createUndefinedVariableError(ExecState* exec, const Identifier& ident)
 {

branches/squirrelfish/JavaScriptCore/VM/ExceptionHelpers.h

@@ -39 +39 @@
     JSValue* createNotAConstructorError(ExecState* exec, JSValue* value, Node* expr);
     JSValue* createNotAFunctionError(ExecState* exec, JSValue* value, Node* expr);
+    JSValue* createInterruptedExecutionException(ExecState* exec);
 }
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -560 +560 @@
             exception->put(exec, "sourceURL", jsOwnedString(codeBlock->ownerNode->sourceURL()));
         }
+        if (exception->isWatchdogException())
+            return 0;
     }
 
@@ -793 +795 @@
     Instruction* vPC = codeBlock->instructions.begin();
     JSValue** k = codeBlock->jsValues.data();
-    
+
     registerFile->setSafeForReentry(false);
 #define VM_CHECK_EXCEPTION() \
@@ -1652 +1654 @@
         NEXT_OPCODE;
     }
+    BEGIN_OPCODE(op_loop_if_true) {
+        /* loop_if_true cond(r) target(offset)
+
+          Does a JS timeout check, and immediately terminates execution and sets
+          an uncatchable exception on the ExecState.
+
+          Assuming the watchdog test indicates it is safe, this jumps to offset
+          target from the current instruction, if and only if register cond 
+          converts to boolean as true.
+         */
+
+        if (UNLIKELY(exec->dynamicGlobalObject()->timedOut())) {
+            exceptionValue = createInterruptedExecutionException(exec);
+            goto vm_throw;
+        }
+
+        int cond = (++vPC)->u.operand;
+        int target = (++vPC)->u.operand;
+        if (r[cond].u.jsValue->toBoolean(exec)) {
+            vPC += target;
+            NEXT_OPCODE;
+        }
+        
+        ++vPC;
+        NEXT_OPCODE;
+    }
     BEGIN_OPCODE(op_jfalse) {
         /* jfalse cond(r) target(offset)

branches/squirrelfish/JavaScriptCore/VM/Opcode.h

@@ -91 +91 @@
         \
         macro(op_jmp) \
+        macro(op_loop_if_true) \
         macro(op_jtrue) \
         macro(op_jfalse) \

branches/squirrelfish/JavaScriptCore/kjs/interpreter.cpp

@@ -89 +89 @@
 #endif
 
-    return exception ? Completion(Throw, exception) : Completion(Normal, result);
+    if (exception) {
+        if (exception->isObject() && static_cast<JSObject*>(exception)->isWatchdogException())
+            return Completion(Interrupted, result);
+        return Completion(Throw, exception);
+    }
+    return Completion(Normal, result);
 }
 

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -4896 +4896 @@
     generator.emitLabel(continueTarget.get());
     RegisterID* cond = generator.emitNode(m_expr.get());
-    generator.emitJumpIfTrue(cond, topOfLoop.get());
+    generator.emitLoopIfTrue(cond, topOfLoop.get());
     generator.emitLabel(breakTarget.get());
     return result.get();
@@ -4958 +4958 @@
     generator.emitLabel(continueTarget.get());
     RegisterID* cond = generator.emitNode(m_expr.get());
-    generator.emitJumpIfTrue(cond, topOfLoop.get());
+    generator.emitLoopIfTrue(cond, topOfLoop.get());
 
     generator.emitLabel(breakTarget.get());
@@ -5026 +5026 @@
     generator.emitLabel(beforeCondition.get());
     RegisterID* cond = generator.emitNode(m_expr2.get());
-    generator.emitJumpIfTrue(cond, topOfLoop.get());
+    generator.emitLoopIfTrue(cond, topOfLoop.get());
     generator.emitLabel(breakTarget.get());
     return result.get();

branches/squirrelfish/JavaScriptCore/kjs/object.h

@@ -432 +432 @@
     virtual bool isVariableObject() const { return false; }
 
+    virtual bool isWatchdogException() const { return false; }
   protected:
     PropertyMap _prop;