Changeset 33296

Timestamp:

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

Author:

mrowe@apple.com

Message:

2008-04-26 Maciej Stachowiak <mjs@apple.com>

Reviewed by Oliver.

• document all property getting, setting and deleting opcodes

(And fix function parameter names to match corresponding opcode parameter names.)

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitResolve): (KJS::CodeGenerator::emitResolveBase): (KJS::CodeGenerator::emitResolveBaseAndProperty): (KJS::CodeGenerator::emitResolveBaseAndFunc): (KJS::CodeGenerator::emitGetPropId): (KJS::CodeGenerator::emitPutPropId): (KJS::CodeGenerator::emitDeletePropId): (KJS::CodeGenerator::emitPutPropVal):
• VM/CodeGenerator.h:
• VM/Machine.cpp: (KJS::resolve): (KJS::resolveBase): (KJS::resolveBaseAndProperty): (KJS::resolveBaseAndFunc): (KJS::Machine::privateExecute):
• kjs/nodes.cpp: (KJS::ResolveNode::emitCode): (KJS::ArrayNode::emitCode): (KJS::PropertyListNode::emitCode): (KJS::BracketAccessorNode::emitCode): (KJS::EvalFunctionCallNode::emitCode): (KJS::FunctionCallResolveNode::emitCode): (KJS::FunctionCallBracketNode::emitCode): (KJS::PostIncResolveNode::emitCode): (KJS::PostDecResolveNode::emitCode): (KJS::PostIncBracketNode::emitCode): (KJS::PostDecBracketNode::emitCode): (KJS::PostIncDotNode::emitCode): (KJS::PostDecDotNode::emitCode): (KJS::DeleteResolveNode::emitCode): (KJS::TypeOfResolveNode::emitCode): (KJS::PreIncResolveNode::emitCode): (KJS::PreDecResolveNode::emitCode): (KJS::PreIncBracketNode::emitCode): (KJS::PreDecBracketNode::emitCode): (KJS::AssignResolveNode::emitCode): (KJS::AssignDotNode::emitCode): (KJS::ReadModifyDotNode::emitCode): (KJS::AssignBracketNode::emitCode): (KJS::ReadModifyBracketNode::emitCode): (KJS::ConstDeclNode::emitCodeSingle):

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (2 diffs)
• VM/CodeGenerator.h (modified) (1 diff)
• VM/Machine.cpp (modified) (20 diffs)
• kjs/nodes.cpp (modified) (26 diffs)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-04-26  Maciej Stachowiak  <mjs@apple.com>
+
+        Reviewed by Oliver.
+        
+        - document all property getting, setting and deleting opcodes
+        
+        (And fix function parameter names to match corresponding opcode parameter names.)
+
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::emitResolve):
+        (KJS::CodeGenerator::emitResolveBase):
+        (KJS::CodeGenerator::emitResolveBaseAndProperty):
+        (KJS::CodeGenerator::emitResolveBaseAndFunc):
+        (KJS::CodeGenerator::emitGetPropId):
+        (KJS::CodeGenerator::emitPutPropId):
+        (KJS::CodeGenerator::emitDeletePropId):
+        (KJS::CodeGenerator::emitPutPropVal):
+        * VM/CodeGenerator.h:
+        * VM/Machine.cpp:
+        (KJS::resolve):
+        (KJS::resolveBase):
+        (KJS::resolveBaseAndProperty):
+        (KJS::resolveBaseAndFunc):
+        (KJS::Machine::privateExecute):
+        * kjs/nodes.cpp:
+        (KJS::ResolveNode::emitCode):
+        (KJS::ArrayNode::emitCode):
+        (KJS::PropertyListNode::emitCode):
+        (KJS::BracketAccessorNode::emitCode):
+        (KJS::EvalFunctionCallNode::emitCode):
+        (KJS::FunctionCallResolveNode::emitCode):
+        (KJS::FunctionCallBracketNode::emitCode):
+        (KJS::PostIncResolveNode::emitCode):
+        (KJS::PostDecResolveNode::emitCode):
+        (KJS::PostIncBracketNode::emitCode):
+        (KJS::PostDecBracketNode::emitCode):
+        (KJS::PostIncDotNode::emitCode):
+        (KJS::PostDecDotNode::emitCode):
+        (KJS::DeleteResolveNode::emitCode):
+        (KJS::TypeOfResolveNode::emitCode):
+        (KJS::PreIncResolveNode::emitCode):
+        (KJS::PreDecResolveNode::emitCode):
+        (KJS::PreIncBracketNode::emitCode):
+        (KJS::PreDecBracketNode::emitCode):
+        (KJS::AssignResolveNode::emitCode):
+        (KJS::AssignDotNode::emitCode):
+        (KJS::ReadModifyDotNode::emitCode):
+        (KJS::AssignBracketNode::emitCode):
+        (KJS::ReadModifyBracketNode::emitCode):
+        (KJS::ConstDeclNode::emitCodeSingle):
+
 2008-04-26  Oliver Hunt  <oliver@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.cpp

@@ -689 +689 @@
 }
 
-RegisterID* CodeGenerator::emitResolve(RegisterID* r0, const Identifier& ident)
+RegisterID* CodeGenerator::emitResolve(RegisterID* dst, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_resolve));
-    instructions().append(r0->index());
-    instructions().append(addConstant(ident));
-    return r0;
-}
-
-RegisterID* CodeGenerator::emitResolveBase(RegisterID* r0, const Identifier& ident)
+    instructions().append(dst->index());
+    instructions().append(addConstant(property));
+    return dst;
+}
+
+RegisterID* CodeGenerator::emitResolveBase(RegisterID* dst, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_resolve_base));
-    instructions().append(r0->index());
-    instructions().append(addConstant(ident));
-    return r0;
-}
-    
-RegisterID* CodeGenerator::emitResolveBaseAndProperty(RegisterID* r0, RegisterID* r1, const Identifier& ident)
+    instructions().append(dst->index());
+    instructions().append(addConstant(property));
+    return dst;
+}
+    
+RegisterID* CodeGenerator::emitResolveBaseAndProperty(RegisterID* baseDst, RegisterID* propDst, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_resolve_base_and_property));
-    instructions().append(r0->index());
-    instructions().append(r1->index());
-    instructions().append(addConstant(ident));
-    return r0;
-}
-
-RegisterID* CodeGenerator::emitResolveBaseAndFunc(RegisterID* r0, RegisterID* r1, const Identifier& ident)
+    instructions().append(baseDst->index());
+    instructions().append(propDst->index());
+    instructions().append(addConstant(property));
+    return baseDst;
+}
+
+RegisterID* CodeGenerator::emitResolveBaseAndFunc(RegisterID* baseDst, RegisterID* funcDst, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_resolve_base_and_func));
-    instructions().append(r0->index());
-    instructions().append(r1->index());
-    instructions().append(addConstant(ident));
-    return r0;
-}
-
-RegisterID* CodeGenerator::emitGetPropId(RegisterID* dst, RegisterID* base, const Identifier& ident)
+    instructions().append(baseDst->index());
+    instructions().append(funcDst->index());
+    instructions().append(addConstant(property));
+    return baseDst;
+}
+
+RegisterID* CodeGenerator::emitGetPropId(RegisterID* dst, RegisterID* base, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_get_prop_id));
     instructions().append(dst->index());
     instructions().append(base->index());
-    instructions().append(addConstant(ident));
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitPutPropId(RegisterID* base, const Identifier& ident, RegisterID* val)
+    instructions().append(addConstant(property));
+    return dst;
+}
+
+RegisterID* CodeGenerator::emitPutPropId(RegisterID* base, const Identifier& property, RegisterID* value)
 {
     instructions().append(machine().getOpcode(op_put_prop_id));
     instructions().append(base->index());
-    instructions().append(addConstant(ident));
-    instructions().append(val->index());
-    return val;
-}
-
-RegisterID* CodeGenerator::emitDeletePropId(RegisterID* dst, RegisterID* base, const Identifier& ident)
+    instructions().append(addConstant(property));
+    instructions().append(value->index());
+    return value;
+}
+
+RegisterID* CodeGenerator::emitDeletePropId(RegisterID* dst, RegisterID* base, const Identifier& property)
 {
     instructions().append(machine().getOpcode(op_delete_prop_id));
     instructions().append(dst->index());
     instructions().append(base->index());
-    instructions().append(addConstant(ident));
+    instructions().append(addConstant(property));
     return dst;
 }
@@ -759 +759 @@
 }
 
-RegisterID* CodeGenerator::emitPutPropVal(RegisterID* base, RegisterID* property, RegisterID* val)
+RegisterID* CodeGenerator::emitPutPropVal(RegisterID* base, RegisterID* property, RegisterID* value)
 {
     instructions().append(machine().getOpcode(op_put_prop_val));
     instructions().append(base->index());
     instructions().append(property->index());
-    instructions().append(val->index());
-    return val;
+    instructions().append(value->index());
+    return value;
 }
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.h

@@ -189 +189 @@
         RegisterID* emitIn(RegisterID*, RegisterID*, RegisterID*);
 
-        RegisterID* emitResolve(RegisterID*, const Identifier&);
-        RegisterID* emitResolve(RegisterID*, int);
-        RegisterID* emitResolve(RegisterID*, int, int);
-
-        RegisterID* emitResolveBase(RegisterID*, const Identifier&);
-        RegisterID* emitResolveBase(RegisterID*, int);
-        RegisterID* emitResolveBase(RegisterID*, int, int);
-        RegisterID* emitResolveBaseAndProperty(RegisterID*, RegisterID*, const Identifier&);
-        RegisterID* emitResolveBaseAndFunc(RegisterID*, RegisterID*, const Identifier&);
+        RegisterID* emitResolve(RegisterID* dst, const Identifier& property);
+
+        RegisterID* emitResolveBase(RegisterID* dst, const Identifier& property);
+        RegisterID* emitResolveBaseAndProperty(RegisterID* baseDst, RegisterID* propDst, const Identifier& property);
+        RegisterID* emitResolveBaseAndFunc(RegisterID* baseDst, RegisterID* funcDst, const Identifier& property);
         
         RegisterID* emitGetPropId(RegisterID* dst, RegisterID* base, const Identifier& property);
-        RegisterID* emitPutPropId(RegisterID* base, const Identifier&, RegisterID* val);
+        RegisterID* emitPutPropId(RegisterID* base, const Identifier& property, RegisterID* value);
         RegisterID* emitDeletePropId(RegisterID* dst, RegisterID* base, const Identifier&);
         RegisterID* emitGetPropVal(RegisterID* dst, RegisterID* base, RegisterID* property);
-        RegisterID* emitPutPropVal(RegisterID* base, RegisterID* property, RegisterID* val);
+        RegisterID* emitPutPropVal(RegisterID* base, RegisterID* property, RegisterID* value);
         RegisterID* emitDeletePropVal(RegisterID* dst, RegisterID* base, RegisterID* property);
-        RegisterID* emitPutPropIndex(RegisterID* base, unsigned index, RegisterID* val);
+        RegisterID* emitPutPropIndex(RegisterID* base, unsigned index, RegisterID* value);
 
         RegisterID* emitCall(RegisterID*, RegisterID*, RegisterID*, ArgumentsNode*);

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -258 +258 @@
 static bool NEVER_INLINE resolve(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
 {
-    int r0 = (vPC + 1)->u.operand;
-    int id0 = (vPC + 2)->u.operand;
+    int dst = (vPC + 1)->u.operand;
+    int property = (vPC + 2)->u.operand;
 
     ScopeChainIterator iter = scopeChain->begin();
@@ -266 +266 @@
 
     PropertySlot slot;
-    Identifier& ident = codeBlock->identifiers[id0];
+    Identifier& ident = codeBlock->identifiers[property];
     do {
         JSObject* o = *iter;
         if (o->getPropertySlot(exec, ident, slot)) {
-            r[r0].u.jsValue = slot.getValue(exec, o, ident);
+            r[dst].u.jsValue = slot.getValue(exec, o, ident);
             return true;
         }
@@ -280 +280 @@
 static void NEVER_INLINE resolveBase(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock)
 {
-    int r0 = (vPC + 1)->u.operand;
-    int id0 = (vPC + 2)->u.operand;
+    int dst = (vPC + 1)->u.operand;
+    int property = (vPC + 2)->u.operand;
 
     ScopeChainIterator iter = scopeChain->begin();
@@ -288 +288 @@
 
     PropertySlot slot;
-    Identifier& ident = codeBlock->identifiers[id0];
+    Identifier& ident = codeBlock->identifiers[property];
     JSObject* base;
     do {
         base = *iter;
         if (base->getPropertySlot(exec, ident, slot)) {
-            r[r0].u.jsValue = base;
+            r[dst].u.jsValue = base;
             return;
         }
     } while (++iter != end);
 
-    r[r0].u.jsValue = base;
+    r[dst].u.jsValue = base;
 }
 
 static bool NEVER_INLINE resolveBaseAndProperty(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
 {
-    int r0 = (vPC + 1)->u.operand;
-    int r1 = (vPC + 2)->u.operand;
-    int id0 = (vPC + 3)->u.operand;
+    int baseDst = (vPC + 1)->u.operand;
+    int propDst = (vPC + 2)->u.operand;
+    int property = (vPC + 3)->u.operand;
     
     ScopeChainIterator iter = scopeChain->begin();
@@ -315 +315 @@
     
     PropertySlot slot;
-    Identifier& ident = codeBlock->identifiers[id0];
+    Identifier& ident = codeBlock->identifiers[property];
     JSObject* base;
     do {
         base = *iter;
         if (base->getPropertySlot(exec, ident, slot)) {            
-            r[r0].u.jsValue = base;
-            r[r1].u.jsValue = slot.getValue(exec, base, ident);
+            r[baseDst].u.jsValue = base;
+            r[propDst].u.jsValue = slot.getValue(exec, base, ident);
             return true;
         }
@@ -333 +333 @@
 static bool NEVER_INLINE resolveBaseAndFunc(ExecState* exec, Instruction* vPC, Register* r, ScopeChainNode* scopeChain, CodeBlock* codeBlock, JSValue*& exceptionValue)
 {
-    int r0 = (vPC + 1)->u.operand;
-    int r1 = (vPC + 2)->u.operand;
-    int id0 = (vPC + 3)->u.operand;
+    int baseDst = (vPC + 1)->u.operand;
+    int funcDst = (vPC + 2)->u.operand;
+    int property = (vPC + 3)->u.operand;
 
     ScopeChainIterator iter = scopeChain->begin();
@@ -345 +345 @@
     
     PropertySlot slot;
-    Identifier& ident = codeBlock->identifiers[id0];
+    Identifier& ident = codeBlock->identifiers[property];
     JSObject* base;
     do {
@@ -359 +359 @@
             JSObject* thisObj = base->toThisObject(exec);
             
-            r[r0].u.jsValue = thisObj;
-            r[r1].u.jsValue = slot.getValue(exec, base, ident);
+            r[baseDst].u.jsValue = thisObj;
+            r[funcDst].u.jsValue = slot.getValue(exec, base, ident);
             return true;
         }
@@ -1110 +1110 @@
     }
     BEGIN_OPCODE(op_resolve) {
+        /* resolve dst(r) property(id)
+
+           Looks up the property named by identifier property in the
+           scope chain, and writes the resulting value to register
+           dst. If the property is not found, raises an exception.
+        */
+
         if (UNLIKELY(!resolve(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
             goto vm_throw;
@@ -1118 +1125 @@
     }
     BEGIN_OPCODE(op_resolve_base) {
+        /* resolve_base dst(r) property(id)
+
+           Searches the scope chain for an object containing
+           identifier property, and if one is found, writes it to
+           register dst. If none is found, the outermost scope (which
+           will be the global object) is stored in register dst.
+        */
         resolveBase(exec, vPC, r, scopeChain, codeBlock);
         vPC += 3;
@@ -1124 +1138 @@
     }
     BEGIN_OPCODE(op_resolve_base_and_property) {
+        /* resolve_base_and_property baseDst(r) propDst(r) property(id)
+
+           Searches the scope chain for an object containing
+           identifier property, and if one is found, writes it to
+           register srcDst, and the retrieved property value to register
+           propDst. If the property is not found, raises an exception.
+
+           This is more efficient than doing resolve_base followed by
+           resolve, or resolve_base followed by get_prop_id, as it
+           avoids duplicate hash lookups.
+        */
         if (UNLIKELY(!resolveBaseAndProperty(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
             goto vm_throw;
@@ -1132 +1157 @@
     }
     BEGIN_OPCODE(op_resolve_base_and_func) {
+        /* resolve_base_and_func baseDst(r) funcDst(r) property(id)
+
+           Searches the scope chain for an object containing
+           identifier property, and if one is found, writes the
+           appropriate object to use as "this" when calling its
+           properties to register baseDst; and the retrieved property
+           value to register propDst. If the property is not found,
+           raises an exception.
+
+           This differs from resolve_base_and_property, because the
+           global this value will be substituted for activations or
+           the global object, which is the right behavior for function
+           calls but not for other property lookup.
+        */
         if (UNLIKELY(!resolveBaseAndFunc(exec, vPC, r, scopeChain, codeBlock, exceptionValue)))
             goto vm_throw;
@@ -1159 +1198 @@
     }
     BEGIN_OPCODE(op_put_prop_id) {
-        int r0 = (++vPC)->u.operand;
-        int id0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-
-        JSObject* base = r[r0].u.jsValue->toObject(exec);
-        
-        Identifier& ident = codeBlock->identifiers[id0];
-        base->put(exec, ident, r[r1].u.jsValue);
+        /* put_prop_id base(r) property(id) value(r)
+
+           Sets register value on register base as the property named
+           by identifier property. Base is converted to object first.
+ 
+           Unlike many opcodes, this one does not write any output to
+           the register file.
+        */
+
+        int base = (++vPC)->u.operand;
+        int property = (++vPC)->u.operand;
+        int value = (++vPC)->u.operand;
+
+        JSObject* baseObj = r[base].u.jsValue->toObject(exec);
+        
+        Identifier& ident = codeBlock->identifiers[property];
+        baseObj->put(exec, ident, r[value].u.jsValue);
         
         VM_CHECK_EXCEPTION();
@@ -1173 +1221 @@
     }
     BEGIN_OPCODE(op_delete_prop_id) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int id0 = (++vPC)->u.operand;
-
-        JSObject* base = r[r1].u.jsValue->toObject(exec);
-        
-        Identifier& ident = codeBlock->identifiers[id0];
-        r[r0].u.jsValue = jsBoolean(base->deleteProperty(exec, ident));
+        /* delete_prop_id dst(r) base(r) property(id)
+
+           Converts register base to Object, deletes the property
+           named by identifier property from the object, and writes a
+           boolean indicating success (if true) or failure (if false)
+           to register dst.
+        */
+        int dst = (++vPC)->u.operand;
+        int base = (++vPC)->u.operand;
+        int property = (++vPC)->u.operand;
+
+        JSObject* baseObj = r[base].u.jsValue->toObject(exec);
+        
+        Identifier& ident = codeBlock->identifiers[property];
+        r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, ident));
         
         VM_CHECK_EXCEPTION();
@@ -1187 +1242 @@
     }
     BEGIN_OPCODE(op_get_prop_val) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int r2 = (++vPC)->u.operand;
-
-        JSObject* base = r[r1].u.jsValue->toObject(exec); // may throw
-        
-        JSValue* subscript = r[r2].u.jsValue;
+        /* get_prop_val dst(r) base(r) property(r)
+
+           Converts register base to Object, gets the property named
+           by register property from the object, and puts the result
+           in register dst. property is nominally converted to string
+           but numbers are treated more efficiently.
+        */
+        int dst = (++vPC)->u.operand;
+        int base = (++vPC)->u.operand;
+        int property = (++vPC)->u.operand;
+
+        JSObject* baseObj = r[base].u.jsValue->toObject(exec); // may throw
+        
+        JSValue* subscript = r[property].u.jsValue;
 
         uint32_t i;
         if (subscript->getUInt32(i))
-            r[r0].u.jsValue = base->get(exec, i);
+            r[dst].u.jsValue = baseObj->get(exec, i);
         else {
             VM_CHECK_EXCEPTION(); // If toObject threw, we must not call toString, which may execute arbitrary code
-            r[r0].u.jsValue = base->get(exec, Identifier(subscript->toString(exec)));
+            r[dst].u.jsValue = baseObj->get(exec, Identifier(subscript->toString(exec)));
         }
         
@@ -1208 +1270 @@
     }
     BEGIN_OPCODE(op_put_prop_val) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int r2 = (++vPC)->u.operand;
-
-        JSObject* base = r[r0].u.jsValue->toObject(exec);
-        
-        JSValue* subscript = r[r1].u.jsValue;
+        /* put_prop_val base(r) property(r) value(r)
+
+           Sets register value on register base as the property named
+           by register property. Base is converted to object
+           first. register property is nominally converted to string
+           but numbers are treated more efficiently.
+ 
+           Unlike many opcodes, this one does not write any output to
+           the register file.
+        */
+        int base = (++vPC)->u.operand;
+        int property = (++vPC)->u.operand;
+        int value = (++vPC)->u.operand;
+
+        JSObject* baseObj = r[base].u.jsValue->toObject(exec);
+        
+        JSValue* subscript = r[property].u.jsValue;
 
         uint32_t i;
         if (subscript->getUInt32(i))
-            base->put(exec, i, r[r2].u.jsValue);
+            baseObj->put(exec, i, r[value].u.jsValue);
         else {
             VM_CHECK_EXCEPTION(); // If toObject threw, we must not call toString, which may execute arbitrary code
-            base->put(exec, Identifier(subscript->toString(exec)), r[r2].u.jsValue);
+            baseObj->put(exec, Identifier(subscript->toString(exec)), r[value].u.jsValue);
         }
         
@@ -1229 +1301 @@
     }
     BEGIN_OPCODE(op_delete_prop_val) {
-        int r0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-        int r2 = (++vPC)->u.operand;
-
-        JSObject* base = r[r1].u.jsValue->toObject(exec); // may throw
-
-        JSValue* subscript = r[r2].u.jsValue;
+        /* delete_prop_id dst(r) base(r) property(r)
+
+           Converts register base to Object, deletes the property
+           named by register property from the object, and writes a
+           boolean indicating success (if true) or failure (if false)
+           to register dst.
+        */
+        int dst = (++vPC)->u.operand;
+        int base = (++vPC)->u.operand;
+        int property = (++vPC)->u.operand;
+
+        JSObject* baseObj = r[base].u.jsValue->toObject(exec); // may throw
+
+        JSValue* subscript = r[property].u.jsValue;
 
         uint32_t i;
         if (subscript->getUInt32(i))
-            r[r0].u.jsValue = jsBoolean(base->deleteProperty(exec, i));
+            r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, i));
         else {
             VM_CHECK_EXCEPTION(); // This is needed as toString may have side effects
-            r[r0].u.jsValue = jsBoolean(base->deleteProperty(exec, Identifier(subscript->toString(exec))));
+            r[dst].u.jsValue = jsBoolean(baseObj->deleteProperty(exec, Identifier(subscript->toString(exec))));
         }
         
@@ -1250 +1329 @@
     }
     BEGIN_OPCODE(op_put_prop_index) {
-        int r0 = (++vPC)->u.operand;
-        unsigned n0 = (++vPC)->u.operand;
-        int r1 = (++vPC)->u.operand;
-
-        r[r0].u.jsObject->put(exec, n0, r[r1].u.jsValue);
+        /* put_prop_val base(r) property(n) value(r)
+
+           Sets register value on register base as the property named
+           by the immediate number property. Base is converted to
+           object first. register property is nominally converted to
+           string but numbers are treated more efficiently.
+ 
+           Unlike many opcodes, this one does not write any output to
+           the register file.
+
+           This opcode is mainly used to initialize array literals.
+        */
+
+        int base = (++vPC)->u.operand;
+        unsigned property = (++vPC)->u.operand;
+        int value = (++vPC)->u.operand;
+
+        r[base].u.jsObject->put(exec, property, r[value].u.jsValue);
 
         ++vPC;
@@ -1605 +1697 @@
     }
     BEGIN_OPCODE(op_jsr) {
-        /* jsr retAddrDst(r) target(address)
+        /* jsr retAddrDst(r) target(offset)
          
          Places the address of the next instruction into the retAddrDst
-         register and branches to target.
-         */
+         register and jumps to offset target from the current instruction.
+        */
         int retAddrDst = (++vPC)->u.operand;
-        int offset = (++vPC)->u.operand;
+        int target = (++vPC)->u.operand;
         r[retAddrDst].u.vPC = vPC + 1;
-        vPC += offset;
+        vPC += target;
         NEXT_OPCODE;
     }
@@ -1619 +1711 @@
         /* sret retAddrSrc(r)
          
-         Sets the vPC to the address stored in the retAddrSrc register.
-         */
+         Jumps to the address stored in the retAddrSrc register. This
+         differs from op_jmp because the target address is stored in a
+         register, not as an immediate.
+        */
         int retAddrSrc = (++vPC)->u.operand;
         vPC = r[retAddrSrc].u.vPC;

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -603 +603 @@
 RegisterID* ResolveNode::emitCode(CodeGenerator& generator, RegisterID* dst)
 {
-    if (RegisterID* r0 = generator.registerForLocal(m_ident))
-        return generator.moveToDestinationIfNeeded(dst, r0);
+    if (RegisterID* local = generator.registerForLocal(m_i