Changeset 50896 in webkit for trunk/JavaScriptCore/interpreter

Timestamp:

Nov 12, 2009, 1:07:51 PM (16 years ago)

Author:

[email protected]

Message:

Start unifying entry logic for function and eval code.

Reviewed by Gavin Barraclough.

Eval now uses a ret instruction to end execution, and sets up
a callframe more in line with what we do for function entry.

File:

• trunk/JavaScriptCore/interpreter/Interpreter.cpp (modified) (2 diffs)

trunk/JavaScriptCore/interpreter/Interpreter.cpp

@@ -814 +814 @@
 
     Register* oldEnd = m_registerFile.end();
-    Register* newEnd = m_registerFile.start() + globalRegisterOffset + codeBlock->m_numCalleeRegisters;
-    if (!m_registerFile.grow(newEnd)) {
+    int argc = 1; // Implicit this argument
+    if (!m_registerFile.grow(m_registerFile.start() + globalRegisterOffset + argc)) {
         *exception = createStackOverflowError(callFrame);
         return jsNull();
@@ -821 +821 @@
 
     CallFrame* newCallFrame = CallFrame::create(m_registerFile.start() + globalRegisterOffset);
-
+    newCallFrame->r(0) = JSValue(thisObj);
+
+    newCallFrame = slideRegisterWindowForCall(codeBlock, &m_registerFile, newCallFrame, argc + RegisterFile::CallFrameHeaderSize, argc);
+    if (UNLIKELY(!newCallFrame)) {
+        *exception = createStackOverflowError(callFrame);
+        m_registerFile.shrink(oldEnd);
+        return jsNull();
+    }
     // a 0 codeBlock indicates a built-in caller
-    newCallFrame->r(codeBlock->thisRegister()) = JSValue(thisObj);
-    newCallFrame->init(codeBlock, 0, scopeChain, callFrame->addHostCallFrameFlag(), 0, 0, 0);
+    newCallFrame->init(codeBlock, 0, scopeChain, callFrame->addHostCallFrameFlag(), 0, argc, 0);
 
     if (codeBlock->needsFullScopeChain())