Changeset 34576 in webkit for trunk/JavaScriptCore/VM/CodeGenerator.cpp

Timestamp:

Jun 15, 2008, 4:59:24 PM (17 years ago)

Author:

[email protected]

Message:

2008-06-15 Maciej Stachowiak <​[email protected]>

Reviewed by Alexey.

• add emitUnaryOp, emitNullaryOp and emitUnaryOpNoDst; use them

This removes some boilerplate code and also reduces the number of
places that will need to be changed to do on-demand emit of
loads (and thus support k operands).

• VM/CodeGenerator.cpp: (KJS::CodeGenerator::emitUnaryOp): (KJS::CodeGenerator::emitNullaryOp): (KJS::CodeGenerator::emitUnaryOpNoDst): (KJS::CodeGenerator::emitPushScope):
• VM/CodeGenerator.h: (KJS::CodeGenerator::emitNewObject): (KJS::CodeGenerator::emitNewArray): (KJS::CodeGenerator::emitNot): (KJS::CodeGenerator::emitBitNot): (KJS::CodeGenerator::emitToJSNumber): (KJS::CodeGenerator::emitNegate): (KJS::CodeGenerator::emitInstanceOf): (KJS::CodeGenerator::emitTypeOf): (KJS::CodeGenerator::emitIn): (KJS::CodeGenerator::emitReturn): (KJS::CodeGenerator::emitEnd): (KJS::CodeGenerator::emitGetPropertyNames):

File:

• trunk/JavaScriptCore/VM/CodeGenerator.cpp (modified) (8 diffs)

trunk/JavaScriptCore/VM/CodeGenerator.cpp

@@ -510 +510 @@
 }
 
-RegisterID* CodeGenerator::emitNot(RegisterID* dst, RegisterID* src)
-{
-    emitOpcode(op_not);
+RegisterID* CodeGenerator::emitUnaryOp(OpcodeID opcode, RegisterID* dst, RegisterID* src)
+{
+    emitOpcode(opcode);
     instructions().append(dst->index());
     instructions().append(src->index());
@@ -548 +548 @@
 }
 
-RegisterID* CodeGenerator::emitToJSNumber(RegisterID* dst, RegisterID* src)
-{
-    emitOpcode(op_to_jsnumber);
-    instructions().append(dst->index());
-    instructions().append(src->index());
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitNegate(RegisterID* dst, RegisterID* src)
-{
-    emitOpcode(op_negate);
-    instructions().append(dst->index());
-    instructions().append(src->index());
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitBitNot(RegisterID* dst, RegisterID* src)
-{
-    emitOpcode(op_bitnot);
-    instructions().append(dst->index());
-    instructions().append(src->index());
-    return dst;
-}
-
 RegisterID* CodeGenerator::emitBinaryOp(OpcodeID opcode, RegisterID* dst, RegisterID* src1, RegisterID* src2)
 {
@@ -581 +557 @@
 }
 
-RegisterID* CodeGenerator::emitInstanceOf(RegisterID* dst, RegisterID* value, RegisterID* base)
-{
-    emitOpcode(op_instanceof);
-    instructions().append(dst->index());
-    instructions().append(value->index());
-    instructions().append(base->index());
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitTypeOf(RegisterID* dst, RegisterID* src)
-{
-    emitOpcode(op_typeof);
-    instructions().append(dst->index());
-    instructions().append(src->index());
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitIn(RegisterID* dst, RegisterID* property, RegisterID* base)
-{
-    emitOpcode(op_in);
-    instructions().append(dst->index());
-    instructions().append(property->index());
-    instructions().append(base->index());
-    return dst;
-}
-
 RegisterID* CodeGenerator::emitLoad(RegisterID* dst, bool b)
 {
@@ -631 +581 @@
 }
 
-RegisterID* CodeGenerator::emitNewObject(RegisterID* dst)
-{
-    emitOpcode(op_new_object);
-    instructions().append(dst->index());
-    return dst;
-}
-
-RegisterID* CodeGenerator::emitNewArray(RegisterID* dst)
-{
-    emitOpcode(op_new_array);
+RegisterID* CodeGenerator::emitNullaryOp(OpcodeID opcode, RegisterID* dst)
+{
+    emitOpcode(opcode);
     instructions().append(dst->index());
     return dst;
@@ -896 +839 @@
 }
 
-RegisterID* CodeGenerator::emitReturn(RegisterID* r0)
-{
-    emitOpcode(op_ret);
-    instructions().append(r0->index());
-    return r0;
-}
-
-RegisterID* CodeGenerator::emitEnd(RegisterID* dst)
-{
-    emitOpcode(op_end);
-    instructions().append(dst->index());
-    return dst;
+RegisterID* CodeGenerator::emitUnaryNoDstOp(OpcodeID opcode, RegisterID* src)
+{
+    emitOpcode(opcode);
+    instructions().append(src->index());
+    return src;
 }
 
@@ -936 +872 @@
 {
     m_codeBlock->needsFullScopeChain = true;
-    emitOpcode(op_push_scope);
-    instructions().append(scope->index());
-
     ControlFlowContext context;
     context.isFinallyBlock = false;
     m_scopeContextStack.append(context);
     m_dynamicScopeDepth++;
-    return scope;
+
+    return emitUnaryNoDstOp(op_push_scope, scope);
 }
 
@@ -1118 +1052 @@
 }
 
-RegisterID* CodeGenerator::emitGetPropertyNames(RegisterID* dst, RegisterID* base)
-{
-    emitOpcode(op_get_pnames);
-    instructions().append(dst->index());
-    instructions().append(base->index());
-    return dst;
-}
-
 RegisterID* CodeGenerator::emitCatch(RegisterID* targetRegister, LabelID* start, LabelID* end)
 {
@@ -1135 +1061 @@
 }
 
-void CodeGenerator::emitThrow(RegisterID* exception)
-{
-    emitOpcode(op_throw);
-    instructions().append(exception->index());
-}
-
 RegisterID* CodeGenerator::emitNewError(RegisterID* dst, ErrorType type, JSValue* message)
 {