Changeset 36851 in webkit for trunk/JavaScriptCore/kjs

Timestamp:

Sep 24, 2008, 10:02:14 AM (17 years ago)

Author:

Darin Adler

Message:

2008-09-24 Darin Adler <Darin Adler>

Reviewed by Sam Weinig.

• ​https://bugs.webkit.org/show_bug.cgi?id=21047 speed up ret_activation with inlining

About 1% on v8-raytrace.

• JavaScriptCore.exp: Removed JSVariableObject::setRegisters.

• kjs/JSActivation.cpp: Moved copyRegisters to the header to make it inline.
• kjs/JSActivation.h: (JSC::JSActivation::copyRegisters): Moved here. Also removed the registerArraySize argument to setRegisters, since the object doesn't need to store the number of registers.

• kjs/JSGlobalObject.cpp: (JSC::JSGlobalObject::reset): Removed unnecessary clearing left over from when we used this on objects that weren't brand new. These days, this function is really just part of the constructor.

• kjs/JSGlobalObject.h: Added registerArraySize to JSGlobalObjectData, since JSVariableObjectData no longer needs it. Added a setRegisters override here that handles storing the size.

• kjs/JSStaticScopeObject.h: Removed code to set registerArraySize, since it no longer exists.

• kjs/JSVariableObject.cpp: Moved copyRegisterArray and setRegisters to the header to make them inline.
• kjs/JSVariableObject.h: Removed registerArraySize from JSVariableObjectData, since it was only used for the global object. (JSC::JSVariableObject::copyRegisterArray): Moved here ot make it inline. (JSC::JSVariableObject::setRegisters): Moved here to make it inline. Also removed the code to set registerArraySize and changed an if statement into an assert to save an unnnecessary branch.

Location:

trunk/JavaScriptCore/kjs

Files:

• JSActivation.cpp (modified) (2 diffs)
• JSActivation.h (modified) (2 diffs)
• JSGlobalObject.cpp (modified) (1 diff)
• JSGlobalObject.h (modified) (4 diffs)
• JSStaticScopeObject.h (modified) (1 diff)
• JSVariableObject.cpp (modified) (1 diff)
• JSVariableObject.h (modified) (4 diffs)

trunk/JavaScriptCore/kjs/JSActivation.cpp

@@ -31 +31 @@
 
 #include "Arguments.h"
-#include "CodeBlock.h"
 #include "Machine.h"
-#include "Register.h"
 #include "JSFunction.h"
 
@@ -84 +82 @@
             r.mark();
     }
-}
-
-void JSActivation::copyRegisters()
-{
-    ASSERT(!d()->registerArray);
-    ASSERT(!d()->registerArraySize);
-
-    size_t numParametersMinusThis = d()->functionBody->generatedByteCode().numParameters - 1;
-    size_t numVars = d()->functionBody->generatedByteCode().numVars;
-    size_t numLocals = numVars + numParametersMinusThis;
-
-    if (!numLocals)
-        return;
-
-    int registerOffset = numParametersMinusThis + RegisterFile::CallFrameHeaderSize;
-    size_t registerArraySize = numLocals + RegisterFile::CallFrameHeaderSize;
-
-    Register* registerArray = copyRegisterArray(d()->registers - registerOffset, registerArraySize);
-    setRegisters(registerArray + registerOffset, registerArray, registerArraySize);
 }
 

trunk/JavaScriptCore/kjs/JSActivation.h

@@ -30 +30 @@
 #define JSActivation_h
 
+#include "CodeBlock.h"
 #include "JSVariableObject.h"
+#include "RegisterFile.h"
 #include "SymbolTable.h"
 #include "nodes.h"
@@ -99 +101 @@
     };
     
+    inline void JSActivation::copyRegisters()
+    {
+        ASSERT(!d()->registerArray);
+
+        size_t numParametersMinusThis = d()->functionBody->generatedByteCode().numParameters - 1;
+        size_t numVars = d()->functionBody->generatedByteCode().numVars;
+        size_t numLocals = numVars + numParametersMinusThis;
+
+        if (!numLocals)
+            return;
+
+        int registerOffset = numParametersMinusThis + RegisterFile::CallFrameHeaderSize;
+        size_t registerArraySize = numLocals + RegisterFile::CallFrameHeaderSize;
+
+        Register* registerArray = copyRegisterArray(d()->registers - registerOffset, registerArraySize);
+        setRegisters(registerArray + registerOffset, registerArray);
+    }
+
 } // namespace JSC
 

trunk/JavaScriptCore/kjs/JSGlobalObject.cpp

@@ -196 +196 @@
 void JSGlobalObject::reset(JSValue* prototype)
 {
-    // Clear before inititalizing, to avoid calling mark() on stale pointers --
-    // which would be wasteful -- or uninitialized pointers -- which would be
-    // dangerous. (The allocations below may cause a GC.)
-
-    ASSERT(!hasCustomProperties());
-    symbolTable().clear();
-    setRegisters(0, 0, 0);
-
     ExecState* exec = d()->globalExec.get();
 

trunk/JavaScriptCore/kjs/JSGlobalObject.h

@@ -57 +57 @@
             JSGlobalObjectData(JSGlobalObject* globalObject, JSObject* thisValue)
                 : JSVariableObjectData(&symbolTable, 0)
+                , registerArraySize(0)
                 , globalScopeChain(globalObject, thisValue)
                 , regExpConstructor(0)
@@ -82 +83 @@
             }
 
+            size_t registerArraySize;
+
             JSGlobalObject* next;
             JSGlobalObject* prev;
@@ -270 +273 @@
         void reset(JSValue* prototype);
 
+        void setRegisters(Register* registers, Register* registerArray, size_t count);
+
         void* operator new(size_t); // can only be allocated with JSGlobalData
     };
+
+    inline void JSGlobalObject::setRegisters(Register* registers, Register* registerArray, size_t count)
+    {
+        JSVariableObject::setRegisters(registers, registerArray);
+        d()->registerArraySize = count;
+    }
 
     inline void JSGlobalObject::addStaticGlobals(GlobalPropertyInfo* globals, int count)
@@ -324 +335 @@
     }
 
+
 } // namespace JSC
 

trunk/JavaScriptCore/kjs/JSStaticScopeObject.h

@@ -38 +38 @@
                 : JSVariableObjectData(&symbolTable, &registerStore + 1)
             {
-                registerArraySize = 1;
             }
             SymbolTable symbolTable;

trunk/JavaScriptCore/kjs/JSVariableObject.cpp

@@ -69 +69 @@
 }
 
-Register* JSVariableObject::copyRegisterArray(Register* src, size_t count)
-{
-    Register* registerArray = new Register[count];
-    memcpy(registerArray, src, count * sizeof(Register));
-
-    return registerArray;
-}
-
-void JSVariableObject::setRegisters(Register* r, Register* registerArray, size_t count)
-{
-    if (registerArray != d->registerArray.get())
-        d->registerArray.set(registerArray);
-    d->registerArraySize = count;
-    d->registers = r;
-}
-
 } // namespace JSC

trunk/JavaScriptCore/kjs/JSVariableObject.h

@@ -65 +65 @@
                 : symbolTable(symbolTable_)
                 , registers(registers_)
-                , registerArraySize(0)
             {
                 ASSERT(symbolTable_);
@@ -73 +72 @@
             Register* registers; // "r" in the register file.
             OwnArrayPtr<Register> registerArray; // Independent copy of registers, used when a variable object copies its registers out of the register file.
-            size_t registerArraySize;
 
             static inline ptrdiff_t offsetOf_registers()
@@ -92 +90 @@
 
         Register* copyRegisterArray(Register* src, size_t count);
-        void setRegisters(Register* r, Register* registerArray, size_t count);
+        void setRegisters(Register* r, Register* registerArray);
 
         bool symbolTableGet(const Identifier&, PropertySlot&);
@@ -161 +159 @@
     }
 
+    inline Register* JSVariableObject::copyRegisterArray(Register* src, size_t count)
+    {
+        Register* registerArray = new Register[count];
+        memcpy(registerArray, src, count * sizeof(Register));
+
+        return registerArray;
+    }
+
+    inline void JSVariableObject::setRegisters(Register* registers, Register* registerArray)
+    {
+        ASSERT(registerArray != d->registerArray.get());
+        d->registerArray.set(registerArray);
+        d->registers = registers;
+    }
+
 } // namespace JSC