Avoid code dupliction

diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h
index d7901698b0870fa759d41a541d19251094b8fdf2..65f492cb4fc7ac910f97eabc0fd102518ad19f51 100644 (file)
--- a/Zend/zend_vm_execute.h
+++ b/Zend/zend_vm_execute.h
@@ -61841,7 +61841,7 @@ ZEND_API int zend_vm_kind(void)
        return ZEND_VM_KIND;
 }
 
-static const void* ZEND_FASTCALL zend_vm_get_opcode_handler_ex(uint32_t spec, const zend_op* op)
+static const uint32_t ZEND_FASTCALL zend_vm_get_opcode_handler_idx(uint32_t spec, const zend_op* op)
 {
        static const int zend_vm_decode[] = {
                _UNUSED_CODE, /* 0 = IS_UNUSED  */
@@ -61875,13 +61875,13 @@ static const void* ZEND_FASTCALL zend_vm_get_opcode_handler_ex(uint32_t spec, co
                        }
                }
        }
-       return zend_opcode_handlers[(spec & SPEC_START_MASK) + offset];
+       return (spec & SPEC_START_MASK) + offset;
 }
 
 #if (ZEND_VM_KIND != ZEND_VM_KIND_HYBRID) || !ZEND_VM_SPEC
 static const void *zend_vm_get_opcode_handler(zend_uchar opcode, const zend_op* op)
 {
-       return zend_vm_get_opcode_handler_ex(zend_spec_handlers[opcode], op);
+       return zend_opcode_handlers[zend_vm_get_opcode_handler_idx(zend_spec_handlers[opcode], op)];
 }
 #endif
 
@@ -61889,35 +61889,7 @@ static const void *zend_vm_get_opcode_handler(zend_uchar opcode, const zend_op*
 static const void *zend_vm_get_opcode_handler_func(zend_uchar opcode, const zend_op* op)
 {
        uint32_t spec = zend_spec_handlers[opcode];
-       static const int zend_vm_decode[] = {
-               _UNUSED_CODE, /* 0 = IS_UNUSED  */
-               _CONST_CODE,  /* 1 = IS_CONST   */
-               _TMP_CODE,    /* 2 = IS_TMP_VAR */
-               _UNUSED_CODE, /* 3              */
-               _VAR_CODE,    /* 4 = IS_VAR     */
-               _UNUSED_CODE, /* 5              */
-               _UNUSED_CODE, /* 6              */
-               _UNUSED_CODE, /* 7              */
-               _CV_CODE      /* 8 = IS_CV      */
-       };
-       uint32_t offset = 0;
-       if (spec & SPEC_RULE_OP1) offset = offset * 5 + zend_vm_decode[op->op1_type];
-       if (spec & SPEC_RULE_OP2) offset = offset * 5 + zend_vm_decode[op->op2_type];
-       if (spec & SPEC_EXTRA_MASK) {
-               if (spec & SPEC_RULE_OP_DATA) offset = offset * 5 + zend_vm_decode[(op + 1)->op1_type];
-               else if (spec & SPEC_RULE_RETVAL) offset = offset * 2 + (op->result_type != IS_UNUSED);
-               else if (spec & SPEC_RULE_QUICK_ARG) offset = offset * 2 + (op->op2.num <= MAX_ARG_FLAG_NUM);
-               else if (spec & SPEC_RULE_SMART_BRANCH) {
-                       offset = offset * 3;
-                       if ((op+1)->opcode == ZEND_JMPZ) {
-                               offset += 1;
-                       } else if ((op+1)->opcode == ZEND_JMPNZ) {
-                               offset += 2;
-                       }
-               }
-               else if (spec & SPEC_RULE_ISSET) offset = offset * 2 + (op->extended_value & ZEND_ISEMPTY);
-       }
-       return zend_opcode_handler_funcs[(spec & SPEC_START_MASK) + offset];
+       return zend_opcode_handler_funcs[zend_vm_get_opcode_handler_idx(spec, op)];
 }
 
 #endif
@@ -61931,7 +61903,7 @@ ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler(zend_op* op)
                        zend_swap_operands(op);
                }
        }
-       op->handler = zend_vm_get_opcode_handler_ex(zend_spec_handlers[opcode], op);
+       op->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(zend_spec_handlers[opcode], op)];
 }
 
 ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint32_t op2_info, uint32_t res_info)
@@ -62158,7 +62130,7 @@ ZEND_API void ZEND_FASTCALL zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t
                default:
                        break;
        }
-       op->handler = zend_vm_get_opcode_handler_ex(spec, op);
+       op->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(spec, op)];
 }
 
 ZEND_API int ZEND_FASTCALL zend_vm_call_opcode_handler(zend_execute_data* ex)

diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php
index 24df28f586b949ecf5ab369b1f98ebb15091dfed..3ba85b1cb8102ed157d8a7785595d38b4635b0e9 100755 (executable)
--- a/Zend/zend_vm_gen.php
+++ b/Zend/zend_vm_gen.php
@@ -2694,10 +2694,10 @@ function gen_vm($def, $skel) {
        out($f, "\n");
 
        // Generate zend_vm_get_opcode_handler() function
-       out($f, "static const void* ZEND_FASTCALL zend_vm_get_opcode_handler_ex(uint32_t spec, const zend_op* op)\n");
+       out($f, "static const uint32_t ZEND_FASTCALL zend_vm_get_opcode_handler_idx(uint32_t spec, const zend_op* op)\n");
        out($f, "{\n");
        if (!ZEND_VM_SPEC) {
-               out($f, "\treturn zend_opcode_handlers[spec];\n");
+               out($f, "\treturn spec;\n");
        } else {
                out($f, "\tstatic const int zend_vm_decode[] = {\n");
                out($f, "\t\t_UNUSED_CODE, /* 0 = IS_UNUSED  */\n");
@@ -2758,16 +2758,16 @@ function gen_vm($def, $skel) {
                        }
                        out($f, "\t}\n");
                }
-               out($f, "\treturn zend_opcode_handlers[(spec & SPEC_START_MASK) + offset];\n");
+               out($f, "\treturn (spec & SPEC_START_MASK) + offset;\n");
        }
        out($f, "}\n\n");
        out($f, "#if (ZEND_VM_KIND != ZEND_VM_KIND_HYBRID) || !ZEND_VM_SPEC\n");
        out($f, "static const void *zend_vm_get_opcode_handler(zend_uchar opcode, const zend_op* op)\n");
        out($f, "{\n");
        if (!ZEND_VM_SPEC) {
-               out($f, "\treturn zend_vm_get_opcode_handler_ex(opcode, op);\n");
+               out($f, "\treturn zend_opcode_handlers[zend_vm_get_opcode_handler_idx(opcode, op)];\n");
        } else {
-               out($f, "\treturn zend_vm_get_opcode_handler_ex(zend_spec_handlers[opcode], op);\n");
+               out($f, "\treturn zend_opcode_handlers[zend_vm_get_opcode_handler_idx(zend_spec_handlers[opcode], op)];\n");
        }
        out($f, "}\n");
        out($f, "#endif\n\n");
@@ -2777,65 +2777,11 @@ function gen_vm($def, $skel) {
                out($f, "#if ZEND_VM_KIND == ZEND_VM_KIND_HYBRID\n");
                out($f,"static const void *zend_vm_get_opcode_handler_func(zend_uchar opcode, const zend_op* op)\n");
                out($f, "{\n");
-                       out($f, "\tuint32_t spec = zend_spec_handlers[opcode];\n");
+               out($f, "\tuint32_t spec = zend_spec_handlers[opcode];\n");
                if (!ZEND_VM_SPEC) {
                        out($f, "\treturn zend_opcode_handler_funcs[spec];\n");
                } else {
-                       out($f, "\tstatic const int zend_vm_decode[] = {\n");
-                       out($f, "\t\t_UNUSED_CODE, /* 0 = IS_UNUSED  */\n");
-                       out($f, "\t\t_CONST_CODE,  /* 1 = IS_CONST   */\n");
-                       out($f, "\t\t_TMP_CODE,    /* 2 = IS_TMP_VAR */\n");
-                       out($f, "\t\t_UNUSED_CODE, /* 3              */\n");
-                       out($f, "\t\t_VAR_CODE,    /* 4 = IS_VAR     */\n");
-                       out($f, "\t\t_UNUSED_CODE, /* 5              */\n");
-                       out($f, "\t\t_UNUSED_CODE, /* 6              */\n");
-                       out($f, "\t\t_UNUSED_CODE, /* 7              */\n");
-                       out($f, "\t\t_CV_CODE      /* 8 = IS_CV      */\n");
-                       out($f, "\t};\n");
-                       out($f, "\tuint32_t offset = 0;\n");
-                       out($f, "\tif (spec & SPEC_RULE_OP1) offset = offset * 5 + zend_vm_decode[op->op1_type];\n");
-                       out($f, "\tif (spec & SPEC_RULE_OP2) offset = offset * 5 + zend_vm_decode[op->op2_type];\n");
-
-                       if (isset($used_extra_spec["OP_DATA"]) ||
-                           isset($used_extra_spec["RETVAL"]) ||
-                           isset($used_extra_spec["QUICK_ARG"]) ||
-                           isset($used_extra_spec["SMART_BRANCH"]) ||
-                           isset($used_extra_spec["ISSET"])) {
-
-                               $else = "";
-                               out($f, "\tif (spec & SPEC_EXTRA_MASK) {\n");
-
-                               if (isset($used_extra_spec["OP_DATA"])) {
-                                       out($f, "\t\t{$else}if (spec & SPEC_RULE_OP_DATA) offset = offset * 5 + zend_vm_decode[(op + 1)->op1_type];\n");
-                                       $else = "else ";
-                               }
-                               if (isset($used_extra_spec["RETVAL"])) {
-                                       out($f, "\t\t{$else}if (spec & SPEC_RULE_RETVAL) offset = offset * 2 + (op->result_type != IS_UNUSED);\n");
-                                       $else = "else ";
-                               }
-                               if (isset($used_extra_spec["QUICK_ARG"])) {
-                                       out($f, "\t\t{$else}if (spec & SPEC_RULE_QUICK_ARG) offset = offset * 2 + (op->op2.num <= MAX_ARG_FLAG_NUM);\n");
-                                       $else = "else ";
-                               }
-                               if (isset($used_extra_spec["SMART_BRANCH"])) {
-                                       out($f, "\t\t{$else}if (spec & SPEC_RULE_SMART_BRANCH) {\n");
-                                       out($f, "\t\t\toffset = offset * 3;\n");
-                                       out($f, "\t\t\tif ((op+1)->opcode == ZEND_JMPZ) {\n");
-                                       out($f, "\t\t\t\toffset += 1;\n");
-                                       out($f, "\t\t\t} else if ((op+1)->opcode == ZEND_JMPNZ) {\n");
-                                       out($f, "\t\t\t\toffset += 2;\n");
-                                       out($f, "\t\t\t}\n");
-                                       out($f, "\t\t}\n");
-                                       $else = "else ";
-                               }
-                               if (isset($used_extra_spec["ISSET"])) {
-                                       out($f, "\t\t{$else}if (spec & SPEC_RULE_ISSET) offset = offset * 2 + (op->extended_value & ZEND_ISEMPTY);\n");
-                                       $else = "else ";
-                               }
-                               out($f, "\t}\n");
-               }
-
-                       out($f, "\treturn zend_opcode_handler_funcs[(spec & SPEC_START_MASK) + offset];\n");
+                       out($f, "\treturn zend_opcode_handler_funcs[zend_vm_get_opcode_handler_idx(spec, op)];\n");
                }
                out($f, "}\n\n");
                out($f, "#endif\n\n");
@@ -2846,7 +2792,7 @@ function gen_vm($def, $skel) {
        out($f, "{\n");
        out($f, "\tzend_uchar opcode = zend_user_opcodes[op->opcode];\n");
        if (!ZEND_VM_SPEC) {
-               out($f, "\top->handler = zend_vm_get_opcode_handler(opcode, op);\n");
+               out($f, "\top->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(opcode, op)];\n");
        } else {
                out($f, "\n");
                out($f, "\tif (zend_spec_handlers[op->opcode] & SPEC_RULE_COMMUTATIVE) {\n");
@@ -2854,7 +2800,7 @@ function gen_vm($def, $skel) {
                out($f, "\t\t\tzend_swap_operands(op);\n");
                out($f, "\t\t}\n");
                out($f, "\t}\n");
-               out($f, "\top->handler = zend_vm_get_opcode_handler_ex(zend_spec_handlers[opcode], op);\n");
+               out($f, "\top->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(zend_spec_handlers[opcode], op)];\n");
        }
        out($f, "}\n\n");
 
@@ -2863,7 +2809,7 @@ function gen_vm($def, $skel) {
        out($f, "{\n");
        out($f, "\tzend_uchar opcode = zend_user_opcodes[op->opcode];\n");
        if (!ZEND_VM_SPEC) {
-               out($f, "\top->handler = zend_vm_get_opcode_handler_ex(opcode, op);\n");
+               out($f, "\top->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(opcode, op)];\n");
        } else {
                out($f, "\tuint32_t spec = zend_spec_handlers[opcode];\n");
                if (isset($used_extra_spec["TYPE"])) {
@@ -2932,7 +2878,7 @@ function gen_vm($def, $skel) {
                        out($f, "\t\t\tbreak;\n");
                        out($f, "\t}\n");
                }
-               out($f, "\top->handler = zend_vm_get_opcode_handler_ex(spec, op);\n");
+               out($f, "\top->handler = zend_opcode_handlers[zend_vm_get_opcode_handler_idx(spec, op)];\n");
        }
        out($f, "}\n\n");