Changeset 37576 in webkit for trunk/JavaScriptCore

Timestamp:

Oct 13, 2008, 10:29:39 PM (17 years ago)

Author:

[email protected]

Message:

2008-10-13 Maciej Stachowiak <​[email protected]>

Reviewed by Cameron Zwarich.

• make Machine::getArgumentsData an Arguments method and inline it

~2% on v8 raytrace

• VM/Machine.cpp:
• kjs/Arguments.h: (JSC::Machine::getArgumentsData):

Location:

trunk/JavaScriptCore

Files:

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

trunk/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-10-13  Maciej Stachowiak  <[email protected]>
+
+        Reviewed by Cameron Zwarich.
+        
+        - make Machine::getArgumentsData an Arguments method and inline it
+        
+        ~2% on v8 raytrace
+
+        * VM/Machine.cpp:
+        * kjs/Arguments.h:
+        (JSC::Machine::getArgumentsData):
+
 2008-10-13  Alp Toker  <[email protected]>
 

trunk/JavaScriptCore/VM/Machine.cpp

@@ -3974 +3974 @@
 }
 
-void Machine::getArgumentsData(CallFrame* callFrame, JSFunction*& function, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc)
-{
-    function = callFrame->callee();
-    
-    CodeBlock* codeBlock = &function->m_body->generatedByteCode();
-    int numParameters = codeBlock->numParameters;
-    argc = callFrame->argumentCount();
-
-    if (argc <= numParameters)
-        argv = callFrame->registers() - RegisterFile::CallFrameHeaderSize - numParameters + 1; // + 1 to skip "this"
-    else
-        argv = callFrame->registers() - RegisterFile::CallFrameHeaderSize - numParameters - argc + 1; // + 1 to skip "this"
-
-    argc -= 1; // - 1 to skip "this"
-    firstParameterIndex = -RegisterFile::CallFrameHeaderSize - numParameters + 1; // + 1 to skip "this"
-}
-
 #if ENABLE(CTI)
 

trunk/JavaScriptCore/kjs/Arguments.h

@@ -72 +72 @@
 
     private:
+        void getArgumentsData(CallFrame*, JSFunction*&, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc);
         virtual bool getOwnPropertySlot(ExecState*, const Identifier& propertyName, PropertySlot&);
         virtual bool getOwnPropertySlot(ExecState*, unsigned propertyName, PropertySlot&);
@@ -86 +87 @@
     };
 
+    ALWAYS_INLINE void Arguments::getArgumentsData(CallFrame* callFrame, JSFunction*& function, ptrdiff_t& firstParameterIndex, Register*& argv, int& argc)
+    {
+        function = callFrame->callee();
+    
+        CodeBlock* codeBlock = &function->m_body->generatedByteCode();
+        int numParameters = codeBlock->numParameters;
+        argc = callFrame->argumentCount();
+
+        if (argc <= numParameters)
+            argv = callFrame->registers() - RegisterFile::CallFrameHeaderSize - numParameters + 1; // + 1 to skip "this"
+        else
+            argv = callFrame->registers() - RegisterFile::CallFrameHeaderSize - numParameters - argc + 1; // + 1 to skip "this"
+
+        argc -= 1; // - 1 to skip "this"
+        firstParameterIndex = -RegisterFile::CallFrameHeaderSize - numParameters + 1; // + 1 to skip "this"
+    }
+
     inline Arguments::Arguments(CallFrame* callFrame)
         : JSObject(callFrame->lexicalGlobalObject()->argumentsStructure())
@@ -94 +112 @@
         Register* argv;
         int numArguments;
-        callFrame->machine()->getArgumentsData(callFrame, callee, firstParameterIndex, argv, numArguments);
+        getArgumentsData(callFrame, callee, firstParameterIndex, argv, numArguments);
 
         d->numParameters = callee->m_body->parameterCount();