cvs: ZendEngine2(PHP_5_3) / zend_execute.c zend_vm_def.h zend_vm_execute.h

dmitry Thu Apr 24 15:45:49 2008 UTC Modified files: (Branch: PHP_5_3) /ZendEngine2 zend_execute.c zend_vm_def.h zend_vm_execute.h Log: Optimized handlers for ZEND_RECV and ZEND_RECV_INIT opocdes http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_execute.c?r1=1.716.2.12.2.24.2.24&r2=1.716.2.12.2.24.2.25&diff_format=u Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.24 ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.25 --- ZendEngine2/zend_execute.c:1.716.2.12.2.24.2.24 Tue Mar 18 14:10:43 2008 +++ ZendEngine2/zend_execute.c Thu Apr 24 15:45:46 2008 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.24 2008/03/18 14:10:43 felipe Exp $ */ +/* $Id: zend_execute.c,v 1.716.2.12.2.24.2.25 2008/04/24 15:45:46 dmitry Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -733,15 +733,6 @@ } -static inline void zend_receive(zval **variable_ptr_ptr, zval *value TSRMLS_DC) -{ - zval *variable_ptr = *variable_ptr_ptr; - - Z_DELREF_P(variable_ptr); - *variable_ptr_ptr = value; - Z_ADDREF_P(value); -} - /* Utility Functions for Extensions */ static void zend_extension_statement_handler(zend_extension *extension, zend_op_array *op_array TSRMLS_DC) { http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_def.h?r1=1.59.2.29.2.48.2.48&r2=1.59.2.29.2.48.2.49&diff_format=u Index: ZendEngine2/zend_vm_def.h diff -u ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.48 ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.49 --- ZendEngine2/zend_vm_def.h:1.59.2.29.2.48.2.48 Mon Apr 21 10:14:20 2008 +++ ZendEngine2/zend_vm_def.h Thu Apr 24 15:45:46 2008 @@ -18,7 +18,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.48 2008/04/21 10:14:20 dmitry Exp $ */ +/* $Id: zend_vm_def.h,v 1.59.2.29.2.48.2.49 2008/04/24 15:45:46 dmitry Exp $ */ /* If you change this file, please regenerate the zend_vm_execute.h and * zend_vm_opcodes.h files by running: @@ -2549,11 +2549,9 @@ zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC); var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); - if (PZVAL_IS_REF(*param)) { - zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); - } else { - zend_receive(var_ptr, *param TSRMLS_CC); - } + Z_DELREF_PP(var_ptr); + *var_ptr = *param; + Z_ADDREF_PP(var_ptr); } ZEND_VM_NEXT_OPCODE(); @@ -2562,42 +2560,31 @@ ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST) { zend_op *opline = EX(opline); - zval *assignment_value, **var_ptr; + zval *assignment_value; zend_uint arg_num = Z_LVAL(opline->op1.u.constant); zend_free_op free_res; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); + zval **var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W);; if (param == NULL) { + ALLOC_ZVAL(assignment_value); + *assignment_value = opline->op2.u.constant; if ((Z_TYPE(opline->op2.u.constant) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT || Z_TYPE(opline->op2.u.constant)==IS_CONSTANT_ARRAY) { - zval *default_value; - - ALLOC_ZVAL(default_value); - *default_value = opline->op2.u.constant; - Z_SET_REFCOUNT_P(default_value, 1); - zval_update_constant(&default_value, 0 TSRMLS_CC); - Z_SET_REFCOUNT_P(default_value, 0); - Z_UNSET_ISREF_P(default_value); - param = &default_value; - assignment_value = default_value; + Z_SET_REFCOUNT_P(assignment_value, 1); + zval_update_constant(&assignment_value, 0 TSRMLS_CC); } else { - param = NULL; - assignment_value = &opline->op2.u.constant; + zval_copy_ctor(assignment_value); } - zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); - - var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); - zend_assign_to_variable(var_ptr, assignment_value, 0 TSRMLS_CC); + INIT_PZVAL(assignment_value); } else { - var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); assignment_value = *param; - zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); - if (PZVAL_IS_REF(assignment_value)) { - zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); - } else { - zend_receive(var_ptr, assignment_value TSRMLS_CC); - } + Z_ADDREF_P(assignment_value); } + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); + Z_DELREF_PP(var_ptr); + *var_ptr = assignment_value; + ZEND_VM_NEXT_OPCODE(); } http://cvs.php.net/viewvc.cgi/ZendEngine2/zend_vm_execute.h?r1=1.62.2.30.2.49.2.47&r2=1.62.2.30.2.49.2.48&diff_format=u Index: ZendEngine2/zend_vm_execute.h diff -u ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.47 ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.48 --- ZendEngine2/zend_vm_execute.h:1.62.2.30.2.49.2.47 Mon Apr 21 10:14:20 2008 +++ ZendEngine2/zend_vm_execute.h Thu Apr 24 15:45:46 2008 @@ -351,11 +351,9 @@ zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param, opline->extended_value TSRMLS_CC); var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); - if (PZVAL_IS_REF(*param)) { - zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); - } else { - zend_receive(var_ptr, *param TSRMLS_CC); - } + Z_DELREF_PP(var_ptr); + *var_ptr = *param; + Z_ADDREF_PP(var_ptr); } ZEND_VM_NEXT_OPCODE(); @@ -697,42 +695,31 @@ static int ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS) { zend_op *opline = EX(opline); - zval *assignment_value, **var_ptr; + zval *assignment_value; zend_uint arg_num = Z_LVAL(opline->op1.u.constant); zend_free_op free_res; zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC); + zval **var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W);; if (param == NULL) { + ALLOC_ZVAL(assignment_value); + *assignment_value = opline->op2.u.constant; if ((Z_TYPE(opline->op2.u.constant) & IS_CONSTANT_TYPE_MASK) == IS_CONSTANT || Z_TYPE(opline->op2.u.constant)==IS_CONSTANT_ARRAY) { - zval *default_value; - - ALLOC_ZVAL(default_value); - *default_value = opline->op2.u.constant; - Z_SET_REFCOUNT_P(default_value, 1); - zval_update_constant(&default_value, 0 TSRMLS_CC); - Z_SET_REFCOUNT_P(default_value, 0); - Z_UNSET_ISREF_P(default_value); - param = &default_value; - assignment_value = default_value; - } else { - param = NULL; - assignment_value = &opline->op2.u.constant; + Z_SET_REFCOUNT_P(assignment_value, 1); + zval_update_constant(&assignment_value, 0 TSRMLS_CC); + } else { + zval_copy_ctor(assignment_value); } - zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); - - var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); - zend_assign_to_variable(var_ptr, assignment_value, 0 TSRMLS_CC); + INIT_PZVAL(assignment_value); } else { - var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); assignment_value = *param; - zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); - if (PZVAL_IS_REF(assignment_value)) { - zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); - } else { - zend_receive(var_ptr, assignment_value TSRMLS_CC); - } + Z_ADDREF_P(assignment_value); } + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value, opline->extended_value TSRMLS_CC); + Z_DELREF_PP(var_ptr); + *var_ptr = assignment_value; + ZEND_VM_NEXT_OPCODE(); }