Changeset 33301

Timestamp:

05/12/08 23:02:17 (6 months ago)

Author:

mrowe@apple.com

Message:

2008-04-28 Geoffrey Garen <ggaren@apple.com>

Reviewed by Maciej Stachowiak.

Simplified activation object a bit: No need to store the callee
in the activation object -- we can pull it out of the call frame
when needed, instead.

SunSpider reports no change.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (4 diffs)
• kjs/JSActivation.cpp (modified) (3 diffs)
• kjs/JSActivation.h (modified) (3 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-04-28  Geoffrey Garen  <ggaren@apple.com>
+
+        Reviewed by Maciej Stachowiak.
+        
+        Simplified activation object a bit: No need to store the callee
+        in the activation object -- we can pull it out of the call frame
+        when needed, instead.
+        
+        SunSpider reports no change.
+
 2008-04-28  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -427 +427 @@
 }
 
-ALWAYS_INLINE ScopeChainNode* scopeChainForCall(CodeBlock* newCodeBlock, ScopeChainNode* callDataScopeChain, FunctionImp* function, Register* callFrame, Register** registerBase, Register* r)
+ALWAYS_INLINE ScopeChainNode* scopeChainForCall(FunctionBodyNode* functionBodyNode, CodeBlock* newCodeBlock, ScopeChainNode* callDataScopeChain, Register* callFrame, Register** registerBase, Register* r)
 {
     if (newCodeBlock->needsFullScopeChain) {
-        JSActivation* activation = new JSActivation(function, registerBase, r - (*registerBase));
+        JSActivation* activation = new JSActivation(functionBodyNode, registerBase, r - (*registerBase));
         callFrame[Machine::OptionalCalleeActivation].u.jsValue = activation;
 
@@ -617 +617 @@
 
     callFrame = (*registerBase) + callFrameOffset; // registerBase may have moved, recompute callFrame
-    scopeChain = scopeChainForCall(newCodeBlock, scopeChain, function, callFrame, registerBase, r);            
+    scopeChain = scopeChainForCall(functionBodyNode, newCodeBlock, scopeChain, callFrame, registerBase, r);            
     m_reentryDepth++;
     JSValue* result = privateExecute(Normal, exec, registerFile, r, scopeChain, newCodeBlock, exception);
@@ -1470 +1470 @@
             codeBlock = newCodeBlock;
             callFrame = (*registerBase) + callFrameOffset; // registerBase may have moved, recompute callFrame
-            scopeChain = scopeChainForCall(codeBlock, callDataScopeChain, static_cast<FunctionImp*>(v), callFrame, registerBase, r);            
+            scopeChain = scopeChainForCall(functionBodyNode, codeBlock, callDataScopeChain, callFrame, registerBase, r);            
             k = codeBlock->jsValues.data();
             vPC = codeBlock->instructions.begin();
@@ -1576 +1576 @@
             codeBlock = newCodeBlock;
             callFrame = (*registerBase) + callFrameOffset; // registerBase may have moved, recompute callFrame
-            scopeChain = scopeChainForCall(codeBlock, callDataScopeChain, static_cast<FunctionImp*>(constructor), callFrame, registerBase, r);            
+            scopeChain = scopeChainForCall(functionBodyNode, codeBlock, callDataScopeChain, callFrame, registerBase, r);            
             k = codeBlock->jsValues.data();
             vPC = codeBlock->instructions.begin();

branches/squirrelfish/JavaScriptCore/kjs/JSActivation.cpp

@@ -38 +38 @@
 const ClassInfo JSActivation::info = { "JSActivation", 0, 0, 0 };
 
-JSActivation::JSActivation(FunctionImp* function, Register** registerBase, int registerOffset)
-    : Base(new JSActivationData(function->body, function, registerBase, registerOffset))
+JSActivation::JSActivation(PassRefPtr<FunctionBodyNode> functionBody, Register** registerBase, int registerOffset)
+    : Base(new JSActivationData(functionBody, registerBase, registerOffset))
 {
 }
@@ -133 +133 @@
     Base::mark();
     
-    // We don't mark d()->function because it can only be accessed while it's
-    // still live in the register file, and we don't want to keep it live
-    // after that.
-    
     if (d()->argumentsObject)
         d()->argumentsObject->mark();
@@ -182 +178 @@
 JSObject* JSActivation::createArgumentsObject(ExecState* exec)
 {
-    CodeBlock& codeBlock = d()->function->body->generatedCode();
+    CodeBlock& codeBlock = d()->functionBody->generatedCode();
     Register* callFrame = registers() - codeBlock.numVars - codeBlock.numParameters - 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() + argv + 1)->u.jsValue, argc - 1);
-
-    return new Arguments(exec, d()->function, args, this);
+    return new Arguments(exec, function, args, this);
 }
 

branches/squirrelfish/JavaScriptCore/kjs/JSActivation.h

@@ -41 +41 @@
     typedef JSVariableObject Base;
     public:
-        JSActivation(FunctionImp*, Register**, int registerOffset);
+        JSActivation(PassRefPtr<FunctionBodyNode>, Register**, int registerOffset);
         virtual ~JSActivation();
         
@@ -64 +64 @@
     private:
         struct JSActivationData : public JSVariableObjectData {
-            JSActivationData(PassRefPtr<FunctionBodyNode> functionBody_, FunctionImp* function_, Register** registerBase, int registerOffset)
+            JSActivationData(PassRefPtr<FunctionBodyNode> functionBody_, Register** registerBase, int registerOffset)
                 : JSVariableObjectData(&functionBody_->symbolTable(), registerBase, registerOffset)
                 , registerArray(0)
                 , functionBody(functionBody_)
-                , function(function_)
                 , argumentsObject(0)
             {
@@ -74 +73 @@
 
             Register* registerArray;
-            RefPtr<FunctionBodyNode> functionBody; // Owns the symbol table
-            FunctionImp* function;
+            RefPtr<FunctionBodyNode> functionBody; // Owns the symbol table and code block
             JSObject* argumentsObject;
         };