Changeset 34351 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Jun 3, 2008, 3:48:52 PM (17 years ago)

Author:

[email protected]

Message:

Bug 12983: Web Inspector break on the debugger keyword
<​https://bugs.webkit.org/show_bug.cgi?id=12983>

Reviewed by Tim

Added a DebuggerStatementNode to handle codegen, and added a new
DidReachBreakPoint debug event (which will hopefully be useful
if we ever move breakpoint management into JSC proper). Also
added didReachBreakpoint to Debugger to allow us to actually respond
to this event.

Location:

trunk/JavaScriptCore/kjs

Files:

• debugger.h (modified) (1 diff)
• grammar.y (modified) (1 diff)
• nodes.cpp (modified) (1 diff)
• nodes.h (modified) (1 diff)
• nodes2string.cpp (modified) (1 diff)

trunk/JavaScriptCore/kjs/debugger.h

@@ -167 +167 @@
     virtual void willExecuteProgram(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
     virtual void didExecuteProgram(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
+    virtual void didReachBreakpoint(const DebuggerCallFrame&, int sourceId, int lineno) = 0;
 
   private:

trunk/JavaScriptCore/kjs/grammar.y

@@ -1021 +1021 @@
 
 DebuggerStatement:
-    DEBUGGER ';'                        { $$ = createNodeDeclarationInfo<StatementNode*>(new EmptyStatementNode(), 0, 0, 0);
+    DEBUGGER ';'                        { $$ = createNodeDeclarationInfo<StatementNode*>(new DebuggerStatementNode(), 0, 0, 0);
                                           DBG($$.m_node, @1, @2); }
-  | DEBUGGER error                      { $$ = createNodeDeclarationInfo<StatementNode*>(new EmptyStatementNode(), 0, 0, 0);
+  | DEBUGGER error                      { $$ = createNodeDeclarationInfo<StatementNode*>(new DebuggerStatementNode(), 0, 0, 0);
                                           DBG($$.m_node, @1, @1); AUTO_SEMICOLON; }
 ;

trunk/JavaScriptCore/kjs/nodes.cpp

@@ -4845 +4845 @@
 }
 
+// ------------------------------ DebuggerStatementNode ---------------------------
+
+RegisterID* DebuggerStatementNode::emitCode(CodeGenerator& generator, RegisterID* dst)
+{
+    generator.emitDebugHook(DidReachBreakpoint, firstLine(), lastLine());
+    return dst;
+}
+
+JSValue* DebuggerStatementNode::execute(OldInterpreterExecState* exec)
+{
+    return exec->setNormalCompletion();
+}
+
 // ------------------------------ ExprStatementNode ----------------------------
 

trunk/JavaScriptCore/kjs/nodes.h

@@ -2639 +2639 @@
         virtual bool isEmptyStatement() const KJS_FAST_CALL { return true; }
     };
+    
+    class DebuggerStatementNode : public StatementNode {
+    public:
+        DebuggerStatementNode() KJS_FAST_CALL
+        {
+        }
+        
+        virtual RegisterID* emitCode(CodeGenerator&, RegisterID* = 0) KJS_FAST_CALL;
+
+        virtual void streamTo(SourceStream&) const KJS_FAST_CALL;
+        virtual JSValue* execute(OldInterpreterExecState*) KJS_FAST_CALL;
+    };
 
     class ExprStatementNode : public StatementNode {

trunk/JavaScriptCore/kjs/nodes2string.cpp

@@ -821 +821 @@
 }
 
+void DebuggerStatementNode::streamTo(SourceStream& s) const
+{
+    s << Endl << "debugger;";
+}
+
 void ExprStatementNode::streamTo(SourceStream& s) const
 {