Changeset 429 for trunk/JavaScriptCore/VM/Machine.cpp

Timestamp:

08/04/08 12:23:14 (5 months ago)

Author:

mbensi

Message:

merge with webkit revision 35534

Files:

• trunk/JavaScriptCore/VM/Machine.cpp (modified) (3 diffs)

trunk/JavaScriptCore/VM/Machine.cpp

@@ -41 +41 @@
-#include "JSNotAnObject.h"
-#include "JSPropertyNameIterator.h"
+#include "JSStaticScopeObject.h"
-#include "JSString.h"
-#include "ObjectPrototype.h"
@@ -999 +1000 @@
-}
-
+static NEVER_INLINE ScopeChainNode* createExceptionScope(ExecState* exec, CodeBlock* codeBlock, const Instruction* vPC, Register* r, ScopeChainNode* scopeChain)
+{
+    int dst = (++vPC)->u.operand;
+    Identifier& property = codeBlock->identifiers[(++vPC)->u.operand];
+    JSValue* value = r[(++vPC)->u.operand].jsValue(exec);
+    JSObject* scope = new (exec) JSStaticScopeObject(property, value, DontDelete);
+    r[dst] = scope;
+    return scopeChain->push(scope);
+}
+
-JSValue* Machine::privateExecute(ExecutionFlag flag, ExecState* exec, RegisterFile* registerFile, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue** exception)
-{
@@ -2603 +2614 @@
-        NEXT_OPCODE;
-    }
+#if HAVE(COMPUTED_GOTO)
+    // Appease GCC
+    goto *(&&skip_new_scope);
+#endif
+    BEGIN_OPCODE(op_push_new_scope) {
+        /* new_scope dst(r) property(id) value(r)
+         
+           Constructs a new StaticScopeObject with property set to value.  That scope
+           object is then pushed onto the ScopeChain.  The scope object is then stored
+           in dst for GC.
+         */
+        setScopeChain(exec, scopeChain, createExceptionScope(exec, codeBlock, vPC, r, scopeChain));
+        vPC += 4;
+        NEXT_OPCODE;
+    }
+#if HAVE(COMPUTED_GOTO)
+    skip_new_scope:
+#endif
-    BEGIN_OPCODE(op_catch) {
-        /* catch ex(r)