Changeset 33480

Timestamp:

05/14/08 23:50:33 (6 months ago)

Author:

ggaren@apple.com

Message:

2008-05-14 Geoffrey Garen <ggaren@apple.com>

Reviewed by Oliver Hunt.

A little more debugger action: filled in op_debug. All debugger control
flow works now, but variable inspection and backtraces still don't.

SunSpider reports no change.

• VM/CodeGenerator.cpp: Changed op_debug to accept line number parameters.

• VM/Machine.cpp: (KJS::Machine::getFunctionAndArguments): Moved op_debug into a NEVER_INLINE function to avoid a stunning 10% performance regression. Also factored out a common function for retrieving the function and arguments from a call frame.

• kjs/JSActivation.cpp: (KJS::JSActivation::createArgumentsObject): Use the new factored out function mentioned above.

• kjs/Parser.cpp: (KJS::Parser::parse): Increment m_sourceId before assigning it, so the sourceId we send to the debugger matches the sourceId recorded in the node.

• kjs/nodes.cpp: Emit debugging hooks.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeBlock.cpp (modified) (2 diffs)
• VM/CodeGenerator.cpp (modified) (1 diff)
• VM/CodeGenerator.h (modified) (2 diffs)
• VM/Machine.cpp (modified) (9 diffs)
• VM/Machine.h (modified) (2 diffs)
• VM/Opcode.h (modified) (1 diff)
• kjs/JSActivation.cpp (modified) (1 diff)
• kjs/Parser.cpp (modified) (1 diff)
• kjs/nodes.cpp (modified) (3 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-14  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Oliver Hunt.
+
+        A little more debugger action: filled in op_debug. All debugger control
+        flow works now, but variable inspection and backtraces still don't.
+        
+        SunSpider reports no change.
+
+        * VM/CodeGenerator.cpp: Changed op_debug to accept line number parameters.
+
+        * VM/Machine.cpp:
+        (KJS::Machine::getFunctionAndArguments): Moved op_debug into a
+        NEVER_INLINE function to avoid a stunning 10% performance regression.
+        Also factored out a common function for retrieving the function and 
+        arguments from a  call frame. 
+
+        * kjs/JSActivation.cpp:
+        (KJS::JSActivation::createArgumentsObject): Use the new factored out
+        function mentioned above.
+
+        * kjs/Parser.cpp:
+        (KJS::Parser::parse): Increment m_sourceId before assigning it, so the
+        sourceId we send to the debugger matches the sourceId recorded in the
+        node.
+
+        * kjs/nodes.cpp: Emit debugging hooks.
+
 2008-05-14  Oliver Hunt  <oliver@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/CodeBlock.cpp

@@ -98 +98 @@
 {
     if (debugHookID == DidEnterCallFrame)
-        return "DidEnterCallFrame";
+        return "didEnterCallFrame";
     else if (debugHookID == WillLeaveCallFrame)
-        return "WillLeaveCallFrame";
+        return "willLeaveCallFrame";
     else {
         ASSERT(debugHookID == WillExecuteStatement);
-        return "WillExecuteStatement";
+        return "willExecuteStatement";
     }
 }
@@ -530 +530 @@
             break;
         }
-        case op_dbg: {
+        case op_debug: {
             int debugHookID = (++it)->u.operand;
-            printf("[%4d] dbg\t\t %s\n", location, debugHookName(debugHookID));
+            int firstLine = (++it)->u.operand;
+            int lastLine = (++it)->u.operand;
+            printf("[%4d] debug\t\t %s, %d, %d\n", location, debugHookName(debugHookID), firstLine, lastLine);
             break;
         }

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.cpp

@@ -984 +984 @@
 }
 
-void CodeGenerator::emitDebugHook(DebugHookID debugHookID)
+void CodeGenerator::emitDebugHook(DebugHookID debugHookID, int firstLine, int lastLine)
 {
     if (!m_shouldEmitDebugHooks)
         return;
-    instructions().append(machine().getOpcode(op_dbg));
+    instructions().append(machine().getOpcode(op_debug));
     instructions().append(debugHookID);
+    instructions().append(firstLine);
+    instructions().append(lastLine);
 }
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.h

@@ -134 +134 @@
         // Node::emitCode. They're the only functions that accept a NULL register.
         RegisterID* emitNode(RegisterID* dst, Node* n) {
-            ASSERT(!dst || !dst->isTemporary() || dst->refCount()); // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
+            // Node::emitCode assumes that dst, if provided, is either a local or a referenced temporary.
+            ASSERT(!dst || !dst->isTemporary() || dst->refCount());
             if (!m_codeBlock->lineInfo.size() || m_codeBlock->lineInfo.last().lineNumber != n->lineNo()) {
                 LineInfo info = { instructions().size(), n->lineNo() };
@@ -237 +238 @@
         void emitPopScope();
         
-        void emitDebugHook(DebugHookID);
+        void emitDebugHook(DebugHookID, int firstLine, int lastLine);
 
         int scopeDepth() { return m_dynamicScopeDepth + m_finallyDepth; }

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -738 +738 @@
 }
 
+NEVER_INLINE void Machine::debug(ExecState* exec, const Instruction* vPC, const CodeBlock* codeBlock, const ScopeChainNode*, Register** registerBase, Register* r)
+{
+    int debugHookID = (++vPC)->u.operand;
+    int firstLine = (++vPC)->u.operand;
+    int lastLine = (++vPC)->u.operand;
+
+    Debugger* debugger = exec->dynamicGlobalObject()->debugger();
+    if (!debugger)
+        return;
+
+    if (debugHookID == DidEnterCallFrame) {
+        Register* callFrame = r - codeBlock->numLocals - CallFrameHeaderSize;
+        FunctionImp* function;
+        Register* argv;
+        int argc;
+        getFunctionAndArguments(registerBase, callFrame, function, argv, argc);
+        List args(&argv->u.jsValue, argc);
+        debugger->callEvent(exec, codeBlock->ownerNode->sourceId(), firstLine, function, args);
+    } else if (debugHookID == WillLeaveCallFrame) {
+        Register* callFrame = r - codeBlock->numLocals - CallFrameHeaderSize;
+        FunctionImp* function = static_cast<FunctionImp*>(callFrame[Callee].u.jsValue);
+        ASSERT(function->inherits(&FunctionImp::info));
+        debugger->returnEvent(exec, codeBlock->ownerNode->sourceId(), lastLine, function);
+    } else {
+        ASSERT(debugHookID == WillExecuteStatement);
+        debugger->atStatement(exec, codeBlock->ownerNode->sourceId(), firstLine, lastLine);
+    }
+}
+
 JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue** exception)
 {
@@ -1361 +1390 @@
 
         vPC += 3;
-        
         NEXT_OPCODE;
     }
@@ -1373 +1401 @@
         */
         resolveBase(exec, vPC, r, scopeChain, codeBlock);
+
         vPC += 3;
-
         NEXT_OPCODE;
     }
@@ -1393 +1421 @@
 
         vPC += 4;
-        
         NEXT_OPCODE;
     }
@@ -1413 +1440 @@
         if (UNLIKELY(!resolveBaseAndFunc(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
             goto vm_throw;
+
         vPC += 4;
-
         NEXT_OPCODE;
     }
@@ -1605 +1632 @@
         */
         int target = (++vPC)->u.operand;
+
         vPC += target;
-
         NEXT_OPCODE;
     }
@@ -2094 +2121 @@
         NEXT_OPCODE;
     }
-    BEGIN_OPCODE(op_dbg) {
-        /* dbg debugHookID(n)
+    BEGIN_OPCODE(op_debug) {
+        /* debug debugHookID(n) firstLine(n) lastLine(n)
          
          Notifies the debugger of the current state of execution:
@@ -2103 +2130 @@
         */
 
-        int debugHookID = (++vPC)->u.operand;
-
-        Debugger* debugger = exec->dynamicGlobalObject()->debugger();
-        if (!debugger) {
-            ++vPC;
-            NEXT_OPCODE;
-        }
-
-        if (debugHookID == DidEnterCallFrame) {
-            // callEvent
-        } else if (debugHookID == WillLeaveCallFrame) {
-            // returnEvent
-        } else {
-            // atStatement
-            ASSERT(debugHookID == WillExecuteStatement);
-        }
-
-        ++vPC;
+        debug(exec, vPC, codeBlock, scopeChain, registerBase, r);
+
+        vPC += 3;
         NEXT_OPCODE;
     }
@@ -2197 +2209 @@
 }
 
+void Machine::getFunctionAndArguments(Register** registerBase, Register* callFrame, FunctionImp*& function, Register*& argv, int& argc)
+{
+    function = static_cast<FunctionImp*>(callFrame[Callee].u.jsValue);
+    ASSERT(function->inherits(&FunctionImp::info));
+
+    argv = (*registerBase) + callFrame[CallerRegisterOffset].u.i + callFrame[ArgumentStartRegister].u.i + 1; // skip "this"
+    argc = callFrame[ArgumentCount].u.i - 1; // skip "this"
+}
+
 } // namespace KJS

branches/squirrelfish/JavaScriptCore/VM/Machine.h

@@ -92 +92 @@
         JSValue* retrieveCaller(ExecState*, FunctionImp*) const;
         
+        void getFunctionAndArguments(Register** registerBase, Register* callFrame, FunctionImp*&, Register*& argv, int& argc);
+        
     private:
         enum { MaxReentryDepth = 128 };
@@ -97 +99 @@
 
         ALWAYS_INLINE void setScopeChain(ExecState* exec, ScopeChainNode*&, ScopeChainNode*);
+        NEVER_INLINE void debug(ExecState*, const Instruction*, const CodeBlock*, const ScopeChainNode*, Register**, Register*);
 
         NEVER_INLINE bool unwindCallFrame(ExecState*, Register**, const Instruction*&, CodeBlock*&, JSValue**&, ScopeChainNode*&, Register*&);

branches/squirrelfish/JavaScriptCore/VM/Opcode.h

@@ -116 +116 @@
         macro(op_sret) \
         \
-        macro(op_dbg) \
+        macro(op_debug) \
         \
         macro(op_end) // end must be the last opcode in the list

branches/squirrelfish/JavaScriptCore/kjs/JSActivation.cpp

@@ -179 +179 @@
 JSObject* JSActivation::createArgumentsObject(ExecState* exec)
 {
-    CodeBlock* codeBlock = &d()->functionBody->generatedCode();
-    Register* callFrame = registers() - codeBlock->numLocals - Machine::CallFrameHeaderSize;
+    Register* callFrame = registers() - d()->functionBody->generatedCode().numLocals - Machine::CallFrameHeaderSize;
 
-    FunctionImp* function = static_cast<FunctionImp*>(callFrame[Machine::Callee].u.jsValue);
-    int argv = callFrame[Machine::ArgumentStartRegister].u.i;
-    int argc = callFrame[Machine::ArgumentCount].u.i;
-
-    List args(&(*registerBase() + callFrame[Machine::CallerRegisterOffset].u.i + argv + 1)->u.jsValue, argc - 1);
+    FunctionImp* function;
+    Register* argv;
+    int argc;
+    exec->machine()->getFunctionAndArguments(registerBase(), callFrame, function, argv, argc);
+    List args(&argv->u.jsValue, argc);
     return new Arguments(exec, function, args, this);
 }

branches/squirrelfish/JavaScriptCore/kjs/Parser.cpp

@@ -68 +68 @@
 
     lexer.setCode(startingLineNumber, source);
-    *sourceId = m_sourceId++;
+    *sourceId = ++m_sourceId;
 
     int parseError = kjsyyparse(&lexer);

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -4678 +4678 @@
     StatementVector::iterator end = statements.end();
     for (StatementVector::iterator it = statements.begin(); it != end; ++it) {
-        generator.emitDebugHook(WillExecuteStatement);
-        if (RegisterID* r1 = generator.emitNode(dst, it->get()))
+        StatementNode* n = it->get();
+        generator.emitDebugHook(WillExecuteStatement, n->firstLine(), n->lastLine());
+        if (RegisterID* r1 = generator.emitNode(dst, n))
             r0 = r1;
     }
@@ -5335 +5336 @@
         generator.emitLabel(l0.get());
     }
-    generator.emitDebugHook(WillLeaveCallFrame);
+    generator.emitDebugHook(WillLeaveCallFrame, firstLine(), lastLine());
     return generator.emitReturn(r0);
 }
@@ -5809 +5810 @@
 RegisterID* FunctionBodyNode::emitCode(CodeGenerator& generator, RegisterID*)
 {
-    generator.emitDebugHook(DidEnterCallFrame);
+    generator.emitDebugHook(DidEnterCallFrame, firstLine(), lastLine());
     statementListEmitCode(m_children, generator);
     if (!m_children.size() || !m_children.last()->isReturnNode()) {
         RegisterID* r0 = generator.emitLoad(generator.newTemporary(), jsUndefined());
-        generator.emitDebugHook(WillLeaveCallFrame);
+        generator.emitDebugHook(WillLeaveCallFrame, firstLine(), lastLine());
         generator.emitReturn(r0);
     }