diff options
| author | Dmitry Stogov <dmitry@php.net> | 2010-09-15 07:38:52 +0000 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@php.net> | 2010-09-15 07:38:52 +0000 |
| commit | f2df6a4a3ee7d1cff29dfc3326b50eb9d2818a05 (patch) | |
| tree | 82cdb33028f6d6a48225c0ac47fc6539c0aafdd0 /Zend/zend_execute_API.c | |
| parent | 3e92b2043494863a2baed87e9f04585a732f9c1b (diff) | |
| download | php-git-f2df6a4a3ee7d1cff29dfc3326b50eb9d2818a05.tar.gz | |
- Improved memory usage
. zend_function.pass_rest_by_reference is replaced by
ZEND_ACC_PASS_REST_BY_REFERENCE in zend_function.fn_flags
. zend_function.return_reference is replaced by ZEND_ACC_RETURN_REFERENCE
in zend_function.fn_flags
. zend_arg_info.required_num_args removed. it was needed only for internal
functions. Now the first arg_info for internal function (which has special
meaning) is represented by zend_internal_function_info structure.
. zend_op_array.size, size_var, size_literal, current_brk_cont,
backpatch_count moved into CG(context), because they are used only during
compilation.
. zend_op_array.start_op is moved into EG(start_op), because it's used
only for 'interactive' execution of single top-level op-array.
. zend_op_array.done_pass_two is replaced by ZEND_ACC_DONE_PASS_TWO in
zend_op_array.fn_flags.
. op_array.vars array is trimmed (reallocated) during pass_two.
. zend_class_entry.constants_updated is replaced by
ZEND_ACC_CONSTANTS_UPDATED in zend_class_entry.ce_flags
. the size of zend_class_entry is reduced by sharing the same memory space
by different information for internal and user classes.
See zend_class_inttry.info union.
Diffstat (limited to 'Zend/zend_execute_API.c')
| -rw-r--r-- | Zend/zend_execute_API.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/Zend/zend_execute_API.c b/Zend/zend_execute_API.c index 3220dfea57..f9c9bce99f 100644 --- a/Zend/zend_execute_API.c +++ b/Zend/zend_execute_API.c @@ -194,6 +194,7 @@ void init_executor(TSRMLS_D) /* {{{ */ EG(active_op_array) = NULL; EG(active) = 1; + EG(start_op) = NULL; } /* }}} */ @@ -1256,7 +1257,7 @@ void execute_new_code(TSRMLS_D) /* {{{ */ int orig_interactive; if (!(CG(active_op_array)->fn_flags & ZEND_ACC_INTERACTIVE) - || CG(active_op_array)->backpatch_count>0 + || CG(context).backpatch_count>0 || CG(active_op_array)->function_name || CG(active_op_array)->type!=ZEND_USER_FUNCTION) { return; @@ -1265,14 +1266,14 @@ void execute_new_code(TSRMLS_D) /* {{{ */ ret_opline = get_next_op(CG(active_op_array) TSRMLS_CC); ret_opline->opcode = ZEND_RETURN; ret_opline->op1_type = IS_CONST; - ret_opline->op1.constant = zend_add_literal(CG(active_op_array), &EG(uninitialized_zval)); + ret_opline->op1.constant = zend_add_literal(CG(active_op_array), &EG(uninitialized_zval) TSRMLS_CC); SET_UNUSED(ret_opline->op2); - if (!CG(active_op_array)->start_op) { - CG(active_op_array)->start_op = CG(active_op_array)->opcodes; + if (!EG(start_op)) { + EG(start_op) = CG(active_op_array)->opcodes; } - opline=CG(active_op_array)->start_op; + opline=EG(start_op); end=CG(active_op_array)->opcodes+CG(active_op_array)->last; while (opline<end) { @@ -1317,7 +1318,7 @@ void execute_new_code(TSRMLS_D) /* {{{ */ } CG(active_op_array)->last -= 1; /* get rid of that ZEND_RETURN */ - CG(active_op_array)->start_op = CG(active_op_array)->opcodes+CG(active_op_array)->last; + EG(start_op) = CG(active_op_array)->opcodes+CG(active_op_array)->last; } /* }}} */ |