Changeset 33326

Timestamp:

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

Author:

mrowe@apple.com

Message:

Bug 18864: SquirrelFish: Support getter and setter definition in object literals
<https://bugs.webkit.org/show_bug.cgi?id=18864>

Reviewed by Maciej

Add new opcodes to allow us to add getters and setters to an object. These are
only used by the codegen for object literals.

Location:

branches/squirrelfish/JavaScriptCore

Files:

• ChangeLog (modified) (1 diff)
• VM/CodeGenerator.cpp (modified) (1 diff)
• VM/CodeGenerator.h (modified) (1 diff)
• VM/Machine.cpp (modified) (1 diff)
• VM/Opcode.h (modified) (1 diff)
• kjs/nodes.cpp (modified) (1 diff)

branches/squirrelfish/JavaScriptCore/ChangeLog

@@ +1 @@
+2008-05-03  Oliver Hunt  <oliver@apple.com>
+
+        Reviewed by Maciej.
+
+        Bug 18864: SquirrelFish: Support getter and setter definition in object literals
+        <https://bugs.webkit.org/show_bug.cgi?id=18864>
+
+        Add new opcodes to allow us to add getters and setters to an object.  These are
+        only used by the codegen for object literals.
+
+        * VM/CodeGenerator.cpp:
+        (KJS::CodeGenerator::emitPutGetter):
+        (KJS::CodeGenerator::emitPutSetter):
+        * VM/CodeGenerator.h:
+        * VM/Machine.cpp:
+        (KJS::Machine::privateExecute):
+        * VM/Opcode.h:
+        * kjs/nodes.cpp:
+        (KJS::PropertyListNode::emitCode):
+
 2008-05-02  Maciej Stachowiak  <mjs@apple.com>
 

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.cpp

@@ -752 +752 @@
 }
 
+RegisterID* CodeGenerator::emitPutGetter(RegisterID* base, const Identifier& property, RegisterID* value)
+{
+    instructions().append(machine().getOpcode(op_put_getter));
+    instructions().append(base->index());
+    instructions().append(addConstant(property));
+    instructions().append(value->index());
+    return value;
+}
+
+RegisterID* CodeGenerator::emitPutSetter(RegisterID* base, const Identifier& property, RegisterID* value)
+{
+    instructions().append(machine().getOpcode(op_put_setter));
+    instructions().append(base->index());
+    instructions().append(addConstant(property));
+    instructions().append(value->index());
+    return value;
+}
+
 RegisterID* CodeGenerator::emitDeletePropId(RegisterID* dst, RegisterID* base, const Identifier& property)
 {

branches/squirrelfish/JavaScriptCore/VM/CodeGenerator.h

@@ -202 +202 @@
         RegisterID* emitDeletePropVal(RegisterID* dst, RegisterID* base, RegisterID* property);
         RegisterID* emitPutPropIndex(RegisterID* base, unsigned index, RegisterID* value);
+        RegisterID* emitPutGetter(RegisterID* base, const Identifier& property, RegisterID* value);
+        RegisterID* emitPutSetter(RegisterID* base, const Identifier& property, RegisterID* value);
 
         RegisterID* emitCall(RegisterID*, RegisterID*, RegisterID*, ArgumentsNode*);

branches/squirrelfish/JavaScriptCore/VM/Machine.cpp

@@ -1709 +1709 @@
         return r[r0].u.jsValue;
     }
+    BEGIN_OPCODE(op_put_getter) {
+        /* put_getter base(r) property(id) function(r)
+         
+           Sets register function on register base as the getter named
+           by identifier property. Base and function are assumed to be
+           objects as this op should only be used for getters defined
+           in object literal form.
+         
+           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 function = (++vPC)->u.operand;
+        
+        ASSERT(r[base].u.jsValue->isObject());
+        JSObject* baseObj = static_cast<JSObject*>(r[base].u.jsValue);
+        Identifier& ident = codeBlock->identifiers[property];
+        ASSERT(r[function].u.jsValue->isObject());
+        baseObj->defineGetter(exec, ident, static_cast<JSObject* >(r[function].u.jsValue));
+
+        ++vPC;
+        NEXT_OPCODE;
+    }
+    BEGIN_OPCODE(op_put_setter) {
+        /* put_setter base(r) property(id) function(r)
+         
+         Sets register function on register base as the setter named
+         by identifier property. Base and function are assumed to be
+         objects as this op should only be used for setters defined
+         in object literal form.
+         
+         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 function = (++vPC)->u.operand;
+        
+        ASSERT(r[base].u.jsValue->isObject());
+        JSObject* baseObj = static_cast<JSObject*>(r[base].u.jsValue);
+        Identifier& ident = codeBlock->identifiers[property];
+        ASSERT(r[function].u.jsValue->isObject());
+        baseObj->defineSetter(exec, ident, static_cast<JSObject* >(r[function].u.jsValue));
+        
+        ++vPC;
+        NEXT_OPCODE;
+    }
     BEGIN_OPCODE(op_jsr) {
         /* jsr retAddrDst(r) target(offset)

branches/squirrelfish/JavaScriptCore/VM/Opcode.h

@@ -87 +87 @@
         macro(op_delete_prop_val) \
         macro(op_put_prop_index) \
+        macro(op_put_getter) \
+        macro(op_put_setter) \
         \
         macro(op_jmp) \

branches/squirrelfish/JavaScriptCore/kjs/nodes.cpp

@@ -963 +963 @@
                 break;
             }
-            // FIXME: No support for getters and setters yet, as it caused a performance regression
+            case PropertyNode::Getter: {
+                generator.emitPutGetter(newObj.get(), p->m_node->name(), value);
+                break;
+            }
+            case PropertyNode::Setter: {
+                generator.emitPutSetter(newObj.get(), p->m_node->name(), value);
+                break;
+            }
             default:
                 ASSERT_NOT_REACHED();