mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-24 10:24:11 +08:00
Code Issues Packages Projects Releases Wiki Activity
2e3e96b24b
php-src/Zend/zend_vm_def.h

5658 lines
159 KiB
C
Raw Normal View History

- Added missing header sections.
2005-01-10 22:57:36 +08:00
/*
+----------------------------------------------------------------------+
| Zend Engine |
+----------------------------------------------------------------------+
Bump year
2014-01-03 11:08:10 +08:00
| Copyright (c) 1998-2014 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
+----------------------------------------------------------------------+
*/
/* $Id$ */
- Regenerate VM files and add warning about regeneration
2005-06-06 23:17:20 +08:00
/* If you change this file, please regenerate the zend_vm_execute.h and
* zend_vm_opcodes.h files by running:
* php zend_vm_gen.php
*/
- 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
ZEND_VM_HANDLER(1, ZEND_ADD, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_add_function(EX_VAR(opline->result.var),
Use better data structures (incomplete)
2014-02-19 05:12:05 +08:00
GET_OP1_ZVAL_PTR(BP_VAR_R),
GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(2, ZEND_SUB, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_sub_function(EX_VAR(opline->result.var),
Use better data structures (incomplete)
2014-02-19 05:12:05 +08:00
GET_OP1_ZVAL_PTR(BP_VAR_R),
GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(3, ZEND_MUL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_mul_function(EX_VAR(opline->result.var),
Use better data structures (incomplete)
2014-02-19 05:12:05 +08:00
GET_OP1_ZVAL_PTR(BP_VAR_R),
GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(4, ZEND_DIV, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_div_function(EX_VAR(opline->result.var),
Use better data structures (incomplete)
2014-02-19 05:12:05 +08:00
GET_OP1_ZVAL_PTR(BP_VAR_R),
GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(5, ZEND_MOD, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_mod_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(6, ZEND_SL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
shift_left_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(7, ZEND_SR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
shift_right_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(8, ZEND_CONCAT, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
concat_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(15, ZEND_IS_IDENTICAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
is_identical_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(16, ZEND_IS_NOT_IDENTICAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
MFH: small CSE optimizations
2008-05-16 22:34:31 +08:00
is_identical_function(result,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
MFH: small CSE optimizations
2008-05-16 22:34:31 +08:00
Z_LVAL_P(result) = !Z_LVAL_P(result);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(17, ZEND_IS_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
ZVAL_BOOL(result, fast_equal_function(result,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC));
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(18, ZEND_IS_NOT_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
ZVAL_BOOL(result, fast_not_equal_function(result,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC));
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(19, ZEND_IS_SMALLER, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
ZVAL_BOOL(result, fast_is_smaller_function(result,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC));
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(20, ZEND_IS_SMALLER_OR_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
ZVAL_BOOL(result, fast_is_smaller_or_equal_function(result,
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC));
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(9, ZEND_BW_OR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
bitwise_or_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(10, ZEND_BW_AND, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
bitwise_and_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(11, ZEND_BW_XOR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
bitwise_xor_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(14, ZEND_BOOL_XOR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
boolean_xor_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R),
GET_OP2_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(12, ZEND_BW_NOT, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
bitwise_not_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(13, ZEND_BOOL_NOT, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
boolean_not_function(EX_VAR(opline->result.var),
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R) TSRMLS_CC);
- 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
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC))
- 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 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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2, free_op_data1;
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zval *object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
- 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
zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
zval *value;
- 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
int have_get_ptr = 0;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(object) == IS_STR_OFFSET)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an object");
}
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
//???: object may become INDIRECT
if (OP1_TYPE == IS_CV && Z_TYPE_P(object) == IS_INDIRECT) {
object = Z_INDIRECT_P(object);
}
Fixed support for references
2014-03-14 02:56:18 +08:00
if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
make_real_object(object TSRMLS_CC);
//???
if (Z_TYPE_P(object) == IS_INDIRECT) {
object = Z_INDIRECT_P(object);
}
}
if (UNEXPECTED(Z_ISREF_P(object))) {
object = Z_REFVAL_P(object);
}
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, execute_data, &free_op_data1, BP_VAR_R);
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
if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
- 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
zend_error(E_WARNING, "Attempt to assign property of non-object");
FREE_OP2();
FREE_OP(free_op_data1);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
}
} else {
/* here we are sure we are dealing with an object */
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
- 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
/* here property is a string */
if (opline->extended_value == ZEND_ASSIGN_OBJ
&& Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
- 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 (zptr != NULL) { /* NULL means no success in getting PTR */
SEPARATE_ZVAL_IF_NOT_REF(zptr);
have_get_ptr = 1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
binary_op(zptr, zptr, value TSRMLS_CC);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), zptr);
- 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 (!have_get_ptr) {
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval *z = NULL;
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
zval rv;
- 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 bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (opline->extended_value == ZEND_ASSIGN_OBJ) {
if (Z_OBJ_HT_P(object)->read_property) {
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_R, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), &rv TSRMLS_CC);
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
}
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
if (Z_OBJ_HT_P(object)->read_dimension) {
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
z = Z_OBJ_HT_P(object)->read_dimension(object, property, BP_VAR_R, &rv TSRMLS_CC);
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +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
}
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
if (z) {
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get) {
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
- 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
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
if (Z_REFCOUNT_P(z) == 0) {
Added garbage collector
2008-01-22 17:27:48 +08:00
GC_REMOVE_ZVAL_FROM_BUFFER(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval_dtor(z);
}
z = value;
}
Fixed memory leak
2014-03-07 04:26:21 +08:00
//??? if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_IF_NOT_REF(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
binary_op(z, z, value TSRMLS_CC);
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (opline->extended_value == ZEND_ASSIGN_OBJ) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
Z_OBJ_HT_P(object)->write_property(object, property, z, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
} else /* if (opline->extended_value == ZEND_ASSIGN_DIM) */ {
Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
} else {
zend_error(E_WARNING, "Attempt to assign property of non-object");
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
FREE_OP(free_op_data1);
}
FREE_OP1_VAR_PTR();
/* assign_obj has two opcodes! */
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
CHECK_EXCEPTION();
- 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
ZEND_VM_INC_OPCODE();
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HELPER_EX(zend_binary_assign_op_helper, VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC))
- 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 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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2, free_op_data2, free_op_data1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr;
- 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
zval *value;
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
SAVE_OPLINE();
- 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
switch (opline->extended_value) {
case ZEND_ASSIGN_OBJ:
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_obj_helper, binary_op, binary_op);
break;
case ZEND_ASSIGN_DIM: {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zval *container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (UNEXPECTED(Z_TYPE_P(container) == IS_OBJECT)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (OP1_TYPE == IS_VAR && !OP1_FREE) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_ADDREF_P(container); /* undo the effect of get_obj_zval_ptr_ptr() */
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +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
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_obj_helper, binary_op, binary_op);
} else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
zval *dim = GET_OP2_ZVAL_PTR(BP_VAR_R);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR((opline+1)->op2.var), container, dim, OP2_TYPE, BP_VAR_RW TSRMLS_CC);
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, execute_data, &free_op_data1, BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = _get_zval_ptr_ptr_var((opline+1)->op2.var, execute_data, &free_op_data2 TSRMLS_CC);
- 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
}
}
break;
default:
value = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
- 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
/* do nothing */
break;
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot use assign-op operators with overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(var_ptr == &EG(error_zval))) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
}
FREE_OP2();
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
if (opline->extended_value == ZEND_ASSIGN_DIM) {
ZEND_VM_INC_OPCODE();
}
- 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
ZEND_VM_NEXT_OPCODE();
}
SEPARATE_ZVAL_IF_NOT_REF(var_ptr);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_OBJECT)
&& Z_OBJ_HANDLER_P(var_ptr, get)
&& Z_OBJ_HANDLER_P(var_ptr, set)) {
- 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
/* proxy object */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *objval = Z_OBJ_HANDLER_P(var_ptr, get)(var_ptr TSRMLS_CC);
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(objval);
- 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
binary_op(objval, objval, value TSRMLS_CC);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HANDLER_P(var_ptr, set)(var_ptr, objval TSRMLS_CC);
zval_ptr_dtor(objval);
- 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
} else {
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
//???deref
if (Z_ISREF_P(var_ptr)) {
var_ptr = Z_REFVAL_P(var_ptr);
Use better data structures (incomplete)
2014-02-18 15:44:58 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
binary_op(var_ptr, var_ptr, value TSRMLS_CC);
- 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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
- 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
}
FREE_OP2();
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (opline->extended_value == ZEND_ASSIGN_DIM) {
Fixed memory leak
2005-07-03 19:09:42 +08:00
FREE_OP(free_op_data1);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
FREE_OP_VAR_PTR(free_op_data2);
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
FREE_OP1_VAR_PTR();
CHECK_EXCEPTION();
ZEND_VM_INC_OPCODE();
} else {
FREE_OP1_VAR_PTR();
CHECK_EXCEPTION();
- 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
}
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(23, ZEND_ASSIGN_ADD, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, add_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(24, ZEND_ASSIGN_SUB, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, sub_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(25, ZEND_ASSIGN_MUL, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, mul_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(26, ZEND_ASSIGN_DIV, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, div_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(27, ZEND_ASSIGN_MOD, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, mod_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(28, ZEND_ASSIGN_SL, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, shift_left_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(29, ZEND_ASSIGN_SR, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, shift_right_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(30, ZEND_ASSIGN_CONCAT, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, concat_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(31, ZEND_ASSIGN_BW_OR, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_or_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(32, ZEND_ASSIGN_BW_AND, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_and_function);
}
Fixed bug #32833 (Invalid opcode)
2005-04-27 20:16:32 +08:00
ZEND_VM_HANDLER(33, ZEND_ASSIGN_BW_XOR, VAR|UNUSED|CV, 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_xor_function);
}
ZEND_VM_HELPER_EX(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, incdec_t incdec_op)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
zval *object;
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
zval *property;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval;
- 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
int have_get_ptr = 0;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
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
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = EX_VAR(opline->result.var);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(object) == IS_STR_OFFSET)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
make_real_object(object TSRMLS_CC); /* this should modify object only if it's empty */
- 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 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
if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
- 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
zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
FREE_OP2();
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(retval);
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
/* here we are sure we are dealing with an object */
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +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
if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
- 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 (zptr != NULL) { /* NULL means no success in getting PTR */
SEPARATE_ZVAL_IF_NOT_REF(zptr);
have_get_ptr = 1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
incdec_op(zptr);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(retval, zptr);
- 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 (!have_get_ptr) {
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
zval rv;
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) {
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_R, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), &rv TSRMLS_CC);
- 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 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
if (UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) && Z_OBJ_HT_P(z)->get) {
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
- 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
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
if (Z_REFCOUNT_P(z) == 0) {
Added garbage collector
2008-01-22 17:27:48 +08:00
GC_REMOVE_ZVAL_FROM_BUFFER(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval_dtor(z);
}
z = value;
}
Fixed reference counting
2014-02-28 03:25:41 +08:00
if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_IF_NOT_REF(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
incdec_op(z);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(retval, z);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
Z_OBJ_HT_P(object)->write_property(object, property, z, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SELECTIVE_PZVAL_LOCK(retval, opline);
zval_ptr_dtor(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
} else {
zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(retval);
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(132, ZEND_PRE_INC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_pre_incdec_property_helper, incdec_op, increment_function);
}
ZEND_VM_HANDLER(133, ZEND_PRE_DEC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_pre_incdec_property_helper, incdec_op, decrement_function);
}
ZEND_VM_HELPER_EX(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, incdec_t incdec_op)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
zval *object;
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
zval *property;
zval *retval;
- 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
int have_get_ptr = 0;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
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
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = EX_VAR(opline->result.var);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(object) == IS_STR_OFFSET)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
make_real_object(object TSRMLS_CC); /* this should modify object only if it's empty */
- 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 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
if (UNEXPECTED(Z_TYPE_P(object) != IS_OBJECT)) {
- 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
zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
FREE_OP2();
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
ZVAL_NULL(retval);
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
/* here we are sure we are dealing with an object */
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +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
if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property, BP_VAR_RW, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
- 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 (zptr != NULL) { /* NULL means no success in getting PTR */
have_get_ptr = 1;
SEPARATE_ZVAL_IF_NOT_REF(zptr);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(retval, zptr);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
incdec_op(zptr);
- 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 (!have_get_ptr) {
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
if (Z_OBJ_HT_P(object)->read_property && Z_OBJ_HT_P(object)->write_property) {
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
zval rv;
zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_R, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), &rv TSRMLS_CC);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval z_copy;
- 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 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
if (UNEXPECTED(Z_TYPE_P(z) == IS_OBJECT) && Z_OBJ_HT_P(z)->get) {
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC);
- 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
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
if (Z_REFCOUNT_P(z) == 0) {
Added garbage collector
2008-01-22 17:27:48 +08:00
GC_REMOVE_ZVAL_FROM_BUFFER(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
zval_dtor(z);
}
z = value;
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(retval, z);
ZVAL_DUP(&z_copy, z);
incdec_op(&z_copy);
Fixed reference counting
2014-02-28 03:25:41 +08:00
if (Z_REFCOUNTED_P(z)) Z_ADDREF_P(z);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HT_P(object)->write_property(object, property, &z_copy, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Fixed bug #30889 (Conflict between __get/__set and ++ operator)
2005-04-26 21:23:23 +08:00
zval_ptr_dtor(&z_copy);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(z);
Fix certain operations to stop relying on presence of read_property and write_property handlers. They may be NULL'ed out by certain objects pretending to be pure arrays, for example. Do checks first.
2005-04-16 01:15:18 +08:00
} else {
zend_error(E_WARNING, "Attempt to increment/decrement property of non-object");
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
ZVAL_NULL(retval);
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(134, ZEND_POST_INC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_post_incdec_property_helper, incdec_op, increment_function);
}
ZEND_VM_HANDLER(135, ZEND_POST_DEC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_post_incdec_property_helper, incdec_op, decrement_function);
}
ZEND_VM_HANDLER(34, ZEND_PRE_INC, VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(var_ptr == &EG(error_zval))) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
if (Z_TYPE_P(var_ptr) == IS_REFERENCE) {
var_ptr = Z_REFVAL_P(var_ptr);
} else {
SEPARATE_ZVAL(var_ptr);
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_OBJECT)
&& Z_OBJ_HANDLER_P(var_ptr, get)
&& Z_OBJ_HANDLER_P(var_ptr, set)) {
- 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
/* proxy object */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *val = Z_OBJ_HANDLER_P(var_ptr, get)(var_ptr TSRMLS_CC);
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(val);
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
fast_increment_function(val);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HANDLER_P(var_ptr, set)(var_ptr, val TSRMLS_CC);
zval_ptr_dtor(val);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_increment_function(var_ptr);
- 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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(35, ZEND_PRE_DEC, VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(var_ptr == &EG(error_zval))) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
if (Z_TYPE_P(var_ptr) == IS_REFERENCE) {
var_ptr = Z_REFVAL_P(var_ptr);
} else {
SEPARATE_ZVAL(var_ptr);
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_OBJECT)
&& Z_OBJ_HANDLER_P(var_ptr, get)
&& Z_OBJ_HANDLER_P(var_ptr, set)) {
- 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
/* proxy object */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *val = Z_OBJ_HANDLER_P(var_ptr, get)(var_ptr TSRMLS_CC);
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(val);
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
fast_decrement_function(val);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HANDLER_P(var_ptr, set)(var_ptr, val TSRMLS_CC);
zval_ptr_dtor(val);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_decrement_function(var_ptr);
- 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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), var_ptr);
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(36, ZEND_POST_INC, VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr, *retval;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(var_ptr == &EG(error_zval))) {
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = EX_VAR(opline->result.var);
- 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 ++/-- of references
2014-02-24 15:23:25 +08:00
if (Z_TYPE_P(var_ptr) == IS_REFERENCE) {
var_ptr = Z_REFVAL_P(var_ptr);
Fixed POST_INC/POST_DEC
2014-02-25 17:20:43 +08:00
ZVAL_DUP(retval, var_ptr);
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
} else {
Fixed POST_INC/POST_DEC
2014-02-25 17:20:43 +08:00
ZVAL_DUP(retval, var_ptr);
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
SEPARATE_ZVAL(var_ptr);
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_OBJECT)
&& Z_OBJ_HANDLER_P(var_ptr, get)
&& Z_OBJ_HANDLER_P(var_ptr, set)) {
- 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
/* proxy object */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *val = Z_OBJ_HANDLER_P(var_ptr, get)(var_ptr TSRMLS_CC);
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(val);
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
fast_increment_function(val);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HANDLER_P(var_ptr, set)(var_ptr, val TSRMLS_CC);
zval_ptr_dtor(val);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_increment_function(var_ptr);
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(37, ZEND_POST_DEC, VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr, *retval;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(var_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(var_ptr == &EG(error_zval))) {
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = EX_VAR(opline->result.var);
- 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 ++/-- of references
2014-02-24 15:23:25 +08:00
if (Z_TYPE_P(var_ptr) == IS_REFERENCE) {
var_ptr = Z_REFVAL_P(var_ptr);
Fixed POST_INC/POST_DEC
2014-02-25 17:20:43 +08:00
ZVAL_DUP(retval, var_ptr);
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
} else {
Fixed POST_INC/POST_DEC
2014-02-25 17:20:43 +08:00
ZVAL_DUP(retval, var_ptr);
Fixed ++/-- of references
2014-02-24 15:23:25 +08:00
SEPARATE_ZVAL(var_ptr);
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(var_ptr) == IS_OBJECT)
&& Z_OBJ_HANDLER_P(var_ptr, get)
&& Z_OBJ_HANDLER_P(var_ptr, set)) {
- 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
/* proxy object */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *val = Z_OBJ_HANDLER_P(var_ptr, get)(var_ptr TSRMLS_CC);
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(val);
Arithmetic speedup. Inlined most probable code-paths for arithmetic operations directly into executor.
2011-05-23 16:05:44 +08:00
fast_decrement_function(val);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HANDLER_P(var_ptr, set)(var_ptr, val TSRMLS_CC);
zval_ptr_dtor(val);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fast_decrement_function(var_ptr);
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(40, ZEND_ECHO, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *z;
SAVE_OPLINE();
z = GET_OP1_ZVAL_PTR(BP_VAR_R);
- 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
Fix bug #64023 (__toString() & SplFileInfo) Defining a __toString() method was having no effect when concatenating the object. This was because the cast_object() handler would ignore __toString(). Using echo() directly would actually use __toString(), but this was a bug: the ECHO handler would try zend_std_cast_object_tostring() before cast_object(), but cast_object() should have priority as zend_std_cast_object_tostring() assumes an object with a zend_class_entry.
2013-01-19 23:21:26 +08:00
if (OP1_TYPE == IS_TMP_VAR && Z_TYPE_P(z) == IS_OBJECT) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
Z_SET_REFCOUNT_P(z, 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
}
Missing handling of IS_REF in ext/standard/tests/strings/bug47842.php
2014-02-23 19:36:38 +08:00
if (UNEXPECTED(Z_ISREF_P(z))) {
z = Z_REFVAL_P(z);
}
Fix bug #64023 (__toString() & SplFileInfo) Defining a __toString() method was having no effect when concatenating the object. This was because the cast_object() handler would ignore __toString(). Using echo() directly would actually use __toString(), but this was a bug: the ECHO handler would try zend_std_cast_object_tostring() before cast_object(), but cast_object() should have priority as zend_std_cast_object_tostring() assumes an object with a zend_class_entry.
2013-01-19 23:21:26 +08:00
zend_print_variable(z);
- 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
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(41, ZEND_PRINT, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_LONG(EX_VAR(opline->result.var), 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
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ECHO);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, UNUSED|CONST|VAR, int type)
- 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 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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *varname;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval;
- 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
zval tmp_varname;
HashTable *target_symbol_table;
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
SAVE_OPLINE();
varname = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (OP1_TYPE != IS_CONST && UNEXPECTED(Z_TYPE_P(varname) != IS_STRING)) {
Use better data structures (incomplete)
2014-02-14 21:48:45 +08:00
ZVAL_DUP_DEREF(&tmp_varname, varname);
- 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
convert_to_string(&tmp_varname);
varname = &tmp_varname;
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
if (OP2_TYPE != IS_UNUSED) {
zend_class_entry *ce;
if (OP2_TYPE == IS_CONST) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
ce = CACHED_PTR(opline->op2.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = zend_fetch_class_by_name(Z_STR_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-02-25 21:56:59 +08:00
if (UNEXPECTED(ce == NULL)) {
if (OP1_TYPE != IS_CONST && varname == &tmp_varname) {
zval_dtor(&tmp_varname);
}
FREE_OP1();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_CE_P(EX_VAR(opline->op2.var));
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = zend_std_get_static_property(ce, Z_STR_P(varname), 0, ((OP1_TYPE == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC);
Fixed memleak in tests/lang/engine_assignExecutionOrder_001.phpt
2009-09-21 21:01:17 +08:00
FREE_OP1();
- 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
} else {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC);
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
//???: STRING may become INDIRECT
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
if (OP1_TYPE == IS_CV && Z_TYPE_P(varname) == IS_INDIRECT) {
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
varname = Z_INDIRECT_P(varname);
}
- 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 (!target_symbol_table) {
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
*/
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((retval = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
- 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
switch (type) {
case BP_VAR_R:
case BP_VAR_UNSET:
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
- 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
/* break missing intentionally */
case BP_VAR_IS:
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
retval = EX_VAR(opline->result.var);
ZVAL_NULL(retval);
- 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
break;
case BP_VAR_RW:
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
zend_error(E_NOTICE,"Undefined variable: %s", Z_STRVAL_P(varname));
- 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
/* break missing intentionally */
Review ended Revert "An demo(for review) to show how to fix the problem(symbol table resize)" This reverts commit 60c354510b6731ec8348af9c5e230a4859c7c383.
2014-03-11 14:23:14 +08:00
case BP_VAR_W:
retval = zend_hash_update(target_symbol_table, Z_STR_P(varname), &EG(uninitialized_zval));
- 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
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
}
Review ended Revert "An demo(for review) to show how to fix the problem(symbol table resize)" This reverts commit 60c354510b6731ec8348af9c5e230a4859c7c383.
2014-03-11 14:23:14 +08:00
switch (opline->extended_value & ZEND_FETCH_TYPE_MASK) {
case ZEND_FETCH_GLOBAL:
if (OP1_TYPE != IS_TMP_VAR) {
FREE_OP1();
}
break;
case ZEND_FETCH_LOCAL:
FREE_OP1();
break;
case ZEND_FETCH_STATIC:
zval_update_constant(retval, (void*) 1 TSRMLS_CC);
break;
case ZEND_FETCH_GLOBAL_LOCK:
if (OP1_TYPE == IS_VAR && !OP1_FREE) {
Z_ADDREF_P(EX_VAR(opline->op1.var));
}
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
}
Additional executor specialization
2008-01-24 01:55:55 +08:00
if (OP1_TYPE != IS_CONST && varname == &tmp_varname) {
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
zval_dtor(&tmp_varname);
- 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 test tests/classes/__call_007.php
2014-02-21 21:39:02 +08:00
Review ended Revert "An demo(for review) to show how to fix the problem(symbol table resize)" This reverts commit 60c354510b6731ec8348af9c5e230a4859c7c383.
2014-03-11 14:23:14 +08:00
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval);
ZEND_FETCH_*_R operations simplified and can't be used with EXT_TYPE_UNUSED flag any more. Thit is very rare and useless case. ZEND_FREE might be required after them instead.
2010-07-16 21:38:09 +08:00
}
Use better data structures (incomplete)
2014-02-19 19:34:32 +08:00
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
if (EXPECTED(retval != NULL)) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(retval)) Z_ADDREF_P(retval);
Fixed test tests/classes/__call_007.php
2014-02-21 21:39:02 +08:00
switch (type) {
case BP_VAR_R:
case BP_VAR_IS:
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), retval);
break;
case BP_VAR_UNSET: {
//??? zend_free_op free_res;
//???
//??? PZVAL_UNLOCK(*retval, &free_res);
//??? if (retval != &EG(uninitialized_zval_ptr)) {
//??? SEPARATE_ZVAL_IF_NOT_REF(retval);
//??? }
//??? PZVAL_LOCK(*retval);
//??? FREE_OP_VAR_PTR(free_res);
}
/* break missing intentionally */
default:
ZVAL_INDIRECT(EX_VAR(opline->result.var), retval);
break;
}
Use better data structures (incomplete)
2014-02-19 19:34: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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(80, ZEND_FETCH_R, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_R);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(83, ZEND_FETCH_W, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_W);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(86, ZEND_FETCH_RW, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_RW);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(92, ZEND_FETCH_FUNC_ARG, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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 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
USE_OPLINE
- 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
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type,
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC) ? BP_VAR_W : BP_VAR_R);
- 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
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(95, ZEND_FETCH_UNSET, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_UNSET);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(89, ZEND_FETCH_IS, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_IS);
}
Implement const array/string dereference RFC:https://wiki.php.net/rfc/constdereference
2012-04-15 11:40:38 +08:00
ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, CONST|TMP|VAR|CV, CONST|TMP|VAR|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
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
zval *container;
- 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 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
SAVE_OPLINE();
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
container = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address_read(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
- 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
FREE_OP2();
Merge branch 'PHP-5.5' into PHP-5.6 * PHP-5.5: Fixed bug #65969 (Chain assignment with T_LIST failure) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-11-27 18:56:18 +08:00
if (OP1_TYPE != IS_VAR || !(opline->extended_value & ZEND_FETCH_ADD_LOCK)) {
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
FREE_OP1();
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(84, ZEND_FETCH_DIM_W, VAR|CV, CONST|TMP|VAR|UNUSED|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_W TSRMLS_CC);
- 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
FREE_OP2();
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
Temporary refcounting fix
2014-02-27 17:06:11 +08:00
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
FREE_OP1_VAR_PTR();
Fixed bug #35163 (Array elements can lose references)
2007-10-23 17:55:11 +08:00
/* We are going to assign the result by reference */
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
if (UNEXPECTED(opline->extended_value != 0)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval_ptr = EX_VAR(opline->result.var);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
It's not possible to create reference to string-offset
2014-03-05 21:32:23 +08:00
if (Z_TYPE_P(retval_ptr) != IS_STR_OFFSET) {
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
zval *retval_ind = retval_ptr;
It's not possible to create reference to string-offset
2014-03-05 21:32:23 +08:00
if (Z_TYPE_P(retval_ptr) == IS_INDIRECT) {
retval_ptr = Z_INDIRECT_P(retval_ptr);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (retval_ptr == &EG(uninitialized_zval) || retval_ptr == &EG(error_zval)) {
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
It's not possible to create reference to string-offset
2014-03-05 21:32:23 +08:00
}
if (!Z_ISREF_P(retval_ptr)) {
if (Z_REFCOUNTED_P(retval_ptr)) {
Z_DELREF_P(retval_ptr);
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr);
} else {
ZVAL_NEW_REF(retval_ptr, retval_ptr);
}
Z_ADDREF_P(retval_ptr);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (retval_ind != retval_ptr) {
ZVAL_REF(retval_ind, Z_REF_P(retval_ptr));
}
Better IS_REFERENCE handling
2014-02-25 04:17:13 +08:00
}
}
Fixed bug #35163 (Array elements can lose references)
2007-10-23 17:55:11 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #34064 (arr[] as param to function in class gives invalid opcode)
2005-08-10 18:39:55 +08:00
ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, 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
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
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
SAVE_OPLINE();
Fixed ArrayAccess behavior
2014-03-06 21:59:17 +08:00
container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_RW TSRMLS_CC);
- 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
FREE_OP2();
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
zval *container;
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
SAVE_OPLINE();
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
container = GET_OP1_ZVAL_PTR(BP_VAR_IS);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address_read(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_IS TSRMLS_CC);
- 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
FREE_OP2();
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #34064 (arr[] as param to function in class gives invalid opcode)
2005-08-10 18:39:55 +08:00
ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, 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
{
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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
- 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
zend_free_op free_op1, free_op2;
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +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
SAVE_OPLINE();
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
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
if (OP1_TYPE == IS_VAR && UNEXPECTED(container == NULL)) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_W TSRMLS_CC);
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP2();
FREE_OP1_VAR_PTR();
executor optimization
2007-12-14 22:14:50 +08:00
} else {
if (OP2_TYPE == IS_UNUSED) {
zend_error_noreturn(E_ERROR, "Cannot use [] for reading");
Fixed bug #43201 (Crash on using unitialized vals and __get/__set)
2007-11-06 22:11:59 +08:00
}
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
container = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address_read(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP2();
Fixed bug #65969 (Chain assignment with T_LIST failure)
2013-11-27 18:26:34 +08:00
FREE_OP1();
Fixed bug #37144 (PHP crashes trying to assign into property of dead object)
2006-07-19 17:55:19 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_ZVAL_PTR_PTR(BP_VAR_UNSET);
- 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 bug #34518 (Unset doesn't separate container in CV)
2005-09-16 22:42:46 +08:00
if (OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_IF_NOT_REF(container);
Fixed bug #34518 (Unset doesn't separate container in CV)
2005-09-16 22:42:46 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR(opline->result.var), container, GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_UNSET TSRMLS_CC);
- 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
FREE_OP2();
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(EX_VAR(opline->result.var)) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
ZEND_VM_NEXT_OPCODE();
- 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
} else {
zend_free_op free_res;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval_ptr = EX_VAR(opline->result.var);
- 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 FETCH_OBJ_UNSET, FETCH_DIM_UNSET
2014-02-28 04:09:43 +08:00
if (Z_TYPE_P(retval_ptr) == IS_INDIRECT) {
retval_ptr = Z_INDIRECT_P(retval_ptr);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
PZVAL_UNLOCK(retval_ptr, &free_res);
SEPARATE_ZVAL_IF_NOT_REF(retval_ptr);
PZVAL_LOCK(retval_ptr);
- 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
FREE_OP_VAR_PTR(free_res);
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
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
- 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 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
ZEND_VM_HELPER(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP|VAR|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
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *container;
Fixed bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object)
2009-01-15 16:48:58 +08:00
zend_free_op free_op2;
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
zval *offset;
- 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 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
SAVE_OPLINE();
container = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R);
offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
Support for IS_REFERENCE
2014-02-24 20:51:38 +08:00
if (UNEXPECTED(Z_TYPE_P(container) == IS_REFERENCE)) {
container = Z_REFVAL_P(container);
}
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
if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) ||
UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) {
zend_error(E_NOTICE, "Trying to get property of non-object");
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
Fixed bug #47109 (Memory leak on $a->{"a"."b"} when $a is not an object)
2009-01-15 16:48:58 +08:00
FREE_OP2();
- 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
} else {
executor optimization
2007-12-14 22:14:50 +08:00
zval *retval;
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(offset);
//??? }
- 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
/* here we are sure we are dealing with an object */
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_R, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), EX_VAR(opline->result.var) TSRMLS_CC);
- 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
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
if (retval != EX_VAR(opline->result.var)) {
ZVAL_COPY(EX_VAR(opline->result.var), retval);
}
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(offset);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
}
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_property_address_read_helper);
- 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
}
ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
zval *property;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
- 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 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
SAVE_OPLINE();
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Fixed error message
2008-01-24 16:51:38 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an object");
Additional executor specialization
2008-01-24 01:55:55 +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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), BP_VAR_W TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
Fixed variations of bug #35163
2007-10-23 20:52:40 +08:00
/* We are going to assign the result by reference */
if (opline->extended_value & ZEND_FETCH_MAKE_REF) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval_ptr = EX_VAR(opline->result.var);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
zval *retval_ind = retval_ptr;
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
Better IS_REFERENCE handling
2014-02-25 04:17:13 +08:00
if (Z_TYPE_P(retval_ptr) == IS_INDIRECT) {
retval_ptr = Z_INDIRECT_P(retval_ptr);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (retval_ptr == &EG(uninitialized_zval) || retval_ptr == &EG(error_zval)) {
Fixed hidden property handling
2014-03-05 21:57:21 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
Better IS_REFERENCE handling
2014-02-25 04:17:13 +08:00
}
if (!Z_ISREF_P(retval_ptr)) {
if (Z_REFCOUNTED_P(retval_ptr)) {
Z_DELREF_P(retval_ptr);
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr);
} else {
ZVAL_NEW_REF(retval_ptr, retval_ptr);
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
Z_ADDREF_P(retval_ptr);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (retval_ind != retval_ptr) {
ZVAL_REF(retval_ind, Z_REF_P(retval_ptr));
}
Better IS_REFERENCE handling
2014-02-25 04:17:13 +08:00
}
Fixed variations of bug #35163
2007-10-23 20:52:40 +08:00
}
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
zval *property;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
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
SAVE_OPLINE();
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW);
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Fixed error message
2008-01-24 16:51:38 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an object");
Additional executor specialization
2008-01-24 01:55:55 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), BP_VAR_RW TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
zend_free_op free_op1;
zval *container;
zend_free_op free_op2;
zval *offset;
SAVE_OPLINE();
container = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_IS);
offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
if (UNEXPECTED(Z_TYPE_P(container) != IS_OBJECT) ||
UNEXPECTED(Z_OBJ_HT_P(container)->read_property == NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
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
FREE_OP2();
} else {
zval *retval;
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(offset);
//??? }
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
/* here we are sure we are dealing with an object */
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
retval = Z_OBJ_HT_P(container)->read_property(container, offset, BP_VAR_IS, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), EX_VAR(opline->result.var) TSRMLS_CC);
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
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
if (retval != EX_VAR(opline->result.var)) {
ZVAL_COPY(EX_VAR(opline->result.var), retval);
}
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
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(offset);
//??? } else {
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
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
}
FREE_OP1();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
- 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
}
ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (zend_is_by_ref_func_arg_fetch(opline, EX(call) TSRMLS_CC)) {
- 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
/* Behave like FETCH_OBJ_W */
zend_free_op free_op1, free_op2;
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
zval *property;
SAVE_OPLINE();
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Fixed error message
2008-01-24 16:51:38 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an object");
Additional executor specialization
2008-01-24 01:55:55 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), BP_VAR_W TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
} else {
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
ZEND_VM_DISPATCH_TO_HELPER(zend_fetch_property_address_read_helper);
- 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
}
}
ZEND_VM_HANDLER(97, ZEND_FETCH_OBJ_UNSET, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2, free_res;
Fixed FETCH_OBJ_UNSET, FETCH_DIM_UNSET
2014-02-28 04:09:43 +08:00
zval *container, *property, *retval_ptr;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
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
property = GET_OP2_ZVAL_PTR(BP_VAR_R);
- 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 bug #34518 (Unset doesn't separate container in CV)
2005-09-16 22:42:46 +08:00
if (OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_IF_NOT_REF(container);
Fixed bug #34518 (Unset doesn't separate container in CV)
2005-09-16 22:42:46 +08:00
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(container) == IS_STR_OFFSET)) {
Fixed error message
2008-01-24 16:51:38 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an object");
Additional executor specialization
2008-01-24 01:55:55 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_property_address(EX_VAR(opline->result.var), container, property, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL), BP_VAR_UNSET TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
Fixed dereferencing of value returned from function (foo()[1] = ...)
2014-03-04 21:23:23 +08:00
if (OP1_TYPE == IS_VAR && OP1_FREE && READY_TO_DESTROY(free_op1.var)) {
EXTRACT_ZVAL_PTR(EX_VAR(opline->result.var));
}
- 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
FREE_OP1_VAR_PTR();
Fixed FETCH_OBJ_UNSET, FETCH_DIM_UNSET
2014-02-28 04:09:43 +08:00
retval_ptr = EX_VAR(opline->result.var);
if (Z_TYPE_P(retval_ptr) == IS_INDIRECT) {
retval_ptr = Z_INDIRECT_P(retval_ptr);
}
PZVAL_UNLOCK(retval_ptr, &free_res);
SEPARATE_ZVAL_IF_NOT_REF(retval_ptr);
PZVAL_LOCK(retval_ptr);
FREE_OP_VAR_PTR(free_res);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #40591 (list()="string"; gives invalid opcode)
2007-02-26 00:02:43 +08:00
ZEND_VM_HANDLER(98, ZEND_FETCH_DIM_TMP_VAR, CONST|TMP, CONST)
- 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 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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *container;
SAVE_OPLINE();
container = GET_OP1_ZVAL_PTR(BP_VAR_R);
- 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 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
if (UNEXPECTED(Z_TYPE_P(container) != IS_ARRAY)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
} else {
zend_free_op free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value = zend_fetch_dimension_address_inner(Z_ARRVAL_P(container), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
- 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
FREE_OP2();
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
executor optimization
2007-12-14 22:14:50 +08:00
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *object;
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
zval *property_name;
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
object = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W);
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
property_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
- 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
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property_name);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(object) == IS_STR_OFFSET)) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an array");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_assign_to_object(RETURN_VALUE_USED(opline)?EX_VAR(opline->result.var):NULL, object, property_name, (opline+1)->op1_type, &(opline+1)->op1, execute_data, ZEND_ASSIGN_OBJ, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property_name);
//??? } else {
executor optimization
2007-12-14 22:14:50 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
FREE_OP1_VAR_PTR();
- 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
/* assign_obj has two opcodes! */
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
CHECK_EXCEPTION();
- 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
ZEND_VM_INC_OPCODE();
ZEND_VM_NEXT_OPCODE();
}
Removed unreachable handlers
2006-09-04 21:58:54 +08:00
ZEND_VM_HANDLER(147, ZEND_ASSIGN_DIM, VAR|CV, 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
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *object_ptr;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
object_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(object_ptr) == IS_STR_OFFSET)) {
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
zend_error_noreturn(E_ERROR, "Cannot use string offset as an 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
}
Fixed string offset handling
2014-03-06 20:00:38 +08:00
if (Z_TYPE_P(object_ptr) == IS_REFERENCE && Z_TYPE_P(Z_REFVAL_P(object_ptr)) == IS_OBJECT) {
Fixed ArrayAccess handling
2014-03-06 17:11:23 +08:00
object_ptr = Z_REFVAL_P(object_ptr);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(object_ptr) == IS_OBJECT) {
executor optimization
2007-12-14 22:14:50 +08:00
zend_free_op free_op2;
zval *property_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(property_name);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_assign_to_object(RETURN_VALUE_USED(opline)?EX_VAR(opline->result.var):NULL, object_ptr, property_name, (opline+1)->op1_type, &(opline+1)->op1, execute_data, ZEND_ASSIGN_DIM, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(property_name);
//??? } else {
executor optimization
2007-12-14 22:14:50 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +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
} else {
executor optimization
2007-12-14 22:14:50 +08:00
zend_free_op free_op2, free_op_data1, free_op_data2;
- 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
zval *value;
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
zval *dim = GET_OP2_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *variable_ptr;
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_fetch_dimension_address(EX_VAR((opline+1)->op2.var), object_ptr, dim, OP2_TYPE, BP_VAR_W TSRMLS_CC);
- 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
FREE_OP2();
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
value = get_zval_ptr((opline+1)->op1_type, &(opline+1)->op1, execute_data, &free_op_data1, BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
variable_ptr = _get_zval_ptr_ptr_var((opline+1)->op2.var, execute_data, &free_op_data2 TSRMLS_CC);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_TYPE_P(variable_ptr) == IS_STR_OFFSET)) {
Fixed string offset handling
2014-03-06 20:00:38 +08:00
zend_string *old_str = Z_STR_P(Z_STR_OFFSET_P(variable_ptr)->str);
if (zend_assign_to_string_offset(variable_ptr, value, (opline+1)->op1_type TSRMLS_CC)) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
ZVAL_STRINGL(EX_VAR(opline->result.var), Z_STRVAL_P(Z_STR_OFFSET_P(EX_VAR((opline+1)->op2.var))->str) + Z_STR_OFFSET_P(EX_VAR((opline+1)->op2.var))->offset, 1);
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
} else if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
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
}
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
//??? instead of FREE_OP_VAR_PTR(free_op_data2);
Fixed string offset handling
2014-03-06 20:00:38 +08:00
STR_RELEASE(old_str);
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
efree(Z_STR_OFFSET_P(variable_ptr));
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (UNEXPECTED(variable_ptr == &EG(error_zval))) {
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
if (IS_TMP_FREE(free_op_data1)) {
zval_dtor(value);
}
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
FREE_OP_VAR_PTR(free_op_data2);
executor optimization
2007-12-14 22:14:50 +08:00
} else {
Optimization of ASSIGN instruction
2010-08-11 23:34:06 +08:00
if ((opline+1)->op1_type == IS_TMP_VAR) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_tmp_to_variable(variable_ptr, value TSRMLS_CC);
Optimization of ASSIGN instruction
2010-08-11 23:34:06 +08:00
} else if ((opline+1)->op1_type == IS_CONST) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_const_to_variable(variable_ptr, value TSRMLS_CC);
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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_to_variable(variable_ptr, value TSRMLS_CC);
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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
FREE_OP_VAR_PTR(free_op_data2);
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +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
FREE_OP_IF_VAR(free_op_data1);
}
FREE_OP1_VAR_PTR();
/* assign_dim has two opcodes! */
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
CHECK_EXCEPTION();
- 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
ZEND_VM_INC_OPCODE();
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(38, ZEND_ASSIGN, VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
executor optimization
2007-12-14 22:14:50 +08:00
zend_free_op free_op1, free_op2;
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
zval *value;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *variable_ptr;
executor optimization
2007-12-14 22:14:50 +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
SAVE_OPLINE();
value = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
variable_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(variable_ptr) == IS_STR_OFFSET)) {
Fixed string offset handling
2014-03-06 20:00:38 +08:00
zend_string *old_str = Z_STR_P(Z_STR_OFFSET_P(variable_ptr)->str);
if (zend_assign_to_string_offset(variable_ptr, value, OP2_TYPE TSRMLS_CC)) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
ZVAL_STRINGL(EX_VAR(opline->result.var), Z_STRVAL_P(Z_STR_OFFSET_P(EX_VAR(opline->op1.var))->str) + Z_STR_OFFSET_P(EX_VAR(opline->op1.var))->offset, 1);
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
} else if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
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
}
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
//??? instead of FREE_OP1_VAR_PTR()
Fixed string offset handling
2014-03-06 20:00:38 +08:00
STR_RELEASE(old_str);
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
efree(Z_STR_OFFSET_P(variable_ptr));
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (OP1_TYPE == IS_VAR && UNEXPECTED(variable_ptr == &EG(error_zval))) {
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
if (IS_OP2_TMP_FREE()) {
zval_dtor(value);
}
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
executor optimization
2007-12-14 22:14:50 +08:00
} else {
Optimization of ASSIGN instruction
2010-08-11 23:34:06 +08:00
if (OP2_TYPE == IS_TMP_VAR) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_tmp_to_variable(variable_ptr, value TSRMLS_CC);
Optimization of ASSIGN instruction
2010-08-11 23:34:06 +08:00
} else if (OP2_TYPE == IS_CONST) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_const_to_variable(variable_ptr, value TSRMLS_CC);
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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_assign_to_variable(variable_ptr, value TSRMLS_CC);
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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
Fixed wrong result of cascading assignment to string offset Fixed memory corruption on cascading assignment of IS_TMP_VAR into string offset Fixed opcode caches shared memory corruption on cascading assignment of IS_CONST into string offset
2008-03-04 18:06:52 +08:00
}
Redesigned SRR_OFFSET handling
2014-02-28 21:39:08 +08:00
FREE_OP1_VAR_PTR();
executor optimization
2007-12-14 22:14:50 +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
/* zend_assign_to_variable() always takes care of op2, never free it! */
FREE_OP2_IF_VAR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *variable_ptr;
zval *value_ptr;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
value_ptr = GET_OP2_ZVAL_PTR_PTR(BP_VAR_W);
- 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 bug #31525 (object reference being dropped. $this getting lost)
2005-05-06 01:37:25 +08:00
if (OP2_TYPE == IS_VAR &&
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value_ptr &&
!Z_ISREF_P(value_ptr) &&
Fixed return by reference
2014-03-07 16:25:55 +08:00
opline->extended_value == ZEND_RETURNS_FUNCTION &&
!(value_ptr->var_flags & IS_VAR_RET_REF)) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
if (!OP2_FREE) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
PZVAL_LOCK(value_ptr); /* undo the effect of get_zval_ptr_ptr() */
Fixed bug #31525 (object reference being dropped. $this getting lost)
2005-05-06 01:37:25 +08:00
}
- MF44: Problems with user defined error handler and references
2005-06-07 18:01:30 +08:00
zend_error(E_STRICT, "Only variables should be assigned by reference");
Fixed bug #45805 (Crach on throwing exception from error handler)
2008-08-13 15:21:30 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
FREE_OP2_VAR_PTR();
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
HANDLE_EXCEPTION();
Fixed bug #45805 (Crach on throwing exception from error handler)
2008-08-13 15:21:30 +08:00
}
Fixed bug #31525 (object reference being dropped. $this getting lost)
2005-05-06 01:37:25 +08:00
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ASSIGN);
Fixed bug #45178 (memory corruption on assignment result of "new" by reference)
2008-07-24 19:47:51 +08:00
} else if (OP2_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
PZVAL_LOCK(value_ptr);
Fixed bug #32660 (Assignment by reference causes crash when field access is overloaded (__get))
2005-06-23 19:04:35 +08:00
}
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (OP1_TYPE == IS_VAR &&
UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_INDIRECT) &&
UNEXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) != IS_REFERENCE)) {
EG(error_zval) must be passed as IS_INDIRECT
2014-03-04 20:32:40 +08:00
zend_error_noreturn(E_ERROR, "Cannot assign by reference to overloaded object");
}
Fixed bug #31525 (object reference being dropped. $this getting lost)
2005-05-06 01:37:25 +08:00
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
variable_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((OP2_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(value_ptr) == IS_STR_OFFSET)) ||
(OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(variable_ptr) == IS_STR_OFFSET))) {
Additional executor specialization
2008-01-24 01:55:55 +08:00
zend_error_noreturn(E_ERROR, "Cannot create references to/from string offsets nor overloaded objects");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_assign_to_variable_reference(variable_ptr, value_ptr TSRMLS_CC);
- 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 bug #45178 (memory corruption on assignment result of "new" by reference)
2008-07-24 19:47:51 +08:00
if (OP2_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_NEW) {
Fixed reference handling
2014-03-11 18:49:25 +08:00
//??? Z_DELREF_P(variable_ptr);
Fixed bug #45178 (memory corruption on assignment result of "new" by reference)
2008-07-24 19:47:51 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), variable_ptr);
- 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
FREE_OP1_VAR_PTR();
Refactored read_property() and read_dimension() handlers
2014-02-27 19:40:13 +08:00
FREE_OP2_VAR_PTR();
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HELPER(zend_leave_helper, ANY, ANY)
- 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
{
Fix bug #63822: Crash when using closures with ArrayAccess op_array->T was used after the closure's op_array was already freed. This just swaps the freeing order.
2012-12-21 08:56:37 +08:00
zend_bool nested = EX(nested);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_op_array *op_array = EX(op_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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EG(current_execute_data) = EX(prev_execute_data);
EG(opline_ptr) = NULL;
if (!EG(active_symbol_table)) {
Save a TSRMLS_FETCH() for zval_ptr_dtor in executor This gives me about 9% improvement on Zend/bench.php for a zts build.
2013-09-14 20:40:48 +08:00
i_free_compiled_variables(execute_data TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Use better data structures (incomplete)
2014-02-18 05:41:23 +08:00
zend_vm_stack_free((char*)execute_data TSRMLS_CC);
Fix bug #63822: Crash when using closures with ArrayAccess op_array->T was used after the closure's op_array was already freed. This just swaps the freeing order.
2012-12-21 08:56:37 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if ((op_array->fn_flags & ZEND_ACC_CLOSURE) && op_array->prototype) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor((zval*)op_array->prototype);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (nested) {
execute_data = EG(current_execute_data);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (nested) {
USE_OPLINE
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
LOAD_REGS();
LOAD_OPLINE();
if (UNEXPECTED(opline->opcode == ZEND_INCLUDE_OR_EVAL)) {
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EX(function_state).function = (zend_function *) EX(op_array);
EX(function_state).arguments = NULL;
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EG(opline_ptr) = &EX(opline);
EG(active_op_array) = EX(op_array);
destroy_op_array(op_array TSRMLS_CC);
efree(op_array);
if (UNEXPECTED(EG(exception) != NULL)) {
zend_throw_exception_internal(NULL TSRMLS_CC);
HANDLE_EXCEPTION_LEAVE();
}
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_INC_OPCODE();
ZEND_VM_LEAVE();
} else {
EG(opline_ptr) = &EX(opline);
EG(active_op_array) = EX(op_array);
if (EG(active_symbol_table)) {
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2012-08-24 19:29:40 +08:00
zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
EG(active_symbol_table) = EX(symbol_table);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EX(function_state).function = (zend_function *) EX(op_array);
EX(function_state).arguments = NULL;
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(EG(This)) != IS_UNDEF) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (UNEXPECTED(EG(exception) != NULL) && EX(call)->is_ctor_call) {
if (EX(call)->is_ctor_result_used) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_DELREF(EG(This));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_REFCOUNT(EG(This)) == 1) {
zend_object_store_ctor_failed(&EG(This) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
}
zval_ptr_dtor(&EG(This));
}
Use better data structures (incomplete)
2014-02-18 22:10:54 +08:00
ZVAL_COPY_VALUE(&EG(This), &EX(current_this));
EG(scope) = EX(current_scope);
EG(called_scope) = EX(current_called_scope);
- 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
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
EX(call)--;
- 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 unnecessary checks
2012-12-13 21:29:30 +08:00
zend_vm_stack_clear_multiple(1 TSRMLS_CC);
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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
zend_throw_exception_internal(NULL TSRMLS_CC);
Fixed passing by reference
2014-03-05 03:54:05 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->result.var));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
HANDLE_EXCEPTION_LEAVE();
}
ZEND_VM_INC_OPCODE();
ZEND_VM_LEAVE();
Improved speed of conditional jump instructions by checking for most useful case (conditional expression)
2009-03-18 22:17:15 +08:00
}
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_RETURN();
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY)
- 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 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
USE_OPLINE
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_bool should_change_scope = 0;
zend_function *fbc = EX(function_state).function;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_uint num_args;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&EX(object), &EX(call)->object);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (UNEXPECTED((fbc->common.fn_flags & (ZEND_ACC_ABSTRACT|ZEND_ACC_DEPRECATED)) != 0)) {
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_ABSTRACT) != 0)) {
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", fbc->common.scope->name->val, fbc->common.function_name->val);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
if (UNEXPECTED((fbc->common.fn_flags & ZEND_ACC_DEPRECATED) != 0)) {
zend_error(E_DEPRECATED, "Function %s%s%s() is deprecated",
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fbc->common.scope ? fbc->common.scope->name->val : "",
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
fbc->common.scope ? "::" : "",
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fbc->common.function_name->val);
ixed bug that exception won't be catched Related failed test Zend/tests/bug35437.phpt (after he latest execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
ZEND_FETCH_*_R operations simplified and can't be used with EXT_TYPE_UNUSED flag any more. Thit is very rare and useless case. ZEND_FREE might be required after them instead.
2010-07-16 21:38:09 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (fbc->common.scope &&
!(fbc->common.fn_flags & ZEND_ACC_STATIC) &&
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_TYPE(EX(object)) == IS_UNDEF) {
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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
/* FIXME: output identifiers properly */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error(E_STRICT, "Non-static method %s::%s() should not be called statically", fbc->common.scope->name->val, fbc->common.function_name->val);
ixed bug that exception won't be catched Related failed test Zend/tests/bug35437.phpt (after he latest execute_data improvement, run with non CALL vm kind)
2012-12-18 15:34:47 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
/* FIXME: output identifiers properly */
/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
Use better data structures (incomplete)
2014-02-19 19:34:32 +08:00
zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically", fbc->common.scope->name->val, fbc->common.function_name->val);
Improved speed of conditional jump instructions by checking for most useful case (conditional expression)
2009-03-18 22:17:15 +08:00
}
}
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (fbc->type == ZEND_USER_FUNCTION || fbc->common.scope) {
should_change_scope = 1;
Use better data structures (incomplete)
2014-02-18 22:10:54 +08:00
ZVAL_COPY_VALUE(&EX(current_this), &EG(This));
EX(current_scope) = EG(scope);
EX(current_called_scope) = EG(called_scope);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EG(This) = EX(object);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
EG(scope) = (fbc->type == ZEND_USER_FUNCTION || Z_TYPE(EX(object)) == IS_UNDEF) ? fbc->common.scope : NULL;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
EG(called_scope) = EX(call)->called_scope;
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
}
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
num_args = opline->extended_value + EX(call)->num_additional_args;
Fix argument unpacking across stack pages If multiple unpacks were used (or mixed with normal arguments) parts of the arguments could land on different stack pages. If this occurs the arguments will now be copied to a new stack page. The code used to do this is copied verbatim from the PHP 5.4 branch and only modified to reduce the amount of inlined code.
2014-01-18 19:30:44 +08:00
if (EX(call)->num_additional_args) {
EX(function_state).arguments = zend_vm_stack_push_args(num_args TSRMLS_CC);
} else {
Use better data structures (incomplete)
2014-02-18 05:41:23 +08:00
zval tmp;
ZVAL_LONG(&tmp, num_args);
Fix argument unpacking across stack pages If multiple unpacks were used (or mixed with normal arguments) parts of the arguments could land on different stack pages. If this occurs the arguments will now be copied to a new stack page. The code used to do this is copied verbatim from the PHP 5.4 branch and only modified to reduce the amount of inlined code.
2014-01-18 19:30:44 +08:00
EX(function_state).arguments = zend_vm_stack_top(TSRMLS_C);
Use better data structures (incomplete)
2014-02-18 05:41:23 +08:00
zend_vm_stack_push(&tmp TSRMLS_CC);
Fix argument unpacking across stack pages If multiple unpacks were used (or mixed with normal arguments) parts of the arguments could land on different stack pages. If this occurs the arguments will now be copied to a new stack page. The code used to do this is copied verbatim from the PHP 5.4 branch and only modified to reduce the amount of inlined code.
2014-01-18 19:30:44 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
LOAD_OPLINE();
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (fbc->type == ZEND_INTERNAL_FUNCTION) {
Don't check argument types for internal functions without type hinting
2013-11-28 15:44:14 +08:00
if (fbc->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) {
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_uint i;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *p = EX(function_state).arguments - num_args;
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
for (i = 0; i < num_args; ++i, ++p) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_verify_arg_type(fbc, i + 1, p, 0 TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
if (EXPECTED(EG(exception) == NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *ret = EX_VAR(opline->result.var);
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(ret);
//??? ret->var.ptr_ptr = &ret->var.ptr;
Fixed return by reference
2014-03-07 16:25:55 +08:00
ret->var_flags = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0;
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
if (!zend_execute_internal) {
/* saves one function call if zend_execute_internal is not used */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
fbc->internal_function.handler(num_args, ret, &EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
} else {
zend_execute_internal(execute_data, NULL, RETURN_VALUE_USED(opline) TSRMLS_CC);
}
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
if (!RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(ret);
Merge branch 'PHP-5.4' into PHP-5.5 * PHP-5.4: Fixed bug #63914 (zend_do_fcall_common_helper_SPEC does not handle exceptions properly). (Jeff Welch) Conflicts: NEWS Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-03-25 19:47:45 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (RETURN_VALUE_USED(opline)) {
//??? EX_T(opline->result.var).var.ptr = NULL;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
} else if (fbc->type == ZEND_USER_FUNCTION) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval *return_value = NULL;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EG(active_symbol_table) = NULL;
EG(active_op_array) = &fbc->op_array;
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
return_value = EX_VAR(opline->result.var);
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_NULL(return_value);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? ret->var.ptr_ptr = &ret->var.ptr;
Fixed return by reference
2014-03-07 16:25:55 +08:00
return_value->var_flags = (fbc->common.fn_flags & ZEND_ACC_RETURN_REFERENCE) != 0 ? IS_VAR_RET_REF : 0;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Generatirs are going to be used less than regular functions
2012-12-06 17:14:31 +08:00
if (UNEXPECTED((EG(active_op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2012-08-24 19:29:40 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_generator_create_zval(EG(active_op_array), EX_VAR(opline->result.var) TSRMLS_CC);
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2012-08-24 19:29:40 +08:00
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
} else if (EXPECTED(zend_execute_ex == execute_ex)) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (EXPECTED(EG(exception) == NULL)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
i_create_execute_data_from_op_array(EG(active_op_array), return_value, 1 TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_ENTER();
}
} else {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zend_execute(EG(active_op_array), return_value TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EG(opline_ptr) = &EX(opline);
EG(active_op_array) = EX(op_array);
if (EG(active_symbol_table)) {
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2012-08-24 19:29:40 +08:00
zend_clean_and_cache_symbol_table(EG(active_symbol_table) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
EG(active_symbol_table) = EX(symbol_table);
} else { /* ZEND_OVERLOADED_FUNCTION */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_NULL(EX_VAR(opline->result.var));
- 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
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2012-08-24 19:29:40 +08:00
/* Not sure what should be done here if it's a static method */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (EXPECTED(Z_TYPE(EX(object)) != IS_UNDEF)) {
Z_OBJ_HT_P(&EX(object))->call_method(fbc->common.function_name, num_args, EX_VAR(opline->result.var), &EX(object), RETURN_VALUE_USED(opline) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object");
}
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (fbc->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) {
Fixed char/zend_string mesh
2014-02-22 04:31:39 +08:00
STR_RELEASE(fbc->common.function_name);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
efree(fbc);
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (!RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->result.var));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? Z_UNSET_ISREF_P(EX_T(opline->result.var).var.ptr);
//??? Z_SET_REFCOUNT_P(EX_T(opline->result.var).var.ptr, 1);
Fixed return by reference
2014-03-07 16:25:55 +08:00
EX_VAR(opline->result.var)->var_flags = 0;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? EX_T(opline->result.var).var.ptr_ptr = &EX_T(opline->result.var).var.ptr;
Improved speed of conditional jump instructions by checking for most useful case (conditional expression)
2009-03-18 22:17:15 +08:00
}
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
EX(function_state).function = (zend_function *) EX(op_array);
EX(function_state).arguments = NULL;
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (should_change_scope) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(EG(This)) != IS_UNDEF) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (UNEXPECTED(EG(exception) != NULL) && EX(call)->is_ctor_call) {
if (EX(call)->is_ctor_result_used) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_DELREF(EG(This));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_REFCOUNT(EG(This)) == 1) {
zend_object_store_ctor_failed(&EG(This) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
}
zval_ptr_dtor(&EG(This));
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
}
Use better data structures (incomplete)
2014-02-18 22:10:54 +08:00
ZVAL_COPY_VALUE(&EG(This), &EX(current_this));
EG(scope) = EX(current_scope);
EG(called_scope) = EX(current_called_scope);
- 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 support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
EX(call)--;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
Removed unnecessary checks
2012-12-13 21:29:30 +08:00
zend_vm_stack_clear_multiple(1 TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
zend_throw_exception_internal(NULL TSRMLS_CC);
Fixed passing by reference
2014-03-05 03:54:05 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->result.var));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
HANDLE_EXCEPTION();
- 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
}
ZEND_VM_NEXT_OPCODE();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(42, ZEND_JMP, ANY, ANY)
- 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 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
USE_OPLINE
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
#if DEBUG_ZEND>=2
printf("Jumping to %d\n", opline->op1.opline_num);
#endif
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_SET_OPCODE(opline->op1.jmp_addr);
ZEND_VM_CONTINUE();
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMP|VAR|CV, ANY)
- 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 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
USE_OPLINE
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_free_op free_op1;
zval *val;
int ret;
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +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
SAVE_OPLINE();
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
ret = Z_LVAL_P(val);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
} else {
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
ret = i_zend_is_true(val TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (!ret) {
#if DEBUG_ZEND>=2
printf("Conditional jmp to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
ZEND_VM_CONTINUE();
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMP|VAR|CV, ANY)
- 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 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
USE_OPLINE
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_free_op free_op1;
zval *val;
int 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
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
SAVE_OPLINE();
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
ret = Z_LVAL_P(val);
Namespaces
2007-09-29 03:52:53 +08:00
} else {
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
ret = i_zend_is_true(val TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
LSB parent/self forwarding
2008-07-24 17:42:18 +08:00
}
Namespaces
2007-09-29 03:52:53 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (ret) {
#if DEBUG_ZEND>=2
printf("Conditional jmp to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
ZEND_VM_CONTINUE();
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMP|VAR|CV, ANY)
{
USE_OPLINE
zend_free_op free_op1;
zval *val;
int retval;
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
retval = Z_LVAL_P(val);
- 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
} else {
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
retval = i_zend_is_true(val TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
- MFH Fixed Bug #38064 ignored constructor visibility
2006-08-08 07:24:33 +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
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (EXPECTED(retval != 0)) {
#if DEBUG_ZEND>=2
printf("Conditional jmp on true to %d\n", opline->extended_value);
#endif
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
ZEND_VM_CONTINUE(); /* CHECK_ME */
} else {
#if DEBUG_ZEND>=2
printf("Conditional jmp on false to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]);
ZEND_VM_CONTINUE(); /* CHECK_ME */
}
}
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY)
{
USE_OPLINE
zend_free_op free_op1;
zval *val;
int retval;
SAVE_OPLINE();
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
retval = Z_LVAL_P(val);
- 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
} else {
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
retval = i_zend_is_true(val TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), retval);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (!retval) {
#if DEBUG_ZEND>=2
printf("Conditional jmp to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
ZEND_VM_CONTINUE();
}
- 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
ZEND_VM_NEXT_OPCODE();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMP|VAR|CV, ANY)
- 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 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
USE_OPLINE
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_free_op free_op1;
zval *val;
int retval;
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
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
Use better data structures (incomplete; able to run bench.php)
2014-02-18 20:27:38 +08:00
val = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_TMP_VAR && EXPECTED(Z_TYPE_P(val) == IS_BOOL)) {
retval = Z_LVAL_P(val);
} else {
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
retval = i_zend_is_true(val TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP1();
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), retval);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (retval) {
#if DEBUG_ZEND>=2
printf("Conditional jmp to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_SET_OPCODE(opline->op2.jmp_addr);
ZEND_VM_CONTINUE();
}
ZEND_VM_NEXT_OPCODE();
}
- Added indirect method call through array variable (FR Bug #47160)
2011-06-07 05:42:05 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(70, ZEND_FREE, TMP|VAR, ANY)
{
USE_OPLINE
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
if (OP1_TYPE == IS_TMP_VAR) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_dtor(EX_VAR(opline->op1.var));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->op1.var));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(53, ZEND_INIT_STRING, ANY, ANY)
{
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *tmp = EX_VAR(opline->result.var);
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_EMPTY_STRING(tmp);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
/*CHECK_EXCEPTION();*/
ZEND_VM_NEXT_OPCODE();
}
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(54, ZEND_ADD_CHAR, TMP|UNUSED, CONST)
{
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *str = EX_VAR(opline->result.var);
- Added indirect method call through array variable (FR Bug #47160)
2011-06-07 05:42:05 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
fix bug #61782 - __clone/__destruct do not match other methods when checking access controls
2012-05-13 13:12:48 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_UNUSED) {
/* Initialize for erealloc in add_char_to_string */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_STR(str, STR_EMPTY_ALLOC());
Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8)
2005-06-16 22:20:00 +08:00
}
Speed-up of ZEND_DO_FCALL and ZEND_INIT_FCALL_BY_NAME by lowercasing and calculating hash values at compile time.
2007-11-22 17:02:55 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
add_char_to_string(str, str, opline->op2.zv);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
/* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
/*CHECK_EXCEPTION();*/
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(55, ZEND_ADD_STRING, TMP|UNUSED, CONST)
Speed-up of ZEND_DO_FCALL and ZEND_INIT_FCALL_BY_NAME by lowercasing and calculating hash values at compile time.
2007-11-22 17:02:55 +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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *str = EX_VAR(opline->result.var);
ws
2010-04-27 20:23:29 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
ws
2010-04-27 20:23:29 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
if (OP1_TYPE == IS_UNUSED) {
/* Initialize for erealloc in add_string_to_string */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_STR(str, STR_EMPTY_ALLOC());
Speed-up of ZEND_DO_FCALL and ZEND_INIT_FCALL_BY_NAME by lowercasing and calculating hash values at compile time.
2007-11-22 17:02:55 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
add_string_to_string(str, str, opline->op2.zv);
- 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
/* FREE_OP is missing intentionally here - we're always working on the same temporary variable */
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
/*CHECK_EXCEPTION();*/
- 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
ZEND_VM_NEXT_OPCODE();
}
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP|UNUSED, TMP|VAR|CV)
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +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
USE_OPLINE
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
zend_free_op free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *str = EX_VAR(opline->result.var);
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
zval *var;
- 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
zval var_copy;
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
int use_copy = 0;
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +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
SAVE_OPLINE();
var = GET_OP2_ZVAL_PTR(BP_VAR_R);
Support trivial finally in generators (no yield, no return) The finally clause is now properly run when an exception is thrown in the try-block. It is not yet run on `return` and also not run when the generator is claused within a try block. I'll add those two things as soon as laruence refactored the finally code.
2012-08-13 23:17:18 +08:00
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
if (OP1_TYPE == IS_UNUSED) {
/* Initialize for erealloc in add_string_to_string */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_STR(str, STR_EMPTY_ALLOC());
Support trivial finally in generators (no yield, no return) The finally clause is now properly run when an exception is thrown in the try-block. It is not yet run on `return` and also not run when the generator is claused within a try block. I'll add those two things as soon as laruence refactored the finally code.
2012-08-13 23:17:18 +08:00
}
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
if (Z_TYPE_P(var) != IS_STRING) {
Use better data structures (incomplete)
2014-02-19 20:50:09 +08:00
if (Z_TYPE_P(var) == IS_REFERENCE) {
var = Z_REFVAL_P(var);
}
if (Z_TYPE_P(var) != IS_STRING) {
zend_make_printable_zval(var, &var_copy, &use_copy);
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
Use better data structures (incomplete)
2014-02-19 20:50:09 +08:00
if (use_copy) {
var = &var_copy;
}
Improved compilation of heredocs and interpolated strings. (Matt, Dmitry)
2007-05-18 21:12:05 +08:00
}
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
}
. Added support for using static HEREDOCs to initialize static variables and class members or constants. (Matt) . Improved syntax highlighting and consistency for variables in double-quoted strings and literal text in HEREDOCs and backticks. (Matt) . Optimized interpolated strings to use one less opcode. (Matt)
2008-07-26 23:30:28 +08:00
add_string_to_string(str, str, var);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +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
if (use_copy) {
zval_dtor(var);
Fixed bug #54367 (Use of closure causes problem in ArrayAccess).
2011-04-20 20:59:18 +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
/* original comment, possibly problematic:
* FREE_OP is missing intentionally here - we're always working on the same temporary variable
* (Zeev): I don't think it's problematic, we only use variables
* which aren't affected by FREE_OP(Ts, )'s anyway, unless they're
* string offsets or overloaded objects
*/
FREE_OP2();
Fixed bug #54367 (Use of closure causes problem in ArrayAccess).
2011-04-20 20:59:18 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +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
ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV)
{
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
USE_OPLINE
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +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
SAVE_OPLINE();
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
if (EG(exception)) {
zend_exception_save(TSRMLS_C);
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
}
- 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 (OP2_TYPE == IS_UNUSED) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(NULL, opline->extended_value TSRMLS_CC);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
} else {
zend_free_op free_op2;
zval *class_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (OP2_TYPE == IS_CONST) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = CACHED_PTR(opline->op2.literal->cache_slot);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class_by_name(Z_STR_P(class_name), opline->op2.literal + 1, opline->extended_value TSRMLS_CC);
CACHE_PTR(opline->op2.literal->cache_slot, Z_CE_P(EX_VAR(opline->result.var)));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
} else if (Z_TYPE_P(class_name) == IS_OBJECT) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = Z_OBJCE_P(class_name);
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
} else if (Z_TYPE_P(class_name) == IS_STRING) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = zend_fetch_class(Z_STR_P(class_name), opline->extended_value TSRMLS_CC);
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
} else {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
- 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
zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string");
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
}
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
FREE_OP2();
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
CHECK_EXCEPTION();
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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 direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18: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
ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zval *function_name;
zend_free_op free_op1, free_op2;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->result.num;
Fixed support for references
2014-02-28 19:58:11 +08:00
zval *object;
- 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 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
SAVE_OPLINE();
- 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_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +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
if (OP2_TYPE != IS_CONST &&
UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
- 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
zend_error_noreturn(E_ERROR, "Method name must be a string");
}
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Fixed support for references
2014-02-28 19:58:11 +08:00
object = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R);
if (Z_TYPE_P(object) == IS_REFERENCE) {
ZVAL_COPY_VALUE(&call->object, Z_REFVAL_P(object));
} else {
ZVAL_COPY_VALUE(&call->object, object);
}
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (EXPECTED(Z_TYPE(call->object) != IS_UNDEF) &&
EXPECTED(Z_TYPE(call->object) == IS_OBJECT)) {
call->called_scope = Z_OBJCE(call->object);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (OP2_TYPE != IS_CONST ||
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
(call->fbc = CACHED_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, call->called_scope)) == NULL) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_object *object = Z_OBJ(call->object);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_OBJ_HT(call->object)->get_method == NULL)) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
zend_error_noreturn(E_ERROR, "Object does not support method calls");
}
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
/* First, locate the function. */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_OBJ_HT(call->object)->get_method(&call->object, Z_STR_P(function_name), ((OP2_TYPE == IS_CONST) ? (opline->op2.literal + 1) : NULL) TSRMLS_CC);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (UNEXPECTED(call->fbc == NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(&call->object), Z_STRVAL_P(function_name));
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (OP2_TYPE == IS_CONST &&
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
EXPECTED(call->fbc->type <= ZEND_USER_FUNCTION) &&
EXPECTED((call->fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0) &&
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
EXPECTED(Z_OBJ(call->object) == object)) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
CACHE_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, call->called_scope, call->fbc);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +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
}
} else {
Fixed bug #64135 (Exceptions from set_error_handler are not always propagated)
2013-02-07 23:44:46 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
FREE_OP2();
HANDLE_EXCEPTION();
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to a member function %s() on a non-object", Z_STRVAL_P(function_name));
- 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 direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
} else {
Fixed support for references
2014-02-28 19:58:11 +08:00
Z_ADDREF(call->object); /* For $this pointer */
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
}
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
- 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
FREE_OP2();
FREE_OP1_IF_VAR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18: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
Namespaces
2007-09-29 03:52:53 +08:00
ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, CONST|VAR, 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
{
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
USE_OPLINE
- 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
zval *function_name;
zend_class_entry *ce;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->result.num;
- 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 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
SAVE_OPLINE();
ws
2007-10-03 14:49:15 +08:00
Clenaup deprecated namespace code
2009-03-10 18:01:44 +08:00
if (OP1_TYPE == IS_CONST) {
ws
2007-10-03 14:49:15 +08:00
/* no function found. try a static method in class */
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op1.literal->cache_slot)) {
ce = CACHED_PTR(opline->op1.literal->cache_slot);
Added support for Late Static Binding. (Dmitry, Etienne Kneuss)
2007-09-29 15:28:34 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = zend_fetch_class_by_name(Z_STR_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (UNEXPECTED(ce == NULL)) {
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
}
CACHE_PTR(opline->op1.literal->cache_slot, ce);
Added support for Late Static Binding. (Dmitry, Etienne Kneuss)
2007-09-29 15:28:34 +08:00
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->called_scope = ce;
Namespaces
2007-09-29 03:52:53 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_CE_P(EX_VAR(opline->op1.var));
- 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
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (opline->extended_value == ZEND_FETCH_CLASS_PARENT || opline->extended_value == ZEND_FETCH_CLASS_SELF) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->called_scope = EG(called_scope);
LSB parent/self forwarding
2008-07-24 17:42:18 +08:00
} else {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->called_scope = ce;
LSB parent/self forwarding
2008-07-24 17:42:18 +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
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (OP1_TYPE == IS_CONST &&
OP2_TYPE == IS_CONST &&
CACHED_PTR(opline->op2.literal->cache_slot)) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = CACHED_PTR(opline->op2.literal->cache_slot);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
} else if (OP1_TYPE != IS_CONST &&
OP2_TYPE == IS_CONST &&
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
(call->fbc = CACHED_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, ce))) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
/* do nothing */
} else if (OP2_TYPE != IS_UNUSED) {
- 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
zend_free_op free_op2;
Added support for Late Static Binding. (Dmitry, Etienne Kneuss)
2007-09-29 15:28:34 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
if (OP2_TYPE != IS_CONST) {
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
if (UNEXPECTED(Z_TYPE_P(function_name) != IS_STRING)) {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
- 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
zend_error_noreturn(E_ERROR, "Function name must be a string");
- Fixed bug #45089 (__callStatic $name case sensitivity)
2008-06-04 02:11:12 +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
}
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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (ce->get_static_method) {
call->fbc = ce->get_static_method(ce, Z_STR_P(function_name) TSRMLS_CC);
} else {
call->fbc = zend_std_get_static_method(ce, Z_STR_P(function_name), ((OP2_TYPE == IS_CONST) ? (opline->op2.literal + 1) : NULL) TSRMLS_CC);
}
if (UNEXPECTED(call->fbc == NULL)) {
zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", ce->name->val, Z_STRVAL_P(function_name));
}
if (OP2_TYPE == IS_CONST &&
EXPECTED(call->fbc->type <= ZEND_USER_FUNCTION) &&
EXPECTED((call->fbc->common.fn_flags & (ZEND_ACC_CALL_VIA_HANDLER|ZEND_ACC_NEVER_CACHE)) == 0)) {
if (OP1_TYPE == IS_CONST) {
CACHE_PTR(opline->op2.literal->cache_slot, call->fbc);
- Fixed bug #45089 (__callStatic $name case sensitivity)
2008-06-04 02:11:12 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
CACHE_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, ce, call->fbc);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
}
Added support for __callstatic() magic method (missing part). (Sara)
2007-09-29 17:34:24 +08:00
}
Additional executor specialization
2008-01-24 01:55:55 +08:00
if (OP2_TYPE != IS_CONST) {
- 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
FREE_OP2();
}
} else {
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
if (UNEXPECTED(ce->constructor == NULL)) {
MFH: Changed error messages to use "cannot" instead of "can not" (meaning "also can")
2009-06-07 23:46:54 +08:00
zend_error_noreturn(E_ERROR, "Cannot call constructor");
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(EG(This)) != IS_UNDEF && Z_OBJCE(EG(This)) != ce->constructor->common.scope && (ce->constructor->common.fn_flags & ZEND_ACC_PRIVATE)) {
zend_error_noreturn(E_ERROR, "Cannot call private %s::__construct()", ce->name->val);
- MFH Fixed Bug #38064 ignored constructor visibility
2006-08-08 07:24:33 +08:00
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = ce->constructor;
- 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
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (call->fbc->common.fn_flags & ZEND_ACC_STATIC) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(EG(This)) != IS_UNDEF &&
Z_OBJ_HT(EG(This))->get_class_entry &&
!instanceof_function(Z_OBJCE(EG(This)), ce TSRMLS_CC)) {
Added E_STRICT warning in case of calling non-static method from incompatible context (this feature is staying for BC with php-4).
2006-03-15 19:12:45 +08:00
/* We are calling method of the other (incompatible) class,
but passing $this. This is done for compatibility with php-4. */
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (call->fbc->common.fn_flags & ZEND_ACC_ALLOW_STATIC) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error(E_DEPRECATED, "Non-static method %s::%s() should not be called statically, assuming $this from incompatible context", call->fbc->common.scope->name->val, call->fbc->common.function_name->val);
- Fix flag handling in message generation
2008-02-02 21:56:59 +08:00
} else {
- MFH Add comment that explains why we need E_ERROR in those cases
2008-02-02 23:48:04 +08:00
/* An internal function assumes $this is present and won't check that. So PHP would crash by allowing the call. */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Non-static method %s::%s() cannot be called statically, assuming $this from incompatible context", call->fbc->common.scope->name->val, call->fbc->common.function_name->val);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(&call->object, &EG(This));
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zval *function_name_ptr, *function_name, *func;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->result.num;
- 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 (OP2_TYPE == IS_CONST) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
function_name_ptr = function_name = (zval*)(opline->op2.literal+1);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = CACHED_PTR(opline->op2.literal->cache_slot);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (UNEXPECTED((func = zend_hash_find(EG(function_table), Z_STR_P(function_name))) == NULL)) {
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
SAVE_OPLINE();
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(opline->op2.zv));
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_FUNC_P(func);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, call->fbc);
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
Fixed uninitialized EX(call)->called_scope
2012-12-14 16:10:29 +08:00
call->called_scope = NULL;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +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
/*CHECK_EXCEPTION();*/
ZEND_VM_NEXT_OPCODE();
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *lcname;
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
zend_free_op free_op2;
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
function_name_ptr = function_name = GET_OP2_ZVAL_PTR(BP_VAR_R);
if (Z_TYPE_P(function_name) == IS_REFERENCE) {
function_name = Z_REFVAL_P(function_name);
}
- 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 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
if (EXPECTED(Z_TYPE_P(function_name) == IS_STRING)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_STRVAL_P(function_name)[0] == '\\') {
lcname = STR_ALLOC(Z_STRLEN_P(function_name) - 1, 0);
zend_str_tolower_copy(lcname->val, Z_STRVAL_P(function_name) + 1, Z_STRLEN_P(function_name) - 1);
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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
lcname = STR_ALLOC(Z_STRLEN_P(function_name), 0);
zend_str_tolower_copy(lcname->val, Z_STRVAL_P(function_name), Z_STRLEN_P(function_name));
Remove asterix modifier (*) for generators Generators are now automatically detected by the presence of a `yield` expression in their body. This removes the ZEND_SUSPEND_AND_RETURN_GENERATOR opcode. Instead additional checks for ZEND_ACC_GENERATOR are added to the fcall_common helper and zend_call_function. This also adds a new function zend_generator_create_zval, which handles the actual creation of the generator zval from an op array. I feel like I should deglobalize the zend_create_execute_data_from_op_array code a bit. It currently changes EG(current_execute_data) and EG(opline_ptr) which is somewhat confusing (given the name).
2012-07-20 06:49:50 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED((func = zend_hash_find(EG(function_table), lcname)) == NULL)) {
zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(function_name));
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
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
STR_FREE(lcname);
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
FREE_OP2();
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_FUNC_P(func);
ZVAL_UNDEF(&call->object);
Fixed uninitialized EX(call)->called_scope
2012-12-14 16:10:29 +08:00
call->called_scope = NULL;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +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
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
Fixed bug #54367 (Use of closure causes problem in ArrayAccess).
2011-04-20 20:59:18 +08:00
} else if (OP2_TYPE != IS_CONST && OP2_TYPE != IS_TMP_VAR &&
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
EXPECTED(Z_TYPE_P(function_name) == IS_OBJECT) &&
MFH: Handlerify get_closure
2008-08-15 05:36:56 +08:00
Z_OBJ_HANDLER_P(function_name, get_closure) &&
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
Z_OBJ_HANDLER_P(function_name, get_closure)(function_name, &call->called_scope, &call->fbc, &call->object TSRMLS_CC) == SUCCESS) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_REFCOUNTED(call->object)) {
Z_ADDREF(call->object);
Added support for lambda functions and closures
2008-07-14 17:49:03 +08:00
}
Fixed bug #65382 (Segfault in closure_030.phpt)
2013-08-12 14:53:20 +08:00
if (OP2_TYPE == IS_VAR && OP2_FREE && Z_REFCOUNT_P(function_name) == 1 &&
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc->common.fn_flags & ZEND_ACC_CLOSURE) {
Fixed bug #54367 (Use of closure causes problem in ArrayAccess).
2011-04-20 20:59:18 +08:00
/* Delay closure destruction until its invocation */
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
call->fbc->common.prototype = (zend_function*)function_name_ptr;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
FREE_OP2();
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (OP2_TYPE != IS_CONST &&
EXPECTED(Z_TYPE_P(function_name) == IS_ARRAY) &&
zend_hash_num_elements(Z_ARRVAL_P(function_name)) == 2) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *obj;
zval *method;
Optimized function call helper
2008-04-21 18:14:20 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
obj = zend_hash_index_find(Z_ARRVAL_P(function_name), 0);
method = zend_hash_index_find(Z_ARRVAL_P(function_name), 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
Merge branch 'PHP-5.4' Conflicts: Zend/zend_vm_def.h
2012-09-28 00:46:27 +08:00
if (!obj || !method) {
zend_error_noreturn(E_ERROR, "Array callback has to contain indices 0 and 1");
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
}
Optimized function call helper
2008-04-21 18:14:20 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(obj) != IS_STRING && Z_TYPE_P(obj) != IS_OBJECT) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_error_noreturn(E_ERROR, "First array member is not a valid class name or object");
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
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(method) != IS_STRING) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_error_noreturn(E_ERROR, "Second array member is not a valid method");
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(obj) == IS_STRING) {
ZVAL_UNDEF(&call->object);
call->called_scope = zend_fetch_class_by_name(Z_STR_P(obj), NULL, 0 TSRMLS_CC);
if (UNEXPECTED(call->called_scope == NULL)) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (call->called_scope->get_static_method) {
call->fbc = call->called_scope->get_static_method(call->called_scope, Z_STR_P(method) TSRMLS_CC);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = zend_std_get_static_method(call->called_scope, Z_STR_P(method), NULL TSRMLS_CC);
}
if (UNEXPECTED(call->fbc == NULL)) {
zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", call->called_scope->name->val, Z_STRVAL_P(method));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->called_scope = Z_OBJCE_P(obj);
ZVAL_COPY_VALUE(&call->object, obj);
Fixed bug #43175 (__destruct() throwing an exception with __call() causes segfault)
2007-11-06 22:56:14 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_OBJ_HT_P(obj)->get_method(obj, Z_STR_P(method), NULL TSRMLS_CC);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (UNEXPECTED(call->fbc == NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(obj), Z_STRVAL_P(method));
Optimized function call helper
2008-04-21 18:14:20 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if ((call->fbc->common.fn_flags & ZEND_ACC_STATIC) != 0) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (!Z_ISREF(call->object)) {
Z_ADDREF(call->object); /* For $this pointer */
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&call->object, Z_REFVAL(call->object));
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
}
Optimized function call helper
2008-04-21 18:14:20 +08:00
}
Fixed bug #30162 (Catching exception in constructor couses lose of $this)
2005-05-04 16:45:46 +08:00
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
FREE_OP2();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
zend_error_noreturn(E_ERROR, "Function name must be a string");
Fixed warning of no return in non-void funciton
2012-12-14 17:21:43 +08:00
ZEND_VM_NEXT_OPCODE(); /* Never reached */
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +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
Optimized function call helper
2008-04-21 18:14:20 +08:00
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
ZEND_VM_HANDLER(69, ZEND_INIT_NS_FCALL_BY_NAME, ANY, CONST)
{
USE_OPLINE
zend_literal *func_name;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *func;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->result.num;
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
func_name = opline->op2.literal + 1;
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = CACHED_PTR(opline->op2.literal->cache_slot);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if ((func = zend_hash_find(EG(function_table), Z_STR(func_name->constant))) == NULL) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
func_name++;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED((func = zend_hash_find(EG(function_table), Z_STR(func_name->constant))) == NULL)) {
Fixed bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
SAVE_OPLINE();
zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(opline->op2.zv));
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_FUNC_P(func);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, call->fbc);
- 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 bug that jmp in try block jmp over finally block Refactor the implemention, make codes clear
2012-08-22 18:32:03 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
call->fbc = Z_FUNC_P(func);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, call->fbc);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
Fixed uninitialized EX(call)->called_scope
2012-12-14 16:10:29 +08:00
call->called_scope = NULL;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
Use better data structures (incomplete)
2014-02-10 14:04:30 +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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(61, ZEND_DO_FCALL_BY_NAME, ANY, ANY)
{
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
EX(function_state).function = EX(call)->fbc;
- 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
ZEND_VM_DISPATCH_TO_HELPER(zend_do_fcall_common_helper);
}
ZEND_VM_HANDLER(60, ZEND_DO_FCALL, CONST, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
zval *fname = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *func;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->op2.num;
- 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 caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op1.literal->cache_slot)) {
EX(function_state).function = CACHED_PTR(opline->op1.literal->cache_slot);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (UNEXPECTED((func = zend_hash_find(EG(function_table), Z_STR_P(fname))) == NULL)) {
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to undefined function %s()", Z_STRVAL_P(fname));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
EX(function_state).function = Z_FUNC_P(func);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op1.literal->cache_slot, EX(function_state).function);
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = EX(function_state).function;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&call->object);
Fixed uninitialized EX(call)->called_scope
2012-12-14 16:10:29 +08:00
call->called_scope = NULL;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 0;
EX(call) = call;
- 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
FREE_OP1();
ZEND_VM_DISPATCH_TO_HELPER(zend_do_fcall_common_helper);
}
ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY)
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
{
USE_OPLINE
zval *retval_ptr;
zend_free_op free_op1;
SAVE_OPLINE();
retval_ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (!EX(return_value)) {
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1();
Removed redundand code
2013-03-13 21:51:10 +08:00
} else {
Fixed return of references by value
2014-03-04 21:38:19 +08:00
if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) {
ZVAL_COPY_VALUE(EX(return_value), retval_ptr);
Removed redundand code
2013-03-13 21:51:10 +08:00
if (OP1_TYPE != IS_TMP_VAR) {
Fixed return of references by value
2014-03-04 21:38:19 +08:00
zval_copy_ctor(EX(return_value));
Removed redundand code
2013-03-13 21:51:10 +08:00
}
Fixed return of references by value
2014-03-04 21:38:19 +08:00
FREE_OP1_IF_VAR();
} else if (Z_ISREF_P(retval_ptr)) {
ZVAL_DUP(EX(return_value), Z_REFVAL_P(retval_ptr));
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_IF_VAR();
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
} else {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY_VALUE(EX(return_value), retval_ptr);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_CV) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(retval_ptr)) Z_ADDREF_P(retval_ptr);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
}
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
}
}
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
}
ZEND_VM_HANDLER(111, ZEND_RETURN_BY_REF, CONST|TMP|VAR|CV, ANY)
- 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 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
USE_OPLINE
- 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
zval *retval_ptr;
zend_free_op free_op1;
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
SAVE_OPLINE();
- 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
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
do {
Removed deprecated AI_SET_PTR()s
2013-11-28 00:30:35 +08:00
if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR ||
(OP1_TYPE == IS_VAR && opline->extended_value == ZEND_RETURNS_VALUE)) {
- 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
/* Not supposed to happen, but we'll allow it */
Make references misuse emit E_NOTICE rather E_STRICT to be compatible with PHP 4.4.0
2005-07-12 02:44:37 +08:00
zend_error(E_NOTICE, "Only variable references should be returned by reference");
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
retval_ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (!EX(return_value)) {
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
if (OP1_TYPE == IS_TMP_VAR) {
FREE_OP1();
}
} else if (!IS_OP1_TMP_FREE()) { /* Not a temp var */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_DUP(EX(return_value), retval_ptr);
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
} else {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY_VALUE(EX(return_value), retval_ptr);
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +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
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
retval_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(retval_ptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Cannot return string offsets by reference");
}
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (OP1_TYPE == IS_VAR && !Z_ISREF_P(retval_ptr)) {
Fixed return by reference
2014-03-07 16:25:55 +08:00
if (opline->extended_value == ZEND_RETURNS_FUNCTION &&
(retval_ptr->var_flags & IS_VAR_RET_REF)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
//??? } else if (EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
Fixed return by reference
2014-03-07 16:25:55 +08:00
} else {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zend_error(E_NOTICE, "Only variable references should be returned by reference");
if (EX(return_value)) {
Better IS_REFERENCE handling
2014-02-25 04:17:13 +08:00
//??? ZVAL_DUP(EX(return_value), retval_ptr);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zval tmp;
ZVAL_DUP(&tmp, retval_ptr);
ZVAL_NEW_REF(EX(return_value), &tmp);
}
break;
Fixed return by reference
2014-03-07 16:25:55 +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
}
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (EX(return_value)) {
SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr);
ZVAL_COPY(EX(return_value), retval_ptr);
Optimized ZEND_RETURN opcode to not allocate and copy return value if it is not used.
2008-04-11 17:43:28 +08:00
}
ZEND_RETURN is splitted into two new instructions ZEND_RETURN and ZEND_RETURN_BY_REF
2010-04-22 19:56:45 +08:00
} while (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
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_VAR_PTR();
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
- 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
}
Remove implementation stubs for yield delegation I decided to leave out yield delegation for an initial proposal, so remove the stubs for it too.
2012-08-26 01:03:23 +08:00
ZEND_VM_HANDLER(161, ZEND_GENERATOR_RETURN, ANY, ANY)
Add dedicated opcode for returns from a generator Generators don't have a return value, so it doesn't make sense to have a shared implementation here.
2012-08-24 19:51:39 +08:00
{
Generator related fixes
2014-02-26 17:58:59 +08:00
/* The generator object is stored in EX(return_value) */
zend_generator *generator = (zend_generator *) EX(return_value);
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 21:25:32 +08:00
/* Close the generator to free up resources */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zend_generator_close(generator, 1 TSRMLS_CC);
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 21:25:32 +08:00
/* Pass execution back to handling code */
ZEND_VM_RETURN();
Add dedicated opcode for returns from a generator Generators don't have a return value, so it doesn't make sense to have a shared implementation here.
2012-08-24 19:51:39 +08:00
}
Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8)
2005-06-16 22:20:00 +08:00
ZEND_VM_HANDLER(108, ZEND_THROW, CONST|TMP|VAR|CV, ANY)
- 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 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
USE_OPLINE
- 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
zval *value;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval exception;
- 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
zend_free_op free_op1;
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
SAVE_OPLINE();
- 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
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
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
if (OP1_TYPE == IS_CONST || UNEXPECTED(Z_TYPE_P(value) != IS_OBJECT)) {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
- 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
zend_error_noreturn(E_ERROR, "Can only throw objects");
}
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
- MFH Improve exception linking
2008-08-14 18:24:52 +08:00
zend_exception_save(TSRMLS_C);
- 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
/* Not sure if a complete copy is what we want here */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&exception, value);
- 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 (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(&exception);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_throw_exception_object(&exception TSRMLS_CC);
- MFH Improve exception linking
2008-08-14 18:24:52 +08:00
zend_exception_restore(TSRMLS_C);
- 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
FREE_OP1_IF_VAR();
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
HANDLE_EXCEPTION();
- 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 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
ZEND_VM_HANDLER(107, ZEND_CATCH, CONST, 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
{
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
USE_OPLINE
zend_class_entry *ce, *catch_ce;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_object *exception;
- 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 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
SAVE_OPLINE();
- 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
/* Check whether an exception has been thrown, if not, jump over code */
- MFH Improve exception linking
2008-08-14 18:24:52 +08:00
zend_exception_restore(TSRMLS_C);
- 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 (EG(exception) == NULL) {
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
ZEND_VM_CONTINUE(); /* CHECK_ME */
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op1.literal->cache_slot)) {
catch_ce = CACHED_PTR(opline->op1.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
catch_ce = zend_fetch_class_by_name(Z_STR_P(opline->op1.zv), opline->op1.literal + 1, ZEND_FETCH_CLASS_NO_AUTOLOAD TSRMLS_CC);
fix bug #61782 - __clone/__destruct do not match other methods when checking access controls
2012-05-13 13:12:48 +08:00
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op1.literal->cache_slot, catch_ce);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? ce = Z_OBJCE_P(EG(exception));
ce = EG(exception)->ce;
Add DTrace probes
2010-04-24 21:32:30 +08:00
#ifdef HAVE_DTRACE
if (DTRACE_EXCEPTION_CAUGHT_ENABLED()) {
Fixed #65431 (Discarded qualifiers from pointer target warnings when using --enable-dtrace) by Sixd
2013-08-14 11:42:39 +08:00
DTRACE_EXCEPTION_CAUGHT((char *)ce->name);
Add DTrace probes
2010-04-24 21:32:30 +08:00
}
#endif /* HAVE_DTRACE */
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
if (ce != catch_ce) {
if (!instanceof_function(ce, catch_ce TSRMLS_CC)) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (opline->result.num) {
- 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
zend_throw_exception_internal(NULL TSRMLS_CC);
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
HANDLE_EXCEPTION();
- 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
}
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]);
ZEND_VM_CONTINUE(); /* CHECK_ME */
}
}
Fixed exception handling in GOTO VM
2010-05-24 22:46:31 +08:00
exception = EG(exception);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_REFCOUNTED_P(EX_VAR_NUM(opline->op2.var))) {
zval_ptr_dtor(EX_VAR_NUM(opline->op2.var));
}
ZVAL_OBJ(EX_VAR_NUM(opline->op2.var), EG(exception));
if (EG(active_symbol_table)) {
zend_string *cv = CV_DEF_OF(opline->op2.var);
Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*
2014-03-18 03:15:22 +08:00
zval *zv = zend_hash_update(&EG(active_symbol_table)->ht, cv, EX_VAR_NUM(opline->op2.var));
Review ended Revert "An demo(for review) to show how to fix the problem(symbol table resize)" This reverts commit 60c354510b6731ec8348af9c5e230a4859c7c383.
2014-03-11 14:23:14 +08:00
ZVAL_INDIRECT(EX_VAR_NUM(opline->op2.var), zv);
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
}
Fixed exception handling in GOTO VM
2010-05-24 22:46:31 +08:00
if (UNEXPECTED(EG(exception) != exception)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
EG(exception)->gc.refcount++;
Fixed exception handling in GOTO VM
2010-05-24 22:46:31 +08:00
HANDLE_EXCEPTION();
} else {
EG(exception) = NULL;
ZEND_VM_NEXT_OPCODE();
}
- 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 redundant code
2010-06-22 22:15:08 +08:00
ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP, ANY)
- 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 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
USE_OPLINE
SAVE_OPLINE();
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) {
int arg_num = opline->op2.num + EX(call)->num_additional_args;
if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", arg_num);
}
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +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
{
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval valptr;
- 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
zval *value;
zend_free_op free_op1;
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&valptr, value);
- 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 (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(&valptr);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_vm_stack_push(&valptr TSRMLS_CC);
- 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
FREE_OP1_IF_VAR();
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HELPER(zend_send_by_var_helper, VAR|CV, ANY)
{
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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *varptr, var;
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
varptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (Z_ISREF_P(varptr)) {
Use better data structures (incomplete)
2014-02-19 19:34:32 +08:00
//??? if (OP1_TYPE == IS_CV ||
//??? (OP1_TYPE == IS_VAR && Z_REFCOUNT_P(varptr) > 2)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&var, Z_REFVAL_P(varptr));
varptr = &var;
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1();
Use better data structures (incomplete)
2014-02-19 19:34:32 +08:00
//??? } else {
//??? varptr = Z_REFVAL_P(varptr);
//??? }
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
} else if (OP1_TYPE == IS_CV) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(varptr)) Z_ADDREF_P(varptr);
- 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
}
Changed EG(argument_stack) implementation.
2008-01-24 17:41:39 +08:00
zend_vm_stack_push(varptr TSRMLS_CC);
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR|CV, ANY)
{
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
USE_OPLINE
Fixed parameter passing incompatibilities. Now it is possible to call array_pop(explode("&","1&2&3")) again.
2005-09-20 00:02:21 +08:00
zend_free_op free_op1;
zval *varptr;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
int arg_num;
Fixed parameter passing incompatibilities. Now it is possible to call array_pop(explode("&","1&2&3")) again.
2005-09-20 00:02:21 +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
SAVE_OPLINE();
- 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 (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */
if (!(opline->extended_value & ZEND_ARG_SEND_BY_REF)) {
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
} else {
arg_num = opline->op2.num + EX(call)->num_additional_args;
if (!ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
- 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
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
varptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
Fixed passing by reference
2014-03-05 03:54:05 +08:00
if ((!(opline->extended_value & ZEND_ARG_SEND_FUNCTION) ||
Fixed return by reference
2014-03-07 16:25:55 +08:00
(varptr->var_flags & IS_VAR_RET_REF)) &&
Fixed pass by reference special cases
2014-03-07 20:45:32 +08:00
((!Z_REFCOUNTED_P(varptr) && Z_TYPE_P(varptr) != IS_STRING) ||
Fixed return by reference
2014-03-07 16:25:55 +08:00
Z_ISREF_P(varptr) ||
Fixed pass by reference special cases
2014-03-07 20:45:32 +08:00
Z_TYPE_P(varptr) == IS_OBJECT ||
(Z_REFCOUNTED_P(varptr) && Z_REFCOUNT_P(varptr) == 1))) {
Fixed return by reference
2014-03-07 16:25:55 +08:00
if (Z_ISREF_P(varptr)) {
if (OP1_TYPE == IS_CV) {
Z_ADDREF_P(varptr);
}
} else {
ZVAL_NEW_REF(varptr, varptr);
if (OP1_TYPE == IS_CV) {
Z_ADDREF_P(varptr);
}
Fixed passing by reference
2014-03-05 03:54:05 +08:00
}
zend_vm_stack_push(varptr TSRMLS_CC);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval val;
- 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 bug #48912 (Namespace causes unexpected strict behaviour with extract())
2009-07-28 20:35:27 +08:00
if ((opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) ?
!(opline->extended_value & ZEND_ARG_SEND_SILENT) :
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
!ARG_MAY_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
Removed wrong warning message
2009-01-20 21:21:52 +08:00
zend_error(E_STRICT, "Only variables should be passed by reference");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&val, varptr);
Fixed parameter passing incompatibilities. Now it is possible to call array_pop(explode("&","1&2&3")) again.
2005-09-20 00:02:21 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(&val);
- 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 IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_IF_VAR();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_vm_stack_push(&val TSRMLS_CC);
Fixed passing by reference
2014-03-05 03:54:05 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
zval *varptr;
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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
varptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(varptr) == IS_STR_OFFSET)) {
- 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
zend_error_noreturn(E_ERROR, "Only variables can be passed by reference");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(varptr == &EG(error_zval))) {
zend_vm_stack_push(&EG(uninitialized_zval) TSRMLS_CC);
Fixed bug #54262 (Crash when assigning value to a dimension in a non-array)
2011-03-16 19:14:33 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
Fixed bug #52237 (Crash when passing the reference of the property of a non-object)
2010-07-05 17:08:35 +08:00
}
Fixed incorrect check. SEND_REF may be executed before DO_FCALL when EX(function_state).function is not yet set to the calling function.
2013-04-24 03:43:23 +08:00
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME &&
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) {
int arg_num = opline->op2.num + EX(call)->num_additional_args;
if (!ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
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
}
fix crash when unexpectedly passed by-ref parameter is modified
2009-08-19 04:51:49 +08:00
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
if (Z_ISREF_P(varptr)) {
Fixed reference handling
2014-03-11 18:49:25 +08:00
Z_ADDREF_P(varptr);
Fixed IS_INDIRECT handling when assign array element by reference. This might cause passing invalid pointer if the array could be resized before IS_INDIRECT usage. Now we use IS_REFERENCE instead of IS_INDIRECT. The following test crashed before: <?php $a = array(0,1,2,3,4,5,6,7); $a[8] = &$a[7]; ?>
2014-03-13 04:30:53 +08:00
} else {
SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr);
//??? don't increment refcount of overloaded element
if (OP1_TYPE != IS_VAR ||
EXPECTED(Z_TYPE_P(EX_VAR(opline->op1.var)) == IS_INDIRECT)) {
Z_ADDREF_P(varptr);
}
Fixed reference handling
2014-03-11 18:49:25 +08:00
}
Changed EG(argument_stack) implementation.
2008-01-24 17:41:39 +08:00
zend_vm_stack_push(varptr TSRMLS_CC);
- 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
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(66, ZEND_SEND_VAR, VAR|CV, ANY)
{
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
USE_OPLINE
- 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 argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (opline->extended_value == ZEND_DO_FCALL_BY_NAME) {
int arg_num = opline->op2.num + EX(call)->num_additional_args;
if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_SEND_REF);
}
- 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 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
SAVE_OPLINE();
- 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
ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper);
}
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
ZEND_VM_HANDLER(165, ZEND_SEND_UNPACK, ANY, ANY)
{
USE_OPLINE
zend_free_op free_op1;
zval *args;
int arg_num;
SAVE_OPLINE();
args = GET_OP1_ZVAL_PTR(BP_VAR_R);
arg_num = opline->op2.num + EX(call)->num_additional_args + 1;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
again:
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
switch (Z_TYPE_P(args)) {
case IS_ARRAY: {
HashTable *ht = Z_ARRVAL_P(args);
HashPosition pos;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *arg;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
ZEND_VM_STACK_GROW_IF_NEEDED(zend_hash_num_elements(ht));
for (zend_hash_internal_pointer_reset_ex(ht, &pos);
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
(arg = zend_hash_get_current_data_ex(ht, &pos)) != NULL;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_hash_move_forward_ex(ht, &pos), ++arg_num
) {
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
zend_string *name;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_ulong index;
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
if (zend_hash_get_current_key_ex(ht, &name, &index, 0, &pos) == HASH_KEY_IS_STRING) {
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
zend_error(E_RECOVERABLE_ERROR, "Cannot unpack array with string keys");
FREE_OP1();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
if (ARG_SHOULD_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_TO_MAKE_IS_REF(arg);
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
Z_ADDREF_P(arg);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
} else if (Z_ISREF_P(arg)) {
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
ZVAL_DUP(arg, Z_REFVAL_P(arg));
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
} else {
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
if (Z_REFCOUNTED_P(arg)) Z_ADDREF_P(arg);
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
}
zend_vm_stack_push(arg TSRMLS_CC);
EX(call)->num_additional_args++;
}
break;
}
case IS_OBJECT: {
zend_class_entry *ce = Z_OBJCE_P(args);
zend_object_iterator *iter;
if (!ce || !ce->get_iterator) {
zend_error(E_WARNING, "Only arrays and Traversables can be unpacked");
break;
}
iter = ce->get_iterator(ce, args, 0 TSRMLS_CC);
if (UNEXPECTED(!iter)) {
FREE_OP1();
if (!EG(exception)) {
zend_throw_exception_ex(
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name->val
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
);
}
HANDLE_EXCEPTION();
}
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
if (UNEXPECTED(EG(exception) != NULL)) {
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
}
for (; iter->funcs->valid(iter TSRMLS_CC) == SUCCESS; ++arg_num) {
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
zval *arg;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
arg = iter->funcs->get_current_data(iter TSRMLS_CC);
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
if (iter->funcs->get_current_key) {
zval key;
iter->funcs->get_current_key(iter, &key TSRMLS_CC);
if (UNEXPECTED(EG(exception) != NULL)) {
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
if (Z_TYPE(key) == IS_STRING) {
zend_error(E_RECOVERABLE_ERROR,
"Cannot unpack Traversable with string keys");
zval_dtor(&key);
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
zval_dtor(&key);
}
if (ARG_MUST_BE_SENT_BY_REF(EX(call)->fbc, arg_num)) {
zend_error(
E_WARNING, "Cannot pass by-reference argument %d of %s%s%s()"
" by unpacking a Traversable, passing by-value instead", arg_num,
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
EX(call)->fbc->common.scope ? EX(call)->fbc->common.scope->name->val : "",
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
EX(call)->fbc->common.scope ? "::" : "",
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
EX(call)->fbc->common.function_name->val
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
);
}
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
if (Z_ISREF_P(arg)) {
//??? ALLOC_ZVAL(arg);
//??? MAKE_COPY_ZVAL(arg_ptr, arg);
ZVAL_DUP(arg, Z_REFVAL_P(arg));
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
} else {
Fixed argument unpacking
2014-02-26 20:17:28 +08:00
if (Z_REFCOUNTED_P(arg)) Z_ADDREF_P(arg);
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
}
ZEND_VM_STACK_GROW_IF_NEEDED(1);
zend_vm_stack_push(arg TSRMLS_CC);
EX(call)->num_additional_args++;
iter->funcs->move_forward(iter TSRMLS_CC);
if (UNEXPECTED(EG(exception) != NULL)) {
ZEND_VM_C_GOTO(unpack_iter_dtor);
}
}
ZEND_VM_C_LABEL(unpack_iter_dtor):
iter->funcs->dtor(iter TSRMLS_CC);
break;
}
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
args = Z_REFVAL_P(args);
goto again;
break;
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
default:
zend_error(E_WARNING, "Only arrays and Traversables can be unpacked");
}
FREE_OP1();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY)
{
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
USE_OPLINE
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
zend_uint arg_num = opline->op1.num;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
- 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 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
SAVE_OPLINE();
if (UNEXPECTED(param == NULL)) {
fix bug37251.phpt failure (two error messages instead of one) should I merge this to 5_2?
2007-11-03 02:05:55 +08:00
if (zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL, opline->extended_value TSRMLS_CC)) {
Fixed ZE specific compile warnings (Bug #55629)
2011-09-13 21:29:35 +08:00
const char *space;
const char *class_name;
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
zend_execute_data *ptr;
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +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
if (EG(active_op_array)->scope) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
class_name = EG(active_op_array)->scope->name->val;
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
space = "::";
} else {
class_name = space = "";
}
ptr = EX(prev_execute_data);
fix bug37251.phpt failure (two error messages instead of one) should I merge this to 5_2?
2007-11-03 02:05:55 +08:00
if(ptr && ptr->op_array) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error(E_WARNING, "Missing argument %u for %s%s%s(), called in %s on line %d and defined", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename->val, ptr->opline->lineno);
fix bug37251.phpt failure (two error messages instead of one) should I merge this to 5_2?
2007-11-03 02:05:55 +08:00
} else {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
zend_error(E_WARNING, "Missing argument %u for %s%s%s()", opline->op1.num, class_name, space, get_active_function_name(TSRMLS_C));
fix bug37251.phpt failure (two error messages instead of one) should I merge this to 5_2?
2007-11-03 02:05:55 +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
}
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr;
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, param, opline->extended_value TSRMLS_CC);
var_ptr = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(var_ptr)) Z_DELREF_P(var_ptr);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(var_ptr, param);
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
{
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
USE_OPLINE
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
zend_uint arg_num = opline->op1.num;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
zval *var_ptr;
- 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 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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
var_ptr = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
zval_ptr_dtor(var_ptr);
Changed EG(argument_stack) implementation.
2008-01-24 17:41:39 +08:00
if (param == NULL) {
Fixed support for undefined constants in RECV_INIT
2014-03-06 04:15:56 +08:00
//???
#if 1
if (IS_CONSTANT_TYPE(Z_TYPE_P(opline->op2.zv))) {
zval tmp;
ZVAL_COPY_VALUE(&tmp, opline->op2.zv);
zval_update_constant(&tmp, 0 TSRMLS_CC);
//???: var_ptr may become INDIRECT
if (Z_TYPE_P(var_ptr) == IS_INDIRECT) {
var_ptr = Z_INDIRECT_P(var_ptr);
}
ZVAL_COPY_VALUE(var_ptr, &tmp);
} else {
ZVAL_COPY_VALUE(var_ptr, opline->op2.zv);
zval_copy_ctor(var_ptr);
}
#else
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(var_ptr, opline->op2.zv);
if (IS_CONSTANT_TYPE(Z_TYPE_P(var_ptr))) {
zval_update_constant(var_ptr, 0 TSRMLS_CC);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(var_ptr);
- 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 support for undefined constants in RECV_INIT
2014-03-06 04:15:56 +08:00
#endif
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(var_ptr, param);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, var_ptr, opline->extended_value TSRMLS_CC);
Optimized handlers for ZEND_RECV and ZEND_RECV_INIT opocdes
2008-04-24 23:45:46 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Implement variadic function syntax As per RFC: https://wiki.php.net/rfc/variadics
2013-09-27 00:39:17 +08:00
ZEND_VM_HANDLER(164, ZEND_RECV_VARIADIC, ANY, ANY)
{
USE_OPLINE
zend_uint arg_num = opline->op1.num;
zend_uint arg_count = zend_vm_stack_get_args_count(TSRMLS_C);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *params;
Implement variadic function syntax As per RFC: https://wiki.php.net/rfc/variadics
2013-09-27 00:39:17 +08:00
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
params = _get_zval_ptr_cv_BP_VAR_W(execute_data, opline->result.var TSRMLS_CC);
Temorary fix for implicit IS_CV conversion into IS_INDIRECTR
2014-02-26 19:17:08 +08:00
if (Z_REFCOUNTED_P(params)) Z_DELREF_P(params);
Implement variadic function syntax As per RFC: https://wiki.php.net/rfc/variadics
2013-09-27 00:39:17 +08:00
if (arg_num <= arg_count) {
array_init_size(params, arg_count - arg_num + 1);
} else {
array_init(params);
}
for (; arg_num <= arg_count; ++arg_num) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, param, opline->extended_value TSRMLS_CC);
Temorary fix for implicit IS_CV conversion into IS_INDIRECTR
2014-02-26 19:17:08 +08:00
//??? "params" may became IS_INDIRECT because of symtable initialization in zend_error
if (Z_TYPE_P(params) == IS_INDIRECT) {
params = Z_INDIRECT_P(params);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_next_index_insert(Z_ARRVAL_P(params), param);
if (Z_REFCOUNTED_P(param)) {
Z_ADDREF_P(param);
}
Implement variadic function syntax As per RFC: https://wiki.php.net/rfc/variadics
2013-09-27 00:39:17 +08:00
}
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(52, ZEND_BOOL, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *retval = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
- 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 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
ZVAL_BOOL(retval, i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R) TSRMLS_CC));
- 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
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Removed support for break/continue $var syntax
2010-11-24 20:19:56 +08:00
ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST)
- 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 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
USE_OPLINE
Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior)
2005-11-01 03:25:14 +08:00
zend_brk_cont_element *el;
- 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 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
SAVE_OPLINE();
Removed support for break/continue $var syntax
2010-11-24 20:19:56 +08:00
el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
EX(op_array), execute_data TSRMLS_CC);
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes + el->brk);
- 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 support for break/continue $var syntax
2010-11-24 20:19:56 +08:00
ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST)
- 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 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
USE_OPLINE
Fixed bug #35017 (Exception thrown in error handler may cause unexpected behavior)
2005-11-01 03:25:14 +08:00
zend_brk_cont_element *el;
- 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 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
SAVE_OPLINE();
Removed support for break/continue $var syntax
2010-11-24 20:19:56 +08:00
el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->op1.opline_num,
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
EX(op_array), execute_data TSRMLS_CC);
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes + el->cont);
- 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
}
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +08:00
ZEND_VM_HANDLER(100, ZEND_GOTO, ANY, CONST)
{
zend_op *brk_opline;
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
USE_OPLINE
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +08:00
zend_brk_cont_element *el;
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
SAVE_OPLINE();
Removed support for break/continue $var syntax
2010-11-24 20:19:56 +08:00
el = zend_brk_cont(Z_LVAL_P(opline->op2.zv), opline->extended_value,
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
EX(op_array), execute_data TSRMLS_CC);
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +08:00
brk_opline = EX(op_array)->opcodes + el->brk;
switch (brk_opline->opcode) {
case ZEND_SWITCH_FREE:
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(brk_opline->op1.var));
- Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR) - Fixed bug #44913 (Segfault when using return in combination with nested loops and continue 2)
2008-05-05 19:03:35 +08:00
}
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +08:00
break;
case ZEND_FREE:
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_dtor(EX_VAR(brk_opline->op1.var));
- Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR) - Fixed bug #44913 (Segfault when using return in combination with nested loops and continue 2)
2008-05-05 19:03:35 +08:00
}
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +08:00
break;
}
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_JMP(opline->op1.jmp_addr);
MFH: Implemented "jump label" operator (limited "goto") [DOC]
2008-03-28 22:35:01 +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
ZEND_VM_HANDLER(48, ZEND_CASE, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
is_equal_function(EX_VAR(opline->result.var),
- 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_OP1_ZVAL_PTR(BP_VAR_R),
GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC);
FREE_OP2();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
- Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR) - Fixed bug #44913 (Segfault when using return in combination with nested loops and continue 2)
2008-05-05 19:03:35 +08:00
ZEND_VM_HANDLER(49, ZEND_SWITCH_FREE, VAR, ANY)
- 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 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
USE_OPLINE
Fixed unspecialized executor
2008-01-11 18:08:49 +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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->op1.var));
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(68, ZEND_NEW, ANY, ANY)
{
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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval object_zval;
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
zend_function *constructor;
- 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 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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED((Z_CE_P(EX_VAR(opline->op1.var))->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) != 0)) {
if (Z_CE_P(EX_VAR(opline->op1.var))->ce_flags & ZEND_ACC_INTERFACE) {
zend_error_noreturn(E_ERROR, "Cannot instantiate interface %s", Z_CE_P(EX_VAR(opline->op1.var))->name->val);
} else if ((Z_CE_P(EX_VAR(opline->op1.var))->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT) {
zend_error_noreturn(E_ERROR, "Cannot instantiate trait %s", Z_CE_P(EX_VAR(opline->op1.var))->name->val);
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Cannot instantiate abstract class %s", Z_CE_P(EX_VAR(opline->op1.var))->name->val);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
object_init_ex(&object_zval, Z_CE_P(EX_VAR(opline->op1.var)));
constructor = Z_OBJ_HT(object_zval)->get_constructor(&object_zval TSRMLS_CC);
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
if (constructor == NULL) {
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), &object_zval);
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
} else {
zval_ptr_dtor(&object_zval);
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes + opline->op2.opline_num);
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
} else {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call_slot *call = EX(call_slots) + opline->extended_value;
executor optimization
2007-12-14 22:14:50 +08:00
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), &object_zval);
executor optimization
2007-12-14 22:14:50 +08:00
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
/* We are not handling overloaded classes right now */
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->fbc = constructor;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&call->object, &object_zval);
call->called_scope = Z_CE_P(EX_VAR(opline->op1.var));
Implement argument unpacking RFC: https://wiki.php.net/rfc/argument_unpacking
2013-08-29 17:35:11 +08:00
call->num_additional_args = 0;
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call->is_ctor_call = 1;
call->is_ctor_result_used = RETURN_VALUE_USED(opline);
EX(call) = call;
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +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
CHECK_EXCEPTION();
Merge three opcodes (ZEND_NEW, ZEND_JMP_NO_CTOR, ZEND_INIT_CTOR) into one (ZEND_NEW). There was no real reason for this anymore and API should be changed before 5.1
2005-06-10 15:56:40 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
}
ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *obj;
- 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
zend_class_entry *ce;
zend_function *clone;
zend_object_clone_obj_t clone_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
SAVE_OPLINE();
obj = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R);
Improved specialization (IS_CONST can't be IS_OBJECT)
2009-04-08 21:19:34 +08:00
if (OP1_TYPE == IS_CONST ||
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
UNEXPECTED(Z_TYPE_P(obj) != IS_OBJECT)) {
Exceptions triggered by undefined variable should be handled before FATAL error this is a enhancement of the fix for bug #64135
2013-02-16 22:22:22 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Fixed bug #42817 (clone() on a non-object does not result in a fatal error)
2007-10-05 07:19:20 +08:00
zend_error_noreturn(E_ERROR, "__clone method called on non-object");
- 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
}
ce = Z_OBJCE_P(obj);
clone = ce ? ce->clone : NULL;
clone_call = Z_OBJ_HT_P(obj)->clone_obj;
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
if (UNEXPECTED(clone_call == NULL)) {
Fixed bug #38234 (Exception in __clone makes memory leak)
2006-07-27 18:44:03 +08:00
if (ce) {
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object of class %s", ce->name->val);
Fixed bug #38234 (Exception in __clone makes memory leak)
2006-07-27 18:44:03 +08:00
} else {
zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object");
}
- 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 (ce && clone) {
if (clone->op_array.fn_flags & ZEND_ACC_PRIVATE) {
/* Ensure that if we're calling a private function, we're allowed to do so.
*/
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
if (UNEXPECTED(ce != EG(scope))) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to private %s::__clone() from context '%s'", ce->name->val, EG(scope) ? EG(scope)->name->val : "");
- 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
}
} else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) {
/* Ensure that if we're calling a protected function, we're allowed to do so.
*/
fix bug #61782 - __clone/__destruct do not match other methods when checking access controls
2012-05-13 13:12:48 +08:00
if (UNEXPECTED(!zend_check_protected(zend_get_function_root_class(clone), EG(scope)))) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name->val, EG(scope) ? EG(scope)->name->val : "");
- 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 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
if (EXPECTED(EG(exception) == NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_OBJ(EX_VAR(opline->result.var), clone_call(obj TSRMLS_CC));
//??? Z_SET_ISREF_P(retval);
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
if (!RETURN_VALUE_USED(opline) || UNEXPECTED(EG(exception) != NULL)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(opline->result.var));
Proper fix for bug #37707 ("clone $x" must call __clone() enven if result value is not used)
2006-06-08 16:56:27 +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
}
FREE_OP1_IF_VAR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Namespaces
2007-09-29 03:52:53 +08:00
ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, VAR|CONST|UNUSED, CONST)
- 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 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
USE_OPLINE
- 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 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
SAVE_OPLINE();
- 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 (OP1_TYPE == IS_UNUSED) {
- Reimplemented ZEND_INIT_FCALL_BY_NAME and ZEND_INIT_NS_FCALL_BY_NAME to use literals instead of additional operands - Optimized access to global constants
2010-04-27 20:09:13 +08:00
zend_constant *c;
zval *retval;
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
c = CACHED_PTR(opline->op2.literal->cache_slot);
} else if ((c = zend_quick_get_constant(opline->op2.literal + 1, opline->extended_value TSRMLS_CC)) == NULL) {
Namespace resolution streamlining patch [DOC] new resolution rules should be documented soon
2008-11-12 03:45:29 +08:00
if ((opline->extended_value & IS_CONSTANT_UNQUALIFIED) != 0) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
char *actual = (char *)zend_memrchr(Z_STRVAL_P(opline->op2.zv), '\\', Z_STRLEN_P(opline->op2.zv));
Namespace resolution streamlining patch [DOC] new resolution rules should be documented soon
2008-11-12 03:45:29 +08:00
if(!actual) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
actual = Z_STRVAL_P(opline->op2.zv);
Namespace resolution streamlining patch [DOC] new resolution rules should be documented soon
2008-11-12 03:45:29 +08:00
} else {
actual++;
- Next step in namespaces, using / as namespace separator.
2008-11-04 23:58:55 +08:00
}
Namespace resolution streamlining patch [DOC] new resolution rules should be documented soon
2008-11-12 03:45:29 +08:00
/* non-qualified constant - allow text substitution */
zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", actual, actual);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_STRINGL(EX_VAR(opline->result.var), actual, Z_STRLEN_P(opline->op2.zv)-(actual - Z_STRVAL_P(opline->op2.zv)));
- Reimplemented ZEND_INIT_FCALL_BY_NAME and ZEND_INIT_NS_FCALL_BY_NAME to use literals instead of additional operands - Optimized access to global constants
2010-04-27 20:09:13 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
- Next step in namespaces, using / as namespace separator.
2008-11-04 23:58:55 +08:00
} else {
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
zend_error_noreturn(E_ERROR, "Undefined constant '%s'", Z_STRVAL_P(opline->op2.zv));
Fixed bug #43344 (Wrong error message for undefined namespace constant)
2007-12-08 01:11:24 +08:00
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
} else {
CACHE_PTR(opline->op2.literal->cache_slot, c);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
retval = EX_VAR(opline->result.var);
ZVAL_DUP(retval, &c->value);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
Namespaces
2007-09-29 03:52:53 +08:00
} else {
- Next step in namespaces, using / as namespace separator.
2008-11-04 23:58:55 +08:00
/* class constant */
Namespaces
2007-09-29 03:52:53 +08:00
zend_class_entry *ce;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
ws
2007-10-03 14:49:15 +08:00
Namespaces
2007-09-29 03:52:53 +08:00
if (OP1_TYPE == IS_CONST) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
value = CACHED_PTR(opline->op2.literal->cache_slot);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(EX_VAR(opline->result.var), value);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
} else if (CACHED_PTR(opline->op1.literal->cache_slot)) {
ce = CACHED_PTR(opline->op1.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = zend_fetch_class_by_name(Z_STR_P(opline->op1.zv), opline->op1.literal + 1, opline->extended_value TSRMLS_CC);
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (UNEXPECTED(ce == NULL)) {
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op1.zv));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
}
CACHE_PTR(opline->op1.literal->cache_slot, ce);
Namespaces
2007-09-29 03:52:53 +08:00
}
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_CE_P(EX_VAR(opline->op1.var));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if ((value = CACHED_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, ce)) != NULL) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(EX_VAR(opline->result.var), value);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
Namespaces
2007-09-29 03:52:53 +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
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (EXPECTED((value = zend_hash_find(&ce->constants_table, Z_STR_P(opline->op2.zv))) != NULL)) {
if (IS_CONSTANT_TYPE(Z_TYPE_P(value))) {
Namespaces
2007-09-29 03:52:53 +08:00
zend_class_entry *old_scope = EG(scope);
- 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
Namespaces
2007-09-29 03:52:53 +08:00
EG(scope) = ce;
zval_update_constant(value, (void *) 1 TSRMLS_CC);
EG(scope) = old_scope;
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (OP1_TYPE == IS_CONST) {
CACHE_PTR(opline->op2.literal->cache_slot, value);
} else {
CACHE_POLYMORPHIC_PTR(opline->op2.literal->cache_slot, ce, value);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(EX_VAR(opline->result.var), value);
Use memcmp here is better
2013-12-17 15:37:10 +08:00
} else if (Z_STRLEN_P(opline->op2.zv) == sizeof("class")-1 && memcmp(Z_STRVAL_P(opline->op2.zv), "class", sizeof("class") - 1) == 0) {
Class Name Resolution As Scalar Via "class" Keyword
2013-01-19 08:00:47 +08:00
/* "class" is assigned as a case-sensitive keyword from zend_do_resolve_class_name */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_STR(EX_VAR(opline->result.var), ce->name);
STR_ADDREF(ce->name);
Namespaces
2007-09-29 03:52:53 +08:00
} else {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
zend_error_noreturn(E_ERROR, "Undefined class constant '%s'", Z_STRVAL_P(opline->op2.zv));
Namespaces
2007-09-29 03:52:53 +08:00
}
Fixed some class constant issues related to bug #41633
2007-06-13 22:50:13 +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
CHECK_EXCEPTION();
Namespaces
2007-09-29 03:52:53 +08:00
ZEND_VM_NEXT_OPCODE();
- 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
}
}
Small optimization of ZEND_INIT_ARRAY/ZEND_ADD_ARRAY_ELEMENT. (Nuno, Dmitry)
2006-09-18 22:23:52 +08:00
ZEND_VM_HANDLER(72, ZEND_ADD_ARRAY_ELEMENT, CONST|TMP|VAR|CV, 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
{
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
USE_OPLINE
zend_free_op free_op1;
Fixed ref hanlding in ADD_ARRAY_ELEMENT (by ext/standard/tests/array/bug30074.phpt)
2014-03-09 19:42:08 +08:00
zval *expr_ptr, new_expr;
- 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 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
SAVE_OPLINE();
if ((OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) && opline->extended_value) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
expr_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(expr_ptr) == IS_STR_OFFSET)) {
Fixed crash on attempt to insert reference to string offset into an array
2010-10-22 19:05:22 +08:00
zend_error_noreturn(E_ERROR, "Cannot create references to/from string offsets");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
SEPARATE_ZVAL_TO_MAKE_IS_REF(expr_ptr);
REFERENCE is always REFCOUNTED
2014-03-14 02:07:37 +08:00
Z_ADDREF_P(expr_ptr);
- 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
} else {
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
expr_ptr = GET_OP1_ZVAL_PTR_DEREF(BP_VAR_R);
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
if (IS_OP1_TMP_FREE()) { /* temporary variable */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&new_expr, expr_ptr);
expr_ptr = &new_expr;
Fixed ref hanlding in ADD_ARRAY_ELEMENT (by ext/standard/tests/array/bug30074.phpt)
2014-03-09 19:42:08 +08:00
} else if (OP1_TYPE == IS_CONST) {
ZVAL_DUP(&new_expr, expr_ptr);
expr_ptr = &new_expr;
} else if (Z_ISREF_P(expr_ptr)) {
ZVAL_DUP(&new_expr, Z_REFVAL_P(expr_ptr));
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
expr_ptr = &new_expr;
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_IF_VAR();
Fix Z_COUNTED() -> Z_REFCOUNTED()
2014-02-21 23:19:52 +08:00
} else if (OP1_TYPE == IS_CV && Z_REFCOUNTED_P(expr_ptr)) {
MFH: Added macros for managing zval refcounts and is_ref statuses
2007-10-07 13:22:07 +08:00
Z_ADDREF_P(expr_ptr);
- 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 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
if (OP2_TYPE != IS_UNUSED) {
zend_free_op free_op2;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
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
ulong hval;
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
again:
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
switch (Z_TYPE_P(offset)) {
- 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
case IS_DOUBLE:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = zend_dval_to_lval(Z_DVAL_P(offset));
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_C_GOTO(num_index);
- 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
case IS_LONG:
case IS_BOOL:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = Z_LVAL_P(offset);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_C_LABEL(num_index):
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_index_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), hval, expr_ptr);
- 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
break;
case IS_STRING:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP2_TYPE != IS_CONST) {
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index));
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), Z_STR_P(offset), expr_ptr);
- 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
break;
case IS_NULL:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_update(Z_ARRVAL_P(EX_VAR(opline->result.var)), STR_EMPTY_ALLOC(), expr_ptr);
- 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
break;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
offset = Z_REFVAL_P(offset);
goto again;
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
default:
zend_error(E_WARNING, "Illegal offset type");
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(expr_ptr);
- 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
/* do nothing */
break;
}
FREE_OP2();
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_next_index_insert(Z_ARRVAL_P(EX_VAR(opline->result.var)), expr_ptr);
- 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 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
if ((OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) && opline->extended_value) {
- 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
FREE_OP1_VAR_PTR();
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV)
{
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
USE_OPLINE
Small optimization of ZEND_INIT_ARRAY/ZEND_ADD_ARRAY_ELEMENT. (Nuno, Dmitry)
2006-09-18 22:23:52 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
array_init(EX_VAR(opline->result.var));
Small optimization of ZEND_INIT_ARRAY/ZEND_ADD_ARRAY_ELEMENT. (Nuno, Dmitry)
2006-09-18 22:23:52 +08:00
if (OP1_TYPE == IS_UNUSED) {
ZEND_VM_NEXT_OPCODE();
#if !defined(ZEND_VM_SPEC) || OP1_TYPE != IS_UNUSED
} else {
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ADD_ARRAY_ELEMENT);
#endif
}
- 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
}
ZEND_VM_HANDLER(21, ZEND_CAST, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *expr;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *result = EX_VAR(opline->result.var);
- 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 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
SAVE_OPLINE();
expr = GET_OP1_ZVAL_PTR(BP_VAR_R);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +08:00
if (opline->extended_value != IS_STRING) {
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
ZVAL_COPY_VALUE(result, expr);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(result);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +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
}
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
again:
- 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
switch (opline->extended_value) {
case IS_NULL:
convert_to_null(result);
break;
case IS_BOOL:
convert_to_boolean(result);
break;
case IS_LONG:
convert_to_long(result);
break;
case IS_DOUBLE:
convert_to_double(result);
break;
case IS_STRING: {
zval var_copy;
int use_copy;
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +08:00
zend_make_printable_zval(expr, &var_copy, &use_copy);
- 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 (use_copy) {
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
ZVAL_COPY_VALUE(result, &var_copy);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +08:00
if (IS_OP1_TMP_FREE()) {
FREE_OP1();
}
} else {
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
ZVAL_COPY_VALUE(result, expr);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(result);
Fixed bug #42772 (Storing $this in a static var fails while handling a cast to string)
2007-10-03 16:02:36 +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
}
break;
}
case IS_ARRAY:
convert_to_array(result);
break;
case IS_OBJECT:
convert_to_object(result);
break;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
result = Z_REFVAL_P(result);
goto again;
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
}
FREE_OP1_IF_VAR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_op_array *new_op_array=NULL;
zend_free_op free_op1;
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
zval *inc_filename;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval tmp_inc_filename;
- 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
zend_bool failure_retval=0;
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
SAVE_OPLINE();
inc_filename = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&tmp_inc_filename);
- 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 (inc_filename->type!=IS_STRING) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&tmp_inc_filename, inc_filename);
convert_to_string(&tmp_inc_filename);
inc_filename = &tmp_inc_filename;
- 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 new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
if (opline->extended_value != ZEND_EVAL && strlen(Z_STRVAL_P(inc_filename)) != Z_STRLEN_P(inc_filename)) {
if (opline->extended_value == ZEND_INCLUDE_ONCE || opline->extended_value == ZEND_INCLUDE) {
zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC);
} else {
zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC);
}
} else {
switch (opline->extended_value) {
case ZEND_INCLUDE_ONCE:
case ZEND_REQUIRE_ONCE: {
zend_file_handle file_handle;
char *resolved_path;
resolved_path = zend_resolve_path(Z_STRVAL_P(inc_filename), Z_STRLEN_P(inc_filename) TSRMLS_CC);
if (resolved_path) {
Fixed include_once() handling
2014-02-21 21:23:13 +08:00
failure_retval = zend_hash_str_exists(&EG(included_files), resolved_path, strlen(resolved_path));
- Added new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
} else {
resolved_path = Z_STRVAL_P(inc_filename);
- 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 new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
if (failure_retval) {
/* do nothing, file already included */
} else if (SUCCESS == zend_stream_open(resolved_path, &file_handle TSRMLS_CC)) {
if (!file_handle.opened_path) {
file_handle.opened_path = estrdup(resolved_path);
}
Fixed include_once() handling
2014-02-21 21:23:13 +08:00
if (zend_hash_str_add_empty_element(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path))) {
new_op_array = zend_compile_file(&file_handle, (opline->extended_value==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC);
zend_destroy_file_handle(&file_handle TSRMLS_CC);
} else {
zend_file_handle_dtor(&file_handle TSRMLS_CC);
failure_retval=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
} else {
- Added new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
if (opline->extended_value == ZEND_INCLUDE_ONCE) {
zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC);
} else {
zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, Z_STRVAL_P(inc_filename) TSRMLS_CC);
}
- 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 new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
if (resolved_path != Z_STRVAL_P(inc_filename)) {
efree(resolved_path);
- 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 new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
break;
case ZEND_INCLUDE:
case ZEND_REQUIRE:
new_op_array = compile_filename(opline->extended_value, inc_filename TSRMLS_CC);
break;
case ZEND_EVAL: {
char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC);
- 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 new parameter parsing option (p - for valid path (string without null byte in the middle)) # The tests will be fixed in the next commits
2011-06-07 05:28:16 +08:00
new_op_array = zend_compile_string(inc_filename, eval_desc TSRMLS_CC);
efree(eval_desc);
}
break;
EMPTY_SWITCH_DEFAULT_CASE()
}
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(tmp_inc_filename) != IS_UNDEF) {
Re-fixed bug #60825 (Segfault when running symfony 2 tests)
2012-01-24 22:39:45 +08:00
zval_ptr_dtor(&tmp_inc_filename);
- 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 direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
FREE_OP1();
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
if (UNEXPECTED(EG(exception) != NULL)) {
HANDLE_EXCEPTION();
} else if (EXPECTED(new_op_array != NULL)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval *return_value = NULL;
- 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
EG(active_op_array) = new_op_array;
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
if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
return_value = EX_VAR(opline->result.var);
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
}
- 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
EX(function_state).function = (zend_function *) new_op_array;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&EX(object));
- 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
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
if (!EG(active_symbol_table)) {
zend_rebuild_symbol_table(TSRMLS_C);
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (EXPECTED(zend_execute_ex == execute_ex)) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
i_create_execute_data_from_op_array(new_op_array, return_value, 1 TSRMLS_CC);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
ZEND_VM_ENTER();
} else {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zend_execute(new_op_array, return_value TSRMLS_CC);
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18: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
- Removed direct executor recursion. - Use fastcall calling convention in executor on x86.
2008-06-11 21:18:41 +08:00
EX(function_state).function = (zend_function *) EX(op_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
EG(opline_ptr) = &EX(opline);
EG(active_op_array) = EX(op_array);
destroy_op_array(new_op_array TSRMLS_CC);
efree(new_op_array);
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
if (UNEXPECTED(EG(exception) != NULL)) {
- 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
zend_throw_exception_internal(NULL TSRMLS_CC);
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
HANDLE_EXCEPTION();
- 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 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
} else if (RETURN_VALUE_USED(opline)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), failure_retval);
- 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
}
ZEND_VM_NEXT_OPCODE();
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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 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
USE_OPLINE
- 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
zval tmp, *varname;
HashTable *target_symbol_table;
zend_free_op free_op1;
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
SAVE_OPLINE();
Additional specialization
2010-07-27 17:50:35 +08:00
if (OP1_TYPE == IS_CV &&
OP2_TYPE == IS_UNUSED &&
(opline->extended_value & ZEND_QUICK_SET)) {
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
if (EG(active_symbol_table)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *cv = CV_DEF_OF(opline->op1.var);
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*
2014-03-18 03:15:22 +08:00
zend_delete_variable(EX(prev_execute_data), &EG(active_symbol_table)->ht, cv TSRMLS_CC);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(EX_VAR_NUM(opline->op1.var));
} else if (Z_TYPE_P(EX_VAR_NUM(opline->op1.var)) != IS_UNDEF) {
zval_ptr_dtor(EX_VAR_NUM(opline->op1.var));
ZVAL_UNDEF(EX_VAR_NUM(opline->op1.var));
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +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
CHECK_EXCEPTION();
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
varname = GET_OP1_ZVAL_PTR(BP_VAR_R);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (OP1_TYPE != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&tmp, varname);
- 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
convert_to_string(&tmp);
varname = &tmp;
Fixed bug #44952 (isset() does not checks correctly variable variable)
2008-05-12 17:09:05 +08:00
} else if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(varname)) Z_ADDREF_P(varname);
- 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
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
if (OP2_TYPE != IS_UNUSED) {
zend_class_entry *ce;
if (OP2_TYPE == IS_CONST) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
ce = CACHED_PTR(opline->op2.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = zend_fetch_class_by_name(Z_STR_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-02-25 21:56:59 +08:00
if (OP1_TYPE != IS_CONST && varname == &tmp) {
zval_dtor(&tmp);
} else if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(varname);
Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-02-25 21:56:59 +08:00
}
FREE_OP1();
Fixed bug #65254 (Exception not catchable when exception thrown in autoload with a namespace).
2013-07-14 11:47:06 +08:00
HANDLE_EXCEPTION();
}
if (UNEXPECTED(ce == NULL)) {
zend_error_noreturn(E_ERROR, "Class '%s' not found", Z_STRVAL_P(opline->op2.zv));
Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-02-25 21:56:59 +08:00
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_CE_P(EX_VAR(opline->op2.var));
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_std_unset_static_property(ce, Z_STR_P(varname), ((OP1_TYPE == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC);
- 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
} else {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC);
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
//???: STRING may become INDIRECT
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
if (OP1_TYPE == IS_CV && Z_TYPE_P(varname) == IS_INDIRECT) {
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
varname = Z_INDIRECT_P(varname);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_delete_variable(execute_data, target_symbol_table, Z_STR_P(varname) TSRMLS_CC);
- 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 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
if (OP1_TYPE != IS_CONST && varname == &tmp) {
- 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
zval_dtor(&tmp);
Fixed bug #44952 (isset() does not checks correctly variable variable)
2008-05-12 17:09:05 +08:00
} else if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(varname);
- 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
}
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
ZEND_VM_HANDLER(75, ZEND_UNSET_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|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
{
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
USE_OPLINE
- 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
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
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
zval *offset;
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ulong hval;
- 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 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
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_CV) {
Fixed bug #54585 (track_errors causes segfault)
2011-04-25 15:50:07 +08:00
SEPARATE_ZVAL_IF_NOT_REF(container);
}
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
offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (OP1_TYPE != IS_VAR || container) {
Use better data structures (incomplete)
2014-02-19 18:35:28 +08:00
//???deref
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
container_again:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
switch (Z_TYPE_P(container)) {
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
case IS_ARRAY: {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
HashTable *ht = Z_ARRVAL_P(container);
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
offset_again:
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
switch (Z_TYPE_P(offset)) {
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
case IS_DOUBLE:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = zend_dval_to_lval(Z_DVAL_P(offset));
Fixed bug #62653: (unset($array[$float]) causes a crash) the reason why jpauli and I can not reproduce is (it's silly): I typo "USE_ZEND_ALLOC *&&* valgrind" at the first time, then I always ctrl+r and jpauli copied my command from the pastbin :) thanks
2012-07-26 13:52:42 +08:00
zend_hash_index_del(ht, hval);
break;
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = Z_LVAL_P(offset);
zend_hash_index_del(ht, hval);
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
break;
case IS_STRING:
Fixed bug #38211 (variable name and cookie name match breaks script execution)
2006-07-26 17:24:26 +08:00
if (OP2_TYPE == IS_CV || OP2_TYPE == IS_VAR) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED_P(offset)) Z_ADDREF_P(offset);
Fixed bug #38211 (variable name and cookie name match breaks script execution)
2006-07-26 17:24:26 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP2_TYPE != IS_CONST) {
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_dim));
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (ht == &EG(symbol_table).ht) {
zend_delete_global_variable(Z_STR_P(offset) TSRMLS_CC);
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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_del(ht, Z_STR_P(offset));
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
}
Fixed bug #38211 (variable name and cookie name match breaks script execution)
2006-07-26 17:24:26 +08:00
if (OP2_TYPE == IS_CV || OP2_TYPE == IS_VAR) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(offset);
Fixed bug #38211 (variable name and cookie name match breaks script execution)
2006-07-26 17:24:26 +08:00
}
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
break;
Fixed bug #55135 (Array keys are no longer type casted in unset())
2011-07-06 20:04:02 +08:00
ZEND_VM_C_LABEL(num_index_dim):
zend_hash_index_del(ht, hval);
if (OP2_TYPE == IS_CV || OP2_TYPE == IS_VAR) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(offset);
Fixed bug #55135 (Array keys are no longer type casted in unset())
2011-07-06 20:04:02 +08:00
}
break;
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
case IS_NULL:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_hash_del(ht, STR_EMPTY_ALLOC());
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
break;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
offset = Z_REFVAL_P(offset);
goto offset_again;
break;
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
default:
zend_error(E_WARNING, "Illegal offset type in unset");
break;
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
}
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
FREE_OP2();
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
}
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
case IS_OBJECT:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED(Z_OBJ_HT_P(container)->unset_dimension == NULL)) {
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
zend_error_noreturn(E_ERROR, "Cannot use object as array");
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//???? if (OP2_TYPE == IS_CONST) {
//???? ZVAL_DUP(offset, offset);
//???? } else if (OP2_TYPE == IS_TMP_VAR) {
//??? MAKE_REAL_ZVAL_PTR(offset);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_OBJ_HT_P(container)->unset_dimension(container, offset TSRMLS_CC);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//???? if (OP2_TYPE == IS_CONST || OP2_TYPE == IS_TMP_VAR) {
//??? zval_ptr_dtor(offset);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
break;
case IS_STRING:
zend_error_noreturn(E_ERROR, "Cannot unset string offsets");
ZEND_VM_CONTINUE(); /* bailed out before */
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
container = Z_REFVAL_P(container);
goto container_again;
break;
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
default:
FREE_OP2();
break;
}
} else {
FREE_OP2();
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(76, ZEND_UNSET_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
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
USE_OPLINE
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
zend_free_op free_op1, free_op2;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *container;
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
zval *offset;
SAVE_OPLINE();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET);
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
offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
Fixed bug #47704 (crashes on some "bad" operations with string offsets) Removed unnecessary checks
2009-03-18 20:53:17 +08:00
if (OP1_TYPE != IS_VAR || container) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP1_TYPE == IS_CV) {
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
SEPARATE_ZVAL_IF_NOT_REF(container);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(container) == IS_OBJECT) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(offset);
//??? }
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_OBJ_HT_P(container)->unset_property) {
Z_OBJ_HT_P(container)->unset_property(container, offset, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Fixed crashes and memory leak for objects with NULL write_property/has_property/unset_property handlers
2008-07-26 22:08:11 +08:00
} else {
zend_error(E_NOTICE, "Trying to unset property of non-object");
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(offset);
//??? } else {
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
ZEND_UNSET_DIM_OBJ is splitted to ZEND_UNSET_DIM and ZEND_UNSET_OBJ.
2005-06-16 20:17:39 +08:00
} else {
FREE_OP2();
- 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
}
} else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
- 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
}
FREE_OP1_VAR_PTR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval *array_ptr, *array_ref;
- 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
HashTable *fe_ht;
zend_object_iterator *iter = NULL;
zend_class_entry *ce = NULL;
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
zend_bool is_empty = 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
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
SAVE_OPLINE();
Additional specialization
2010-07-27 17:50:35 +08:00
if ((OP1_TYPE == IS_CV || OP1_TYPE == IS_VAR) &&
(opline->extended_value & ZEND_FE_RESET_VARIABLE)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ptr = array_ref = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R);
if (Z_ISREF_P(array_ref)) {
Fixed support for references
2014-02-26 03:26:04 +08:00
array_ptr = Z_REFVAL_P(array_ptr);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(array_ptr) == IS_NULL) {
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
if(Z_OBJ_HT_P(array_ptr)->get_class_entry == NULL) {
MFH: Changed error messages to use "cannot" instead of "can not" (meaning "also can")
2009-06-07 23:46:54 +08:00
zend_error(E_WARNING, "foreach() cannot iterate over objects without PHP class");
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
fixes for non-php objects
2005-06-28 18:49:56 +08:00
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_OBJCE_P(array_ptr);
- 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 (!ce || ce->get_iterator == NULL) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
if (!Z_ISREF_P(array_ref)) {
Fixed support for references
2014-02-26 03:26:04 +08:00
SEPARATE_ZVAL(array_ptr);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_ADDREF_P(array_ptr);
- 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 "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ref = array_ptr;
- 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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(array_ptr) == IS_ARRAY) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
if (!Z_ISREF_P(array_ref)) {
Fixed support for references
2014-02-26 03:26:04 +08:00
SEPARATE_ZVAL(array_ptr);
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ref = array_ptr;
Fixed support for references
2014-02-26 03:26:04 +08:00
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ZVAL_NEW_REF(array_ptr, array_ptr);
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ref = array_ptr;
ifixed foreach() by reference
2014-02-26 19:38:58 +08:00
array_ptr = Z_REFVAL_P(array_ptr);
Fixed support for references
2014-02-26 03:26:04 +08:00
}
Fixed foreach by-ref bug. # Patch from Brian Shire
2007-04-06 07:48:43 +08:00
}
Fixed bug #36303 (foreach on error_zval produces segfault)
2006-02-06 19:45:56 +08:00
}
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
if (Z_REFCOUNTED_P(array_ref)) Z_ADDREF_P(array_ref);
- 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
}
} else {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ptr = array_ref = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (Z_ISREF_P(array_ref)) {
Fixed support for references
2014-02-26 03:26:04 +08:00
array_ptr = Z_REFVAL_P(array_ptr);
}
- 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 (IS_OP1_TMP_FREE()) { /* IS_TMP_VAR */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval tmp;
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&tmp, array_ptr);
array_ptr = &tmp;
Fixed bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration). (Etienne, Dmitry)
2009-08-17 15:40:43 +08:00
if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
if (ce && ce->get_iterator) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
Z_DELREF_P(array_ref);
Fixed bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration). (Etienne, Dmitry)
2009-08-17 15:40:43 +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
} else if (Z_TYPE_P(array_ptr) == IS_OBJECT) {
ce = Z_OBJCE_P(array_ptr);
Fixed bug #39017 (foreach(($obj = new myClass) as $v); echo $obj; segfaults)
2006-10-03 17:05:14 +08:00
if (!ce || !ce->get_iterator) {
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_CV) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
Z_ADDREF_P(array_ref);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
}
Fixed bug #39017 (foreach(($obj = new myClass) as $v); echo $obj; segfaults)
2006-10-03 17:05:14 +08:00
}
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
} else if (Z_REFCOUNTED_P(array_ref)) {
Fixed assertions
2014-02-22 00:35:40 +08:00
if (OP1_TYPE == IS_CONST ||
(OP1_TYPE == IS_CV &&
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
!Z_ISREF_P(array_ref) &&
Z_REFCOUNT_P(array_ref) > 1) ||
Fixed assertions
2014-02-22 00:35:40 +08:00
(OP1_TYPE == IS_VAR &&
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
!Z_ISREF_P(array_ref) &&
Z_REFCOUNT_P(array_ref) > 2)) {
Fixed assertions
2014-02-22 00:35:40 +08:00
zval tmp;
if (OP1_TYPE == IS_VAR) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
Z_DELREF_P(array_ref);
Fixed assertions
2014-02-22 00:35:40 +08:00
}
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
ZVAL_DUP(&tmp, array_ref);
array_ptr = array_ref = &tmp;
Fixed assertions
2014-02-22 00:35:40 +08:00
} else if (OP1_TYPE == IS_CV) {
Fixed reference afto conversion
2014-03-12 16:07:03 +08:00
//??? dereference
if (Z_ISREF_P(array_ref)) {
if (Z_REFCOUNT_P(array_ref) == 1) {
zend_reference *ref = Z_REF_P(array_ref);
ZVAL_COPY(array_ref, &ref->val);
efree(ref);
array_ptr = array_ref;
} else {
Z_ADDREF_P(array_ref);
}
} else {
Z_ADDREF_P(array_ref);
}
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +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
}
}
Fixed bug #49269 (Ternary operator fails on Iterator object when used inside foreach declaration). (Etienne, Dmitry)
2009-08-17 15:40:43 +08:00
if (ce && ce->get_iterator) {
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
iter = ce->get_iterator(ce, array_ptr, opline->extended_value & ZEND_FE_RESET_REFERENCE TSRMLS_CC);
- 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 IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_VAR && !(opline->extended_value & ZEND_FE_RESET_VARIABLE)) {
FREE_OP1_IF_VAR();
}
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
if (iter && EXPECTED(EG(exception) == NULL)) {
Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback.
2014-02-26 19:01:08 +08:00
zval iterator;
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array_ptr = array_ref = &iterator;
Fixed iterators API. zend_iterator_init() has to be used in each get_iterator() callback.
2014-02-26 19:01:08 +08:00
ZVAL_OBJ(array_ptr, &iter->std);
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +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
} else {
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_VAR && opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
}
- Bugfix #26229 (getIterator() segfaults when it returns arrays or scalars)
2005-01-25 18:40:51 +08:00
if (!EG(exception)) {
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_throw_exception_ex(NULL, 0 TSRMLS_CC, "Object of type %s did not create an Iterator", ce->name->val);
- Bugfix #26229 (getIterator() segfaults when it returns arrays or scalars)
2005-01-25 18:40:51 +08:00
}
- Second and last part of #30725 fix
2005-01-25 04:02:55 +08:00
zend_throw_exception_internal(NULL TSRMLS_CC);
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
HANDLE_EXCEPTION();
- 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 "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), array_ref);
- 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 (iter) {
iter->index = 0;
if (iter->funcs->rewind) {
iter->funcs->rewind(iter TSRMLS_CC);
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_VAR && opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
}
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
HANDLE_EXCEPTION();
Fixed bug #32674 (exception in iterator causes crash)
2005-04-27 14:47:08 +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
}
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
is_empty = iter->funcs->valid(iter TSRMLS_CC) != SUCCESS;
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_VAR && opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
}
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
HANDLE_EXCEPTION();
Fixed bug #32674 (exception in iterator causes crash)
2005-04-27 14:47:08 +08:00
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
iter->index = -1; /* will be set to 0 before using next handler */
- 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
} else if ((fe_ht = HASH_OF(array_ptr)) != NULL) {
zend_hash_internal_pointer_reset(fe_ht);
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
if (ce) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_object *zobj = Z_OBJ_P(array_ptr);
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
while (zend_hash_has_more_elements(fe_ht) == SUCCESS) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *str_key;
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
ulong int_key;
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
zend_uchar key_type;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &int_key, 0, NULL);
HASH_KEY_NON_EXISTANT fix
2013-07-09 05:09:06 +08:00
if (key_type != HASH_KEY_NON_EXISTENT &&
Fixed bug #39825 (foreach produces memory error)
2006-12-26 03:23:03 +08:00
(key_type == HASH_KEY_IS_LONG ||
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_check_property_access(zobj, str_key TSRMLS_CC) == SUCCESS)) {
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
break;
}
zend_hash_move_forward(fe_ht);
}
}
is_empty = zend_hash_has_more_elements(fe_ht) != SUCCESS;
Fixed foreach (now we store HashPointer in additional IS_TMP_VAR slot(s))
2014-03-13 21:01:28 +08:00
zend_hash_get_pointer(fe_ht, (HashPointer*)EX_VAR((opline+2)->op1.var));
- 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
} else {
zend_error(E_WARNING, "Invalid argument supplied for foreach()");
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
is_empty = 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
}
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_VAR && opline->extended_value & ZEND_FE_RESET_VARIABLE) {
FREE_OP1_VAR_PTR();
}
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
if (is_empty) {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
} else {
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
CHECK_EXCEPTION();
- Cleanup foreach statement
2005-02-05 22:01:59 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
}
ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval *array, *array_ref;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
- 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
HashTable *fe_ht;
zend_object_iterator *iter = NULL;
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
zval *key = NULL;
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
array = array_ref = EX_VAR(opline->op1.var);
if (Z_TYPE_P(array) == IS_REFERENCE) {
array = Z_REFVAL_P(array);
}
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
if (opline->extended_value & ZEND_FE_FETCH_WITH_KEY) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
key = EX_VAR((opline+1)->result.var);
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +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
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
SAVE_OPLINE();
- 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
switch (zend_iterator_unwrap(array, &iter TSRMLS_CC)) {
default:
case ZEND_ITER_INVALID:
zend_error(E_WARNING, "Invalid argument supplied for foreach()");
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- 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
case ZEND_ITER_PLAIN_OBJECT: {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_object *zobj = Z_OBJ_P(array);
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
int key_type;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *str_key;
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
zend_ulong int_key;
- 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 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
fe_ht = Z_OBJPROP_P(array);
Fixed foreach (now we store HashPointer in additional IS_TMP_VAR slot(s))
2014-03-13 21:01:28 +08:00
zend_hash_set_pointer(fe_ht, (HashPointer*)EX_VAR((opline+1)->op1.var));
- 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
do {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_get_current_data(fe_ht)) == NULL) {
- 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
/* reached end of iteration */
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &int_key, 0, NULL);
- 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
zend_hash_move_forward(fe_ht);
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
} while (key_type != HASH_KEY_IS_LONG &&
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_check_property_access(zobj, str_key TSRMLS_CC) != SUCCESS);
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
if (key) {
if (key_type == HASH_KEY_IS_LONG) {
ZVAL_LONG(key, int_key);
} else {
Fixed foreach() over object properties
2014-02-25 21:56:03 +08:00
const char *class_name, *prop_name;
int prop_name_len;
zend_unmangle_property_name_ex(
str_key->val, str_key->len, &class_name, &prop_name, &prop_name_len
);
ZVAL_STRINGL(key, prop_name, prop_name_len);
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +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
}
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
Fixed foreach (now we store HashPointer in additional IS_TMP_VAR slot(s))
2014-03-13 21:01:28 +08:00
zend_hash_get_pointer(fe_ht, (HashPointer*)EX_VAR((opline+1)->op1.var));
- 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
break;
}
case ZEND_ITER_PLAIN_ARRAY:
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
fe_ht = Z_ARRVAL_P(array);
Fixed foreach (now we store HashPointer in additional IS_TMP_VAR slot(s))
2014-03-13 21:01:28 +08:00
zend_hash_set_pointer(fe_ht, (HashPointer*)EX_VAR((opline+1)->op1.var));
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_get_current_data(fe_ht)) == NULL) {
- 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
/* reached end of iteration */
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- 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 support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
if (key) {
zend_hash_get_current_key_zval(fe_ht, key);
- 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
}
zend_hash_move_forward(fe_ht);
Fixed foreach (now we store HashPointer in additional IS_TMP_VAR slot(s))
2014-03-13 21:01:28 +08:00
zend_hash_get_pointer(fe_ht, (HashPointer*)EX_VAR((opline+1)->op1.var));
- 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
break;
case ZEND_ITER_OBJECT:
/* !iter happens from exception */
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
if (iter && ++iter->index > 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
/* This could cause an endless loop if index becomes zero again.
* In case that ever happens we need an additional flag. */
iter->funcs->move_forward(iter TSRMLS_CC);
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
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
HANDLE_EXCEPTION();
Fixed bug #32674 (exception in iterator causes crash)
2005-04-27 14:47:08 +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
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
/* If index is zero we come from FE_RESET and checked valid() already. */
if (!iter || (iter->index > 0 && iter->funcs->valid(iter TSRMLS_CC) == FAILURE)) {
- 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
/* reached end of iteration */
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
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
HANDLE_EXCEPTION();
Fixed bug #32674 (exception in iterator causes crash)
2005-04-27 14:47:08 +08:00
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = iter->funcs->get_current_data(iter TSRMLS_CC);
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
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
HANDLE_EXCEPTION();
Fixed bug #32993 (implemented Iterator function current() don't throw exception)
2005-06-06 16:24:05 +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
if (!value) {
/* failure in get_current_data */
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(EX(op_array)->opcodes+opline->op2.opline_num);
- 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 support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
if (key) {
- 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 (iter->funcs->get_current_key) {
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
iter->funcs->get_current_key(iter, key TSRMLS_CC);
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
if (UNEXPECTED(EG(exception) != NULL)) {
Fixed "foreach ($reference as $val)"
2014-03-06 03:22:50 +08:00
zval_ptr_dtor(array_ref);
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
HANDLE_EXCEPTION();
Fixed bug #32674 (exception in iterator causes crash)
2005-04-27 14:47:08 +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
} else {
Add support for non-scalar Iterator keys in foreach RFC: https://wiki.php.net/rfc/foreach-non-scalar-keys
2013-02-17 02:13:36 +08:00
ZVAL_LONG(key, iter->index);
- 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
}
}
break;
}
if (opline->extended_value & ZEND_FE_FETCH_BYREF) {
ifixed foreach() by reference
2014-02-26 19:38:58 +08:00
SEPARATE_ZVAL_TO_MAKE_IS_REF(value);
foreash($a as $key => $val) optimization Removed temorary array creation on each iteration.
2005-02-08 00:09:54 +08:00
}
ifixed foreach() by reference
2014-02-26 19:38:58 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
- 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 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
CHECK_EXCEPTION();
foreash($a as $key => $val) optimization Removed temorary array creation on each iteration.
2005-02-08 00:09:54 +08:00
ZEND_VM_INC_OPCODE();
- 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
ZEND_VM_NEXT_OPCODE();
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, UNUSED|CONST|VAR)
- 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 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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
- 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
zend_bool isset = 1;
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
SAVE_OPLINE();
Additional specialization
2010-07-27 17:50:35 +08:00
if (OP1_TYPE == IS_CV &&
OP2_TYPE == IS_UNUSED &&
(opline->extended_value & ZEND_QUICK_SET)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE_P(EX_VAR_NUM(opline->op1.var)) != IS_UNDEF) {
value = EX_VAR_NUM(opline->op1.var);
Fixed empty()
2014-02-27 16:48:53 +08:00
if (Z_TYPE_P(value) == IS_INDIRECT) {
value = Z_INDIRECT_P(value);
}
if (Z_TYPE_P(value) == IS_REFERENCE) {
value = Z_REFVAL_P(value);
}
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
} else if (EG(active_symbol_table)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *cv = CV_DEF_OF(opline->op1.var);
- 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
Refactored EG(active_symbol_table) to be zend_array* instead of HashTable*
2014-03-18 03:15:22 +08:00
if ((value = zend_hash_find(&EG(active_symbol_table)->ht, cv)) == NULL) {
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
isset = 0;
}
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
} else {
- 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
isset = 0;
}
} else {
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
HashTable *target_symbol_table;
zend_free_op free_op1;
zval tmp, *varname = GET_OP1_ZVAL_PTR(BP_VAR_IS);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (OP1_TYPE != IS_CONST && Z_TYPE_P(varname) != IS_STRING) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&tmp, varname);
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
convert_to_string(&tmp);
varname = &tmp;
- 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
}
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
if (OP2_TYPE != IS_UNUSED) {
zend_class_entry *ce;
if (OP2_TYPE == IS_CONST) {
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
ce = CACHED_PTR(opline->op2.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = zend_fetch_class_by_name(Z_STR_P(opline->op2.zv), opline->op2.literal + 1, 0 TSRMLS_CC);
Fixed bug #61011 (Crash when an exception is thrown by __autoload accessing a static property)
2012-02-25 21:56:59 +08:00
if (UNEXPECTED(ce == NULL)) {
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, ce);
}
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ce = Z_CE_P(EX_VAR(opline->op2.var));
Optimized access to static properties using executor specialization. A constant class name may be used as a direct operand of ZEND_FETCH_* instruction without previous ZEND_FETCH_CLASS.
2010-05-06 18:27:35 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
value = zend_std_get_static_property(ce, Z_STR_P(varname), 1, ((OP1_TYPE == IS_CONST) ? opline->op1.literal : NULL) TSRMLS_CC);
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
if (!value) {
isset = 0;
}
} else {
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
target_symbol_table = zend_get_target_symbol_table(opline->extended_value & ZEND_FETCH_TYPE_MASK TSRMLS_CC);
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
//???: STRING may become INDIRECT
Temporary fix for lazy symbol table initialization called from zemd_error(), that converts CV variables into IS_INDIRECT
2014-03-05 19:33:31 +08:00
if (OP1_TYPE == IS_CV && Z_TYPE_P(varname) == IS_INDIRECT) {
ASSIGN_REF related fixes
2014-02-24 16:15:11 +08:00
varname = Z_INDIRECT_P(varname);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_find(target_symbol_table, Z_STR_P(varname))) == NULL) {
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
isset = 0;
}
}
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
if (OP1_TYPE != IS_CONST && varname == &tmp) {
Lazy EG(active_symbol_table) initialization
2008-04-29 16:15:20 +08:00
zval_dtor(&tmp);
}
FREE_OP1();
- 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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (opline->extended_value & ZEND_ISSET) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (isset && Z_TYPE_P(value) != IS_NULL) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), 0);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
}
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (!isset || !i_zend_is_true(value TSRMLS_CC)) {
ZVAL_BOOL(EX_VAR(opline->result.var), 1);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), 0);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +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
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|TMP|VAR|CV, int prop_dim)
{
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
USE_OPLINE
Simplified string offset reading
2010-07-16 19:44:30 +08:00
zend_free_op free_op1, free_op2;
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
zval *container;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
- 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
int result = 0;
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ulong hval;
Simplified string offset reading
2010-07-16 19:44:30 +08:00
zval *offset;
- 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 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
SAVE_OPLINE();
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
container = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_IS);
Simplified string offset reading
2010-07-16 19:44:30 +08:00
offset = GET_OP2_ZVAL_PTR(BP_VAR_R);
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
Fixed IS_REFERENCE support
2014-02-28 16:54:38 +08:00
if (Z_TYPE_P(container) == IS_REFERENCE) {
container = Z_REFVAL_P(container);
}
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
if (Z_TYPE_P(container) == IS_ARRAY && !prop_dim) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
HashTable *ht;
int isset = 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
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
ht = Z_ARRVAL_P(container);
- 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
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
again:
Simplified string offset reading
2010-07-16 19:44:30 +08:00
switch (Z_TYPE_P(offset)) {
case IS_DOUBLE:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = zend_dval_to_lval(Z_DVAL_P(offset));
Simplified string offset reading
2010-07-16 19:44:30 +08:00
ZEND_VM_C_GOTO(num_index_prop);
case IS_RESOURCE:
case IS_BOOL:
case IS_LONG:
Fixed bug #51008 (Zend/tests/bug45877.phpt fails)
2010-10-05 19:28:56 +08:00
hval = Z_LVAL_P(offset);
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_C_LABEL(num_index_prop):
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_index_find(ht, hval)) != NULL) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
isset = 1;
}
break;
case IS_STRING:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (OP2_TYPE != IS_CONST) {
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
ZEND_HANDLE_NUMERIC_EX(Z_STRVAL_P(offset), Z_STRLEN_P(offset)+1, hval, ZEND_VM_C_GOTO(num_index_prop));
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_find(ht, Z_STR_P(offset))) != NULL) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
isset = 1;
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
break;
case IS_NULL:
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((value = zend_hash_find(ht, STR_EMPTY_ALLOC())) != NULL) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
isset = 1;
Fixed crashes and memory leak for objects with NULL write_property/has_property/unset_property handlers
2008-07-26 22:08:11 +08:00
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
break;
IS_REFERENCE is unfrequent
2014-03-06 18:23:16 +08:00
case IS_REFERENCE:
offset = Z_REFVAL_P(offset);
goto again;
break;
Simplified string offset reading
2010-07-16 19:44:30 +08:00
default:
zend_error(E_WARNING, "Illegal offset type in isset or empty");
break;
}
if (opline->extended_value & ZEND_ISSET) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (isset && Z_TYPE_P(value) == IS_NULL) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = 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
} else {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = isset;
- 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
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (!isset || !i_zend_is_true(value TSRMLS_CC)) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = 0;
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
} else {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = 1;
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
}
FREE_OP2();
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
} else if (Z_TYPE_P(container) == IS_OBJECT) {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? MAKE_REAL_ZVAL_PTR(offset);
//??? }
Simplified string offset reading
2010-07-16 19:44:30 +08:00
if (prop_dim) {
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
if (Z_OBJ_HT_P(container)->has_property) {
result = Z_OBJ_HT_P(container)->has_property(container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0, ((OP2_TYPE == IS_CONST) ? opline->op2.literal : NULL) TSRMLS_CC);
Simplified string offset reading
2010-07-16 19:44:30 +08:00
} else {
zend_error(E_NOTICE, "Trying to check property of non-object");
result = 0;
Fixed bug #29883 (isset gives invalid values on strings).
2004-12-01 22:02:35 +08:00
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
} else {
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
if (Z_OBJ_HT_P(container)->has_dimension) {
result = Z_OBJ_HT_P(container)->has_dimension(container, offset, (opline->extended_value & ZEND_ISEMPTY) != 0 TSRMLS_CC);
Simplified string offset reading
2010-07-16 19:44:30 +08:00
} else {
zend_error(E_NOTICE, "Trying to check element of non-array");
result = 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
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
}
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? if (IS_OP2_TMP_FREE()) {
//??? zval_ptr_dtor(offset);
//??? } else {
Fixed memory allocation bugs related to magic object handlers (__get(), __set(), ...)
2005-06-03 19:16:19 +08:00
FREE_OP2();
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
//??? }
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
} else if (Z_TYPE_P(container) == IS_STRING && !prop_dim) { /* string offsets */
Simplified string offset reading
2010-07-16 19:44:30 +08:00
zval tmp;
if (Z_TYPE_P(offset) != IS_LONG) {
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_TYPE_P(offset) < IS_STRING /* simple scalar types */
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
|| (Z_TYPE_P(offset) == IS_STRING /* or numeric string */
Fix warning on non-numeric offsets
2011-12-22 11:22:42 +08:00
&& IS_LONG == is_numeric_string(Z_STRVAL_P(offset), Z_STRLEN_P(offset), NULL, NULL, 0))) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&tmp, offset);
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
convert_to_long(&tmp);
offset = &tmp;
implement the solution for isset/string offsets, fix bug #60362
2011-12-19 10:05:03 +08:00
} else {
/* can not be converted to proper offset, return "not set" */
result = 0;
WS, merged from trunk cause this issue, sorry
2012-01-26 09:28:37 +08:00
}
Simplified string offset reading
2010-07-16 19:44:30 +08:00
}
if (Z_TYPE_P(offset) == IS_LONG) {
if (opline->extended_value & ZEND_ISSET) {
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container)) {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = 1;
}
} else /* if (opline->extended_value & ZEND_ISEMPTY) */ {
Use zval* instead of zval**
2013-10-28 18:44:07 +08:00
if (offset->value.lval >= 0 && offset->value.lval < Z_STRLEN_P(container) && Z_STRVAL_P(container)[offset->value.lval] != '0') {
Simplified string offset reading
2010-07-16 19:44:30 +08:00
result = 1;
}
}
}
FREE_OP2();
} else {
FREE_OP2();
- 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
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (opline->extended_value & ZEND_ISSET) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), result);
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
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), !result);
- 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
}
Merge branch 'PHP-5.5' * PHP-5.5: Use zval* instead of zval** Conflicts: Zend/zend_vm_def.h Zend/zend_vm_execute.h
2013-10-28 19:23:10 +08:00
FREE_OP1_IF_VAR();
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(115, ZEND_ISSET_ISEMPTY_DIM_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, prop_dim, 0);
}
ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV)
{
ZEND_VM_DISPATCH_TO_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, prop_dim, 1);
}
ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY)
{
Wrap "wrong" unreachable code with "#if 0"
2006-06-08 16:37:51 +08:00
#if !defined(ZEND_VM_SPEC) || (OP1_TYPE != IS_UNUSED)
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
USE_OPLINE
SAVE_OPLINE();
- 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 (OP1_TYPE != IS_UNUSED) {
zend_free_op free_op1;
Fixed bug #33318 (throw 1; results in Invalid opcode 108/1/8)
2005-06-16 22:20:00 +08:00
zval *ptr = GET_OP1_ZVAL_PTR(BP_VAR_R);
- 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 (Z_TYPE_P(ptr) == IS_LONG) {
EG(exit_status) = Z_LVAL_P(ptr);
} else {
zend_print_variable(ptr);
}
FREE_OP1();
}
- MFH Sync vm generation with head - Regenerate vm
2006-05-22 02:00:14 +08:00
#endif
- 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
zend_bailout();
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
ZEND_VM_NEXT_OPCODE(); /* Never reached */
- 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
}
ZEND_VM_HANDLER(57, ZEND_BEGIN_SILENCE, ANY, ANY)
{
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
USE_OPLINE
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_LONG(EX_VAR(opline->result.var), EG(error_reporting));
if (Z_TYPE(EX(old_error_reporting)) == IS_UNDEF) {
ZVAL_LONG(&EX(old_error_reporting), EG(error_reporting));
- store current value of error_reporting only if it's not stored yet - reset old_error_reporting to NULL only it points to the tmp_var at current opline
2005-09-23 17:36:43 +08:00
}
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
MFH: fix #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
2005-09-23 03:03:18 +08:00
if (EG(error_reporting)) {
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
do {
EG(error_reporting) = 0;
if (!EG(error_reporting_ini_entry)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_ini_entry *p = zend_hash_str_find_ptr(EG(ini_directives), "error_reporting", sizeof("error_reporting")-1);
if (p) {
EG(error_reporting_ini_entry) = p;
} else {
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
break;
}
}
if (!EG(error_reporting_ini_entry)->modified) {
if (!EG(modified_ini_directives)) {
ALLOC_HASHTABLE(EG(modified_ini_directives));
zend_hash_init(EG(modified_ini_directives), 8, NULL, NULL, 0);
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (EXPECTED(zend_hash_str_add_ptr(EG(modified_ini_directives), "error_reporting", sizeof("error_reporting")-1, EG(error_reporting_ini_entry)) != NULL)) {
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
EG(error_reporting_ini_entry)->orig_value = EG(error_reporting_ini_entry)->value;
EG(error_reporting_ini_entry)->orig_value_length = EG(error_reporting_ini_entry)->value_length;
EG(error_reporting_ini_entry)->orig_modifiable = EG(error_reporting_ini_entry)->modifiable;
EG(error_reporting_ini_entry)->modified = 1;
}
} else if (EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value) {
efree(EG(error_reporting_ini_entry)->value);
}
EG(error_reporting_ini_entry)->value = estrndup("0", sizeof("0")-1);
EG(error_reporting_ini_entry)->value_length = sizeof("0")-1;
} while (0);
MFH: fix #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
2005-09-23 03:03:18 +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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(142, ZEND_RAISE_ABSTRACT_ERROR, ANY, ANY)
{
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
SAVE_OPLINE();
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EG(scope)->name->val, EX(op_array)->function_name->val);
- 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
ZEND_VM_NEXT_OPCODE(); /* Never reached */
}
ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY)
{
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
USE_OPLINE
- 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
zval restored_error_reporting;
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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (!EG(error_reporting) && Z_LVAL_P(EX_VAR(opline->op1.var)) != 0) {
ZVAL_LONG(&restored_error_reporting, Z_LVAL_P(EX_VAR(opline->op1.var)));
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
EG(error_reporting) = Z_LVAL(restored_error_reporting);
- 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
convert_to_string(&restored_error_reporting);
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
if (EXPECTED(EG(error_reporting_ini_entry) != NULL)) {
if (EXPECTED(EG(error_reporting_ini_entry)->modified &&
EG(error_reporting_ini_entry)->value != EG(error_reporting_ini_entry)->orig_value)) {
efree(EG(error_reporting_ini_entry)->value);
}
Fixed segfault in BEGIN/END SILENT
2014-02-19 18:34:27 +08:00
EG(error_reporting_ini_entry)->value = estrndup(Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting));
improved performance of @ (silence) operator
2010-08-18 21:58:13 +08:00
EG(error_reporting_ini_entry)->value_length = Z_STRLEN(restored_error_reporting);
Fixed memory leak (forgot to release the zval)
2014-02-19 18:41:50 +08:00
}
zval_dtor(&restored_error_reporting);
- 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 better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? if (EX(old_error_reporting) == EX_VAR(opline->op1.var)) {
//??? EX(old_error_reporting) = NULL;
//??? }
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
ZEND_VM_HANDLER(152, ZEND_JMP_SET, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
zend_free_op free_op1;
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
zval *value;
SAVE_OPLINE();
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
if (i_zend_is_true(value TSRMLS_CC)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), value);
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(EX_VAR(opline->result.var));
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
}
FREE_OP1_IF_VAR();
#if DEBUG_ZEND>=2
printf("Conditional jmp to %d\n", opline->op2.opline_num);
#endif
ZEND_VM_JMP(opline->op2.jmp_addr);
}
FREE_OP1();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(158, ZEND_JMP_SET_VAR, CONST|TMP|VAR|CV, ANY)
{
USE_OPLINE
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
SAVE_OPLINE();
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
Eliminate another TSRMLS_FETCH() in i_zend_is_true() # Affected extensions have all been updated, ext/opcache and ext/zip # both have macros for cross version compatibility
2013-12-18 14:25:05 +08:00
if (i_zend_is_true(value TSRMLS_CC)) {
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), value);
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(EX_VAR(opline->result.var));
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
}
}
FREE_OP1_IF_VAR();
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
#if DEBUG_ZEND>=2
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
printf("Conditional jmp to %d\n", opline->op2.opline_num);
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
#endif
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_JMP(opline->op2.jmp_addr);
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
}
FREE_OP1();
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
CHECK_EXCEPTION();
- MFH Improved version of ternary shortcut (Marcus)
2007-11-21 17:41:35 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(22, ZEND_QM_ASSIGN, CONST|TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *value;
- 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 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
SAVE_OPLINE();
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), value);
- 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 (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(EX_VAR(opline->result.var));
- 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
}
FREE_OP1_IF_VAR();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
ZEND_VM_HANDLER(157, ZEND_QM_ASSIGN_VAR, CONST|TMP|VAR|CV, ANY)
{
USE_OPLINE
zend_free_op free_op1;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *value;
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
SAVE_OPLINE();
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
if (OP1_TYPE == IS_VAR || OP1_TYPE == IS_CV) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY(EX_VAR(opline->result.var), value);
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(EX_VAR(opline->result.var), value);
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(EX_VAR(opline->result.var));
Improved ternary operator performance when returning arrays
2011-10-19 03:42:42 +08:00
}
}
FREE_OP1_IF_VAR();
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(101, ZEND_EXT_STMT, ANY, ANY)
{
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
SAVE_OPLINE();
- 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 (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_statement_handler, EX(op_array) TSRMLS_CC);
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(102, ZEND_EXT_FCALL_BEGIN, ANY, ANY)
{
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
SAVE_OPLINE();
- 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 (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, EX(op_array) TSRMLS_CC);
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(103, ZEND_EXT_FCALL_END, ANY, ANY)
{
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
SAVE_OPLINE();
- 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 (!EG(no_extensions)) {
zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_end_handler, EX(op_array) TSRMLS_CC);
}
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(139, ZEND_DECLARE_CLASS, ANY, ANY)
{
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
USE_OPLINE
- 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 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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = do_bind_class(EX(op_array), opline, EG(class_table), 0 TSRMLS_CC);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(140, ZEND_DECLARE_INHERITED_CLASS, ANY, ANY)
{
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
USE_OPLINE
- 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 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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_CE_P(EX_VAR(opline->result.var)) = do_bind_inherited_class(EX(op_array), opline, EG(class_table), Z_CE_P(EX_VAR(opline->extended_value)), 0 TSRMLS_CC);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Implemented concept of "delayed early binding" that allows opcode caches to perform class declaration (early and/or run-time binding) in exactly the same order as vanila php. The following pseudo-code explains how it should be used in opcode cache. function cache_compile_file($filename) { if (!is_cached($filename)) { ... orig_compiler_options = CG(compiler_optins); CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING; $op_array = orig_compile_file($filename); CG(compiler_options) = orig_copiler_options; ... } else { $op_array = restore_from_cache($filename); } zend_do_delayed_early_binding($op_array); }
2008-03-18 16:36:30 +08:00
ZEND_VM_HANDLER(145, ZEND_DECLARE_INHERITED_CLASS_DELAYED, ANY, ANY)
{
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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *zce, *orig_zce;
Implemented concept of "delayed early binding" that allows opcode caches to perform class declaration (early and/or run-time binding) in exactly the same order as vanila php. The following pseudo-code explains how it should be used in opcode cache. function cache_compile_file($filename) { if (!is_cached($filename)) { ... orig_compiler_options = CG(compiler_optins); CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING; $op_array = orig_compile_file($filename); CG(compiler_options) = orig_copiler_options; ... } else { $op_array = restore_from_cache($filename); } zend_do_delayed_early_binding($op_array); }
2008-03-18 16:36:30 +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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if ((zce = zend_hash_find(EG(class_table), Z_STR_P(opline->op2.zv))) == NULL ||
((orig_zce = zend_hash_find(EG(class_table), Z_STR_P(opline->op1.zv))) != NULL &&
Z_CE_P(zce) != Z_CE_P(orig_zce))) {
do_bind_inherited_class(EX(op_array), opline, EG(class_table), Z_CE_P(EX_VAR(opline->extended_value)), 0 TSRMLS_CC);
Implemented concept of "delayed early binding" that allows opcode caches to perform class declaration (early and/or run-time binding) in exactly the same order as vanila php. The following pseudo-code explains how it should be used in opcode cache. function cache_compile_file($filename) { if (!is_cached($filename)) { ... orig_compiler_options = CG(compiler_optins); CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING; $op_array = orig_compile_file($filename); CG(compiler_options) = orig_copiler_options; ... } else { $op_array = restore_from_cache($filename); } zend_do_delayed_early_binding($op_array); }
2008-03-18 16:36:30 +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
CHECK_EXCEPTION();
Implemented concept of "delayed early binding" that allows opcode caches to perform class declaration (early and/or run-time binding) in exactly the same order as vanila php. The following pseudo-code explains how it should be used in opcode cache. function cache_compile_file($filename) { if (!is_cached($filename)) { ... orig_compiler_options = CG(compiler_optins); CG(compiler_options) |= ZEND_COMPILE_IGNORE_INTERNAL_CLASSES | ZEND_COMPILE_DELAYED_BINDING; $op_array = orig_compile_file($filename); CG(compiler_options) = orig_copiler_options; ... } else { $op_array = restore_from_cache($filename); } zend_do_delayed_early_binding($op_array); }
2008-03-18 16:36:30 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(141, ZEND_DECLARE_FUNCTION, ANY, ANY)
{
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
USE_OPLINE
SAVE_OPLINE();
do_bind_function(EX(op_array), opline, EG(function_table), 0);
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_HANDLER(105, ZEND_TICKS, ANY, ANY)
- 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 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
USE_OPLINE
- 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 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
SAVE_OPLINE();
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (++EG(ticks_count)>=opline->extended_value) {
- 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
EG(ticks_count)=0;
if (zend_ticks_function) {
Eliminate the TSRMLS_FETCH() calls in the ticks functions and hook
2013-12-18 16:32:26 +08:00
zend_ticks_function(opline->extended_value TSRMLS_CC);
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(138, ZEND_INSTANCEOF, TMP|VAR|CV, ANY)
{
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
USE_OPLINE
- 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
zend_free_op free_op1;
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
zval *expr;
- 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
zend_bool result;
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
SAVE_OPLINE();
expr = GET_OP1_ZVAL_PTR(BP_VAR_R);
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
fixes for non-php objects
2005-06-28 18:49:56 +08:00
if (Z_TYPE_P(expr) == IS_OBJECT && Z_OBJ_HT_P(expr)->get_class_entry) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
result = instanceof_function(Z_OBJCE_P(expr), Z_CE_P(EX_VAR(opline->op2.var)) TSRMLS_CC);
- 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
} else {
result = 0;
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_BOOL(EX_VAR(opline->result.var), result);
- 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
FREE_OP1();
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(104, ZEND_EXT_NOP, ANY, ANY)
{
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(0, ZEND_NOP, ANY, ANY)
{
ZEND_VM_NEXT_OPCODE();
}
Optimized ZEND_FETCH_CLASS + ZEND_ADD_INTERFACE into single ZEND_ADD_INTERFACE opcode
2008-03-12 18:32:12 +08:00
ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, CONST)
- 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 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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var));
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
zend_class_entry *iface;
SAVE_OPLINE();
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
iface = CACHED_PTR(opline->op2.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
iface = zend_fetch_class_by_name(Z_STR_P(opline->op2.zv), opline->op2.literal + 1, opline->extended_value TSRMLS_CC);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (UNEXPECTED(iface == NULL)) {
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
- Fixed bug #49908 (throwing exception in __autoload crashes when interface is not defined)
2009-11-02 05:26:03 +08:00
}
Fixed bug (Wrong ce cached)
2013-04-11 14:28:42 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, iface);
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
}
if (UNEXPECTED((iface->ce_flags & ZEND_ACC_INTERFACE) == 0)) {
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name->val, iface->name->val);
- 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 caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
zend_do_implement_interface(ce, iface TSRMLS_CC);
- 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 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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
ZEND_VM_HANDLER(154, ZEND_ADD_TRAIT, ANY, ANY)
{
Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO)
2011-05-06 00:02:11 +08:00
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var));
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
zend_class_entry *trait;
Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO)
2011-05-06 00:02:11 +08:00
SAVE_OPLINE();
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
if (CACHED_PTR(opline->op2.literal->cache_slot)) {
trait = CACHED_PTR(opline->op2.literal->cache_slot);
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
trait = zend_fetch_class_by_name(Z_STR_P(opline->op2.zv),
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
opline->op2.literal + 1,
opline->extended_value TSRMLS_CC);
if (UNEXPECTED(trait == NULL)) {
CHECK_EXCEPTION();
ZEND_VM_NEXT_OPCODE();
}
- Added check for constant creation on Traits - Simplified trait flag check - Test++ :)
2010-05-07 19:09:35 +08:00
if (!((trait->ce_flags & ZEND_ACC_TRAIT) == ZEND_ACC_TRAIT)) {
Fixed error messages
2014-02-22 00:44:26 +08:00
zend_error_noreturn(E_ERROR, "%s cannot use %s - it is not a trait", ce->name->val, trait->name->val);
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
CACHE_PTR(opline->op2.literal->cache_slot, trait);
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
}
Added caches to eliminate repeatable run-time bindings of functions, classes, constants, methods and properties
2010-05-24 22:11:39 +08:00
zend_do_implement_trait(ce, trait TSRMLS_CC);
Added compiler hints
2010-05-06 20:52:27 +08:00
CHECK_EXCEPTION();
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
ZEND_VM_NEXT_OPCODE();
}
ZEND_VM_HANDLER(155, ZEND_BIND_TRAITS, ANY, ANY)
{
Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO)
2011-05-06 00:02:11 +08:00
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_class_entry *ce = Z_CE_P(EX_VAR(opline->op1.var));
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO)
2011-05-06 00:02:11 +08:00
SAVE_OPLINE();
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
zend_do_bind_traits(ce TSRMLS_CC);
Fixed direct threaded executor (php zend_vm_gen.php --with-vm-kind=GOTO)
2011-05-06 00:02:11 +08:00
CHECK_EXCEPTION();
Implemented Traits for PHP as proposed in the RFC [TRAITS] # RFC http://wiki.php.net/rfc/horizontalreuse#traits_-_reuse_of_behavior # Ok, here we go, I guess that will result in more discussion, which is fine # by me. But now, the patch is here, and properly archived. # # See below a list of notes to the patch, it also includes a list of # points which should be fixed # # Internals of the Traits Patch # ----------------------------- # # Open TODOs # """""""""" # # - Reflection API # - support for traits for internal classes # - currently destroy_zend_class does not handle that case # # Introduced Structures # """"""""""""""""""""" # # Data structures to encode the composition information specified in the # source: # - zend_trait_method_reference # - zend_trait_precedence # - zend_trait_alias # # Changes # """"""" # # zend_class_entry # - uses NULL terminated lists of pointers for # - trait_aliases # - trait_precedences # - do you prefer an explicit counter? # - the information is only necessary during class composition # but might be interesting for reflection # - did not want to blow up class further with not really necessary length counters # # added keywords # - trait # - insteadof # # Added opcodes # ZEND_ADD_TRAIT # - similar to ZEND_ADD_INTERFACE # - adds the trait to the list of traits of a class, no actual composition done # ZEND_BIND_TRAITS # - emitted in zend_do_end_class_declaration # - concludes the class definition and will initiate the trait composition # when the class definition is encountered during runtime # # Added Flags # ZEND_ACC_TRAIT = 0x120 # ZEND_ACC_IMPLEMENT_TRAITS = 0x400000 # ZEND_FETCH_CLASS_TRAIT = 14 # # zend_vm_execute.h # - not sure whether the handler initialization (ZEND_ADD_TRAIT_SPEC_HANDLER, # ZEND_BIND_TRAITS_SPEC_HANDLER) is correct, maybe it should be more selective # # zend_compile.c # - refactored do_inherit_method_check # split into do_inherit_method_check and do_inheritance_check_on_method # - added helper functions use a '_' as prefix and are not mentioned in the # headers # - _copy_functions # prepare hash-maps of functions which should be merged into a class # here the aliases are handled # - _merge_functions # builds a hash-table of the methods which need to be added to a class # does the conflict detection # - reused php_runkit_function_copy_ctor # - it is not identical with the original code anymore, needed to update it # think I fixed some bugs, not sure whether all have been reported back to runkit # - has to be renamed, left the name for the moment, to make its origin obvious # - here might be optimization potential # - not sure whether everything needs to be copied # - copying the literals might be broken # - added it since the literals array is freed by efree and gave problems # with doubled frees # - all immutable parts of the zend_op array should not be copied # - am not sure which parts are immutable # - and not sure how to avoid doubled frees on the same arrays on shutdown # - _merge_functions_to_class # does the final merging with the target class to handle inherited # and overridden methods # - small helper for NULL terminated lists # zend_init_list, zend_add_to_list # # zend_language_parser.y # - reused class definition for traits # - there should be something with regard to properties # - if they get explicitly defined, it might be worthwhile to # check that there are no collisions with other traits in a composition # (however, I would not introduce elaborate language features to control that # but a notice for such conflicts might be nice to the developers)
2010-04-23 06:05:56 +08:00
ZEND_VM_NEXT_OPCODE();
}
- 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
ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY)
{
zend_uint op_num = EG(opline_before_exception)-EG(active_op_array)->opcodes;
int i;
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
zend_uint catch_op_num = 0, finally_op_num = 0, finally_op_end = 0;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *stack_frame;
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +08:00
Allow throwing exceptions from generators The missing piece is how one can find the next stack frame, which is required for dtor'ing arguments pushed to the stack. As the generator execute_data does not live on the stack one can't use it to figure out the start of the next stack frame. So there must be some other method.
2012-05-30 22:28:33 +08:00
/* Figure out where the next stack frame (which maybe contains pushed
* arguments that have to be dtor'ed) starts */
Optimized access to temporary and compiled VM variables
2012-12-04 14:14:39 +08:00
stack_frame = zend_vm_stack_frame_base(execute_data);
Changed EG(argument_stack) implementation.
2008-01-24 17:41:39 +08:00
Allow throwing exceptions from generators The missing piece is how one can find the next stack frame, which is required for dtor'ing arguments pushed to the stack. As the generator execute_data does not live on the stack one can't use it to figure out the start of the next stack frame. So there must be some other method.
2012-05-30 22:28:33 +08:00
/* If the exception was thrown during a function call there might be
* arguments pushed to the stack that have to be dtor'ed. */
Changed EG(argument_stack) implementation.
2008-01-24 17:41:39 +08:00
while (zend_vm_stack_top(TSRMLS_C) != stack_frame) {
zval *stack_zval_p = zend_vm_stack_pop(TSRMLS_C);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(stack_zval_p);
- 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
}
for (i=0; i<EG(active_op_array)->last_try_catch; i++) {
if (EG(active_op_array)->try_catch_array[i].try_op > op_num) {
/* further blocks will not be relevant... */
break;
Use zend_execute_internal always to call internal functions
2012-10-05 14:14:20 +08:00
}
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
if (op_num < EG(active_op_array)->try_catch_array[i].catch_op) {
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
catch_op_num = EX(op_array)->try_catch_array[i].catch_op;
- 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 functions declarations, use tabs
2012-08-14 08:59:40 +08:00
if (op_num < EG(active_op_array)->try_catch_array[i].finally_op) {
finally_op_num = EX(op_array)->try_catch_array[i].finally_op;
}
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
if (op_num >= EG(active_op_array)->try_catch_array[i].finally_op &&
op_num < EG(active_op_array)->try_catch_array[i].finally_end) {
finally_op_end = EG(active_op_array)->try_catch_array[i].finally_end;
}
- 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
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (EX(call) >= EX(call_slots)) {
call_slot *call = EX(call);
do {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_TYPE(call->object) != IS_UNDEF) {
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
if (call->is_ctor_call) {
if (call->is_ctor_result_used) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
Z_DELREF(call->object);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (Z_REFCOUNT(call->object) == 1) {
zend_object_store_ctor_failed(&call->object TSRMLS_CC);
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
}
Fixed bug #47771 (Exception during object construction from arg call calls object's destructor)
2009-03-26 18:17:30 +08:00
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
zval_ptr_dtor(&call->object);
Fixed bug #31177 (menory leaks and corruption because of incorrect refcounting)
2005-10-20 15:23:26 +08:00
}
. The VM stacks for passing function arguments and syntaticaly nested calls were merged into a single stack. The stack size needed for op_array execution is calculated at compile time and preallocated at once. As result all the stack push operatins don't require checks for stack overflow any more. . Generators implementation was improved using the new VM stack. Now it's a bit more clear and faster.
2012-11-30 17:39:23 +08:00
call--;
} while (call >= EX(call_slots));
EX(call) = NULL;
Fixed bug #30707 (Segmentation fault on exception in method)
2005-05-04 19:17:30 +08:00
}
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
for (i=0; i<EX(op_array)->last_brk_cont; i++) {
Fixed bug #44184 (Double free of loop-variable on exception)
2008-02-20 20:05:57 +08:00
if (EX(op_array)->brk_cont_array[i].start < 0) {
continue;
} else if (EX(op_array)->brk_cont_array[i].start > op_num) {
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
/* further blocks will not be relevant... */
break;
Fixed bug #44184 (Double free of loop-variable on exception)
2008-02-20 20:05:57 +08:00
} else if (op_num < EX(op_array)->brk_cont_array[i].brk) {
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
if (!catch_op_num ||
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
catch_op_num >= EX(op_array)->brk_cont_array[i].brk) {
zend_op *brk_opline = &EX(op_array)->opcodes[EX(op_array)->brk_cont_array[i].brk];
switch (brk_opline->opcode) {
case ZEND_SWITCH_FREE:
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_ptr_dtor(EX_VAR(brk_opline->op1.var));
- Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR) - Fixed bug #44913 (Segfault when using return in combination with nested loops and continue 2)
2008-05-05 19:03:35 +08:00
}
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
break;
case ZEND_FREE:
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
if (!(brk_opline->extended_value & EXT_TYPE_FREE_ON_RETURN)) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_dtor(EX_VAR(brk_opline->op1.var));
- Use ZEND_FREE() opcode instead of ZEND_SWITCH_FREE(IS_TMP_VAR) - Fixed bug #44913 (Segfault when using return in combination with nested loops and continue 2)
2008-05-05 19:03:35 +08:00
}
Fixed bugs #34065 and #38623 (throw in foreach/switch causes memory leaks)
2006-09-20 05:36:54 +08:00
break;
}
}
}
}
MFH: fix #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
2005-09-23 03:03:18 +08:00
/* restore previous error_reporting value */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (!EG(error_reporting) && Z_TYPE(EX(old_error_reporting)) != IS_UNDEF && Z_LVAL(EX(old_error_reporting)) != 0) {
Allow throwing exceptions from generators The missing piece is how one can find the next stack frame, which is required for dtor'ing arguments pushed to the stack. As the generator execute_data does not live on the stack one can't use it to figure out the start of the next stack frame. So there must be some other method.
2012-05-30 22:28:33 +08:00
zval restored_error_reporting;
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_string *key;
Allow throwing exceptions from generators The missing piece is how one can find the next stack frame, which is required for dtor'ing arguments pushed to the stack. As the generator execute_data does not live on the stack one can't use it to figure out the start of the next stack frame. So there must be some other method.
2012-05-30 22:28:33 +08:00
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_LONG(&restored_error_reporting, Z_LVAL(EX(old_error_reporting)));
MFH: fix #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
2005-09-23 03:03:18 +08:00
convert_to_string(&restored_error_reporting);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
key = STR_INIT("error_reporting", sizeof("error_reporting")-1, 0);
zend_alter_ini_entry_ex(key, Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting), ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME, 1 TSRMLS_CC);
STR_FREE(key);
zval_dtor(&restored_error_reporting);
MFH: fix #33771 (error_reporting falls to 0 when @ was used inside try/catch block)
2005-09-23 03:03:18 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_UNDEF(&EX(old_error_reporting));
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +08:00
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
if (finally_op_num && (!catch_op_num || catch_op_num >= finally_op_num)) {
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
if (EX(delayed_exception)) {
zend_exception_set_previous(EG(exception), EX(delayed_exception) TSRMLS_CC);
}
EX(delayed_exception) = EG(exception);
EG(exception) = NULL;
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
EX(fast_ret) = NULL;
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[finally_op_num]);
ZEND_VM_CONTINUE();
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
} else if (catch_op_num) {
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
if (finally_op_end && catch_op_num > finally_op_end) {
/* we are going out of current finally scope */
if (EX(delayed_exception)) {
zend_exception_set_previous(EG(exception), EX(delayed_exception) TSRMLS_CC);
EX(delayed_exception) = NULL;
}
}
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[catch_op_num]);
ZEND_VM_CONTINUE();
Add functions declarations, use tabs
2012-08-14 08:59:40 +08:00
} else {
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
if (EX(delayed_exception)) {
zend_exception_set_previous(EG(exception), EX(delayed_exception) TSRMLS_CC);
EX(delayed_exception) = NULL;
}
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 21:25:32 +08:00
if (UNEXPECTED((EX(op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_GENERATOR_RETURN);
} else {
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
}
Add functions declarations, use tabs
2012-08-14 08:59:40 +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
}
ZEND_VM_HANDLER(146, ZEND_VERIFY_ABSTRACT_CLASS, ANY, ANY)
{
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
USE_OPLINE
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_verify_abstract_class(Z_CE_P(EX_VAR(opline->op1.var)) TSRMLS_CC);
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
CHECK_EXCEPTION();
- 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
ZEND_VM_NEXT_OPCODE();
}
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
ZEND_VM_HANDLER(150, ZEND_USER_OPCODE, ANY, ANY)
- MFH missing bits and pieces of the partial sync with head # This time i added: # ZEND_FE_RESET_VARIABLE # ZEND_FE_RESET_REFERENCE # and dapted parser,compiler,executor,interfaces to handle these flags # their purpose is to be able to pass whetehr foreach is done by ref to # the current() handler so that it can error out in case it is not capable # to comply to the requested return signature/protocol/semantics (weyp).
2006-05-12 05:07:39 +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
USE_OPLINE
int ret;
fix UMR when variable name is an object and __toString is used # zend_call_function checks IS_REF on This
2011-03-16 13:25:02 +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
SAVE_OPLINE();
ret = zend_user_opcode_handlers[opline->opcode](ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL);
LOAD_OPLINE();
USER_OPCODE API is improvet. Implemented ability to dispatch from user handler to internal handler of another opcode.
2005-06-16 14:00:48 +08:00
switch (ret) {
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
case ZEND_USER_OPCODE_CONTINUE:
ZEND_VM_CONTINUE();
case ZEND_USER_OPCODE_RETURN:
- generators API exported for extensions - improved RETURN sequence to avoid redundant check if op_array is a generator
2012-12-11 21:25:32 +08:00
if (UNEXPECTED((EX(op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_GENERATOR_RETURN);
} else {
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
}
Fixed ability to call user functions from user opcodes without recursion
2009-08-18 18:12:32 +08:00
case ZEND_USER_OPCODE_ENTER:
ZEND_VM_ENTER();
case ZEND_USER_OPCODE_LEAVE:
ZEND_VM_LEAVE();
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
case ZEND_USER_OPCODE_DISPATCH:
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
ZEND_VM_DISPATCH(opline->opcode, opline);
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
default:
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
ZEND_VM_DISPATCH((zend_uchar)(ret & 0xff), opline);
Fix so that extensions like xdebug, can overload opcodes in all execution modes including goto/switch
2005-06-10 17:54:38 +08:00
}
}
Namespaces
2007-09-29 03:52:53 +08:00
ZEND_VM_HANDLER(143, ZEND_DECLARE_CONST, CONST, CONST)
{
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
USE_OPLINE
Namespaces
2007-09-29 03:52:53 +08:00
zend_free_op free_op1, free_op2;
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
zval *name;
zval *val;
Namespaces
2007-09-29 03:52:53 +08:00
zend_constant c;
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
SAVE_OPLINE();
name = GET_OP1_ZVAL_PTR(BP_VAR_R);
val = GET_OP2_ZVAL_PTR(BP_VAR_R);
converted several switches to ifs and made more opcache friendly
2013-11-01 23:16:58 +08:00
if (IS_CONSTANT_TYPE(Z_TYPE_P(val))) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_COPY_VALUE(&c.value, val);
Namespaces
2007-09-29 03:52:53 +08:00
if (Z_TYPE_P(val) == IS_CONSTANT_ARRAY) {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_copy_ctor(&c.value);
Namespaces
2007-09-29 03:52:53 +08:00
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval_update_constant(&c.value, NULL TSRMLS_CC);
Namespaces
2007-09-29 03:52:53 +08:00
} else {
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(&c.value, val);
Namespaces
2007-09-29 03:52:53 +08:00
}
c.flags = CONST_CS; /* non persistent, case sensetive */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
c.name = STR_DUP(Z_STR_P(name), 0);
Namespaces
2007-09-29 03:52:53 +08:00
c.module_number = PHP_USER_CONSTANT;
if (zend_register_constant(&c TSRMLS_CC) == FAILURE) {
}
FREE_OP1();
FREE_OP2();
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
CHECK_EXCEPTION();
Namespaces
2007-09-29 03:52:53 +08:00
ZEND_VM_NEXT_OPCODE();
}
Changed the structure of op_array.opcodes. The constant values are moved from opcode operands into a separate literal table
2010-04-20 18:57:45 +08:00
ZEND_VM_HANDLER(153, ZEND_DECLARE_LAMBDA_FUNCTION, CONST, UNUSED)
Added support for lambda functions and closures
2008-07-14 17:49:03 +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
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *zfunc;
Added support for lambda functions and closures
2008-07-14 17:49:03 +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
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
if (UNEXPECTED((zfunc = zend_hash_find(EG(function_table), Z_STR_P(opline->op1.zv))) == NULL) ||
UNEXPECTED(Z_FUNC_P(zfunc)->type != ZEND_USER_FUNCTION)) {
Added support for lambda functions and closures
2008-07-14 17:49:03 +08:00
zend_error_noreturn(E_ERROR, "Base lambda function for closure not found");
}
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zend_create_closure(EX_VAR(opline->result.var), Z_FUNC_P(zfunc), EG(scope), &EG(This) TSRMLS_CC);
Added support for lambda functions and closures
2008-07-14 17:49:03 +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
CHECK_EXCEPTION();
Added support for lambda functions and closures
2008-07-14 17:49:03 +08:00
ZEND_VM_NEXT_OPCODE();
}
Fixed bug #52614 (Memory leak when writing on uninitialized variable returned from method call)
2010-08-25 17:14:36 +08:00
ZEND_VM_HANDLER(156, ZEND_SEPARATE, VAR, UNUSED)
{
USE_OPLINE
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
zval *var_ptr;
Fixed bug #52614 (Memory leak when writing on uninitialized variable returned from method call)
2010-08-25 17:14:36 +08:00
SAVE_OPLINE();
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
var_ptr = EX_VAR(opline->op1.var);
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
if (Z_TYPE_P(var_ptr) != IS_OBJECT &&
!Z_ISREF_P(var_ptr) &&
Z_REFCOUNTED_P(var_ptr) &&
Z_REFCOUNT_P(var_ptr) > 1) {
Z_DELREF_P(var_ptr);
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
ZVAL_DUP(EX_VAR(opline->op1.var), var_ptr);
Fixed bug #52614 (Memory leak when writing on uninitialized variable returned from method call)
2010-08-25 17:14:36 +08:00
}
ZEND_VM_NEXT_OPCODE();
}
Merge remote-tracking branch 'php-src/master' into addGeneratorsSupport This is just an intial merge. It does not yet make generators and finally work together. Conflicts: Zend/zend_language_scanner.c Zend/zend_language_scanner_defs.h Zend/zend_vm_def.h Zend/zend_vm_execute.h Zend/zend_vm_execute.skl Zend/zend_vm_opcodes.h
2012-08-13 22:51:41 +08:00
ZEND_VM_HANDLER(160, ZEND_YIELD, CONST|TMP|VAR|CV|UNUSED, CONST|TMP|VAR|CV|UNUSED)
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
{
Add support for $generator->send() Yield now is an expression and the return value is the value passed to $generator->send(). By default (i.e. if ->next() is called) the value is NULL. Unlike in Python ->send() can be run without priming the generator with a ->next() call first.
2012-05-29 23:34:33 +08:00
USE_OPLINE
Generator related fixes
2014-02-26 17:58:59 +08:00
/* The generator object is stored in EX(return_value) */
zend_generator *generator = (zend_generator *) EX(return_value);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Fix several issues and allow rewind only at/before first yield * Trying to resume a generator while it is already running now throws a fatal error. * Trying to use yield in finally while the generator is being force-closed (by GC) throws a fatal error. * Rewinding after the first yield now throws an Exception
2012-08-25 23:40:08 +08:00
if (generator->flags & ZEND_GENERATOR_FORCED_CLOSE) {
zend_error_noreturn(E_ERROR, "Cannot yield from finally in a force-closed generator");
}
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
/* Destroy the previously yielded value */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval_ptr_dtor(&generator->value);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
/* Destroy the previously yielded key */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval_ptr_dtor(&generator->key);
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
Add support for $generator->send() Yield now is an expression and the return value is the value passed to $generator->send(). By default (i.e. if ->next() is called) the value is NULL. Unlike in Python ->send() can be run without priming the generator with a ->next() call first.
2012-05-29 23:34:33 +08:00
/* Set the new yielded value */
Allow to use yield without value If the generator is used as a coroutine it often doesn't make sense to yield anything. In this case one can simply receive values using $value = yield; The yield here will simply yield NULL.
2012-05-29 23:53:11 +08:00
if (OP1_TYPE != IS_UNUSED) {
Move a variable
2012-07-20 23:38:39 +08:00
zend_free_op free_op1;
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
if (EX(op_array)->fn_flags & ZEND_ACC_RETURN_REFERENCE) {
/* Constants and temporary variables aren't yieldable by reference,
* but we still allow them with a notice. */
if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval *value;
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
zend_error(E_NOTICE, "Only variable references should be yielded by reference");
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
value = GET_OP1_ZVAL_PTR(BP_VAR_R);
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY_VALUE(&generator->value, value);
Handle interned strings as non-refcounted scalars
2014-03-05 17:55:56 +08:00
if (Z_REFCOUNTED(generator->value)) Z_SET_REFCOUNT(generator->value, 1);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
/* Temporary variables don't need ctor copying */
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval_copy_ctor(&generator->value);
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
}
} else {
Fixed destruction of VM handler operands (FREE_OP1 and family)
2014-03-04 16:27:50 +08:00
zval *value_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (OP1_TYPE == IS_VAR && UNEXPECTED(Z_TYPE_P(value_ptr) == IS_STR_OFFSET)) {
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
zend_error_noreturn(E_ERROR, "Cannot yield string offsets by reference");
}
/* If a function call result is yielded and the function did
* not return by reference we throw a notice. */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (OP1_TYPE == IS_VAR && !Z_ISREF_P(value_ptr)
Fixed return by reference
2014-03-07 16:25:55 +08:00
&& !(opline->extended_value == ZEND_RETURNS_FUNCTION
&& (value_ptr->var_flags & IS_VAR_RET_REF))
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
//??? && EX_T(opline->op1.var).var.ptr_ptr == &EX_T(opline->op1.var).var.ptr) {
) {
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
zend_error(E_NOTICE, "Only variable references should be yielded by reference");
} else {
SEPARATE_ZVAL_TO_MAKE_IS_REF(value_ptr);
}
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY(&generator->value, value_ptr);
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_VAR_PTR();
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
}
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
} else {
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
zval *value = GET_OP1_ZVAL_PTR(BP_VAR_R);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
/* Consts, temporary variables and references need copying */
if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
|| Z_ISREF_P(value)
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
//??? INIT_PZVAL_COPY(copy, value);
ZVAL_COPY_VALUE(&generator->value, value);
Generator related fixes
2014-02-26 17:58:59 +08:00
if (Z_REFCOUNTED(generator->value)) Z_SET_REFCOUNT(generator->value, 1);
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
/* Temporary variables don't need ctor copying */
if (!IS_OP1_TMP_FREE()) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval_copy_ctor(&generator->value);
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
}
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
FREE_OP1_IF_VAR();
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
} else {
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
if (OP1_TYPE == IS_CV) {
Generator related fixes
2014-02-26 17:58:59 +08:00
if (Z_REFCOUNTED_P(value)) Z_ADDREF_P(value);
Improved IS_VAR operands fetching
2013-05-17 17:15:09 +08:00
}
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY_VALUE(&generator->value, value);
Add support by yielding by-reference
2012-07-17 19:24:27 +08:00
}
}
Allow to use yield without value If the generator is used as a coroutine it often doesn't make sense to yield anything. In this case one can simply receive values using $value = yield; The yield here will simply yield NULL.
2012-05-29 23:53:11 +08:00
} else {
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
/* If no value was specified yield null */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_NULL(&generator->value);
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
}
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
/* Set the new yielded key */
if (OP2_TYPE != IS_UNUSED) {
zend_free_op free_op2;
zval *key = GET_OP2_ZVAL_PTR(BP_VAR_R);
/* Consts, temporary variables and references need copying */
if (OP2_TYPE == IS_CONST || OP2_TYPE == IS_TMP_VAR
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
|| (Z_ISREF_P(key) && Z_REFCOUNT_P(key) > 0)
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
//??? INIT_PZVAL_COPY(copy, key);
ZVAL_COPY_VALUE(&generator->key, key);
Generator related fixes
2014-02-26 17:58:59 +08:00
if (Z_REFCOUNTED(generator->key)) Z_SET_REFCOUNT(generator->key, 1);
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
/* Temporary variables don't need ctor copying */
Fix leak when yielding array as key The code was copy-pasted and I forgot to change OP1 to OP2 in that one place.
2012-09-02 02:31:40 +08:00
if (!IS_OP2_TMP_FREE()) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
zval_copy_ctor(&generator->key);
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
}
} else {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_COPY(&generator->key, key);
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
}
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
if (Z_TYPE(generator->key) == IS_LONG
&& Z_LVAL(generator->key) > generator->largest_used_integer_key
Add auto-increment keys When no key is explicitely yielded PHP will used auto-incrementing keys as a fallback. They behave the same as with arrays, i.e. the key is the successor of the largest previously used integer key.
2012-05-30 11:05:49 +08:00
) {
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
generator->largest_used_integer_key = Z_LVAL(generator->key);
Add auto-increment keys When no key is explicitely yielded PHP will used auto-incrementing keys as a fallback. They behave the same as with arrays, i.e. the key is the successor of the largest previously used integer key.
2012-05-30 11:05:49 +08:00
}
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
FREE_OP2_IF_VAR();
} else {
Add auto-increment keys When no key is explicitely yielded PHP will used auto-incrementing keys as a fallback. They behave the same as with arrays, i.e. the key is the successor of the largest previously used integer key.
2012-05-30 11:05:49 +08:00
/* If no key was specified we use auto-increment keys */
generator->largest_used_integer_key++;
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
ZVAL_LONG(&generator->key, generator->largest_used_integer_key);
Add support for yielding keys Keys are yielded using the yield $key => $value syntax. Currently this is implemented as a statement only and not as an expression, because conflicts arise considering nesting and use in arrays: yield yield $a => $b; // could be either yield (yield $a) => $b; // or yield (yield $a => $b); Once I find some way to resolve these conflicts this should be available as an expression too. Also the key yielding code is rather copy-and-past-y for the value yielding code, so that should be factored out.
2012-05-30 08:44:06 +08:00
}
Fixed bug #66041: list() fails to unpack yielded ArrayAccess object Yield return values now use IS_VAR rather than IS_TMP_VAR. This fixes the issue with list() and should also be faster as it avoids doing a zval copy.
2013-11-30 20:05:40 +08:00
if (RETURN_VALUE_USED(opline)) {
/* If the return value of yield is used set the send
* target and initialize it to NULL */
Use better data structures (incomplete) - refactored return_value handling
2014-02-12 18:29:51 +08:00
generator->send_target = EX_VAR(opline->result.var);
ZVAL_NULL(generator->send_target);
Fixed bug #66041: list() fails to unpack yielded ArrayAccess object Yield return values now use IS_VAR rather than IS_TMP_VAR. This fixes the issue with list() and should also be faster as it avoids doing a zval copy.
2013-11-30 20:05:40 +08:00
} else {
generator->send_target = NULL;
}
Add support for $generator->send() Yield now is an expression and the return value is the value passed to $generator->send(). By default (i.e. if ->next() is called) the value is NULL. Unlike in Python ->send() can be run without priming the generator with a ->next() call first.
2012-05-29 23:34:33 +08:00
Remove asterix modifier (*) for generators Generators are now automatically detected by the presence of a `yield` expression in their body. This removes the ZEND_SUSPEND_AND_RETURN_GENERATOR opcode. Instead additional checks for ZEND_ACC_GENERATOR are added to the fcall_common helper and zend_call_function. This also adds a new function zend_generator_create_zval, which handles the actual creation of the generator zval from an op array. I feel like I should deglobalize the zend_create_execute_data_from_op_array code a bit. It currently changes EG(current_execute_data) and EG(opline_ptr) which is somewhat confusing (given the name).
2012-07-20 06:49:50 +08:00
/* We increment to the next op, so we are at the correct position when the
* generator is resumed. */
ZEND_VM_INC_OPCODE();
Make the GOTO and SWITCH VMs work again
2012-05-29 08:31:56 +08:00
/* The GOTO VM uses a local opline variable. We need to set the opline
* variable in execute_data so we don't resume at an old position. */
SAVE_OPLINE();
Add YIELD opcode implementation
2012-05-27 04:44:53 +08:00
ZEND_VM_RETURN();
}
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 06:48:51 +08:00
ZEND_VM_HANDLER(159, ZEND_DISCARD_EXCEPTION, ANY, ANY)
{
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
if (EX(delayed_exception) != NULL) {
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 06:48:51 +08:00
/* discard the previously thrown exception */
Use better data structures (incomplete)
2014-02-10 14:04:30 +08:00
//??? zval_ptr_dtor(EX(delayed_exception));
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
EX(delayed_exception) = NULL;
An exception thrown in try or catch block is disacarded by return statement in finally block.
2012-12-13 06:48:51 +08:00
}
ZEND_VM_NEXT_OPCODE();
}
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_HANDLER(162, ZEND_FAST_CALL, ANY, ANY)
{
USE_OPLINE
if (opline->extended_value &&
fix bug #49348 - issue notice on get_property_ptr_ptr when used for read
2013-02-19 12:56:02 +08:00
UNEXPECTED(EG(prev_exception) != NULL)) {
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
/* in case of unhandled exception jump to catch block instead of finally */
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]);
ZEND_VM_CONTINUE();
}
EX(fast_ret) = opline + 1;
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
EX(delayed_exception) = NULL;
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
ZEND_VM_SET_OPCODE(opline->op1.jmp_addr);
ZEND_VM_CONTINUE();
}
ZEND_VM_HANDLER(163, ZEND_FAST_RET, ANY, ANY)
{
if (EX(fast_ret)) {
ZEND_VM_SET_OPCODE(EX(fast_ret));
ZEND_VM_CONTINUE();
} else {
/* special case for unhandled exceptions */
USE_OPLINE
if (opline->extended_value == ZEND_FAST_RET_TO_FINALLY) {
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]);
ZEND_VM_CONTINUE();
} else {
Fixed bug #65784 (Segfault with finally).
2013-12-13 00:15:50 +08:00
EG(exception) = EX(delayed_exception);
EX(delayed_exception) = NULL;
if (opline->extended_value == ZEND_FAST_RET_TO_CATCH) {
ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.opline_num]);
ZEND_VM_CONTINUE();
} else if (UNEXPECTED((EX(op_array)->fn_flags & ZEND_ACC_GENERATOR) != 0)) {
ZEND_VM_DISPATCH_TO_HANDLER(ZEND_GENERATOR_RETURN);
} else {
ZEND_VM_DISPATCH_TO_HELPER(zend_leave_helper);
}
Improved "finally" im[plementation
2012-11-22 19:17:05 +08:00
}
}
}
Export zend_do_fcall() helper from executor
2005-06-24 20:33:53 +08:00
ZEND_VM_EXPORT_HELPER(zend_do_fcall, zend_do_fcall_common_helper)
Reference in New Issue Copy Permalink