Changeset 33370

Timestamp:

05/12/08 23:06:43 (6 months ago)

Author:

mrowe@apple.com

Message:

JavaScriptCore:

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

Reviewed by Maciej Stachowiak.

Introduced support for function.caller.

Improved support for walking interesting scopes for function introspection.

This fixes all remaining layout tests not blocked by rebasing to trunk.

SunSpider reports no change.

• VM/Machine.cpp: (KJS::Machine::dumpRegisters): Fixed a spacing issue.

LayoutTests:

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

Reviewed by Maciej Stachowiak.

Layout test for function.arguments and function.caller in interesting
scopes.

• fast/js/function-dot-arguments-and-caller-expected.txt: Added.
• fast/js/function-dot-arguments-and-caller.html: Added.

Location:

branches/squirrelfish

Files:

• JavaScriptCore/ChangeLog (modified) (1 diff)
• JavaScriptCore/VM/Machine.cpp (modified) (3 diffs)
• JavaScriptCore/VM/Machine.h (modified) (1 diff)
• JavaScriptCore/kjs/function.cpp (modified) (1 diff)
• LayoutTests/ChangeLog (modified) (1 diff)
• LayoutTests/fast/js/function-dot-arguments-and-caller-expected.txt (added)
• LayoutTests/fast/js/function-dot-arguments-and-caller.html (added)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-12  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+        
+        Introduced support for function.caller.
+        
+        Improved support for walking interesting scopes for function introspection.
+        
+        This fixes all remaining layout tests not blocked by rebasing to trunk.
+        
+        SunSpider reports no change.
+
+        * VM/Machine.cpp:
+        (KJS::Machine::dumpRegisters): Fixed a spacing issue.
+
 2008-05-11  Cameron Zwarich  <cwzwarich@uwaterloo.ca>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -61 +61 @@
 #endif
 
+// Retrieves the offset of a calling function within the current register file.
+bool getCallerFunctionOffset(Register** registerBase, int callOffset, int& callerOffset)
+{
+    Register* callFrame = (*registerBase) + callOffset;
+
+    CodeBlock* callerCodeBlock = callFrame[Machine::CallerCodeBlock].u.codeBlock;
+    if (!callerCodeBlock) // test for top frame of re-entrant function call
+        return false;
+
+    callerOffset = callFrame[Machine::CallerRegisterOffset].u.i - callerCodeBlock->numLocals - Machine::CallFrameHeaderSize;
+    if (callerOffset < 0) // test for global frame
+        return false;
+
+    Register* callerCallFrame = (*registerBase) + callerOffset;
+    if (!callerCallFrame[Machine::CallerCodeBlock].u.codeBlock) // test for eval frame
+        return false;
+
+    return true;
+}
+
 // Returns the depth of the scope chain within a given call frame.
 static int depth(ScopeChain& sc)
@@ -442 +462 @@
         if (it != end) {
             do {
-                printf("[call frame] | %10p | %10p \n", it, (*it).u.jsValue);
+                printf("[call frame]  | %10p | %10p \n", it, (*it).u.jsValue);
                 ++it;
             } while (it != end);
@@ -2042 +2062 @@
 }
 
+JSValue* Machine::retrieveCaller(ExecState* exec, FunctionImp* function) const
+{
+    Register** registerBase;
+    int callFrameOffset;
+
+    if (!getCallFrame(exec, function, registerBase, callFrameOffset))
+        return jsNull();
+
+    int callerFrameOffset;
+    if (!getCallerFunctionOffset(registerBase, callFrameOffset, callerFrameOffset))
+        return jsNull();
+
+    Register* callerFrame = (*registerBase) + callerFrameOffset;
+    ASSERT(callerFrame[Callee].u.jsValue);
+    return callerFrame[Callee].u.jsValue;
+}
+
 bool Machine::getCallFrame(ExecState* exec, FunctionImp* function, Register**& registerBase, int& callFrameOffset) const
 {
     callFrameOffset = exec->m_callFrameOffset;
-    if (callFrameOffset < 0)
-        return false;
-    
-    registerBase = exec->m_registerFile->basePointer();
-    Register* callFrame = (*registerBase) + callFrameOffset;
-    return callFrame[Callee].u.jsValue == function;
+
+    while (1) {
+        while (callFrameOffset < 0) {
+            exec = exec->m_prev;
+            if (!exec)
+                return false;
+            callFrameOffset = exec->m_callFrameOffset;
+        }
+
+        registerBase = exec->m_registerFile->basePointer();
+        Register* callFrame = (*registerBase) + callFrameOffset;
+        if (callFrame[Callee].u.jsValue == function)
+            return true;
+
+        if (!getCallerFunctionOffset(registerBase, callFrameOffset, callFrameOffset))
+            callFrameOffset = -1;
+    }
 }
 

branches/squirrelfish/JavaScriptCore/VM/Machine.h

@@ -90 +90 @@
         
         JSValue* retrieveArguments(ExecState*, FunctionImp*) const;
+        JSValue* retrieveCaller(ExecState*, FunctionImp*) const;
         
     private:

branches/squirrelfish/JavaScriptCore/kjs/function.cpp

@@ -111 +111 @@
     FunctionImp* thisObj = static_cast<FunctionImp*>(slot.slotBase());
     ASSERT(exec->machine());
-    UNUSED_PARAM(exec);
-    UNUSED_PARAM(slot);
-    UNUSED_PARAM(thisObj);
-    // FIXME: Implement this.
-    return jsNull();
+    return exec->machine()->retrieveCaller(exec, thisObj);
 }
 

branches/squirrelfish/LayoutTests/ChangeLog

@@ +1 @@
+2008-05-12  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+        
+        Layout test for function.arguments and function.caller in interesting
+        scopes.
+
+        * fast/js/function-dot-arguments-and-caller-expected.txt: Added.
+        * fast/js/function-dot-arguments-and-caller.html: Added.
+
 2008-05-11  Cameron Zwarich  <cwzwarich@uwaterloo.ca>