Changeset 33317

Timestamp:

05/12/08 23:03:02 (6 months ago)

Author:

mrowe@apple.com

Message:

Minor code restructuring to prepare for getters and setters,
also helps exception semantics a bit.

Reviewed by Maciej

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/Machine.cpp (modified) (4 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-04-30  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Minor code restructuring to prepare for getters and setters, 
+        also helps exception semantics a bit.
+
+        * VM/Machine.cpp:
+        (KJS::Machine::privateExecute):
+
 2008-04-30  Geoffrey Garen  <ggaren@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -1199 +1199 @@
 
         Identifier& ident = codeBlock->identifiers[property];
-        r[dst].u.jsValue = baseObj->get(exec, ident);
+        JSValue *result = baseObj->get(exec, ident);
         VM_CHECK_EXCEPTION();
+        r[dst].u.jsValue = result;
         ++vPC;
         NEXT_OPCODE;
@@ -1242 +1243 @@
         
         Identifier& ident = codeBlock->identifiers[property];
-        r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, ident));
-        
+        JSValue* result = jsBoolean(baseObj->deleteProperty(exec, ident));
         VM_CHECK_EXCEPTION();
+        r[dst].u.jsValue = result;
         ++vPC;
         NEXT_OPCODE;
@@ -1263 +1264 @@
         
         JSValue* subscript = r[property].u.jsValue;
-
+        JSValue* result;
         uint32_t i;
         if (subscript->getUInt32(i))
-            r[dst].u.jsValue = baseObj->get(exec, i);
+            result = baseObj->get(exec, i);
         else {
             VM_CHECK_EXCEPTION(); // If toObject threw, we must not call toString, which may execute arbitrary code
-            r[dst].u.jsValue = baseObj->get(exec, Identifier(subscript->toString(exec)));
+            result = baseObj->get(exec, Identifier(subscript->toString(exec)));
         }
         
         VM_CHECK_EXCEPTION();
+        r[dst].u.jsValue = result;
         ++vPC;
         NEXT_OPCODE;
@@ -1322 +1324 @@
 
         JSValue* subscript = r[property].u.jsValue;
-
+        JSValue* result;
         uint32_t i;
         if (subscript->getUInt32(i))
-            r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, i));
+            result = jsBoolean(baseObj->deleteProperty(exec, i));
         else {
             VM_CHECK_EXCEPTION(); // If toObject threw, we must not call toString, which may execute arbitrary code
-            r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, Identifier(subscript->toString(exec))));
+            result = jsBoolean(baseObj->deleteProperty(exec, Identifier(subscript->toString(exec))));
         }
         
         VM_CHECK_EXCEPTION();
+        r[dst].u.jsValue = result;
         ++vPC;
         NEXT_OPCODE;