Changeset 35918 in webkit for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

Aug 25, 2008, 11:18:01 AM (17 years ago)

Author:

[email protected]

Message:

JavaScriptCore:

2008-08-25 Kevin McCullough <​[email protected]>

Reviewed by Geoff, Tim and Mark.

<rdar://problem/6150623> JSProfiler: It would be nice if the profiles
in the console said what file and line number they came from

• Lay the foundation for getting line numbers and other data from the JavaScript engine. With the cleanup in kjs/ExecState this is actually a slight performance improvement.

• JavaScriptCore.exp: Export retrieveLastCaller() for WebCore.
• JavaScriptCore.xcodeproj/project.pbxproj:
• VM/Machine.cpp: Now Host and JS functions set a call frame on the exec state, so this and the profiler code were pulled out of the branches. (KJS::Machine::privateExecute): (KJS::Machine::retrieveLastCaller): This get's the lineNumber, sourceID and sourceURL for the previously called function.
• VM/Machine.h:
• kjs/ExecState.cpp: Remove references to JSFunction since it's not used anywhere.
• kjs/ExecState.h:

WebCore:

2008-08-22 Kevin McCullough <​[email protected]>

Reviewed by Geoff, Mark and Tim.

<rdar://problem/6150623> JSProfiler: It would be nice if the profiles
in the console said what file and line number they came from

• Lay the foundation for getting line numbers and other data from the JavaScript engine.

• ForwardingHeaders/VM: Added.
• ForwardingHeaders/VM/Machine.h: Added.
• page/Console.cpp: Gather the line number and file information when profileEnd has been called, but don't use it until didFinishProfiling is called. We won't need to wait once we remove the profiler "zombie" mode which this patch helps pave the foundation for. (WebCore::Console::Console): (WebCore::Console::profileEnd): (WebCore::Console::finishedProfiling):
• page/Console.h:
• page/InspectorController.cpp: Modify calls to addProfileMessageToConsole to satisfy the new arguments it takes. (WebCore::InspectorController::finishedProfiling): (WebCore::InspectorController::addProfile): (WebCore::InspectorController::addProfileMessageToConsole): (WebCore::InspectorController::finishedProfiling):
• page/InspectorController.h:

File:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (4 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -2423 +2423 @@
         CallType callType = v->getCallData(callData);
 
+        if (*enabledProfilerReference)
+            (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
+
+        Register* callFrame = r + firstArg - RegisterFile::CallFrameHeaderSize;
+        initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, r, dst, firstArg, argCount, 0, v);
+        exec->m_callFrame = callFrame;
+
         if (callType == CallTypeJS) {
-            if (*enabledProfilerReference)
-                (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
 
             ScopeChainNode* callDataScopeChain = callData.js.scopeChain;
@@ -2432 +2437 @@
 
             r[firstArg] = thisVal == missingThisObjectMarker() ? exec->globalThisValue() : r[thisVal].jsValue(exec);
-
-            Register* callFrame = r + firstArg - RegisterFile::CallFrameHeaderSize;
-            initializeCallFrame(callFrame, codeBlock, vPC, scopeChain, r, dst, firstArg, argCount, 0, v);
-            exec->m_callFrame = callFrame;
 
             r = slideRegisterWindowForCall(exec, newCodeBlock, registerFile, registerBase, r, firstArg, argCount, exceptionValue);
@@ -2453 +2454 @@
 
         if (callType == CallTypeHost) {
-            if (*enabledProfilerReference)
-                (*enabledProfilerReference)->willExecute(exec, static_cast<JSObject*>(v));
-
             JSValue* thisValue = thisVal == missingThisObjectMarker() ? exec->globalThisValue() : r[thisVal].jsValue(exec);
             ArgList args(r + firstArg + 1, argCount - 1);
@@ -2935 +2933 @@
 }
 
+void Machine::retrieveLastCaller(ExecState* exec, int& lineNumber, int& sourceId, UString& sourceURL) const
+{
+    lineNumber = -1;
+    sourceURL = UString();
+
+    Register* callFrame = exec->m_callFrame;
+    if (!callFrame)
+        return;
+
+    CodeBlock* callerCodeBlock = callFrame[RegisterFile::CallerCodeBlock].codeBlock();
+    if (!callerCodeBlock)
+        return;
+
+    Instruction* vPC = callFrame[RegisterFile::ReturnVPC].vPC();
+    lineNumber = callerCodeBlock->lineNumberForVPC(vPC - 1);
+    sourceId = callerCodeBlock->ownerNode->sourceId();
+    sourceURL = callerCodeBlock->ownerNode->sourceURL();
+}
+
 Register* Machine::callFrame(ExecState* exec, JSFunction* function) const
 {