Changeset 43276 in webkit for trunk/JavaScriptCore/jit

Timestamp:

May 5, 2009, 9:50:19 PM (16 years ago)

Author:

[email protected]

Message:

2009-05-05 Geoffrey Garen <​[email protected]>

Reviewed by Maciej Stachowiak.

Simplified a bit of codegen.

• jit/JIT.cpp: (JSC::JIT::privateCompileMainPass):

File:

• trunk/JavaScriptCore/jit/JIT.cpp (modified) (12 diffs)

trunk/JavaScriptCore/jit/JIT.cpp

@@ -110 +110 @@
     break;
 
-#define CTI_COMPILE_BINARY_OP(name) \
+#define DEFINE_BINARY_OP(name) \
     case name: { \
         emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2); \
@@ -119 +119 @@
     }
 
-#define CTI_COMPILE_UNARY_OP(name) \
+#define DEFINE_UNARY_OP(name) \
     case name: { \
         emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2); \
@@ -154 +154 @@
 
         switch (opcodeID) {
+        DEFINE_BINARY_OP(op_del_by_val)
+        DEFINE_BINARY_OP(op_div)
+        DEFINE_BINARY_OP(op_in)
+        DEFINE_BINARY_OP(op_less)
+        DEFINE_BINARY_OP(op_lesseq)
+        DEFINE_BINARY_OP(op_urshift)
+        DEFINE_UNARY_OP(op_get_pnames)
+        DEFINE_UNARY_OP(op_is_boolean)
+        DEFINE_UNARY_OP(op_is_function)
+        DEFINE_UNARY_OP(op_is_number)
+        DEFINE_UNARY_OP(op_is_object)
+        DEFINE_UNARY_OP(op_is_string)
+        DEFINE_UNARY_OP(op_is_undefined)
+        DEFINE_UNARY_OP(op_negate)
+        DEFINE_UNARY_OP(op_typeof)
         case op_mov: {
             int src = currentInstruction[2].u.operand;
@@ -515 +530 @@
             NEXT_OPCODE(op_put_by_val);
         }
-        CTI_COMPILE_BINARY_OP(op_lesseq)
         case op_loop_if_true: {
             emitTimeoutCheck();
@@ -537 +551 @@
             emitPutVirtualRegister(currentInstruction[1].u.operand);
             NEXT_OPCODE(op_resolve_base);
-        }
-        case op_negate: {
-            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2);
-            emitCTICall(JITStubs::cti_op_negate);
-            emitPutVirtualRegister(currentInstruction[1].u.operand);
-            NEXT_OPCODE(op_negate);
         }
         case op_resolve_skip: {
@@ -583 +591 @@
             NEXT_OPCODE(op_resolve_global);
         }
-        CTI_COMPILE_BINARY_OP(op_div)
         case op_pre_dec: {
             compileFastArith_op_pre_dec(currentInstruction[1].u.operand);
@@ -775 +782 @@
             NEXT_OPCODE(op_jtrue);
         }
-        CTI_COMPILE_BINARY_OP(op_less)
         case op_neq: {
             emitGetVirtualRegisters(currentInstruction[2].u.operand, regT0, currentInstruction[3].u.operand, regT1);
@@ -790 +796 @@
             NEXT_OPCODE(op_post_dec);
         }
-        CTI_COMPILE_BINARY_OP(op_urshift)
         case op_bitxor: {
             emitGetVirtualRegisters(currentInstruction[2].u.operand, regT0, currentInstruction[3].u.operand, regT1);
@@ -836 +841 @@
             NEXT_OPCODE(op_throw);
         }
-        case op_get_pnames: {
-            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2);
-            emitCTICall(JITStubs::cti_op_get_pnames);
-            emitPutVirtualRegister(currentInstruction[1].u.operand);
-            NEXT_OPCODE(op_get_pnames);
-        }
         case op_next_pname: {
             emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2);
@@ -862 +861 @@
             NEXT_OPCODE(op_pop_scope);
         }
-        CTI_COMPILE_UNARY_OP(op_typeof)
-        CTI_COMPILE_UNARY_OP(op_is_undefined)
-        CTI_COMPILE_UNARY_OP(op_is_boolean)
-        CTI_COMPILE_UNARY_OP(op_is_number)
-        CTI_COMPILE_UNARY_OP(op_is_string)
-        CTI_COMPILE_UNARY_OP(op_is_object)
-        CTI_COMPILE_UNARY_OP(op_is_function)
         case op_stricteq: {
             compileOpStrictEq(currentInstruction, OpStrictEq);
@@ -892 +884 @@
             NEXT_OPCODE(op_to_jsnumber);
         }
-        CTI_COMPILE_BINARY_OP(op_in)
         case op_push_new_scope: {
             Identifier* ident = &(m_codeBlock->identifier(currentInstruction[2].u.operand));
@@ -968 +959 @@
             jump(regT0);
             NEXT_OPCODE(op_switch_string);
-        }
-        case op_del_by_val: {
-            emitPutJITStubArgFromVirtualRegister(currentInstruction[2].u.operand, 1, regT2);
-            emitPutJITStubArgFromVirtualRegister(currentInstruction[3].u.operand, 2, regT2);
-            emitCTICall(JITStubs::cti_op_del_by_val);
-            emitPutVirtualRegister(currentInstruction[1].u.operand);
-            NEXT_OPCODE(op_del_by_val);
         }
         case op_put_getter: {