Changeset 100224 in webkit

Timestamp:

Nov 14, 2011, 5:39:52 PM (15 years ago)

Author:

ggaren@apple.com

Message:

A little bit of arguments / activation cleanup
​https://bugs.webkit.org/show_bug.cgi?id=72339

Reviewed by Gavin Barraclough.

Renamed copyRegisters => tearOff to match bytecode and other terminology.

Renamed setActivation => didTearOffActivation to indicate that this is a
notification the object may choose to ignore. Moved "Should I ignore?"
code into the arguments object to avoid duplication elsewhere.

• interpreter/Interpreter.cpp:

(JSC::Interpreter::unwindCallFrame):
(JSC::Interpreter::privateExecute):
(JSC::Interpreter::retrieveArguments):

• jit/JITStubs.cpp:

(JSC::DEFINE_STUB_FUNCTION):

• runtime/Arguments.h:

(JSC::Arguments::createAndTearOff):
(JSC::Arguments::didTearOffActivation):
(JSC::Arguments::finishCreationButDontTearOff):
(JSC::Arguments::finishCreation):
(JSC::Arguments::finishCreationAndTearOff):
(JSC::Arguments::tearOff):

• runtime/JSActivation.h:

(JSC::JSActivation::tearOff): Moved Activation's code into its own header
because that's where it belongs.

Location:

trunk/Source/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• interpreter/Interpreter.cpp (modified) (4 diffs)
• jit/JITStubs.cpp (modified) (2 diffs)
• runtime/Arguments.h (modified) (7 diffs)
• runtime/JSActivation.h (modified) (2 diffs)

trunk/Source/JavaScriptCore/ChangeLog

@@ +1 @@
+2011-11-14  Geoffrey Garen  <ggaren@apple.com>
+
+        A little bit of arguments / activation cleanup
+        https://bugs.webkit.org/show_bug.cgi?id=72339
+
+        Reviewed by Gavin Barraclough.
+        
+        Renamed copyRegisters => tearOff to match bytecode and other terminology.
+        
+        Renamed setActivation => didTearOffActivation to indicate that this is a
+        notification the object may choose to ignore. Moved "Should I ignore?"
+        code into the arguments object to avoid duplication elsewhere.
+
+        * interpreter/Interpreter.cpp:
+        (JSC::Interpreter::unwindCallFrame):
+        (JSC::Interpreter::privateExecute):
+        (JSC::Interpreter::retrieveArguments):
+        * jit/JITStubs.cpp:
+        (JSC::DEFINE_STUB_FUNCTION):
+        * runtime/Arguments.h:
+        (JSC::Arguments::createAndTearOff):
+        (JSC::Arguments::didTearOffActivation):
+        (JSC::Arguments::finishCreationButDontTearOff):
+        (JSC::Arguments::finishCreation):
+        (JSC::Arguments::finishCreationAndTearOff):
+        (JSC::Arguments::tearOff):
+
+        * runtime/JSActivation.h:
+        (JSC::JSActivation::tearOff): Moved Activation's code into its own header
+        because that's where it belongs.
+
 2011-11-14  Gavin Barraclough  <barraclough@apple.com>
 

trunk/Source/JavaScriptCore/interpreter/Interpreter.cpp

@@ -696 +696 @@
         callFrame->setScopeChain(scopeChain);
         JSActivation* activation = asActivation(scopeChain->object.get());
-        activation->copyRegisters(*scopeChain->globalData);
-        if (JSValue arguments = callFrame->uncheckedR(unmodifiedArgumentsRegister(oldCodeBlock->argumentsRegister())).jsValue()) {
-            if (!oldCodeBlock->isStrictMode())
-                asArguments(arguments)->setActivation(callFrame->globalData(), activation);
-        }
+        activation->tearOff(*scopeChain->globalData);
+        if (JSValue arguments = callFrame->uncheckedR(unmodifiedArgumentsRegister(oldCodeBlock->argumentsRegister())).jsValue())
+            asArguments(arguments)->didTearOffActivation(callFrame->globalData(), activation);
     } else if (oldCodeBlock->usesArguments() && !oldCodeBlock->isStrictMode()) {
         if (JSValue arguments = callFrame->uncheckedR(unmodifiedArgumentsRegister(oldCodeBlock->argumentsRegister())).jsValue())
-            asArguments(arguments)->copyRegisters(callFrame->globalData());
+            asArguments(arguments)->tearOff(callFrame->globalData());
     }
 
@@ -4454 +4452 @@
         JSValue activationValue = callFrame->r(activation).jsValue();
         if (activationValue) {
-            asActivation(activationValue)->copyRegisters(*globalData);
-
-            if (JSValue argumentsValue = callFrame->r(unmodifiedArgumentsRegister(arguments)).jsValue()) {
-                if (!codeBlock->isStrictMode())
-                    asArguments(argumentsValue)->setActivation(*globalData, asActivation(activationValue));
-            }
+            asActivation(activationValue)->tearOff(*globalData);
+
+            if (JSValue argumentsValue = callFrame->r(unmodifiedArgumentsRegister(arguments)).jsValue())
+                asArguments(argumentsValue)->didTearOffActivation(*globalData, asActivation(activationValue));
         } else if (JSValue argumentsValue = callFrame->r(unmodifiedArgumentsRegister(arguments)).jsValue()) {
             if (!codeBlock->isStrictMode())
-                asArguments(argumentsValue)->copyRegisters(*globalData);
+                asArguments(argumentsValue)->tearOff(*globalData);
         }
 
@@ -4484 +4480 @@
 
         if (JSValue arguments = callFrame->r(unmodifiedArgumentsRegister(src1)).jsValue())
-            asArguments(arguments)->copyRegisters(*globalData);
+            asArguments(arguments)->tearOff(*globalData);
 
         vPC += OPCODE_LENGTH(op_tear_off_arguments);
@@ -5145 +5141 @@
     }
 
-    return Arguments::createAndCopyRegisters(functionCallFrame->globalData(), functionCallFrame);
+    return Arguments::createAndTearOff(functionCallFrame->globalData(), functionCallFrame);
 }
 

trunk/Source/JavaScriptCore/jit/JITStubs.cpp

@@ -2395 +2395 @@
         if (JSValue v = stackFrame.args[1].jsValue()) {
             if (!stackFrame.callFrame->codeBlock()->isStrictMode())
-                asArguments(v)->copyRegisters(*stackFrame.globalData);
+                asArguments(v)->tearOff(*stackFrame.globalData);
         }
         return;
     }
     JSActivation* activation = asActivation(stackFrame.args[0].jsValue());
-    activation->copyRegisters(*stackFrame.globalData);
-    if (JSValue v = stackFrame.args[1].jsValue()) {
-        if (!stackFrame.callFrame->codeBlock()->isStrictMode())
-            asArguments(v)->setActivation(*stackFrame.globalData, activation);
-    }
+    activation->tearOff(*stackFrame.globalData);
+    if (JSValue v = stackFrame.args[1].jsValue())
+        asArguments(v)->didTearOffActivation(*stackFrame.globalData, activation);
 }
 
@@ -2412 +2410 @@
 
     ASSERT(stackFrame.callFrame->codeBlock()->usesArguments() && !stackFrame.callFrame->codeBlock()->needsFullScopeChain());
-    asArguments(stackFrame.args[0].jsValue())->copyRegisters(*stackFrame.globalData);
+    asArguments(stackFrame.args[0].jsValue())->tearOff(*stackFrame.globalData);
 }
 

trunk/Source/JavaScriptCore/runtime/Arguments.h

@@ -71 +71 @@
         }
         
-        static Arguments* createAndCopyRegisters(JSGlobalData& globalData, CallFrame* callFrame)
+        static Arguments* createAndTearOff(JSGlobalData& globalData, CallFrame* callFrame)
         {
             Arguments* arguments = new (allocateCell<Arguments>(globalData.heap)) Arguments(callFrame);
-            arguments->finishCreationAndCopyRegisters(callFrame);
+            arguments->finishCreationAndTearOff(callFrame);
             return arguments;
         }
@@ -112 +112 @@
         
         void copyToRegisters(ExecState* exec, Register* buffer, uint32_t maxSize);
-        void copyRegisters(JSGlobalData&);
+        void tearOff(JSGlobalData&);
         bool isTornOff() const { return d->registerArray; }
-        void setActivation(JSGlobalData& globalData, JSActivation* activation)
-        {
-            ASSERT(!d->registerArray);
+        void didTearOffActivation(JSGlobalData& globalData, JSActivation* activation)
+        {
+            if (isTornOff())
+                return;
             d->activation.set(globalData, this, activation);
             d->registers = &activation->registerAt(0);
@@ -129 +130 @@
         static const unsigned StructureFlags = OverridesGetOwnPropertySlot | OverridesVisitChildren | OverridesGetPropertyNames | JSObject::StructureFlags;
 
-        void finishCreationButDontCopyRegisters(CallFrame*);
+        void finishCreationButDontTearOff(CallFrame*);
         void finishCreation(CallFrame*);
-        void finishCreationAndCopyRegisters(CallFrame*);
+        void finishCreationAndTearOff(CallFrame*);
         void finishCreation(CallFrame*, NoParametersType);
 
@@ -191 +192 @@
     }
     
-    inline void Arguments::finishCreationButDontCopyRegisters(CallFrame* callFrame)
+    inline void Arguments::finishCreationButDontTearOff(CallFrame* callFrame)
     {
         Base::finishCreation(callFrame->globalData());
@@ -234 +235 @@
     {
         ASSERT(!callFrame->isInlineCallFrame());
-        finishCreationButDontCopyRegisters(callFrame);
+        finishCreationButDontTearOff(callFrame);
         if (d->isStrictMode)
-            copyRegisters(callFrame->globalData());
-    }
-
-    inline void Arguments::finishCreationAndCopyRegisters(CallFrame* callFrame)
+            tearOff(callFrame->globalData());
+    }
+
+    inline void Arguments::finishCreationAndTearOff(CallFrame* callFrame)
     {
         Base::finishCreation(callFrame->globalData());
@@ -357 +358 @@
         d->isStrictMode = callFrame->codeBlock()->isStrictMode();
         if (d->isStrictMode)
-            copyRegisters(callFrame->globalData());
-    }
-
-    inline void Arguments::copyRegisters(JSGlobalData& globalData)
+            tearOff(callFrame->globalData());
+    }
+
+    inline void Arguments::tearOff(JSGlobalData& globalData)
     {
         ASSERT(!isTornOff());
@@ -377 +378 @@
     }
 
-    // This JSActivation function is defined here so it can get at Arguments::setRegisters.
-    inline void JSActivation::copyRegisters(JSGlobalData& globalData)
-    {
-        ASSERT(!m_registerArray);
-
-        size_t numLocals = m_numCapturedVars + m_numParametersMinusThis;
-
-        if (!numLocals)
-            return;
-
-        int registerOffset = m_numParametersMinusThis + RegisterFile::CallFrameHeaderSize;
-        size_t registerArraySize = numLocals + RegisterFile::CallFrameHeaderSize;
-
-        OwnArrayPtr<WriteBarrier<Unknown> > registerArray = copyRegisterArray(globalData, m_registers - registerOffset, registerArraySize, m_numParametersMinusThis + 1);
-        WriteBarrier<Unknown>* registers = registerArray.get() + registerOffset;
-        setRegisters(registers, registerArray.release());
-    }
-
 } // namespace JSC
 

trunk/Source/JavaScriptCore/runtime/JSActivation.h

@@ -70 +70 @@
         static JSObject* toThisObject(JSCell*, ExecState*);
 
-        void copyRegisters(JSGlobalData&);
+        void tearOff(JSGlobalData&);
         
         static const ClassInfo s_info;
@@ -115 +115 @@
     }
 
+    inline void JSActivation::tearOff(JSGlobalData& globalData)
+    {
+        ASSERT(!m_registerArray);
+
+        size_t numLocals = m_numCapturedVars + m_numParametersMinusThis;
+
+        if (!numLocals)
+            return;
+
+        int registerOffset = m_numParametersMinusThis + RegisterFile::CallFrameHeaderSize;
+        size_t registerArraySize = numLocals + RegisterFile::CallFrameHeaderSize;
+
+        OwnArrayPtr<WriteBarrier<Unknown> > registerArray = copyRegisterArray(globalData, m_registers - registerOffset, registerArraySize, m_numParametersMinusThis + 1);
+        WriteBarrier<Unknown>* registers = registerArray.get() + registerOffset;
+        setRegisters(registers, registerArray.release());
+    }
+
 } // namespace JSC