mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-12-17 05:50:14 +08:00
Code Issues Packages Projects Releases Wiki Activity
9d7544aa1c
php-src/Zend/zend_vm_gen.php

2856 lines
103 KiB
PHP
Raw Normal View History

- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
<?php
$id:$ tatgs are removed from generated files to avoid committing of Zend/zend_vm_opcodes.h without real changes.
2005-10-28 14:05:57 +08:00
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
year++
2018-01-02 12:57:58 +08:00
| Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
$id:$ tatgs are removed from generated files to avoid committing of Zend/zend_vm_opcodes.h without real changes.
2005-10-28 14:05:57 +08:00
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Dmitry Stogov <dmitry@zend.com> |
+----------------------------------------------------------------------+
$Id$
*/
- Added missing header sections.
2005-01-10 22:57:36 +08:00
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
const HEADER_TEXT = <<< DATA
- Added missing header sections.
2005-01-10 22:57:36 +08:00
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
year++
2018-01-02 12:57:58 +08:00
| Copyright (c) 1998-2018 Zend Technologies Ltd. (http://www.zend.com) |
- Added missing header sections.
2005-01-10 22:57:36 +08:00
+----------------------------------------------------------------------+
| This source file is subject to version 2.00 of the Zend license, |
| that is bundled with this package in the file LICENSE, and is |
| available through the world-wide-web at the following url: |
| http://www.zend.com/license/2_00.txt. |
| If you did not receive a copy of the Zend license and are unable to |
| obtain it through the world-wide-web, please send a note to |
| license@zend.com so we can mail you a copy immediately. |
+----------------------------------------------------------------------+
| Authors: Andi Gutmans <andi@zend.com> |
$id:$ tatgs are removed from generated files to avoid committing of Zend/zend_vm_opcodes.h without real changes.
2005-10-28 14:05:57 +08:00
| Zeev Suraski <zeev@zend.com> |
| Dmitry Stogov <dmitry@zend.com> |
- Added missing header sections.
2005-01-10 22:57:36 +08:00
+----------------------------------------------------------------------+
*/
DATA;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
/*
This script creates zend_vm_execute.h and zend_vm_opcodes.h
from existing zend_vm_def.h and zend_vm_execute.skl
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
*/
error_reporting(E_ALL);
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
const ZEND_VM_KIND_CALL = 1;
const ZEND_VM_KIND_SWITCH = 2;
const ZEND_VM_KIND_GOTO = 3;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
const ZEND_VM_KIND_HYBRID = 4;
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
$vm_op_flags = array(
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
"ZEND_VM_OP_SPEC" => 1<<0,
"ZEND_VM_OP_CONST" => 1<<1,
"ZEND_VM_OP_TMPVAR" => 1<<2,
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ZEND_VM_OP_TMPVARCV" => 1<<3,
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
"ZEND_VM_OP_MASK" => 0xf0,
"ZEND_VM_OP_NUM" => 0x10,
"ZEND_VM_OP_JMP_ADDR" => 0x20,
"ZEND_VM_OP_TRY_CATCH" => 0x30,
"ZEND_VM_OP_LIVE_RANGE" => 0x40,
"ZEND_VM_OP_THIS" => 0x50,
"ZEND_VM_OP_NEXT" => 0x60,
"ZEND_VM_OP_CLASS_FETCH" => 0x70,
"ZEND_VM_OP_CONSTRUCTOR" => 0x80,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
Use more compact description encoding schema to free some bits
2015-12-11 06:45:26 +08:00
"ZEND_VM_EXT_VAR_FETCH" => 1<<16,
"ZEND_VM_EXT_ISSET" => 1<<17,
"ZEND_VM_EXT_ARG_NUM" => 1<<18,
"ZEND_VM_EXT_ARRAY_INIT" => 1<<19,
"ZEND_VM_EXT_REF" => 1<<20,
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
"ZEND_VM_EXT_MASK" => 0x0f000000,
Use more compact description encoding schema to free some bits
2015-12-11 06:45:26 +08:00
"ZEND_VM_EXT_NUM" => 0x01000000,
Remove uses of VARs in extended_value The DECLARE_(ANON_)INHERITED_CLASS(_DELAYED) opcodes were referencing the parent ce VAR through extended_value. This is hacky and we can't track the def-use chain in SSA. To avoid this, the layout of declaration opcodes is changed as follows: op1 points to the lcname and rtd_key literals, in that order. (For anon/lambda declarations only one of lcname or rtd_key is present.) This frees up op2, which is now used to reference the parent ce VAR in inheriting declarations. The jmp offset for anon class declarations is moved frop op2 to extended_value. The changes were applied both to class and function declarations to keep everything symmetric.
2015-12-20 20:42:26 +08:00
// unused 0x2000000
Use more compact description encoding schema to free some bits
2015-12-11 06:45:26 +08:00
"ZEND_VM_EXT_JMP_ADDR" => 0x03000000,
"ZEND_VM_EXT_DIM_OBJ" => 0x04000000,
"ZEND_VM_EXT_CLASS_FETCH" => 0x05000000,
"ZEND_VM_EXT_CONST_FETCH" => 0x06000000,
"ZEND_VM_EXT_TYPE" => 0x07000000,
"ZEND_VM_EXT_EVAL" => 0x08000000,
TYPE_CHECK instruction changed. Now it keeps in extended_value a type mask. This makes check for "boolean" cheaper and allows check combination e.g. (is_string($a) || is_null($a))
2017-11-23 20:58:34 +08:00
"ZEND_VM_EXT_TYPE_MASK" => 0x09000000,
Fixed bug #72213 (Finally leaks on nested exceptions). Squashed commit of the following: commit 8461b0407fc9eab0869d43b84e6a92ba2fe06997 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed May 25 00:34:42 2016 +0300 Rmoved zend_try_catch_element.parent and walk through op_array.try_catch_array backward from the current try_cacth_offset. commit 0c71e249649bed178bfbef30bb3e63c57f07af05 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed May 25 00:04:53 2016 +0300 Move SAVE_OPLINE() to its original place commit 111432a4df738fcd65878a42f23194dc3c4983a2 Author: Dmitry Stogov <dmitry@zend.com> Date: Wed May 25 00:01:10 2016 +0300 Separate the common part of ZEND_HANDLE_EXCEPTION and FAST_RET into zend_dispatch_try_catch_finally_helper. commit 4f21c06c2ec17819a708bc037f318784554a6ecd Author: Nikita Popov <nikic@php.net> Date: Tue May 24 14:55:27 2016 +0200 Improve finally fix commit da5c7274997b8308e682b5bf280124e3a1483086 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue May 24 10:36:08 2016 +0300 Fixed Zend/tests/try/bug70228_3.phpt and Zend/tests/try/bug70228_4.phpt commit cfcedf2fb4f4fc1f7de9f7d53a3037fed7795f19 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue May 24 02:59:27 2016 +0300 Added test commit 4c6aa93d43da941eb4fda15b48154bfb104bdc04 Author: Dmitry Stogov <dmitry@zend.com> Date: Tue May 24 00:38:20 2016 +0300 Added tests commit 8a8f4704b0eca2e460d42c1f253a363b0db8e510 Author: Dmitry Stogov <dmitry@zend.com> Date: Mon May 23 23:27:34 2016 +0300 Fixed bug #72213 (Finally leaks on nested exceptions)
2016-05-25 06:25:12 +08:00
// unused 0x0a000000,
Use more compact description encoding schema to free some bits
2015-12-11 06:45:26 +08:00
"ZEND_VM_EXT_SRC" => 0x0b000000,
Split ZEND_SEND_VAR_NO_REF into ZEND_SEND_VAR_NO_REF and ZEND_SEND_VAR_NO_REF_EX (similar to ZEND_SEND_VAL) and remove ZEND_ARG_* flags.
2016-05-31 09:06:00 +08:00
// unused 0x0c000000,
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
"ZEND_VM_NO_CONST_CONST" => 0x40000000,
"ZEND_VM_COMMUTATIVE" => 0x80000000,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
);
foreach ($vm_op_flags as $name => $val) {
define($name, $val);
}
$vm_op_decode = array(
"ANY" => 0,
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
"CONST" => ZEND_VM_OP_SPEC | ZEND_VM_OP_CONST,
"TMP" => ZEND_VM_OP_SPEC,
"VAR" => ZEND_VM_OP_SPEC,
"UNUSED" => ZEND_VM_OP_SPEC,
"CV" => ZEND_VM_OP_SPEC,
"TMPVAR" => ZEND_VM_OP_SPEC | ZEND_VM_OP_TMPVAR,
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => ZEND_VM_OP_SPEC | ZEND_VM_OP_TMPVARCV,
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
"NUM" => ZEND_VM_OP_NUM,
"JMP_ADDR" => ZEND_VM_OP_JMP_ADDR,
"TRY_CATCH" => ZEND_VM_OP_TRY_CATCH,
"LIVE_RANGE" => ZEND_VM_OP_LIVE_RANGE,
"THIS" => ZEND_VM_OP_THIS,
"NEXT" => ZEND_VM_OP_NEXT,
"CLASS_FETCH" => ZEND_VM_OP_CLASS_FETCH,
"CONSTRUCTOR" => ZEND_VM_OP_CONSTRUCTOR,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
);
$vm_ext_decode = array(
"NUM" => ZEND_VM_EXT_NUM,
Changed ZEND_CLONE->extended_value meaning to relative offset (previously it was absolute opline number)
2015-10-30 19:53:53 +08:00
"JMP_ADDR" => ZEND_VM_EXT_JMP_ADDR,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
"DIM_OBJ" => ZEND_VM_EXT_DIM_OBJ,
"CLASS_FETCH" => ZEND_VM_EXT_CLASS_FETCH,
"CONST_FETCH" => ZEND_VM_EXT_CONST_FETCH,
"VAR_FETCH" => ZEND_VM_EXT_VAR_FETCH,
"ARRAY_INIT" => ZEND_VM_EXT_ARRAY_INIT,
"TYPE" => ZEND_VM_EXT_TYPE,
"EVAL" => ZEND_VM_EXT_EVAL,
TYPE_CHECK instruction changed. Now it keeps in extended_value a type mask. This makes check for "boolean" cheaper and allows check combination e.g. (is_string($a) || is_null($a))
2017-11-23 20:58:34 +08:00
"TYPE_MASK" => ZEND_VM_EXT_TYPE_MASK,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
"ISSET" => ZEND_VM_EXT_ISSET,
Improve Optimizer debugging facility (print the meaning of extended_value)
2015-12-11 05:47:02 +08:00
"ARG_NUM" => ZEND_VM_EXT_ARG_NUM,
"REF" => ZEND_VM_EXT_REF,
"SRC" => ZEND_VM_EXT_SRC,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
);
Exposed ZEND_VM_KIND etc
2015-03-16 17:00:04 +08:00
$vm_kind_name = array(
ZEND_VM_KIND_CALL => "ZEND_VM_KIND_CALL",
ZEND_VM_KIND_SWITCH => "ZEND_VM_KIND_SWITCH",
ZEND_VM_KIND_GOTO => "ZEND_VM_KIND_GOTO",
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
ZEND_VM_KIND_HYBRID => "ZEND_VM_KIND_HYBRID",
Exposed ZEND_VM_KIND etc
2015-03-16 17:00:04 +08:00
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$op_types = array(
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"ANY",
"CONST",
"TMP",
"VAR",
"UNUSED",
"CV"
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
$op_types_ex = array(
"ANY",
"CONST",
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
"TMPVARCV",
"TMPVAR",
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
"TMP",
"VAR",
"UNUSED",
"CV",
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$prefix = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "",
"TMP" => "_TMP",
"VAR" => "_VAR",
"CONST" => "_CONST",
"UNUSED" => "_UNUSED",
"CV" => "_CV",
"TMPVAR" => "_TMPVAR",
"TMPVARCV" => "_TMPVARCV",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
$commutative_order = array(
"ANY" => 0,
"TMP" => 1,
"VAR" => 2,
"CONST" => 0,
"UNUSED" => 0,
"CV" => 4,
"TMPVAR" => 2,
"TMPVARCV" => 4,
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$op1_type = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "opline->op1_type",
"TMP" => "IS_TMP_VAR",
"VAR" => "IS_VAR",
"CONST" => "IS_CONST",
"UNUSED" => "IS_UNUSED",
"CV" => "IS_CV",
"TMPVAR" => "(IS_TMP_VAR|IS_VAR)",
"TMPVARCV" => "(IS_TMP_VAR|IS_VAR|IS_CV)",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_type = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "opline->op2_type",
"TMP" => "IS_TMP_VAR",
"VAR" => "IS_VAR",
"CONST" => "IS_CONST",
"UNUSED" => "IS_UNUSED",
"CV" => "IS_CV",
"TMPVAR" => "(IS_TMP_VAR|IS_VAR)",
"TMPVARCV" => "(IS_TMP_VAR|IS_VAR|IS_CV)",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Removed some compilation warnings.
2005-07-18 14:34:42 +08:00
$op1_free = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "(free_op1 != NULL)",
"TMP" => "1",
"VAR" => "(free_op1 != NULL)",
"CONST" => "0",
"UNUSED" => "0",
"CV" => "0",
"TMPVAR" => "???",
"TMPVARCV" => "???",
Removed some compilation warnings.
2005-07-18 14:34:42 +08:00
);
$op2_free = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "(free_op2 != NULL)",
"TMP" => "1",
"VAR" => "(free_op2 != NULL)",
"CONST" => "0",
"UNUSED" => "0",
"CV" => "0",
"TMPVAR" => "???",
"TMPVARCV" => "???",
Removed some compilation warnings.
2005-07-18 14:34:42 +08:00
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$op1_get_zval_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_\\1(opline->op1.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_get_zval_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_\\1(opline->op2.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_zval_ptr_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
);
$op2_get_zval_ptr_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
);
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
$op1_get_zval_ptr_deref = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_deref(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var_deref(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_deref_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
);
$op2_get_zval_ptr_deref = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_deref(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var_deref(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_deref_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
);
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
$op1_get_zval_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_undef(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_undef(opline->op1.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "EX_VAR(opline->op1.var)",
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
);
$op2_get_zval_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_undef(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_undef(opline->op2.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "EX_VAR(opline->op2.var)",
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
);
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
$op1_get_zval_ptr_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_ptr_undef(opline->op1_type, opline->op1, &free_op1, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_undef_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "EX_VAR(opline->op1.var)",
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
);
$op2_get_zval_ptr_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_zval_ptr_ptr_undef(opline->op2_type, opline->op2, &free_op2, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_undef_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "EX_VAR(opline->op2.var)",
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$op1_get_obj_zval_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_\\1(opline->op1.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_get_obj_zval_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_\\1(opline->op2.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
$op1_get_obj_zval_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_undef(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_undef(opline->op1.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "EX_VAR(opline->op1.var)",
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
);
$op2_get_obj_zval_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_undef(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_undef(opline->op2.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "EX_VAR(opline->op2.var)",
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
);
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
$op1_get_obj_zval_ptr_deref = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var_deref(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op1)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_deref_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
);
$op2_get_obj_zval_ptr_deref = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
"TMP" => "_get_zval_ptr_tmp(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var_deref(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT(opline, opline->op2)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_deref_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_obj_zval_ptr_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
);
$op2_get_obj_zval_ptr_ptr = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
);
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
$op1_get_obj_zval_ptr_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_ptr(opline->op1_type, opline->op1, &free_op1, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op1.var, &free_op1 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_undef_\\1(opline->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "EX_VAR(opline->op1.var)",
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
);
$op2_get_obj_zval_ptr_ptr_undef = array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"ANY" => "get_obj_zval_ptr_ptr(opline->op2_type, opline->op2, &free_op2, \\1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"VAR" => "_get_zval_ptr_ptr_var(opline->op2.var, &free_op2 EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"UNUSED" => "_get_obj_zval_ptr_unused(EXECUTE_DATA_C)",
"CV" => "_get_zval_ptr_cv_undef_\\1(opline->op2.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "EX_VAR(opline->op2.var)",
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$op1_free_op = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_OP(free_op1)",
"TMP" => "zval_ptr_dtor_nogc(free_op1)",
"VAR" => "zval_ptr_dtor_nogc(free_op1)",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(free_op1)",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_free_op = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_OP(free_op2)",
"TMP" => "zval_ptr_dtor_nogc(free_op2)",
"VAR" => "zval_ptr_dtor_nogc(free_op2)",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(free_op2)",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op1_free_op_if_var = array(
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"ANY" => "if (opline->op1_type == IS_VAR) {zval_ptr_dtor_nogc(free_op1);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "",
"VAR" => "zval_ptr_dtor_nogc(free_op1)",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "???",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_free_op_if_var = array(
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"ANY" => "if (opline->op2_type == IS_VAR) {zval_ptr_dtor_nogc(free_op2);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "",
"VAR" => "zval_ptr_dtor_nogc(free_op2)",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "???",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op1_free_op_var_ptr = array(
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"ANY" => "if (free_op1) {zval_ptr_dtor_nogc(free_op1);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "",
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"VAR" => "if (UNEXPECTED(free_op1)) {zval_ptr_dtor_nogc(free_op1);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "???",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
$op2_free_op_var_ptr = array(
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"ANY" => "if (free_op2) {zval_ptr_dtor_nogc(free_op2);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMP" => "",
Revert "Refactor zval cleanup into single function" This reverts commit bac6fdb0c52c924e726c5a78de8858bf27b6586b.
2016-05-06 14:23:37 +08:00
"VAR" => "if (UNEXPECTED(free_op2)) {zval_ptr_dtor_nogc(free_op2);}",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "???",
"TMPVARCV" => "???",
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
);
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
$op1_free_unfetched = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_UNFETCHED_OP(opline->op1_type, opline->op1.var)",
"TMP" => "zval_ptr_dtor_nogc(EX_VAR(opline->op1.var))",
"VAR" => "zval_ptr_dtor_nogc(EX_VAR(opline->op1.var))",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(EX_VAR(opline->op1.var))",
"TMPVARCV" => "???",
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
);
$op2_free_unfetched = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_UNFETCHED_OP(opline->op2_type, opline->op2.var)",
"TMP" => "zval_ptr_dtor_nogc(EX_VAR(opline->op2.var))",
"VAR" => "zval_ptr_dtor_nogc(EX_VAR(opline->op2.var))",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(EX_VAR(opline->op2.var))",
"TMPVARCV" => "???",
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$op_data_type = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "(opline+1)->op1_type",
"TMP" => "IS_TMP_VAR",
"VAR" => "IS_VAR",
"CONST" => "IS_CONST",
"UNUSED" => "IS_UNUSED",
"CV" => "IS_CV",
"TMPVAR" => "(IS_TMP_VAR|IS_VAR)",
"TMPVARCV" => "(IS_TMP_VAR|IS_VAR|IS_CV)",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
);
$op_data_get_zval_ptr = array(
Fix ZEND_VM_SPEC=0 build
2017-11-25 05:57:45 +08:00
"ANY" => "get_op_data_zval_ptr_r((opline+1)->op1_type, (opline+1)->op1, &free_op_data)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"TMP" => "_get_zval_ptr_tmp((opline+1)->op1.var, &free_op_data EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var((opline+1)->op1.var, &free_op_data EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT((opline+1), (opline+1)->op1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_\\1((opline+1)->op1.var EXECUTE_DATA_CC)",
"TMPVAR" => "_get_zval_ptr_var((opline+1)->op1.var, &free_op_data EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVARCV" => "???",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
);
$op_data_get_zval_ptr_deref = array(
Fix ZEND_VM_SPEC=0 build
2017-11-25 05:57:45 +08:00
"ANY" => "get_op_data_zval_ptr_deref_r((opline+1)->op1_type, (opline+1)->op1, &free_op_data)",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"TMP" => "_get_zval_ptr_tmp((opline+1)->op1.var, &free_op_data EXECUTE_DATA_CC)",
"VAR" => "_get_zval_ptr_var_deref((opline+1)->op1.var, &free_op_data EXECUTE_DATA_CC)",
Changed the way VM accesses constant operands in 64-bit builds.
2017-10-04 21:53:01 +08:00
"CONST" => "RT_CONSTANT((opline+1), (opline+1)->op1)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"UNUSED" => "NULL",
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"CV" => "_get_zval_ptr_cv_deref_\\1((opline+1)->op1.var EXECUTE_DATA_CC)",
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"TMPVAR" => "???",
"TMPVARCV" => "???",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
);
$op_data_free_op = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_OP(free_op_data)",
"TMP" => "zval_ptr_dtor_nogc(free_op_data)",
"VAR" => "zval_ptr_dtor_nogc(free_op_data)",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(free_op_data)",
"TMPVARCV" => "???",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
);
$op_data_free_unfetched = array(
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
"ANY" => "FREE_UNFETCHED_OP((opline+1)->op1_type, (opline+1)->op1.var)",
"TMP" => "zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var))",
"VAR" => "zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var))",
"CONST" => "",
"UNUSED" => "",
"CV" => "",
"TMPVAR" => "zval_ptr_dtor_nogc(EX_VAR((opline+1)->op1.var))",
"TMPVARCV" => "???",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
$list = array(); // list of opcode handlers and helpers in original order
$opcodes = array(); // opcode handlers by code
$helpers = array(); // opcode helpers by name
$params = array(); // parameters of helpers
$opnames = array(); // opcode name to code mapping
$line_no = 1;
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$used_extra_spec = array();
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
// Writes $s into resulting executor
function out($f, $s) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $line_no;
fputs($f,$s);
$line_no += substr_count($s, "\n");
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Resets #line directives in resulting executor
function out_line($f) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $line_no, $executor_file;
fputs($f,"#line ".($line_no+1)." \"".$executor_file."\"\n");
++$line_no;
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Returns name of specialized helper
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function helper_name($name, $spec, $op1, $op2, $extra_spec) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $prefix, $helpers;
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
$extra = "";
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (isset($helpers[$name])) {
// If we haven't helper with specified spicialized operands then
// using unspecialized helper
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
if (!isset($helpers[$name]["op1"][$op1])) {
if (($op1 == 'TMP' || $op1 == 'VAR') &&
isset($helpers[$name]["op1"]["TMPVAR"])) {
$op1 = "TMPVAR";
} else if (($op1 == 'TMP' || $op1 == 'VAR') &&
isset($helpers[$name]["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
} else if ($op1 == 'CV' &&
isset($helpers[$name]["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
} else if (isset($helpers[$name]["op1"]["ANY"])) {
$op1 = "ANY";
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
if (!isset($helpers[$name]["op2"][$op2])) {
if (($op2 == 'TMP' || $op2 == 'VAR') &&
isset($helpers[$name]["op2"]["TMPVAR"])) {
$op2 = "TMPVAR";
} else if (($op2 == 'TMP' || $op2 == 'VAR') &&
isset($helpers[$name]["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
} else if ($op2 == 'CV' &&
isset($helpers[$name]["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
} else if (isset($helpers[$name]["op2"]["ANY"])) {
$op2 = "ANY";
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
/* forward common specs (e.g. in ZEND_VM_DISPATCH_TO_HELPER) */
if (isset($extra_spec, $helpers[$name]["spec"])) {
$extra = extra_spec_name(array_intersect_key($extra_spec, $helpers[$name]["spec"]));
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].$extra;
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Improved specializer: - Allow dispatching from specialized handler to unspecialized one
2015-12-11 01:46:14 +08:00
function opcode_name($name, $spec, $op1, $op2) {
global $prefix, $opnames, $opcodes;
if (isset($opnames[$name])) {
$opcode = $opcodes[$opnames[$name]];
// If we haven't helper with specified spicialized operands then
// using unspecialized helper
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
if (!isset($opcode["op1"][$op1])) {
if (($op1 == 'TMP' || $op1 == 'VAR') &&
isset($opcode["op1"]["TMPVAR"])) {
$op1 = "TMPVAR";
} else if (($op1 == 'TMP' || $op1 == 'VAR') &&
isset($opcode["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
} else if ($op1 == 'CV' &&
isset($opcode["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
} else if (isset($opcode["op1"]["ANY"])) {
$op1 = "ANY";
} else if ($spec) {
/* dispatch to invalid handler from unreachable code */
return "ZEND_NULL";
}
Improved specializer: - Allow dispatching from specialized handler to unspecialized one
2015-12-11 01:46:14 +08:00
}
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
if (!isset($opcode["op2"][$op2])) {
if (($op2 == 'TMP' || $op2 == 'VAR') &&
isset($opcode["op2"]["TMPVAR"])) {
$op2 = "TMPVAR";
} else if (($op2 == 'TMP' || $op2 == 'VAR') &&
isset($opcode["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
} else if ($op2 == 'CV' &&
isset($opcode["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
} else if (isset($opcode["op2"]["ANY"])) {
$op2 = "ANY";
} else if ($spec) {
/* dispatch to unkonwn handler in unreachable code */
return "ZEND_NULL";
}
Improved specializer: - Allow dispatching from specialized handler to unspecialized one
2015-12-11 01:46:14 +08:00
}
}
return $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2];
}
Remove extraneous parentheses in conditions The zend_vm_gen.php generator now checks if the condition is already enclosed by parentheses, and them only if needed. This fixes nine clang/llvm parentheses-equality warnings.
2016-12-23 05:01:20 +08:00
// Formats condition, protecting it by parentheses when needed.
function format_condition($condition) {
if ($condition === "") {
throw new InvalidArgumentException("A non empty string condition was expected.");
}
if ($condition[0] === "(" && substr($condition, -1) === ")") {
return $condition;
}
return "(".$condition.")";
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
// Generates code for opcode handler or helper
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
function gen_code($f, $spec, $kind, $export, $code, $op1, $op2, $name, $extra_spec=null) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $op1_type, $op2_type, $op1_get_zval_ptr, $op2_get_zval_ptr,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
$op1_get_zval_ptr_deref, $op2_get_zval_ptr_deref,
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
$op1_get_zval_ptr_undef, $op2_get_zval_ptr_undef,
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_zval_ptr_ptr, $op2_get_zval_ptr_ptr,
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
$op1_get_zval_ptr_ptr_undef, $op2_get_zval_ptr_ptr_undef,
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$op1_get_obj_zval_ptr, $op2_get_obj_zval_ptr,
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
$op1_get_obj_zval_ptr_undef, $op2_get_obj_zval_ptr_undef,
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
$op1_get_obj_zval_ptr_deref, $op2_get_obj_zval_ptr_deref,
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_obj_zval_ptr_ptr, $op2_get_obj_zval_ptr_ptr,
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
$op1_get_obj_zval_ptr_ptr_undef, $op2_get_obj_zval_ptr_ptr_undef,
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
$op1_free, $op2_free, $op1_free_unfetched, $op2_free_unfetched,
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$op1_free_op, $op2_free_op, $op1_free_op_if_var, $op2_free_op_if_var,
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix,
$op_data_type, $op_data_get_zval_ptr, $op_data_get_zval_ptr_deref,
$op_data_free_op, $op_data_free_unfetched;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Specializing
$code = preg_replace(
array(
"/OP1_TYPE/",
"/OP2_TYPE/",
Removed some compilation warnings.
2005-07-18 14:34:42 +08:00
"/OP1_FREE/",
"/OP2_FREE/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/GET_OP1_ZVAL_PTR\(([^)]*)\)/",
"/GET_OP2_ZVAL_PTR\(([^)]*)\)/",
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
"/GET_OP1_ZVAL_PTR_DEREF\(([^)]*)\)/",
"/GET_OP2_ZVAL_PTR_DEREF\(([^)]*)\)/",
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
"/GET_OP1_ZVAL_PTR_UNDEF\(([^)]*)\)/",
"/GET_OP2_ZVAL_PTR_UNDEF\(([^)]*)\)/",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
"/GET_OP1_ZVAL_PTR_PTR\(([^)]*)\)/",
"/GET_OP2_ZVAL_PTR_PTR\(([^)]*)\)/",
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
"/GET_OP1_ZVAL_PTR_PTR_UNDEF\(([^)]*)\)/",
"/GET_OP2_ZVAL_PTR_PTR_UNDEF\(([^)]*)\)/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/GET_OP1_OBJ_ZVAL_PTR\(([^)]*)\)/",
"/GET_OP2_OBJ_ZVAL_PTR\(([^)]*)\)/",
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
"/GET_OP1_OBJ_ZVAL_PTR_UNDEF\(([^)]*)\)/",
"/GET_OP2_OBJ_ZVAL_PTR_UNDEF\(([^)]*)\)/",
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
"/GET_OP1_OBJ_ZVAL_PTR_DEREF\(([^)]*)\)/",
"/GET_OP2_OBJ_ZVAL_PTR_DEREF\(([^)]*)\)/",
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
"/GET_OP1_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
"/GET_OP2_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/",
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
"/GET_OP1_OBJ_ZVAL_PTR_PTR_UNDEF\(([^)]*)\)/",
"/GET_OP2_OBJ_ZVAL_PTR_PTR_UNDEF\(([^)]*)\)/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/FREE_OP1\(\)/",
"/FREE_OP2\(\)/",
"/FREE_OP1_IF_VAR\(\)/",
"/FREE_OP2_IF_VAR\(\)/",
"/FREE_OP1_VAR_PTR\(\)/",
"/FREE_OP2_VAR_PTR\(\)/",
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
"/FREE_UNFETCHED_OP1\(\)/",
"/FREE_UNFETCHED_OP2\(\)/",
Fixed ability to build unspecialized executor
2015-02-26 22:53:03 +08:00
"/^#(\s*)ifdef\s+ZEND_VM_SPEC\s*\n/m",
"/^#(\s*)ifndef\s+ZEND_VM_SPEC\s*\n/m",
Wrap "wrong" unreachable code with "#if 0"
2006-06-08 16:37:51 +08:00
"/\!defined\(ZEND_VM_SPEC\)/m",
"/defined\(ZEND_VM_SPEC\)/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m",
"/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m",
Fixed ability to build unspecialized executor
2015-02-26 22:53:03 +08:00
"/^#(\s*)if\s+1\s*\\|\\|.*[^\\\\]$/m",
"/^#(\s*)if\s+0\s*&&.*[^\\\\]$/m",
"/^#(\s*)ifdef\s+ZEND_VM_EXPORT\s*\n/m",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
"/^#(\s*)ifndef\s+ZEND_VM_EXPORT\s*\n/m",
"/OP_DATA_TYPE/",
"/GET_OP_DATA_ZVAL_PTR\(([^)]*)\)/",
"/GET_OP_DATA_ZVAL_PTR_DEREF\(([^)]*)\)/",
"/FREE_OP_DATA\(\)/",
"/FREE_UNFETCHED_OP_DATA\(\)/",
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
2016-02-05 20:07:58 +08:00
"/RETURN_VALUE_USED\(opline\)/",
"/arg_num <= MAX_ARG_FLAG_NUM/",
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
"/ZEND_VM_SMART_BRANCH\(\s*([^,)]*)\s*,\s*([^)]*)\s*\)/",
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
"/opline->extended_value\s*==\s*0/",
"/opline->extended_value\s*==\s*ZEND_ASSIGN_DIM/",
"/opline->extended_value\s*==\s*ZEND_ASSIGN_OBJ/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
),
array(
$op1_type[$op1],
$op2_type[$op2],
Removed some compilation warnings.
2005-07-18 14:34:42 +08:00
$op1_free[$op1],
$op2_free[$op2],
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$op1_get_zval_ptr[$op1],
$op2_get_zval_ptr[$op2],
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
$op1_get_zval_ptr_deref[$op1],
$op2_get_zval_ptr_deref[$op2],
Embed "fast" operator functions (add, sub, increment, etc) into executor with additional optimizations
2015-03-17 23:53:19 +08:00
$op1_get_zval_ptr_undef[$op1],
$op2_get_zval_ptr_undef[$op2],
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_zval_ptr_ptr[$op1],
$op2_get_zval_ptr_ptr[$op2],
Tergets of ASSIGN and ASSIGN_REF don't have to be initialized
2014-04-04 19:22:41 +08:00
$op1_get_zval_ptr_ptr_undef[$op1],
$op2_get_zval_ptr_ptr_undef[$op2],
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$op1_get_obj_zval_ptr[$op1],
$op2_get_obj_zval_ptr[$op2],
Delay checks for undefined CV variables after checks for fast paths.
2015-06-05 06:53:32 +08:00
$op1_get_obj_zval_ptr_undef[$op1],
$op2_get_obj_zval_ptr_undef[$op2],
Use ZVAL_DEREF() macro
2014-03-27 17:39:09 +08:00
$op1_get_obj_zval_ptr_deref[$op1],
$op2_get_obj_zval_ptr_deref[$op2],
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
$op1_get_obj_zval_ptr_ptr[$op1],
$op2_get_obj_zval_ptr_ptr[$op2],
Improved ASSIGN_DIM and ASSIGN_OBJ
2014-12-09 05:10:23 +08:00
$op1_get_obj_zval_ptr_ptr_undef[$op1],
$op2_get_obj_zval_ptr_ptr_undef[$op2],
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$op1_free_op[$op1],
$op2_free_op[$op2],
$op1_free_op_if_var[$op1],
$op2_free_op_if_var[$op2],
$op1_free_op_var_ptr[$op1],
$op2_free_op_var_ptr[$op2],
Implement engine exceptions RFC: https://wiki.php.net/rfc/engine_exceptions_for_php7 Pending changes regarding naming of BaseException and whether it should be an interface.
2015-03-09 20:57:15 +08:00
$op1_free_unfetched[$op1],
$op2_free_unfetched[$op2],
Fixed ability to build unspecialized executor
2015-02-26 22:53:03 +08:00
($op1!="ANY"||$op2!="ANY")?"#\\1if 1\n":"#\\1if 0\n",
($op1!="ANY"||$op2!="ANY")?"#\\1if 0\n":"#\\1if 1\n",
Wrap "wrong" unreachable code with "#if 0"
2006-06-08 16:37:51 +08:00
($op1!="ANY"||$op2!="ANY")?"0":"1",
($op1!="ANY"||$op2!="ANY")?"1":"0",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
"\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec)):""),
"goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec)):""),
Fixed ability to build unspecialized executor
2015-02-26 22:53:03 +08:00
"#\\1if 1",
"#\\1if 0",
$export?"#\\1if 1\n":"#\\1if 0\n",
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$export?"#\\1if 0\n":"#\\1if 1\n",
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$op_data_type[isset($extra_spec['OP_DATA']) ? $extra_spec['OP_DATA'] : "ANY"],
$op_data_get_zval_ptr[isset($extra_spec['OP_DATA']) ? $extra_spec['OP_DATA'] : "ANY"],
$op_data_get_zval_ptr_deref[isset($extra_spec['OP_DATA']) ? $extra_spec['OP_DATA'] : "ANY"],
$op_data_free_op[isset($extra_spec['OP_DATA']) ? $extra_spec['OP_DATA'] : "ANY"],
$op_data_free_unfetched[isset($extra_spec['OP_DATA']) ? $extra_spec['OP_DATA'] : "ANY"],
isset($extra_spec['RETVAL']) ? $extra_spec['RETVAL'] : "RETURN_VALUE_USED(opline)",
isset($extra_spec['QUICK_ARG']) ? $extra_spec['QUICK_ARG'] : "arg_num <= MAX_ARG_FLAG_NUM",
isset($extra_spec['SMART_BRANCH']) ?
($extra_spec['SMART_BRANCH'] == 1 ?
"ZEND_VM_SMART_BRANCH_JMPZ(\\1, \\2)"
: ($extra_spec['SMART_BRANCH'] == 2 ?
"ZEND_VM_SMART_BRANCH_JMPNZ(\\1, \\2)" : ""))
: "ZEND_VM_SMART_BRANCH(\\1, \\2)",
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
isset($extra_spec['DIM_OBJ']) ?
($extra_spec['DIM_OBJ'] == 0 ? "1" : "0")
: "\\0",
isset($extra_spec['DIM_OBJ']) ?
($extra_spec['DIM_OBJ'] == 1 ? "1" : "0")
: "\\0",
isset($extra_spec['DIM_OBJ']) ?
($extra_spec['DIM_OBJ'] == 2 ? "1" : "0")
: "\\0",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
),
$code);
- MFH Little debug hack to allow printing vm function
2008-07-21 16:14:24 +08:00
if (0 && strpos($code, '{') === 0) {
$code = "{\n\tfprintf(stderr, \"$name\\n\");\n" . substr($code, 1);
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Updating code according to selected threading model
switch($kind) {
case ZEND_VM_KIND_CALL:
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
$code = preg_replace_callback(
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"/EXECUTE_DATA(?=[^_])/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
"/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*(,[^)]*)?\)/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
),
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function($matches) use ($spec, $prefix, $op1, $op2, $extra_spec) {
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
if (strncasecmp($matches[0], "EXECUTE_DATA", strlen("EXECUTE_DATA")) == 0) {
return "execute_data";
} else if (strncasecmp($matches[0], "ZEND_VM_DISPATCH_TO_HANDLER", strlen("ZEND_VM_DISPATCH_TO_HANDLER")) == 0) {
Improved specializer: - Allow dispatching from specialized handler to unspecialized one
2015-12-11 01:46:14 +08:00
return "ZEND_VM_TAIL_CALL(" . opcode_name($matches[1], $spec, $op1, $op2) . "_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU))";
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
} else {
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
// ZEND_VM_DISPATCH_TO_HELPER
if (isset($matches[2])) {
// extra args
$args = substr(preg_replace("/,\s*[A-Za-z_]*\s*,\s*([^,)\s]*)\s*/", ", $1", $matches[2]), 2);
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return "ZEND_VM_TAIL_CALL(" . helper_name($matches[1], $spec, $op1, $op2, $extra_spec) . "(" . $args. " ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC))";
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return "ZEND_VM_TAIL_CALL(" . helper_name($matches[1], $spec, $op1, $op2, $extra_spec) . "(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU))";
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
}
},
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$code);
break;
case ZEND_VM_KIND_SWITCH:
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
$code = preg_replace_callback(
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"/EXECUTE_DATA(?=[^_])/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
"/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*(,[^)]*)?\)/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
),
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function($matches) use ($spec, $prefix, $op1, $op2, $extra_spec) {
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
if (strncasecmp($matches[0], "EXECUTE_DATA", strlen("EXECUTE_DATA")) == 0) {
return "execute_data";
} else if (strncasecmp($matches[0], "ZEND_VM_DISPATCH_TO_HANDLER", strlen("ZEND_VM_DISPATCH_TO_HANDLER")) == 0) {
Improved specializer: - Allow dispatching from specialized handler to unspecialized one
2015-12-11 01:46:14 +08:00
return "goto " . opcode_name($matches[1], $spec, $op1, $op2) . "_LABEL";
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
} else {
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
// ZEND_VM_DISPATCH_TO_HELPER
if (isset($matches[2])) {
// extra args
$args = preg_replace("/,\s*([A-Za-z_]*)\s*,\s*([^,)\s]*)\s*/", "$1 = $2; ", $matches[2]);
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return $args . "goto " . helper_name($matches[1], $spec, $op1, $op2, $extra_spec);
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return "goto " . helper_name($matches[1], $spec, $op1, $op2, $extra_spec);
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
}
},
$code);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
$code = preg_replace_callback(
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
array(
VM refactoring, to avoid passing "execute_data" into helper functions that can access it using global register variable.
2017-06-16 06:42:49 +08:00
"/EXECUTE_DATA(?=[^_])/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m",
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
"/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*(,[^)]*)?\)/m",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
),
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function($matches) use ($spec, $prefix, $op1, $op2, $extra_spec) {
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
if (strncasecmp($matches[0], "EXECUTE_DATA", strlen("EXECUTE_DATA")) == 0) {
return "execute_data";
} else if (strncasecmp($matches[0], "ZEND_VM_DISPATCH_TO_HANDLER", strlen("ZEND_VM_DISPATCH_TO_HANDLER")) == 0) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
return "goto " . opcode_name($matches[1], $spec, $op1, $op2) . "_LABEL";
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
} else {
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
// ZEND_VM_DISPATCH_TO_HELPER
if (isset($matches[2])) {
// extra args
$args = preg_replace("/,\s*([A-Za-z_]*)\s*,\s*([^,)\s]*)\s*/", "$1 = $2; ", $matches[2]);
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return $args . "goto " . helper_name($matches[1], $spec, $op1, $op2, $extra_spec);
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return "goto " . helper_name($matches[1], $spec, $op1, $op2, $extra_spec);
The /e modifier is deprecated
2012-11-04 00:53:45 +08:00
}
},
$code);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
Removed old executor
2005-06-14 20:55:48 +08:00
/* Remove unused free_op1 and free_op2 declarations */
if ($spec && preg_match_all('/^\s*zend_free_op\s+[^;]+;\s*$/me', $code, $matches, PREG_SET_ORDER)) {
$n = 0;
foreach ($matches as $match) {
$code = preg_replace('/'.preg_quote($match[0],'/').'/', "\$D$n", $code);
++$n;
}
$del_free_op1 = (strpos($code, "free_op1") === false);
$del_free_op2 = (strpos($code, "free_op2") === false);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$del_free_op_data = (strpos($code, "free_op_data") === false);
Removed old executor
2005-06-14 20:55:48 +08:00
$n = 0;
foreach ($matches as $match) {
$dcl = $match[0];
$changed = 0;
if ($del_free_op1 && strpos($dcl, "free_op1") !== false) {
$dcl = preg_replace("/free_op1\s*,\s*/", "", $dcl);
$dcl = preg_replace("/free_op1\s*;/", ";", $dcl);
$changed = 1;
}
if ($del_free_op2 && strpos($dcl, "free_op2") !== false) {
$dcl = preg_replace("/free_op2\s*,\s*/", "", $dcl);
$dcl = preg_replace("/free_op2\s*;/", ";", $dcl);
$changed = 1;
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
if ($del_free_op_data && strpos($dcl, "free_op_data") !== false) {
$dcl = preg_replace("/free_op_data\s*,\s*/", "", $dcl);
$dcl = preg_replace("/free_op_data\s*;/", ";", $dcl);
$changed = 1;
}
Removed old executor
2005-06-14 20:55:48 +08:00
if ($changed) {
$dcl = preg_replace("/,\s*;/", ";", $dcl);
$dcl = preg_replace("/zend_free_op\s*;/", "", $dcl);
}
$code = preg_replace("/\\\$D$n/", $dcl, $code);
++$n;
}
}
/* Remove unnecessary ';' */
$code = preg_replace('/^\s*;\s*$/m', '', $code);
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
/* Remove WS */
$code = preg_replace('/[ \t]+\n/m', "\n", $code);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f, $code);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function skip_extra_spec_function($op1, $op2, $extra_spec) {
global $commutative_order;
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if (isset($extra_spec["NO_CONST_CONST"]) &&
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
$op1 == "CONST" && $op2 == "CONST") {
// Skip useless constant handlers
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return true;
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if (isset($extra_spec["COMMUTATIVE"]) &&
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
$commutative_order[$op1] < $commutative_order[$op2]) {
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
// Skip duplicate commutative handlers
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return true;
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if (isset($extra_spec["DIM_OBJ"]) &&
(($op2 == "UNUSED" && $extra_spec["DIM_OBJ"] != 1) ||
($op1 == "UNUSED" && $extra_spec["DIM_OBJ"] != 2))) {
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
// Skip useless handlers
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
return true;
}
return false;
}
// Generates opcode handler
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
function gen_handler($f, $spec, $kind, $name, $op1, $op2, $use, $code, $lineno, $opcode, $extra_spec = null, &$switch_labels = array()) {
Removed unused array
2018-01-10 04:17:10 +08:00
global $definition_file, $prefix, $opnames;
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if ($spec && skip_extra_spec_function($op1, $op2, $extra_spec)) {
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
return;
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (ZEND_VM_LINES) {
out($f, "#line $lineno \"$definition_file\"\n");
}
// Generate opcode handler's entry point according to selected threading model
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$spec_name = $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].($spec?extra_spec_name($extra_spec):"");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
switch($kind) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
case ZEND_VM_KIND_HYBRID:
out($f,"\t\t\tHYBRID_CASE({$spec_name}):\n");
out($f,"\t\t\t\t{$spec_name}_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
out($f,"\t\t\t\tHYBRID_BREAK();\n");
return;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
case ZEND_VM_KIND_CALL:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($opcode["hot"] && ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
out($f,"static ZEND_VM_HOT ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL {$spec_name}_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
} else {
out($f,"static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL {$spec_name}_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_SWITCH:
if ($spec) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$cur = $switch_labels ? end($switch_labels) + 1 : 0;
out($f,"case $cur: /* $spec_name */");
$switch_labels[$spec_name] = $cur;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
out($f,"case ".$name.":");
}
if ($use) {
// This handler is used by other handlers. We will add label to call it.
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f," {$spec_name}_LABEL:\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
out($f,"\n");
}
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"{$spec_name}_LABEL: ZEND_VM_GUARD($spec_name);\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
// Generate opcode handler's code
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
gen_code($f, $spec, $kind, 0, $code, $op1, $op2, $name, $extra_spec);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Generates helper
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
function gen_helper($f, $spec, $kind, $name, $op1, $op2, $param, $code, $lineno, $inline, $extra_spec = null) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $definition_file, $prefix;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
return;
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if ($spec && skip_extra_spec_function($op1, $op2, $extra_spec)) {
return;
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (ZEND_VM_LINES) {
out($f, "#line $lineno \"$definition_file\"\n");
}
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
$spec_name = $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].($spec?extra_spec_name($extra_spec):"");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Generate helper's entry point according to selected threading model
switch($kind) {
case ZEND_VM_KIND_CALL:
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
if ($inline) {
$zend_always_inline = " zend_always_inline";
$zend_fastcall = "";
} else {
$zend_always_inline = "";
$zend_fastcall = " ZEND_FASTCALL";
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if ($param == null) {
// Helper without parameters
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
out($f, "static$zend_always_inline ZEND_OPCODE_HANDLER_RET$zend_fastcall $spec_name(ZEND_OPCODE_HANDLER_ARGS)\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
// Helper with parameter
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
out($f, "static$zend_always_inline ZEND_OPCODE_HANDLER_RET$zend_fastcall $spec_name($param ZEND_OPCODE_HANDLER_ARGS_DC)\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
break;
case ZEND_VM_KIND_SWITCH:
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
out($f, "$spec_name:\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
out($f, "$spec_name:\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
// Generate helper's code
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
gen_code($f, $spec, $kind, 0, $code, $op1, $op2, $name, $extra_spec);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
function gen_null_label($f, $kind, $prolog) {
switch ($kind) {
case ZEND_VM_KIND_CALL:
out($f,$prolog."ZEND_NULL_HANDLER,\n");
break;
case ZEND_VM_KIND_SWITCH:
out($f,$prolog."(void*)(uintptr_t)-1,\n");
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&ZEND_NULL_LABEL,\n");
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
break;
}
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
// Generates array of opcode handlers (specialized or unspecialized)
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
function gen_labels($f, $spec, $kind, $prolog, &$specs, $switch_labels = array()) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
global $opcodes, $op_types, $prefix;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$next = 0;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$label = 0;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if ($spec) {
// Emit labels for specialized executor
// For each opcode in opcode number order
foreach($opcodes as $num => $dsc) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$specs[$num] = "$label";
$spec_op1 = $spec_op2 = $spec_extra = false;
$next = $num + 1;
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$diff = array_diff_key(array_flip($op_types), isset($dsc["op1"]) ? $dsc["op1"] : array());
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
if ((count($diff) == count($op_types) - 1 ? isset($diff["ANY"]) : count($diff) != count($op_types)) || isset($dsc["op1"]["TMPVAR"]) || isset($dsc["op1"]["TMPVARCV"])) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$spec_op1 = true;
$specs[$num] .= " | SPEC_RULE_OP1";
}
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$diff = array_diff_key(array_flip($op_types), isset($dsc["op2"]) ? $dsc["op2"] : array());
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
if ((count($diff) == count($op_types) - 1 ? isset($diff["ANY"]) : count($diff) != count($op_types)) || isset($dsc["op2"]["TMPVAR"]) || isset($dsc["op2"]["TMPVARCV"])) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$spec_op2 = true;
$specs[$num] .= " | SPEC_RULE_OP2";
}
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$spec_extra = call_user_func_array("array_merge", extra_spec_handler($dsc) ?: array(array()));
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$flags = extra_spec_flags($spec_extra);
if ($flags) {
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
$specs[$num] .= " | " . implode(" | ", $flags);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if ($num >= 256) {
$opcodes[$num]['spec_code'] = $specs[$num];
unset($specs[$num]);
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$foreach_op1 = function($do) use ($dsc, $op_types) {
return function() use ($do, $dsc, $op_types) {
// For each op1.op_type except ANY
foreach($op_types as $op1) {
if ($op1 != "ANY") {
if (!isset($dsc["op1"][$op1])) {
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
if ($op1 == "TMP" || $op1 == "VAR") {
if (isset($dsc["op1"]["TMPVAR"])) {
$op1 = "TMPVAR";
} else if (isset($dsc["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
} else {
$op1 = "ANY";
}
} else if ($op1 == "CV" && isset($dsc["op1"]["TMPVARCV"])) {
$op1 = "TMPVARCV";
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
} else {
// Try to use unspecialized handler
$op1 = "ANY";
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$do($op1, "ANY");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
};
};
$foreach_op2 = function($do) use ($dsc, $op_types) {
return function($op1) use ($do, $dsc, $op_types) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// For each op2.op_type except ANY
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
foreach($op_types as $op2) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if ($op2 != "ANY") {
if (!isset($dsc["op2"][$op2])) {
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
if ($op2 == "TMP" || $op2 == "VAR") {
if (isset($dsc["op2"]["TMPVAR"])) {
$op2 = "TMPVAR";
} else if (isset($dsc["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
} else {
$op2 = "ANY";
}
} else if ($op2 == "CV" && isset($dsc["op2"]["TMPVARCV"])) {
$op2 = "TMPVARCV";
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
} else {
// Try to use unspecialized handler
$op2 = "ANY";
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$do($op1, $op2);
}
}
};
};
$foreach_op_data = function($do) use ($dsc, $op_types) {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
return function($op1, $op2, $extra_spec = array()) use ($do, $dsc, $op_types) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
// For each op_data.op_type except ANY
foreach($op_types as $op_data) {
if ($op_data != "ANY") {
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (!isset($dsc["spec"]["OP_DATA"][$op_data])) {
Allow usage of "TMPVARCV" pattern for cases when there is no difference in handling for TMP, VAR and CV operands.
2016-03-11 18:38:53 +08:00
if ($op_data == "TMP" || $op_data == "VAR") {
if (isset($dsc["spec"]["OP_DATA"]["TMPVAR"])) {
$op_data = "TMPVAR";
} else if (isset($dsc["spec"]["OP_DATA"]["TMPVARCV"])) {
$op_data = "TMPVARCV";
} else {
// Try to use unspecialized handler
$op_data = "ANY";
}
} else if ($op_data == "CV" && isset($dsc["OP_DATA"]["TMPVARCV"])) {
$op_data = "TMPVARCV";
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
} else {
// Try to use unspecialized handler
$op_data = "ANY";
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$do($op1, $op2, array("OP_DATA" => $op_data) + $extra_spec);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
};
};
$foreach_extra_spec = function($do, $spec) use ($dsc) {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
return function($op1, $op2, $extra_spec = array()) use ($do, $spec, $dsc) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
foreach ($dsc["spec"][$spec] as $val) {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$do($op1, $op2, array($spec => $val) + $extra_spec);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
};
};
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$generate = function ($op1, $op2, $extra_spec = array()) use ($f, $kind, $dsc, $prefix, $prolog, $num, $switch_labels, &$label) {
Removed unused array
2018-01-10 04:17:10 +08:00
global $commutative_order;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
// Check if specialized handler is defined
/* TODO: figure out better way to signal "specialized and not defined" than an extra lookup */
if (isset($dsc["op1"][$op1]) &&
isset($dsc["op2"][$op2]) &&
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
(!isset($extra_spec["OP_DATA"]) || isset($dsc["spec"]["OP_DATA"][$extra_spec["OP_DATA"]]))) {
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if (skip_extra_spec_function($op1, $op2, $extra_spec)) {
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
gen_null_label($f, $kind, $prolog);
$label++;
return;
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
// Emit pointer to specialized handler
$spec_name = $dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2].extra_spec_name($extra_spec);
switch ($kind) {
case ZEND_VM_KIND_CALL:
out($f,"$prolog{$spec_name}_HANDLER,\n");
$label++;
break;
case ZEND_VM_KIND_SWITCH:
out($f,$prolog."(void*)(uintptr_t)$switch_labels[$spec_name],\n");
$label++;
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&{$spec_name}_LABEL,\n");
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$label++;
break;
}
} else {
// Emit pointer to handler of undefined opcode
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
gen_null_label($f, $kind, $prolog);
$label++;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
};
$do = $generate;
if ($spec_extra) {
foreach ($spec_extra as $extra => $devnull) {
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if ($extra == "OP_DATA") {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$do = $foreach_op_data($do);
} else {
$do = $foreach_extra_spec($do, $extra);
}
}
}
if ($spec_op2) {
$do = $foreach_op2($do);
}
if ($spec_op1) {
$do = $foreach_op1($do);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$do("ANY", "ANY");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
} else {
// Emit labels for unspecialized executor
// For each opcode in opcode number order
foreach($opcodes as $num => $dsc) {
while ($next != $num) {
// If some opcode numbers are not used then fill hole with pointers
// to handler of undefined opcode
switch ($kind) {
case ZEND_VM_KIND_CALL:
out($f,$prolog."ZEND_NULL_HANDLER,\n");
break;
case ZEND_VM_KIND_SWITCH:
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,$prolog."(void*)(uintptr_t)-1,\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&ZEND_NULL_LABEL,\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
$next++;
}
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if ($num >= 256) {
continue;
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$next = $num+1;
Fixed ZEND_VM_DEFINE_OP build when --without-specializer
2015-06-28 21:16:08 +08:00
//ugly trick for ZEND_VM_DEFINE_OP
if ($dsc["code"]) {
// Emit pointer to unspecialized handler
switch ($kind) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
case ZEND_VM_KIND_CALL:
out($f,$prolog.$dsc["op"]."_HANDLER,\n");
break;
case ZEND_VM_KIND_SWITCH:
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,$prolog."(void*)(uintptr_t)".((string)$num).",\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&".$dsc["op"]."_LABEL,\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
Fixed ZEND_VM_DEFINE_OP build when --without-specializer
2015-06-28 21:16:08 +08:00
}
} else {
switch ($kind) {
case ZEND_VM_KIND_CALL:
out($f,$prolog."ZEND_NULL_HANDLER,\n");
break;
case ZEND_VM_KIND_SWITCH:
out($f,$prolog."(void*)(uintptr_t)-1,\n");
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&ZEND_NULL_LABEL,\n");
Fixed ZEND_VM_DEFINE_OP build when --without-specializer
2015-06-28 21:16:08 +08:00
break;
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
}
}
// Emit last handler's label (undefined opcode)
switch ($kind) {
case ZEND_VM_KIND_CALL:
out($f,$prolog."ZEND_NULL_HANDLER\n");
break;
case ZEND_VM_KIND_SWITCH:
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,$prolog."(void*)(uintptr_t)-1\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."(void*)&&ZEND_NULL_LABEL\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$specs[$num + 1] = "$label";
}
// Generates specialized offsets
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
function gen_specs($f, $prolog, $specs) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$lastdef = array_pop($specs);
$last = 0;
foreach ($specs as $num => $def) {
while (++$last < $num) {
out($f, "$prolog$lastdef,\n");
}
$last = $num;
out($f, "$prolog$def,\n");
}
out($f, "$prolog$lastdef\n");
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Generates handler for undefined opcodes (CALL threading model)
function gen_null_handler($f) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
static $done = 0;
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
// New and all executors with CALL threading model can use the same handler
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// for undefined opcodes, do we emit code for it only once
if (!$done) {
$done = 1;
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,"{\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"\tUSE_OPLINE\n");
out($f,"\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
out($f,"\tZEND_VM_NEXT_OPCODE(); /* Never reached */\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,"}\n\n");
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
function extra_spec_name($extra_spec) {
global $prefix;
$s = "";
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["OP_DATA"])) {
$s .= "_OP_DATA" . $prefix[$extra_spec["OP_DATA"]];
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["RETVAL"])) {
$s .= "_RETVAL_".($extra_spec["RETVAL"] ? "USED" : "UNUSED");
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["QUICK_ARG"])) {
if ($extra_spec["QUICK_ARG"]) {
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
2016-02-05 20:07:58 +08:00
$s .= "_QUICK";
}
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["SMART_BRANCH"])) {
if ($extra_spec["SMART_BRANCH"] == 1) {
$s .= "_JMPZ";
} else if ($extra_spec["SMART_BRANCH"] == 2) {
$s .= "_JMPNZ";
}
}
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
if (isset($extra_spec["DIM_OBJ"])) {
if ($extra_spec["DIM_OBJ"] == 1) {
$s .= "_DIM";
} else if ($extra_spec["DIM_OBJ"] == 2) {
$s .= "_OBJ";
}
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
return $s;
}
function extra_spec_flags($extra_spec) {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$s = array();
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["OP_DATA"])) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$s[] = "SPEC_RULE_OP_DATA";
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["RETVAL"])) {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$s[] = "SPEC_RULE_RETVAL";
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["QUICK_ARG"])) {
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
2016-02-05 20:07:58 +08:00
$s[] = "SPEC_RULE_QUICK_ARG";
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($extra_spec["SMART_BRANCH"])) {
$s[] = "SPEC_RULE_SMART_BRANCH";
}
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
if (isset($extra_spec["DIM_OBJ"])) {
$s[] = "SPEC_RULE_DIM_OBJ";
}
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
if (isset($extra_spec["COMMUTATIVE"])) {
$s[] = "SPEC_RULE_COMMUTATIVE";
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
return $s;
}
function extra_spec_handler($dsc) {
global $op_types_ex;
if (!isset($dsc["spec"])) {
return array(array());
}
$specs = $dsc["spec"];
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($specs["OP_DATA"])) {
$op_data_specs = $specs["OP_DATA"];
$specs["OP_DATA"] = array();
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
foreach($op_types_ex as $op_data) {
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($dsc["spec"]["OP_DATA"][$op_data])) {
$specs["OP_DATA"][] = $op_data;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
}
}
$f = function($specs) use (&$f) {
$spec = key($specs);
$top = array_shift($specs);
if ($specs) {
$next = $f($specs);
} else {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$next = array(array());
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$ret = array();
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
foreach ($next as $existing) {
foreach ($top as $mode) {
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$ret[] = array($spec => $mode) + $existing;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
}
return $ret;
};
return $f($specs);
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
// Generates all opcode handlers and helpers (specialized or unspecilaized)
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
function gen_executor_code($f, $spec, $kind, $prolog, &$switch_labels = array()) {
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
global $list, $opcodes, $helpers, $op_types_ex;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if ($spec) {
// Produce specialized executor
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
$op1t = $op_types_ex;
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
// for each op1.op_type
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach($op1t as $op1) {
Get rid of duplicate handlers (ZEND_ADD_SPEC_TMP_TMP and ZEND_ADD_SPEC_VAR_VAR are absolutely the same).
2014-12-03 23:02:02 +08:00
$op2t = $op_types_ex;
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
// for each op2.op_type
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach($op2t as $op2) {
// for each handlers in helpers in original order
foreach ($list as $lineno => $dsc) {
if (isset($dsc["handler"])) {
$num = $dsc["handler"];
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
foreach (extra_spec_handler($opcodes[$num]) as $extra_spec) {
// Check if handler accepts such types of operands (op1 and op2)
if (isset($opcodes[$num]["op1"][$op1]) &&
isset($opcodes[$num]["op2"][$op2])) {
// Generate handler code
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
gen_handler($f, 1, $kind, $opcodes[$num]["op"], $op1, $op2, isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno, $opcodes[$num], $extra_spec, $switch_labels);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
} else if (isset($dsc["helper"])) {
$num = $dsc["helper"];
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
foreach (extra_spec_handler($helpers[$num]) as $extra_spec) {
// Check if handler accepts such types of operands (op1 and op2)
if (isset($helpers[$num]["op1"][$op1]) &&
isset($helpers[$num]["op2"][$op2])) {
// Generate helper code
gen_helper($f, 1, $kind, $num, $op1, $op2, $helpers[$num]["param"], $helpers[$num]["code"], $lineno, $helpers[$num]["inline"], $extra_spec);
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
} else {
var_dump($dsc);
die("??? $kind:$num\n");
}
}
}
}
} else {
// Produce unspecialized executor
// for each handlers in helpers in original order
foreach ($list as $lineno => $dsc) {
if (isset($dsc["handler"])) {
$num = $dsc["handler"];
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
// Generate handler code
if ($num < 256) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
gen_handler($f, 0, $kind, $opcodes[$num]["op"], "ANY", "ANY", isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno, $opcodes[$num]);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else if (isset($dsc["helper"])) {
$num = $dsc["helper"];
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
// Generate helper code
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
gen_helper($f, 0, $kind, $num, "ANY", "ANY", $helpers[$num]["param"], $helpers[$num]["code"], $lineno, $helpers[$num]["inline"]);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
var_dump($dsc);
die("??? $kind:$num\n");
}
}
}
if (ZEND_VM_LINES) {
// Reset #line directives
out_line($f);
}
// Generate handler for undefined opcodes
switch ($kind) {
case ZEND_VM_KIND_CALL:
gen_null_handler($f);
break;
case ZEND_VM_KIND_SWITCH:
out($f,"default:\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
out($f,"\tZEND_VM_NEXT_OPCODE(); /* Never reached */\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"ZEND_NULL_LABEL:\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
out($f,"\tZEND_VM_NEXT_OPCODE(); /* Never reached */\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
case ZEND_VM_KIND_HYBRID:
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f,"\t\t\tHYBRID_CASE(HYBRID_HALT):\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"\t\t\t\texecute_data = orig_execute_data;\n");
out($f,"\t\t\t\topline = orig_opline;\n");
out($f,"\t\t\t\treturn;\n");
out($f,"\t\t\tHYBRID_DEFAULT:\n");
out($f,"\t\t\t\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", OPLINE->opcode, OPLINE->op1_type, OPLINE->op2_type);\n");
out($f,"\t\t\t\tHYBRID_BREAK(); /* Never reached */\n");
break;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
function skip_blanks($f, $prolog, $epilog) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (trim($prolog) != "" || trim($epilog) != "") {
out($f, $prolog.$epilog);
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Generates executor from skeleton file and definition (specialized or unspecialized)
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $params, $skeleton_file, $line_no;
It's better to support 5.3 as well
2016-02-15 11:05:01 +08:00
$switch_labels = array();
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$lineno = 0;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach ($skl as $line) {
// Skeleton file contains special markers in form %NAME% those are
// substituted by custom code
if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) {
switch ($m[2]) {
case "DEFINES":
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
out($f,"#define SPEC_START_MASK 0x0000ffff\n");
out($f,"#define SPEC_RULE_OP1 0x00010000\n");
out($f,"#define SPEC_RULE_OP2 0x00020000\n");
out($f,"#define SPEC_RULE_OP_DATA 0x00040000\n");
out($f,"#define SPEC_RULE_RETVAL 0x00080000\n");
out($f,"#define SPEC_RULE_QUICK_ARG 0x00100000\n");
out($f,"#define SPEC_RULE_SMART_BRANCH 0x00200000\n");
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
out($f,"#define SPEC_RULE_DIM_OBJ 0x00400000\n");
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
out($f,"#define SPEC_RULE_COMMUTATIVE 0x00800000\n");
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f,"\n");
out($f,"static const uint32_t *zend_spec_handlers;\n");
Fix warning in the proper place
2017-12-18 16:28:59 +08:00
out($f,"static const void * const *zend_opcode_handlers;\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f,"static int zend_handlers_count;\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
Move constants into read-only data segment
2017-12-14 23:43:44 +08:00
out($f,"static const void * const * zend_opcode_handler_funcs;\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f,"static zend_op hybrid_halt_op;\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"#endif\n");
}
fixed "unused function" compilation warning
2017-12-18 16:43:12 +08:00
out($f,"#if (ZEND_VM_KIND != ZEND_VM_KIND_HYBRID)\n");
out($f,"static const void *zend_vm_get_opcode_handler(zend_uchar opcode, const zend_op* op);\n");
out($f,"#endif\n\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
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,"#else\n");
out($f,"# define zend_vm_get_opcode_handler_func zend_vm_get_opcode_handler\n");
out($f,"#endif\n\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
switch ($kind) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
case ZEND_VM_KIND_HYBRID:
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
out($f,"#define HYBRID_NEXT() goto *(void**)(OPLINE->handler)\n");
out($f,"#define HYBRID_SWITCH() HYBRID_NEXT();\n");
out($f,"#define HYBRID_CASE(op) op ## _LABEL\n");
out($f,"#define HYBRID_BREAK() HYBRID_NEXT()\n");
out($f,"#define HYBRID_DEFAULT ZEND_NULL_LABEL\n");
out($f,"#endif\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
case ZEND_VM_KIND_CALL:
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"\n");
out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS void\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_DC\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC\n");
out($f,"#else\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU execute_data\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_DC , ZEND_OPCODE_HANDLER_ARGS\n");
out($f,"# define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_CC , ZEND_OPCODE_HANDLER_ARGS_PASSTHRU\n");
out($f,"#endif\n");
out($f,"\n");
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)\n");
out($f,"# define ZEND_OPCODE_HANDLER_RET void\n");
out($f,"# define ZEND_VM_TAIL_CALL(call) call; return\n");
Allow an experimental VM with tail call dispatch technique (disabled by default). This VM may work only if all tail calls are optimized, otherwaise it will crach because of stack overflow. Unfortunately, we can't guarantee tail call optimization in C.
2015-09-25 17:54:51 +08:00
out($f,"# ifdef ZEND_VM_TAIL_CALL_DISPATCH\n");
out($f,"# define ZEND_VM_CONTINUE() ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); return\n");
out($f,"# else\n");
out($f,"# define ZEND_VM_CONTINUE() return\n");
out($f,"# endif\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"# if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f,"# define ZEND_VM_RETURN() opline = &hybrid_halt_op; return\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"# define ZEND_VM_HOT zend_always_inline\n");
out($f,"# else\n");
out($f,"# define ZEND_VM_RETURN() opline = NULL; return\n");
out($f,"# define ZEND_VM_HOT\n");
out($f,"# endif\n");
} else {
out($f,"# define ZEND_VM_RETURN() opline = NULL; return\n");
}
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f,"#else\n");
out($f,"# define ZEND_OPCODE_HANDLER_RET int\n");
out($f,"# define ZEND_VM_TAIL_CALL(call) return call\n");
out($f,"# define ZEND_VM_CONTINUE() return 0\n");
out($f,"# define ZEND_VM_RETURN() return -1\n");
Added missing ZEND_VM_HOT define
2017-05-04 22:57:49 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"# define ZEND_VM_HOT\n");
}
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f,"#endif\n");
out($f,"\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"typedef ZEND_OPCODE_HANDLER_RET (ZEND_FASTCALL *opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS);\n");
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,"\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef OPLINE\n");
out($f,"#undef DCL_OPLINE\n");
out($f,"#undef USE_OPLINE\n");
out($f,"#undef LOAD_OPLINE\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"#undef LOAD_OPLINE_EX\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef SAVE_OPLINE\n");
out($f,"#define DCL_OPLINE\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f,"# define OPLINE opline\n");
out($f,"# define USE_OPLINE\n");
out($f,"# define LOAD_OPLINE() opline = EX(opline)\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"# define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"# define SAVE_OPLINE() EX(opline) = opline\n");
out($f,"#else\n");
out($f,"# define OPLINE EX(opline)\n");
out($f,"# define USE_OPLINE const zend_op *opline = EX(opline);\n");
out($f,"# define LOAD_OPLINE()\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"# define LOAD_NEXT_OPLINE() ZEND_VM_INC_OPCODE()\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"# define SAVE_OPLINE()\n");
out($f,"#endif\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef HANDLE_EXCEPTION\n");
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
Revert "Fix return value memory leaks upon exceptions in opcode operand freeing" This reverts commit 9ad9d7ae375a6e8847ceaab287d3d23e0963a06e.
2016-12-02 16:58:41 +08:00
out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
Removed useless #ifdef
2015-06-16 22:17:49 +08:00
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG)\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"# define ZEND_VM_ENTER_EX() ZEND_VM_INTERRUPT_CHECK(); ZEND_VM_CONTINUE()\n");
out($f,"# define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"# define ZEND_VM_LEAVE() ZEND_VM_CONTINUE()\n");
out($f,"#elif defined(ZEND_VM_IP_GLOBAL_REG)\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"# define ZEND_VM_ENTER_EX() return 1\n");
out($f,"# define ZEND_VM_ENTER() opline = EG(current_execute_data)->opline; ZEND_VM_ENTER_EX()\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"# define ZEND_VM_LEAVE() return 2\n");
out($f,"#else\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"# define ZEND_VM_ENTER_EX() return 1\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"# define ZEND_VM_ENTER() return 1\n");
out($f,"# define ZEND_VM_LEAVE() return 2\n");
out($f,"#endif\n");
Turn safe timeout handling into general interrupt handling ability.
2016-06-23 20:01:23 +08:00
out($f,"#define ZEND_VM_INTERRUPT() ZEND_VM_TAIL_CALL(zend_interrupt_helper".($spec?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));\n");
Fixed executor without global register variales (gcc warnings or clang errors)
2016-06-27 15:36:41 +08:00
out($f,"#define ZEND_VM_LOOP_INTERRUPT() zend_interrupt_helper".($spec?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) ZEND_VM_TAIL_CALL(((opcode_handler_t)zend_vm_get_opcode_handler_func(opcode, opline))(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));\n");
} else {
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) ZEND_VM_TAIL_CALL(((opcode_handler_t)zend_vm_get_opcode_handler(opcode, opline))(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU));\n");
}
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,"\n");
Reduced VM code size. Made FETCH_DIM/OBJ_FUNC_ARG to dispatch ro corresponding FETCH_DIM/OBJ_R/_W handlers. Merged TMP and VAR specializations of ZEND_FETCH_OBJ_R. Allowed dispatching to less specialized handelrs and helpers. (e.g. from OP_TMP_CONST to OP_TMPVAR_CONST).
2017-12-07 06:52:27 +08:00
out($f,"static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_interrupt_helper".($spec?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS);\n");
out($f,"static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS);\n");
Turn safe timeout handling into general interrupt handling ability.
2016-06-23 20:01:23 +08:00
out($f,"\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_SWITCH:
out($f,"\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef OPLINE\n");
out($f,"#undef DCL_OPLINE\n");
out($f,"#undef USE_OPLINE\n");
out($f,"#undef LOAD_OPLINE\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"#undef LOAD_NEXT_OPLINE\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef SAVE_OPLINE\n");
out($f,"#define OPLINE opline\n");
Assign CPU registers for GOTO and SWITCH executor as well
2015-08-25 07:38:06 +08:00
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n");
out($f,"#else\n");
out($f,"# define DCL_OPLINE const zend_op *opline;\n");
out($f,"#endif\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define USE_OPLINE\n");
out($f,"#define LOAD_OPLINE() opline = EX(opline)\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define SAVE_OPLINE() EX(opline) = opline\n");
out($f,"#undef HANDLE_EXCEPTION\n");
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
Revert "Fix return value memory leaks upon exceptions in opcode operand freeing" This reverts commit 9ad9d7ae375a6e8847ceaab287d3d23e0963a06e.
2016-12-02 16:58:41 +08:00
out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
2014-07-03 05:02:25 +08:00
out($f,"#define ZEND_VM_RETURN() return\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"#define ZEND_VM_ENTER_EX() ZEND_VM_INTERRUPT_CHECK(); ZEND_VM_CONTINUE()\n");
out($f,"#define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()\n");
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
out($f,"#define ZEND_VM_LEAVE() ZEND_VM_CONTINUE()\n");
Turn safe timeout handling into general interrupt handling ability.
2016-06-23 20:01:23 +08:00
out($f,"#define ZEND_VM_INTERRUPT() goto zend_interrupt_helper".($spec?"_SPEC":"").";\n");
Fixed executor without global register variales (gcc warnings or clang errors)
2016-06-27 15:36:41 +08:00
out($f,"#define ZEND_VM_LOOP_INTERRUPT() goto zend_interrupt_helper".($spec?"_SPEC":"").";\n");
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) dispatch_handler = zend_vm_get_opcode_handler(opcode, opline); goto zend_vm_dispatch;\n");
out($f,"\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case ZEND_VM_KIND_GOTO:
out($f,"\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef OPLINE\n");
out($f,"#undef DCL_OPLINE\n");
out($f,"#undef USE_OPLINE\n");
out($f,"#undef LOAD_OPLINE\n");
Fixed typo
2015-08-10 22:57:49 +08:00
out($f,"#undef LOAD_NEXT_OPLINE\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef SAVE_OPLINE\n");
out($f,"#define OPLINE opline\n");
Assign CPU registers for GOTO and SWITCH executor as well
2015-08-25 07:38:06 +08:00
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f,"# define DCL_OPLINE register const zend_op *opline __asm__(ZEND_VM_IP_GLOBAL_REG);\n");
out($f,"#else\n");
out($f,"# define DCL_OPLINE const zend_op *opline;\n");
out($f,"#endif\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define USE_OPLINE\n");
out($f,"#define LOAD_OPLINE() opline = EX(opline)\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"#define LOAD_NEXT_OPLINE() opline = EX(opline) + 1\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define SAVE_OPLINE() EX(opline) = opline\n");
out($f,"#undef HANDLE_EXCEPTION\n");
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
Fixed ability to build non-specialized GOTO VM
2013-12-02 14:59:32 +08:00
if (ZEND_VM_SPEC) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_SPEC_LABEL\n");
out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_SPEC_LABEL\n");
Fixed ability to build non-specialized GOTO VM
2013-12-02 14:59:32 +08:00
} else {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"#define HANDLE_EXCEPTION() goto ZEND_HANDLE_EXCEPTION_LABEL\n");
out($f,"#define HANDLE_EXCEPTION_LEAVE() goto ZEND_HANDLE_EXCEPTION_LABEL\n");
Fixed ability to build non-specialized GOTO VM
2013-12-02 14:59:32 +08:00
}
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(OPLINE->handler)\n");
Removed EG(in_execution). If EG(currentent_execute_data) is not NULL we are executing something.
2014-07-03 05:02:25 +08:00
out($f,"#define ZEND_VM_RETURN() return\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"#define ZEND_VM_ENTER_EX() ZEND_VM_INTERRUPT_CHECK(); ZEND_VM_CONTINUE()\n");
out($f,"#define ZEND_VM_ENTER() execute_data = EG(current_execute_data); LOAD_OPLINE(); ZEND_VM_ENTER_EX()\n");
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
out($f,"#define ZEND_VM_LEAVE() ZEND_VM_CONTINUE()\n");
Turn safe timeout handling into general interrupt handling ability.
2016-06-23 20:01:23 +08:00
out($f,"#define ZEND_VM_INTERRUPT() goto zend_interrupt_helper".($spec?"_SPEC":"").";\n");
Fixed executor without global register variales (gcc warnings or clang errors)
2016-06-27 15:36:41 +08:00
out($f,"#define ZEND_VM_LOOP_INTERRUPT() goto zend_interrupt_helper".($spec?"_SPEC":"").";\n");
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) goto *(void**)(zend_vm_get_opcode_handler(opcode, opline));\n");
out($f,"\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
gen_executor_code($f, $spec, ZEND_VM_KIND_CALL, $m[1]);
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
case "EXECUTOR_NAME":
out($f, $m[1].$executor_name.$m[3]."\n");
break;
case "HELPER_VARS":
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind != ZEND_VM_KIND_CALL && $kind != ZEND_VM_KIND_HYBRID) {
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
if ($kind == ZEND_VM_KIND_SWITCH) {
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,$m[1]."const void *dispatch_handler;\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
}
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
// Emit local variables those are used for helpers' parameters
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach ($params as $param => $x) {
out($f,$m[1].$param.";\n");
}
Assign CPU registers for GOTO and SWITCH executor as well
2015-08-25 07:38:06 +08:00
out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n");
out($f,$m[1]."register zend_execute_data *execute_data __asm__(ZEND_VM_FP_GLOBAL_REG) = ex;\n");
out($f,"#else\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,$m[1]."zend_execute_data *execute_data = ex;\n");
Assign CPU registers for GOTO and SWITCH executor as well
2015-08-25 07:38:06 +08:00
out($f,"#endif\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,"#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f,$m[1]."const zend_op *orig_opline = opline;\n");
out($f,"#endif\n");
out($f,"#ifdef ZEND_VM_FP_GLOBAL_REG\n");
out($f,$m[1]."zend_execute_data *orig_execute_data = execute_data;\n");
out($f,$m[1]."execute_data = ex;\n");
out($f,"#else\n");
out($f,$m[1]."zend_execute_data *execute_data = ex;\n");
out($f,"#endif\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
break;
- Fix typo
2004-10-28 09:19:33 +08:00
case "INTERNAL_LABELS":
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_GOTO || $kind == ZEND_VM_KIND_HYBRID) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Emit array of labels of opcode handlers and code for
// zend_opcode_handlers initialization
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$prolog = $m[1];
Hint label lookup table initialization branch on GOTO VM kind. This initialization is performed only once so it shall be marked as unexpected.
2015-06-30 15:58:17 +08:00
out($f,$prolog."if (UNEXPECTED(execute_data == NULL)) {\n");
Move constants into read-only data segment
2017-12-14 23:43:44 +08:00
out($f,$prolog."\tstatic const void * const labels[] = {\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
gen_labels($f, $spec, ZEND_VM_KIND_GOTO, $prolog."\t\t", $specs);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,$prolog."\t};\n");
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f,$prolog."\tzend_opcode_handlers = (const void **) labels;\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f,$prolog."\tzend_handlers_count = sizeof(labels) / sizeof(void*);\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f,$prolog."\tmemset(&hybrid_halt_op, 0, sizeof(hybrid_halt_op));\n");
out($f,$prolog."\thybrid_halt_op.handler = (void*)&&HYBRID_HALT_LABEL;\n");
out($f,$prolog."\tgoto HYBRID_HALT_LABEL;\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
} else {
out($f,$prolog."\treturn;\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,$prolog."}\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#endif\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
skip_blanks($f, $m[1], $m[3]);
}
break;
case "ZEND_VM_CONTINUE_LABEL":
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_CALL || $kind == ZEND_VM_KIND_HYBRID) {
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
// Only SWITCH dispatch method use it
Unused ret
2015-06-28 19:09:19 +08:00
out($f,"#if !defined(ZEND_VM_FP_GLOBAL_REG) || !defined(ZEND_VM_IP_GLOBAL_REG)\n");
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
out($f,$m[1]."\tint ret;".$m[3]."\n");
Unused ret
2015-06-28 19:09:19 +08:00
out($f,"#endif\n");
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
} else if ($kind == ZEND_VM_KIND_SWITCH) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Only SWITCH dispatch method use it
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
out($f,"zend_vm_continue:".$m[3]."\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
skip_blanks($f, $m[1], $m[3]);
}
break;
case "ZEND_VM_DISPATCH":
// Emit code that dispatches to opcode handler
switch ($kind) {
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
case ZEND_VM_KIND_SWITCH:
out($f, $m[1]."dispatch_handler = OPLINE->handler;\nzend_vm_dispatch:\n".$m[1]."switch ((int)(uintptr_t)dispatch_handler)".$m[3]."\n");
break;
case ZEND_VM_KIND_GOTO:
out($f, $m[1]."goto *(void**)(OPLINE->handler);".$m[3]."\n");
break;
case ZEND_VM_KIND_HYBRID:
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
Cleanup
2017-05-09 14:37:46 +08:00
out($f, $m[1]."HYBRID_SWITCH()".$m[3]."\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,"#else\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
case ZEND_VM_KIND_CALL:
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)\n");
out($f, $m[1]."((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
out($f, $m[1]."if (UNEXPECTED(!OPLINE))".$m[3]."\n");
out($f,"#else\n");
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f, $m[1]."if (UNEXPECTED((ret = ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)) != 0))".$m[3]."\n");
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f,"#endif\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#endif\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
break;
}
break;
case "INTERNAL_EXECUTOR":
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind != ZEND_VM_KIND_CALL) {
// Emit executor code
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
}
gen_executor_code($f, $spec, $kind, $m[1], $switch_labels);
}
if ($kind == ZEND_VM_KIND_CALL || $kind == ZEND_VM_KIND_HYBRID) {
// Executor is defined as a set of functions
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#else\n");
}
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f,
"#ifdef ZEND_VM_FP_GLOBAL_REG\n" .
$m[1]."execute_data = orig_execute_data;\n" .
"# ifdef ZEND_VM_IP_GLOBAL_REG\n" .
$m[1]."opline = orig_opline;\n" .
"# endif\n" .
$m[1]."return;\n" .
"#else\n" .
$m[1]."if (EXPECTED(ret > 0)) {\n" .
Micro optimization for the main interpreter loop
2014-07-17 15:18:44 +08:00
$m[1]."\texecute_data = EG(current_execute_data);\n".
Fixed executor without global register variales (gcc warnings or clang errors)
2016-06-27 15:36:41 +08:00
$m[1]."\tZEND_VM_LOOP_INTERRUPT_CHECK();\n".
Micro optimization for the main interpreter loop
2014-07-17 15:18:44 +08:00
$m[1]."} else {\n" .
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
"# ifdef ZEND_VM_IP_GLOBAL_REG\n" .
$m[1]."\topline = orig_opline;\n" .
"# endif\n".
Micro optimization for the main interpreter loop
2014-07-17 15:18:44 +08:00
$m[1]."\treturn;\n".
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
$m[1]."}\n".
"#endif\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#endif\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
break;
case "EXTERNAL_EXECUTOR":
if ($kind == ZEND_VM_KIND_CALL) {
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
gen_executor_code($f, $spec, $kind, $m[1]);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
break;
case "INITIALIZER_NAME":
out($f, $m[1].$initializer_name.$m[3]."\n");
break;
case "EXTERNAL_LABELS":
// Emit code that initializes zend_opcode_handlers array
$prolog = $m[1];
if ($kind == ZEND_VM_KIND_GOTO) {
// Labels are defined in the executor itself, so we call it
Make the GOTO and SWITCH VMs work again
2012-05-29 08:31:56 +08:00
// with execute_data NULL and it sets zend_opcode_handlers array
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."static const uint32_t specs[] = {\n");
gen_specs($f, $prolog."\t", $specs);
out($f,$prolog."};\n");
out($f,$prolog."zend_spec_handlers = specs;\n");
second shot on removing TSRMLS_*
2014-12-14 21:07:59 +08:00
out($f,$prolog.$executor_name."_ex(NULL);\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
Move constants into read-only data segment
2017-12-14 23:43:44 +08:00
out($f,$prolog."static const void * const labels[] = {\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
gen_labels($f, $spec, ZEND_VM_KIND_CALL, $prolog."\t", $specs, $switch_labels);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f,$prolog."};\n");
out($f,$prolog."static const uint32_t specs[] = {\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
gen_specs($f, $prolog."\t", $specs);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f,$prolog."};\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f,$prolog."zend_opcode_handler_funcs = labels;\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f,$prolog."zend_spec_handlers = specs;\n");
out($f,$prolog.$executor_name."_ex(NULL);\n");
out($f,"#else\n");
}
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,$prolog."zend_opcode_handlers = labels;\n");
Remove redundant \t
2016-08-25 13:29:22 +08:00
out($f,$prolog."zend_handlers_count = sizeof(labels) / sizeof(void*);\n");
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f,$prolog."zend_spec_handlers = specs;\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if ($kind == ZEND_VM_KIND_HYBRID) {
out($f,"#endif\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
break;
default:
die("ERROR: Unknown keyword ".$m[2]." in skeleton file.\n");
}
} else {
// Copy the line as is
out($f, $line);
}
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
function parse_operand_spec($def, $lineno, $str, &$flags) {
global $vm_op_decode;
$flags = 0;
$a = explode("|",$str);
foreach($a as $val) {
if (isset($vm_op_decode[$val])) {
$flags |= $vm_op_decode[$val];
} else {
die("ERROR ($def:$lineno): Wrong operand type '$str'\n");
}
}
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
if (!($flags & ZEND_VM_OP_SPEC)) {
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
if (count($a) != 1) {
die("ERROR ($def:$lineno): Wrong operand type '$str'\n");
}
$a = array("ANY");
}
return array_flip($a);
}
function parse_ext_spec($def, $lineno, $str) {
global $vm_ext_decode;
Fixed few issues: - Added ZEND_VM_LAST_OPCODE macro - Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET - Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
2015-10-29 14:15:37 +08:00
$flags = 0;
$a = explode("|",$str);
foreach($a as $val) {
if (isset($vm_ext_decode[$val])) {
$flags |= $vm_ext_decode[$val];
} else {
die("ERROR ($def:$lineno): Wrong extended_value type '$str'\n");
}
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
}
Fixed few issues: - Added ZEND_VM_LAST_OPCODE macro - Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET - Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
2015-10-29 14:15:37 +08:00
return $flags;
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
function parse_spec_rules($def, $lineno, $str) {
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
global $used_extra_spec;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
$ret = array();
$a = explode(",", $str);
foreach($a as $rule) {
$n = strpos($rule, "=");
if ($n !== false) {
$id = trim(substr($rule, 0, $n));
$val = trim(substr($rule, $n+1));
switch ($id) {
case "OP_DATA":
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$ret["OP_DATA"] = parse_operand_spec($def, $lineno, $val, $devnull);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
break;
default:
die("ERROR ($def:$lineno): Wrong specialization rules '$str'\n");
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$used_extra_spec[$id] = 1;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
} else {
switch ($rule) {
case "RETVAL":
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$ret["RETVAL"] = array(0, 1);
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
break;
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
2016-02-05 20:07:58 +08:00
case "QUICK_ARG":
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$ret["QUICK_ARG"] = array(0, 1);
break;
case "SMART_BRANCH":
$ret["SMART_BRANCH"] = array(0, 1, 2);
Use extra specialization to eliminate run-time checks for conditions known at compile time in SEND_VAL_EX and SEND_VAR_EX.
2016-02-05 20:07:58 +08:00
break;
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
case "DIM_OBJ":
$ret["DIM_OBJ"] = array(0, 1, 2);
break;
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
case "NO_CONST_CONST":
$ret["NO_CONST_CONST"] = array(1);
break;
case "COMMUTATIVE":
$ret["COMMUTATIVE"] = array(1);
break;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
default:
die("ERROR ($def:$lineno): Wrong specialization rules '$str'\n");
}
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$used_extra_spec[$rule] = 1;
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
}
return $ret;
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
function gen_vm($def, $skel) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
global $definition_file, $skeleton_file, $executor_file,
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
$op_types, $list, $opcodes, $helpers, $params, $opnames,
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
$vm_op_flags, $used_extra_spec;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Load definition file
$in = @file($def);
if (!$in) {
die("ERROR: Can not open definition file '$def'\n");
}
// We need absolute path to definition file to use it in #line directives
$definition_file = realpath($def);
// Load skeleton file
$skl = @file($skel);
if (!$skl) {
die("ERROR: Can not open skeleton file '$skel'\n");
}
// We need absolute path to skeleton file to use it in #line directives
$skeleton_file = realpath($skel);
// Parse definition file into tree
$lineno = 0;
$handler = null;
$helper = null;
$max_opcode_len = 0;
$max_opcode = 0;
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$extra_num = 256;
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
$export = array();
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach ($in as $line) {
++$lineno;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (strpos($line,"ZEND_VM_HANDLER(") === 0 ||
strpos($line,"ZEND_VM_HOT_HANDLER(") === 0) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Parsing opcode handler's definition
if (preg_match(
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
"/^ZEND_VM_(HOT_)?HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_HANDLER definition.\n");
}
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$hot = !empty($m[1]);
$code = (int)$m[2];
$op = $m[3];
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$len = strlen($op);
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$op1 = parse_operand_spec($def, $lineno, $m[4], $flags1);
$op2 = parse_operand_spec($def, $lineno, $m[5], $flags2);
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
$flags = $flags1 | ($flags2 << 8);
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (!empty($m[7])) {
$flags |= parse_ext_spec($def, $lineno, $m[7]);
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if ($len > $max_opcode_len) {
$max_opcode_len = $len;
}
if ($code > $max_opcode) {
$max_opcode = $code;
}
if (isset($opcodes[$code])) {
die("ERROR ($def:$lineno): Opcode with code '$code' is already defined.\n");
}
if (isset($opnames[$op])) {
die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n");
}
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$opcodes[$code] = array("op"=>$op,"op1"=>$op1,"op2"=>$op2,"code"=>"","flags"=>$flags,"hot"=>$hot);
if (isset($m[9])) {
$opcodes[$code]["spec"] = parse_spec_rules($def, $lineno, $m[9]);
Added ability to avoid code generation for useless opcode handlers. - SPEC(NO_CONST_CONST) may prevent codegeneration for handlers like ADD_SPEC_CONST_CONST. Compiler and optimizaer should care about constants folding. - SPEC(COMMUTATIVE) generate only single handler instead of two eqivalents like ADD_SPEC_CONST_CV and ADD_SPEC_CV_CONST. Compiler and optimizer should care avout operands swapping.
2016-03-11 21:51:06 +08:00
if (isset($opcodes[$code]["spec"]["NO_CONST_CONST"])) {
$opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
}
if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
$opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$opnames[$op] = $code;
$handler = $code;
$helper = null;
$list[$lineno] = array("handler"=>$handler);
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
} else if (strpos($line,"ZEND_VM_TYPE_SPEC_HANDLER(") === 0 ||
strpos($line,"ZEND_VM_HOT_TYPE_SPEC_HANDLER(") === 0) {
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
// Parsing opcode handler's definition
if (preg_match(
Allow commas in specializer conditions
2018-01-09 20:08:18 +08:00
"/^ZEND_VM_(HOT_)?TYPE_SPEC_HANDLER\(\s*([A-Z_]+)\s*,\s*((?:[^(,]|\([^()]*|(?R)*\))*),\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(,\s*([A-Z_|]+)\s*)?(,\s*SPEC\(([A-Z_|=,]+)\)\s*)?\)/",
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_TYPE_HANDLER_HANDLER definition.\n");
}
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$hot = !empty($m[1]);
$orig_op = $m[2];
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if (!isset($opnames[$orig_op])) {
die("ERROR ($def:$lineno): Opcode with name '$orig_op' is not defined.\n");
}
$orig_code = $opnames[$orig_op];
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$condition = $m[3];
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$code = $extra_num++;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
$op = $m[4];
$op1 = parse_operand_spec($def, $lineno, $m[5], $flags1);
$op2 = parse_operand_spec($def, $lineno, $m[6], $flags2);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$flags = $flags1 | ($flags2 << 8);
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (!empty($m[8])) {
$flags |= parse_ext_spec($def, $lineno, $m[8]);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
}
if (isset($opcodes[$code])) {
die("ERROR ($def:$lineno): Opcode with name '$code' is already defined.\n");
}
$opcodes[$orig_code]['type_spec'][$code] = $condition;
$used_extra_spec["TYPE"] = 1;
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
$opcodes[$code] = array("op"=>$op,"op1"=>$op1,"op2"=>$op2,"code"=>"","flags"=>$flags,"hot"=>$hot,"is_type_spec"=>true);
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (isset($m[10])) {
$opcodes[$code]["spec"] = parse_spec_rules($def, $lineno, $m[10]);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if (isset($opcodes[$code]["spec"]["NO_CONST_CONST"])) {
$opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_NO_CONST_CONST"];
}
if (isset($opcodes[$code]["spec"]["COMMUTATIVE"])) {
$opcodes[$code]["flags"] |= $vm_op_flags["ZEND_VM_COMMUTATIVE"];
}
}
$opnames[$op] = $code;
$handler = $code;
$helper = null;
$list[$lineno] = array("handler"=>$handler);
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
} else if (strpos($line,"ZEND_VM_HELPER(") === 0 || strpos($line,"ZEND_VM_INLINE_HELPER(") === 0) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Parsing helper's definition
if (preg_match(
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
"/^ZEND_VM(_INLINE)?_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z_|]+)\s*,\s*([A-Z_|]+)\s*(?:,\s*SPEC\(([A-Z_|=,]+)\)\s*)?(?:,\s*([^)]*)\s*)?\)/",
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n");
}
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
$inline = !empty($m[1]);
$helper = $m[2];
$op1 = parse_operand_spec($def, $lineno, $m[3], $flags1);
$op2 = parse_operand_spec($def, $lineno, $m[4], $flags2);
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
$param = isset($m[6]) ? $m[6] : null;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (isset($helpers[$helper])) {
die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n");
}
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
// Store parameters
foreach (explode(",", $param) as $p) {
$p = trim($p);
if ($p !== "") {
$params[$p] = 1;
}
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
Improved specializer (Bob) - All helpers now may be declatred and called without ZEND_VM_HELPER_EX() and ZEND_VM_DISPATCH_TO_HELPER_EX() macros - ZEND_VM_HELPER() may declare few arguments - ZEND_VM_DISPATCH_TO_HELPER() may pass few parameters - ZEND_VM_INLINE_HELPER() may be used to declare inline helpers (it won't be inlined in SWITH/GOTO executors)
2015-12-10 22:17:59 +08:00
$helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>$param,"code"=>"","inline"=>$inline);
Use an inline handler instead of repeating logic for calling assign op helpers each time
2016-12-04 00:34:02 +08:00
if (!empty($m[5])) {
$helpers[$helper]["spec"] = parse_spec_rules($def, $lineno, $m[5]);
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
$handler = null;
$list[$lineno] = array("helper"=>$helper);
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
} else if (strpos($line,"ZEND_VM_EXPORT_HANDLER(") === 0) {
if (preg_match(
"/^ZEND_VM_EXPORT_HANDLER\(\s*([A-Za-z_]+)\s*,\s*([A-Z_]+)\s*\)/",
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_EXPORT_HANDLER definition.\n");
}
if (!isset($opnames[$m[2]])) {
die("ERROR ($def:$lineno): opcode '{$m[2]}' is not defined.\n");
}
$export[] = array("handler",$m[1],$m[2]);
} else if (strpos($line,"ZEND_VM_EXPORT_HELPER(") === 0) {
if (preg_match(
"/^ZEND_VM_EXPORT_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Za-z_]+)\s*\)/",
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_EXPORT_HELPER definition.\n");
}
if (!isset($helpers[$m[2]])) {
die("ERROR ($def:$lineno): helper '{$m[2]}' is not defined.\n");
}
$export[] = array("helper",$m[1],$m[2]);
Properly define ZEND_OP_DATA in zend_vm_def.h This allows zend_vm_gen.php to define them in zend_vm_opcodes.{c,h} without further hacks.
2015-04-20 05:21:57 +08:00
} else if (strpos($line,"ZEND_VM_DEFINE_OP(") === 0) {
if (preg_match(
"/^ZEND_VM_DEFINE_OP\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*\);/",
$line,
$m) == 0) {
die("ERROR ($def:$lineno): Invalid ZEND_VM_DEFINE_OP definition.\n");
}
$code = (int)$m[1];
$op = $m[2];
$len = strlen($op);
if ($len > $max_opcode_len) {
$max_opcode_len = $len;
}
if ($code > $max_opcode) {
$max_opcode = $code;
}
if (isset($opcodes[$code])) {
die("ERROR ($def:$lineno): Opcode with code '$code' is already defined.\n");
}
if (isset($opnames[$op])) {
die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n");
}
$opcodes[$code] = array("op"=>$op,"code"=>"");
$opnames[$op] = $code;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else if ($handler !== null) {
// Add line of code to current opcode handler
$opcodes[$handler]["code"] .= $line;
} else if ($helper !== null) {
// Add line of code to current helper
$helpers[$helper]["code"] .= $line;
}
}
ksort($opcodes);
// Search for opcode handlers those are used by other opcode handlers
foreach ($opcodes as $dsc) {
if (preg_match("/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", $dsc["code"], $m)) {
$op = $m[1];
if (!isset($opnames[$op])) {
die("ERROR ($def:$lineno): Opcode with name '$op' is not defined.\n");
}
$code = $opnames[$op];
$opcodes[$code]['use'] = 1;
}
}
// Generate opcode #defines (zend_vm_opcodes.h)
$code_len = strlen((string)$max_opcode);
Allow calling zend_vm_gen from everywhere Before one could only call it with cwd=Zend.
2012-05-24 02:34:17 +08:00
$f = fopen(__DIR__ . "/zend_vm_opcodes.h", "w+") or die("ERROR: Cannot create zend_vm_opcodes.h\n");
- Added missing header sections.
2005-01-10 22:57:36 +08:00
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
// Insert header
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
out($f, HEADER_TEXT);
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-22 02:27:58 +08:00
fputs($f, "#ifndef ZEND_VM_OPCODES_H\n#define ZEND_VM_OPCODES_H\n\n");
Exposed ZEND_VM_KIND etc
2015-03-16 17:00:04 +08:00
fputs($f, "#define ZEND_VM_SPEC\t\t" . ZEND_VM_SPEC . "\n");
fputs($f, "#define ZEND_VM_LINES\t\t" . ZEND_VM_LINES . "\n");
fputs($f, "#define ZEND_VM_KIND_CALL\t" . ZEND_VM_KIND_CALL . "\n");
fputs($f, "#define ZEND_VM_KIND_SWITCH\t" . ZEND_VM_KIND_SWITCH . "\n");
fputs($f, "#define ZEND_VM_KIND_GOTO\t" . ZEND_VM_KIND_GOTO . "\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
fputs($f, "#define ZEND_VM_KIND_HYBRID\t" . ZEND_VM_KIND_HYBRID . "\n");
if ($GLOBALS["vm_kind_name"][ZEND_VM_KIND] === "ZEND_VM_KIND_HYBRID") {
typo
2017-05-09 17:15:42 +08:00
fputs($f, "/* HYBRID requires support for computed GOTO and global register variables*/\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
fputs($f, "#if (defined(__GNUC__) && defined(HAVE_GCC_GLOBAL_REGS))\n");
fputs($f, "# define ZEND_VM_KIND\t\tZEND_VM_KIND_HYBRID\n");
fputs($f, "#else\n");
fputs($f, "# define ZEND_VM_KIND\t\tZEND_VM_KIND_CALL\n");
fputs($f, "#endif\n");
} else {
fputs($f, "#define ZEND_VM_KIND\t\t" . $GLOBALS["vm_kind_name"][ZEND_VM_KIND] . "\n");
}
Exposed ZEND_VM_KIND etc
2015-03-16 17:00:04 +08:00
fputs($f, "\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
foreach($vm_op_flags as $name => $val) {
fprintf($f, "#define %-24s 0x%08x\n", $name, $val);
}
Consolidate op1/op2 vm flags
2016-01-22 04:13:43 +08:00
fputs($f, "#define ZEND_VM_OP1_FLAGS(flags) (flags & 0xff)\n");
fputs($f, "#define ZEND_VM_OP2_FLAGS(flags) ((flags >> 8) & 0xff)\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
fputs($f, "\n");
Update the VM generation script, per Bob.
2014-11-01 01:10:49 +08:00
fputs($f, "BEGIN_EXTERN_C()\n\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
fputs($f, "ZEND_API const char *zend_get_opcode_name(zend_uchar opcode);\n");
fputs($f, "ZEND_API uint32_t zend_get_opcode_flags(zend_uchar opcode);\n\n");
Update the VM generation script, per Bob.
2014-11-01 01:10:49 +08:00
fputs($f, "END_EXTERN_C()\n\n");
stop warnings from unused opcode map
2013-12-22 21:00:51 +08:00
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
foreach ($opcodes as $code => $dsc) {
$code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT);
$op = str_pad($dsc["op"],$max_opcode_len);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if ($code <= $max_opcode) {
fputs($f,"#define $op $code\n");
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-22 02:27:58 +08:00
Fixed few issues: - Added ZEND_VM_LAST_OPCODE macro - Use better names LINE->OPLINE, REL_LINE->REL_OPLINE, FCALL->FAST_CALL, FRET->FAST_RET - Added ISSET flag to extended value of ZEND_ISSET_ISEMPTY_VAR opcode
2015-10-29 14:15:37 +08:00
$code = str_pad((string)$max_opcode,$code_len," ",STR_PAD_LEFT);
$op = str_pad("ZEND_VM_LAST_OPCODE",$max_opcode_len);
fputs($f,"\n#define $op $code\n");
Fixed warning "No new line at end of file"
2013-12-26 17:45:37 +08:00
fputs($f, "\n#endif\n");
Moved to new file, killing a lot of warnings
2013-12-22 06:45:34 +08:00
fclose($f);
echo "zend_vm_opcodes.h generated successfully.\n";
// zend_vm_opcodes.c
Fixed little typo in zend_vm_gen.php
2013-12-22 06:52:48 +08:00
$f = fopen(__DIR__ . "/zend_vm_opcodes.c", "w+") or die("ERROR: Cannot create zend_vm_opcodes.c\n");
Moved to new file, killing a lot of warnings
2013-12-22 06:45:34 +08:00
// Insert header
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
out($f, HEADER_TEXT);
stop warnings from unused opcode map
2013-12-22 21:00:51 +08:00
fputs($f,"#include <stdio.h>\n");
fputs($f,"#include <zend.h>\n\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
fputs($f,"static const char *zend_vm_opcodes_names[".($max_opcode + 1)."] = {\n");
Merge branch 'PHP-5.4' into PHP-5.5
2013-12-22 02:27:58 +08:00
for ($i = 0; $i <= $max_opcode; $i++) {
fputs($f,"\t".(isset($opcodes[$i]["op"])?'"'.$opcodes[$i]["op"].'"':"NULL").",\n");
}
stop warnings from unused opcode map
2013-12-22 21:00:51 +08:00
fputs($f, "};\n\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
fputs($f,"static uint32_t zend_vm_opcodes_flags[".($max_opcode + 1)."] = {\n");
for ($i = 0; $i <= $max_opcode; $i++) {
fprintf($f, "\t0x%08x,\n", isset($opcodes[$i]["flags"]) ? $opcodes[$i]["flags"] : 0);
}
fputs($f, "};\n\n");
Properly define ZEND_OP_DATA in zend_vm_def.h This allows zend_vm_gen.php to define them in zend_vm_opcodes.{c,h} without further hacks.
2015-04-20 05:21:57 +08:00
fputs($f, "ZEND_API const char* zend_get_opcode_name(zend_uchar opcode) {\n");
Added zend_get_opcode_flags() function to get information about opcode operands and extended_value meaning
2015-10-29 04:25:05 +08:00
fputs($f, "\treturn zend_vm_opcodes_names[opcode];\n");
fputs($f, "}\n");
fputs($f, "ZEND_API uint32_t zend_get_opcode_flags(zend_uchar opcode) {\n");
fputs($f, "\treturn zend_vm_opcodes_flags[opcode];\n");
Properly define ZEND_OP_DATA in zend_vm_def.h This allows zend_vm_gen.php to define them in zend_vm_opcodes.{c,h} without further hacks.
2015-04-20 05:21:57 +08:00
fputs($f, "}\n");
stop warnings from unused opcode map
2013-12-22 21:00:51 +08:00
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
fclose($f);
Moved to new file, killing a lot of warnings
2013-12-22 06:45:34 +08:00
echo "zend_vm_opcodes.c generated successfully.\n";
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Generate zend_vm_execute.h
Allow calling zend_vm_gen from everywhere Before one could only call it with cwd=Zend.
2012-05-24 02:34:17 +08:00
$f = fopen(__DIR__ . "/zend_vm_execute.h", "w+") or die("ERROR: Cannot create zend_vm_execute.h\n");
$executor_file = realpath(__DIR__ . "/zend_vm_execute.h");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
// Insert header
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
out($f, HEADER_TEXT);
- Added missing header sections.
2005-01-10 22:57:36 +08:00
Suppress static analyzer warnings in specialized executor As things like if(0) will be removed by the compiler, no need to see that tons of warnings with static analyzer enabled.
2013-08-23 23:41:07 +08:00
out($f, "#ifdef ZEND_WIN32\n");
- Let's generate this #ifdef only on zend_vm_execute.h
2010-06-08 07:04:30 +08:00
// Suppress free_op1 warnings on Windows
Disable C4101 warnings entirely on Windows
2016-12-08 10:50:31 +08:00
out($f, "# pragma warning(disable : 4101)\n");
Suppress static analyzer warnings in specialized executor As things like if(0) will be removed by the compiler, no need to see that tons of warnings with static analyzer enabled.
2013-08-23 23:41:07 +08:00
if (ZEND_VM_SPEC) {
// Suppress (<non-zero constant> || <expression>) warnings on windows
out($f, "# pragma warning(once : 6235)\n");
// Suppress (<zero> && <expression>) warnings on windows
out($f, "# pragma warning(once : 6237)\n");
// Suppress (<non-zero constant> && <expression>) warnings on windows
out($f, "# pragma warning(once : 6239)\n");
// Suppress (<expression> && <non-zero constant>) warnings on windows
out($f, "# pragma warning(once : 6240)\n");
// Suppress (<non-zero constant> || <non-zero constant>) warnings on windows
out($f, "# pragma warning(once : 6285)\n");
// Suppress (<non-zero constant> || <expression>) warnings on windows
out($f, "# pragma warning(once : 6286)\n");
typo spotted by Lajos Veres
2014-02-27 18:28:46 +08:00
// Suppress constant with constant comparison warnings on windows
Suppress static analyzer warnings in specialized executor As things like if(0) will be removed by the compiler, no need to see that tons of warnings with static analyzer enabled.
2013-08-23 23:41:07 +08:00
out($f, "# pragma warning(once : 6326)\n");
}
out($f, "#endif\n");
- Let's generate this #ifdef only on zend_vm_execute.h
2010-06-08 07:04:30 +08:00
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
// Support for ZEND_USER_OPCODE
Prevent generation of long strings
2010-08-10 22:44:50 +08:00
out($f, "static user_opcode_handler_t zend_user_opcode_handlers[256] = {\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
for ($i = 0; $i < 255; ++$i) {
Prevent generation of long strings
2010-08-10 22:44:50 +08:00
out($f, "\t(user_opcode_handler_t)NULL,\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
}
Prevent generation of long strings
2010-08-10 22:44:50 +08:00
out($f, "\t(user_opcode_handler_t)NULL\n};\n\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
out($f, "static zend_uchar zend_user_opcodes[256] = {");
for ($i = 0; $i < 255; ++$i) {
Prevent generation of long strings
2010-08-10 22:44:50 +08:00
if ($i % 16 == 1) out($f, "\n\t");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
out($f, "$i,");
}
Prevent generation of long strings
2010-08-10 22:44:50 +08:00
out($f, "255\n};\n\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
// Generate specialized executor
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_init_opcodes_handlers");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
// Generate zend_vm_get_opcode_handler() function
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f, "static const void *zend_vm_get_opcode_handler_ex(uint32_t spec, const zend_op* op)\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
out($f, "{\n");
if (!ZEND_VM_SPEC) {
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f, "\treturn zend_opcode_handlers[spec];\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else {
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f, "\tstatic const int zend_vm_decode[] = {\n");
out($f, "\t\t_UNUSED_CODE, /* 0 */\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_UNUSED_CODE, /* 8 = IS_UNUSED */\n");
out($f, "\t\t_UNUSED_CODE, /* 9 */\n");
out($f, "\t\t_UNUSED_CODE, /* 10 */\n");
out($f, "\t\t_UNUSED_CODE, /* 11 */\n");
out($f, "\t\t_UNUSED_CODE, /* 12 */\n");
out($f, "\t\t_UNUSED_CODE, /* 13 */\n");
out($f, "\t\t_UNUSED_CODE, /* 14 */\n");
out($f, "\t\t_UNUSED_CODE, /* 15 */\n");
out($f, "\t\t_CV_CODE /* 16 = 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");
Added possibility for extra specialization for SMART_BRANCH (e.g. IS_EQUAL+JMPZ superinstruction).
2016-03-11 17:17:03 +08:00
if (isset($used_extra_spec["OP_DATA"])) {
out($f, "\tif (spec & SPEC_RULE_OP_DATA) offset = offset * 5 + zend_vm_decode[(op + 1)->op1_type];\n");
}
if (isset($used_extra_spec["RETVAL"])) {
out($f, "\tif (spec & SPEC_RULE_RETVAL) offset = offset * 2 + (op->result_type != IS_UNUSED);\n");
}
if (isset($used_extra_spec["QUICK_ARG"])) {
out($f, "\tif (spec & SPEC_RULE_QUICK_ARG) offset = offset * 2 + (op->op2.num < MAX_ARG_FLAG_NUM);\n");
}
if (isset($used_extra_spec["SMART_BRANCH"])) {
out($f, "\tif (spec & SPEC_RULE_SMART_BRANCH) {\n");
out($f, "\t\toffset = offset * 3;\n");
out($f, "\t\tif ((op+1)->opcode == ZEND_JMPZ) {\n");
out($f, "\t\t\toffset += 1;\n");
out($f, "\t\t} else if ((op+1)->opcode == ZEND_JMPNZ) {\n");
out($f, "\t\t\toffset += 2;\n");
out($f, "\t\t}\n");
out($f, "\t}\n");
}
Specialize ZEND_ASSIGN_ADD and family according to value of opline->extended_value
2016-05-17 16:46:25 +08:00
if (isset($used_extra_spec["DIM_OBJ"])) {
out($f, "\tif (spec & SPEC_RULE_DIM_OBJ) {\n");
out($f, "\t\toffset = offset * 3;\n");
out($f, "\t\tif (op->extended_value == ZEND_ASSIGN_DIM) {\n");
out($f, "\t\t\toffset += 1;\n");
out($f, "\t\t} else if (op->extended_value == ZEND_ASSIGN_OBJ) {\n");
out($f, "\t\t\toffset += 2;\n");
out($f, "\t\t}\n");
out($f, "\t}\n");
}
Add extra VM operand specialization For now RETVAL and OP_DATA= are supported
2016-02-02 10:03:21 +08:00
out($f, "\treturn zend_opcode_handlers[(spec & SPEC_START_MASK) + offset];\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
}
out($f, "}\n\n");
fixed "unused function" compilation warning
2017-12-18 16:43:12 +08:00
out($f, "#if ZEND_VM_KIND != ZEND_VM_KIND_HYBRID\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
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");
} else {
out($f, "\treturn zend_vm_get_opcode_handler_ex(zend_spec_handlers[opcode], op);\n");
}
fixed "unused function" compilation warning
2017-12-18 16:43:12 +08:00
out($f, "}\n");
out($f, "#endif\n\n");
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
// Generate zend_vm_get_opcode_handler_func() function
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");
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 */\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_UNUSED_CODE, /* 8 = IS_UNUSED */\n");
out($f, "\t\t_UNUSED_CODE, /* 9 */\n");
out($f, "\t\t_UNUSED_CODE, /* 10 */\n");
out($f, "\t\t_UNUSED_CODE, /* 11 */\n");
out($f, "\t\t_UNUSED_CODE, /* 12 */\n");
out($f, "\t\t_UNUSED_CODE, /* 13 */\n");
out($f, "\t\t_UNUSED_CODE, /* 14 */\n");
out($f, "\t\t_UNUSED_CODE, /* 15 */\n");
out($f, "\t\t_CV_CODE /* 16 = 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"])) {
out($f, "\tif (spec & SPEC_RULE_OP_DATA) offset = offset * 5 + zend_vm_decode[(op + 1)->op1_type];\n");
}
if (isset($used_extra_spec["RETVAL"])) {
out($f, "\tif (spec & SPEC_RULE_RETVAL) offset = offset * 2 + (op->result_type != IS_UNUSED);\n");
}
if (isset($used_extra_spec["QUICK_ARG"])) {
out($f, "\tif (spec & SPEC_RULE_QUICK_ARG) offset = offset * 2 + (op->op2.num < MAX_ARG_FLAG_NUM);\n");
}
if (isset($used_extra_spec["SMART_BRANCH"])) {
out($f, "\tif (spec & SPEC_RULE_SMART_BRANCH) {\n");
out($f, "\t\toffset = offset * 3;\n");
out($f, "\t\tif ((op+1)->opcode == ZEND_JMPZ) {\n");
out($f, "\t\t\toffset += 1;\n");
out($f, "\t\t} else if ((op+1)->opcode == ZEND_JMPNZ) {\n");
out($f, "\t\t\toffset += 2;\n");
out($f, "\t\t}\n");
out($f, "\t}\n");
}
if (isset($used_extra_spec["DIM_OBJ"])) {
out($f, "\tif (spec & SPEC_RULE_DIM_OBJ) {\n");
out($f, "\t\toffset = offset * 3;\n");
out($f, "\t\tif (op->extended_value == ZEND_ASSIGN_DIM) {\n");
out($f, "\t\t\toffset += 1;\n");
out($f, "\t\t} else if (op->extended_value == ZEND_ASSIGN_OBJ) {\n");
out($f, "\t\t\toffset += 2;\n");
out($f, "\t\t}\n");
out($f, "\t}\n");
}
out($f, "\treturn zend_opcode_handler_funcs[(spec & SPEC_START_MASK) + offset];\n");
}
out($f, "}\n\n");
out($f, "#endif\n\n");
Fixed USER_OPCODE handling in HYBRID VM.
2017-05-16 02:17:58 +08:00
}
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
// Generate zend_vm_get_opcode_handler() function
export zend_vm_set_opcode_handler
2005-06-22 20:24:25 +08:00
out($f, "ZEND_API void zend_vm_set_opcode_handler(zend_op* op)\n");
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
out($f, "{\n");
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
if (!ZEND_VM_SPEC) {
out($f, "\top->handler = zend_vm_get_opcode_handler(op->opcode, op);\n");
} else {
out($f, "\tuint32_t spec = zend_spec_handlers[op->opcode];\n\n");
out($f, "\tif (spec & SPEC_RULE_COMMUTATIVE) {\n");
out($f, "\t\tif (op->op1_type < op->op2_type) {\n");
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(spec, op);\n");
}
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
out($f, "}\n\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
// Generate zend_vm_set_opcode_handler_ex() function
out($f, "ZEND_API void zend_vm_set_opcode_handler_ex(zend_op* op, uint32_t op1_info, uint32_t op2_info, uint32_t res_info)\n");
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");
} else {
out($f, "\tuint32_t spec = zend_spec_handlers[opcode];\n");
if (isset($used_extra_spec["TYPE"])) {
out($f, "\tswitch (opcode) {\n");
foreach($opcodes as $code => $dsc) {
if (isset($dsc['type_spec'])) {
$orig_op = $dsc['op'];
out($f, "\t\tcase $orig_op:\n");
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
if (isset($dsc["spec"]["COMMUTATIVE"])) {
out($f, "\t\t\tif (op->op1_type < op->op2_type) {\n");
out($f, "\t\t\t\tzend_swap_operands(op);\n");
out($f, "\t\t\t}\n");
}
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$first = true;
foreach($dsc['type_spec'] as $code => $condition) {
Remove extraneous parentheses in conditions The zend_vm_gen.php generator now checks if the condition is already enclosed by parentheses, and them only if needed. This fixes nine clang/llvm parentheses-equality warnings.
2016-12-23 05:01:20 +08:00
$condition = format_condition($condition);
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
if ($first) {
Remove extraneous parentheses in conditions The zend_vm_gen.php generator now checks if the condition is already enclosed by parentheses, and them only if needed. This fixes nine clang/llvm parentheses-equality warnings.
2016-12-23 05:01:20 +08:00
out($f, "\t\t\tif $condition {\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
$first = false;
} else {
Remove extraneous parentheses in conditions The zend_vm_gen.php generator now checks if the condition is already enclosed by parentheses, and them only if needed. This fixes nine clang/llvm parentheses-equality warnings.
2016-12-23 05:01:20 +08:00
out($f, "\t\t\t} else if $condition {\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
}
$spec_dsc = $opcodes[$code];
if (isset($spec_dsc["spec"]["NO_CONST_CONST"])) {
out($f, "\t\t\t\tif (op->op1_type == IS_CONST && op->op2_type == IS_CONST) {\n");
out($f, "\t\t\t\t\tbreak;\n");
out($f, "\t\t\t\t}\n");
}
out($f, "\t\t\t\tspec = ${spec_dsc['spec_code']};\n");
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
if (isset($spec_dsc["spec"]["COMMUTATIVE"]) && !isset($dsc["spec"]["COMMUTATIVE"])) {
out($f, "\t\t\t\tif (op->op1_type < op->op2_type) {\n");
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f, "\t\t\t\t\tzend_swap_operands(op);\n");
out($f, "\t\t\t\t}\n");
}
}
if (!$first) {
out($f, "\t\t\t}\n");
}
out($f, "\t\t\tbreak;\n");
}
}
Remove duplicate handlers for commutative operations
2017-12-15 18:42:54 +08:00
$has_commutative = false;
foreach($opcodes as $code => $dsc) {
if (!isset($dsc['is_type_spec']) &&
!isset($dsc['type_spec']) &&
isset($dsc["spec"]["COMMUTATIVE"])) {
$orig_op = $dsc['op'];
out($f, "\t\tcase $orig_op:\n");
$has_commutative = true;
}
}
if ($has_commutative) {
out($f, "\t\t\tif (op->op1_type < op->op2_type) {\n");
out($f, "\t\t\t\tzend_swap_operands(op);\n");
out($f, "\t\t\t}\n");
out($f, "\t\t\tbreak;\n");
}
Squashed commit of the following: commit 98471821a89d7106de508fc544504ba674025abe Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:56:04 2016 +0300 Fixed wrong constant usage commit 8183b811e74c2989bcd8ab9d870fc3adbe973980 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 21:10:23 2016 +0300 Added ability to serialize and serialize opcode handlers for file-cache commit 3516b261de7694bb1f34c5ae1adfb2f29dfab7bf Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:11:59 2016 +0300 Added missed file commit f4475a23608623ccbf11b00c1c74df1db55dffa2 Author: Dmitry Stogov <dmitry@zend.com> Date: Thu Mar 17 10:00:45 2016 +0300 Transparently introduce type-specialized opcode handlers. This affects only PHP VM, and doesn't change anything else.
2016-03-18 03:00:27 +08:00
out($f, "\t\tdefault:\n");
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, "}\n\n");
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
// Generate zend_vm_call_opcode_handler() function
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_CALL || ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
out($f, "ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)\n");
out($f, "{\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
out($f, "\topcode_handler_t handler;\n");
out($f,"#endif\n");
}
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
out($f, "\tint ret;\n");
out($f, "#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f, "\tconst zend_op *orig_opline = opline;\n");
out($f, "#endif\n");
out($f, "#ifdef ZEND_VM_FP_GLOBAL_REG\n");
out($f, "\tzend_execute_data *orig_execute_data = execute_data;\n");
out($f, "\texecute_data = ex;\n");
out($f, "#else\n");
out($f, "\tzend_execute_data *execute_data = ex;\n");
out($f, "#endif\n");
out($f, "\n");
out($f, "\tLOAD_OPLINE();\n");
Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
2017-05-04 23:56:28 +08:00
out($f,"#if defined(ZEND_VM_FP_GLOBAL_REG) && defined(ZEND_VM_IP_GLOBAL_REG)\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
out($f,"#if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID)\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f, "\thandler = (opcode_handler_t)zend_vm_get_opcode_handler_func(opline->opcode, opline);\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
out($f, "\thandler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
HYBRID VM cleanup
2017-05-16 14:24:23 +08:00
out($f, "\tif (EXPECTED(opline != &hybrid_halt_op)) {\n");
Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
2017-05-04 23:56:28 +08:00
out($f,"#else\n");
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
}
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f, "\t((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
Fixed zend_vm_call_opcode_handler(). Make phpdbg work with HYBRID VM.
2017-05-04 23:56:28 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_HYBRID) {
out($f, "\tif (EXPECTED(opline)) {\n");
out($f,"#endif\n");
} else {
out($f, "\tif (EXPECTED(opline)) {\n");
}
Fix zend_vm_call_opcode_handler (e.g. Generators throwing exceptions) with IP/FP registers
2015-08-26 07:25:25 +08:00
out($f, "\t\tret = execute_data != ex ? (int)(execute_data->prev_execute_data != ex) + 1 : 0;\n");
out($f, "\t\tSAVE_OPLINE();\n");
out($f, "\t} else {\n");
out($f, "\t\tret = -1;\n");
out($f, "\t}\n");
Make CALL VM with FP and IP in global registers not to return anything from opcode handlers. Set OPLINE to NULL to terminate VM loop instead. This saves 1 CPU instruction for each opcode handler.
2015-06-16 19:11:16 +08:00
out($f, "#else\n");
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
out($f, "\tret = ((opcode_handler_t)OPLINE->handler)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
out($f, "\tSAVE_OPLINE();\n");
Fix zend_vm_call_opcode_handler (e.g. Generators throwing exceptions) with IP/FP registers
2015-08-26 07:25:25 +08:00
out($f, "#endif\n");
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
out($f, "#ifdef ZEND_VM_FP_GLOBAL_REG\n");
out($f, "\texecute_data = orig_execute_data;\n");
out($f, "#endif\n");
out($f, "#ifdef ZEND_VM_IP_GLOBAL_REG\n");
out($f, "\topline = orig_opline;\n");
out($f, "#endif\n");
out($f, "\treturn ret;\n");
out($f, "}\n\n");
Fixed GOTO executor
2015-04-09 23:18:10 +08:00
} else {
out($f, "ZEND_API int zend_vm_call_opcode_handler(zend_execute_data* ex)\n");
out($f, "{\n");
out($f, "\tzend_error_noreturn(E_CORE_ERROR, \"zend_vm_call_opcode_handler() is not supported\");\n");
out($f, "\treturn 0;\n");
out($f, "}\n\n");
Added API function to call VM opcode handler in a portable way
2015-03-13 16:29:43 +08:00
}
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
// Export handlers and helpers
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
if (count($export) > 0 &&
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
ZEND_VM_KIND != ZEND_VM_KIND_CALL) {
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef OPLINE\n");
out($f,"#undef DCL_OPLINE\n");
out($f,"#undef USE_OPLINE\n");
out($f,"#undef LOAD_OPLINE\n");
Fixed typo
2015-08-10 22:57:49 +08:00
out($f,"#undef LOAD_NEXT_OPLINE\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#undef SAVE_OPLINE\n");
out($f,"#define OPLINE EX(opline)\n");
out($f,"#define DCL_OPLINE\n");
Use 'const' qualifier for pointrs to code used at run-time (the code must not be changed)
2014-08-28 06:44:06 +08:00
out($f,"#define USE_OPLINE const zend_op *opline = EX(opline);\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define LOAD_OPLINE()\n");
Fixed situation, when CHECH_EXCEPTION() might change value of "opline" variable and the following "opline" useages would access elements of different opcode. That might lead to unpredictable behavior. (Only PHP-7 with GCC global register variables was affected). CHECK_EXCEPTION() macro is removed. ZEND_VM_NEXT_OPCODE_CHECK_EXCEPTIO() should be used instead. It's equivalent to old CHECK_EXCEPTION() + ZEND_VM_NEXT_OPCODE(). As a side effect, this also slightly improved performnce of builds with GCC >= 4.8.
2015-07-08 23:33:58 +08:00
out($f,"#define LOAD_NEXT_OPLINE() ZEND_VM_INC_OPCODE()\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define SAVE_OPLINE()\n");
out($f,"#undef HANDLE_EXCEPTION\n");
out($f,"#undef HANDLE_EXCEPTION_LEAVE\n");
Revert "Fix return value memory leaks upon exceptions in opcode operand freeing" This reverts commit 9ad9d7ae375a6e8847ceaab287d3d23e0963a06e.
2016-12-02 16:58:41 +08:00
out($f,"#define HANDLE_EXCEPTION() LOAD_OPLINE(); ZEND_VM_CONTINUE()\n");
Added a number of small performance tweaks and optimizations . ZEND_RECV now always has IS_CV as its result . ZEND_CATCH now has to be used only with constant class names . ZEND_FETCH_DIM_? may fetch array and dimension operans in a different order
2010-04-20 19:16:39 +08:00
out($f,"#define HANDLE_EXCEPTION_LEAVE() LOAD_OPLINE(); ZEND_VM_LEAVE()\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
out($f,"#undef ZEND_VM_CONTINUE\n");
out($f,"#undef ZEND_VM_RETURN\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"#undef ZEND_VM_ENTER_EX\n");
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
out($f,"#undef ZEND_VM_ENTER\n");
out($f,"#undef ZEND_VM_LEAVE\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
out($f,"#undef ZEND_VM_DISPATCH\n");
Micro optimization for the main interpreter loop
2014-07-17 15:18:44 +08:00
out($f,"#define ZEND_VM_CONTINUE() return 0\n");
out($f,"#define ZEND_VM_RETURN() return -1\n");
Optimization of init_func_execute_data()
2017-12-06 07:53:30 +08:00
out($f,"#define ZEND_VM_ENTER_EX() return 1\n");
Micro optimization for the main interpreter loop
2014-07-17 15:18:44 +08:00
out($f,"#define ZEND_VM_ENTER() return 1\n");
out($f,"#define ZEND_VM_LEAVE() return 2\n");
Turn safe timeout handling into general interrupt handling ability.
2016-06-23 20:01:23 +08:00
out($f,"#define ZEND_VM_INTERRUPT() return zend_interrupt_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n\n");
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
out($f,"\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
}
foreach ($export as $dsk) {
list($kind, $func, $name) = $dsk;
out($f, "ZEND_API int $func(");
if ($kind == "handler") {
out($f, "ZEND_OPCODE_HANDLER_ARGS)\n");
$code = $opcodes[$opnames[$name]]['code'];
} else {
$h = $helpers[$name];
if ($h['param'] == null) {
out($f, "ZEND_OPCODE_HANDLER_ARGS)\n");
} else {
Allow CALL executor to keep few very often used vaiables in CPU registers. This is disabled by default yet, but may be enabled compiling zend_execute.c with -DHAVE_GCC_GLOBAL_REGS. Only tested on Linux x86 and x86_64 with GCC 4.9.2.
2015-03-13 08:28:21 +08:00
out($f, $h['param']. " ZEND_OPCODE_HANDLER_ARGS_DC)\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
}
$code = $h['code'];
}
$done = 0;
Executor cleanup: fix GOTO and SWITCH VMs, remove aility to build additional PHP-5.0 compatible VM, hide executor implementation details.
2015-03-13 01:39:04 +08:00
if (ZEND_VM_KIND == ZEND_VM_KIND_CALL) {
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
if ($kind == "handler") {
$op = $opcodes[$opnames[$name]];
if (isset($op['op1']["ANY"]) && isset($op['op2']["ANY"])) {
Fixed "zend_vm_gen.php --without-specializer"
2006-03-15 16:06:28 +08:00
out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
$done = 1;
}
} else if ($helpers[$name]["param"] == null) {
$h = $helpers[$name];
if (isset($h['op1']["ANY"]) && isset($h['op2']["ANY"])) {
Fixed "zend_vm_gen.php --without-specializer"
2006-03-15 16:06:28 +08:00
out($f, "{\n\treturn ".$name.(ZEND_VM_SPEC?"_SPEC":"")."(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n}\n\n");
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
$done = 1;
}
}
}
if (!$done) {
- MFH Little debug hack to allow printing vm function
2008-07-21 16:14:24 +08:00
gen_code($f, 0, ZEND_VM_KIND_CALL, 1, $code, 'ANY', 'ANY', $name);
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
}
}
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
fclose($f);
more typos fixed (thanks to Mike Naberezny for noticing these)
2005-12-06 04:06:33 +08:00
echo "zend_vm_execute.h generated successfully.\n";
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
function usage() {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
echo("\nUsage: php zend_vm_gen.php [options]\n".
"\nOptions:".
Switch to HYBRID VM
2017-05-17 20:07:33 +08:00
"\n --with-vm-kind=CALL|SWITCH|GOTO|HYBRID - select threading model (default is HYBRID)".
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
"\n --without-specializer - disable executor specialization".
"\n --with-lines - enable #line directives".
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
"\n\n");
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Parse arguments
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
for ($i = 1; $i < $argc; $i++) {
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
if (strpos($argv[$i],"--with-vm-kind=") === 0) {
$kind = substr($argv[$i], strlen("--with-vm-kind="));
switch ($kind) {
case "CALL":
define("ZEND_VM_KIND", ZEND_VM_KIND_CALL);
break;
case "SWITCH":
define("ZEND_VM_KIND", ZEND_VM_KIND_SWITCH);
break;
case "GOTO":
define("ZEND_VM_KIND", ZEND_VM_KIND_GOTO);
break;
Implemented HYBRID VM instruction dispatch method that takes advantages of both CALL and GOTO VMs.
2017-05-03 15:01:22 +08:00
case "HYBRID":
define("ZEND_VM_KIND", ZEND_VM_KIND_HYBRID);
break;
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
default:
echo("ERROR: Invalid vm kind '$kind'\n");
usage();
die();
}
} else if ($argv[$i] == "--without-specializer") {
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
// Disabling specialization
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
define("ZEND_VM_SPEC", 0);
--without-lines changed to --with-lines
2004-10-28 14:48:59 +08:00
} else if ($argv[$i] == "--with-lines") {
typo fixes
2013-07-13 20:37:04 +08:00
// Enabling debugging using original zend_vm_def.h
--without-lines changed to --with-lines
2004-10-28 14:48:59 +08:00
define("ZEND_VM_LINES", 1);
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
} else if ($argv[$i] == "--help") {
usage();
exit();
} else {
echo("ERROR: Invalid option '".$argv[$i]."'\n");
usage();
die();
}
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
// Using defaults
if (!defined("ZEND_VM_KIND")) {
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
// Using CALL threading by default
Switch to HYBRID VM
2017-05-17 20:07:33 +08:00
define("ZEND_VM_KIND", ZEND_VM_KIND_HYBRID);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
if (!defined("ZEND_VM_SPEC")) {
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
// Using specialized executor by default
- Improve comments, docs, code...
2004-10-28 01:58:46 +08:00
define("ZEND_VM_SPEC", 1);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
if (!defined("ZEND_VM_LINES")) {
Remove a few references to $GLOBALS and clean up a bit
2016-06-01 14:57:33 +08:00
// Disabling #line directives
--without-lines changed to --with-lines
2004-10-28 14:48:59 +08:00
define("ZEND_VM_LINES", 0);
- Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :)
2004-10-23 05:42:14 +08:00
}
Allow calling zend_vm_gen from everywhere Before one could only call it with cwd=Zend.
2012-05-24 02:34:17 +08:00
gen_vm(__DIR__ . "/zend_vm_def.h", __DIR__ . "/zend_vm_execute.skl");
Reference in New Issue Copy Permalink