--EXPECTF--
Fatal error: Uncaught exception 'ErrorException' with message 'Undefined variable: id' in %s:%d
Stack trace:
-#0 %s(%d): env::errorHandler()
+#0 %s(%d): env::errorHandler(8, '%s', '%s', 34, Array)
#1 {main}
thrown in %s on line %d
zval **param, *param_ptr;
TSRMLS_FETCH();
- p = EG(argument_stack).top_element-2;
+ p = zend_vm_stack_top(TSRMLS_C) - 1;
arg_count = (int)(zend_uintptr_t) *p;
if (param_count>arg_count) {
int arg_count;
zval *param_ptr;
- p = EG(argument_stack).top_element-2;
+ p = zend_vm_stack_top(TSRMLS_C) - 1;
arg_count = (int)(zend_uintptr_t) *p;
if (param_count>arg_count) {
zval ***param;
TSRMLS_FETCH();
- p = EG(argument_stack).top_element-2;
+ p = zend_vm_stack_top(TSRMLS_C) - 1;
arg_count = (int)(zend_uintptr_t) *p;
if (param_count>arg_count) {
void **p;
int arg_count;
- p = EG(argument_stack).top_element-2;
+ p = zend_vm_stack_top(TSRMLS_C) - 1;
arg_count = (int)(zend_uintptr_t) *p;
if (param_count>arg_count) {
void **p;
int arg_count;
- p = EG(argument_stack).top_element-2;
+ p = zend_vm_stack_top(TSRMLS_C) - 1;
arg_count = (int)(zend_uintptr_t) *p;
if (param_count>arg_count) {
return FAILURE;
}
- arg_count = (int)(zend_uintptr_t) *(EG(argument_stack).top_element-2);
+ arg_count = (int)(zend_uintptr_t) *(zend_vm_stack_top(TSRMLS_C) - 1);
if (num_args > arg_count) {
zend_error(E_WARNING, "%v(): could not obtain parameters for parsing",
for (spec_walk = type_spec, i = 0; *spec_walk && i < num_args; spec_walk++) {
switch (*spec_walk) {
case 'T':
- arg = (zval **) (EG(argument_stack).top_element - 2 - (arg_count-i));
+ arg = (zval**)zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count-i);
if (Z_TYPE_PP(arg) == IS_UNICODE && (T_arg_type == -1 || T_arg_type == IS_STRING)) {
/* we can upgrade from strings to Unicode */
T_arg_type = IS_UNICODE;
if (num_varargs > 0) {
int iv = 0;
- zval **p = (zval **) (EG(argument_stack).top_element - 2 - (arg_count - i));
+ zval **p = (zval **) (zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count - i));
*n_varargs = num_varargs;
}
}
- arg = (zval **) (EG(argument_stack).top_element - 2 - (arg_count-i));
+ arg = (zval **) (zend_vm_stack_top(TSRMLS_C) - 1 - (arg_count-i));
if (zend_parse_arg(i+1, arg, va, &type_spec, quiet, T_arg_type TSRMLS_CC) == FAILURE) {
/* clean up varargs array if it was used */
Get the number of arguments that were passed to the function */
ZEND_FUNCTION(func_num_args)
{
- void **p;
- int arg_count;
+ zend_execute_data *ex = EG(current_execute_data)->prev_execute_data;
- p = EG(argument_stack).top_element-1-1;
- arg_count = (int)(zend_uintptr_t) *p; /* this is the amount of arguments passed to func_num_args(); */
- p -= 1+arg_count;
- if (*p) {
- zend_error(E_ERROR, "func_num_args(): Can't be used as a function parameter");
- }
- --p;
- if (p>=EG(argument_stack).elements) {
- RETURN_LONG((long)(zend_uintptr_t) *p);
+ if (ex && ex->function_state.arguments) {
+ RETURN_LONG((long)(zend_uintptr_t)*(ex->function_state.arguments));
} else {
zend_error(E_WARNING, "func_num_args(): Called from the global scope - no function context");
RETURN_LONG(-1);
zval **z_requested_offset;
zval *arg;
long requested_offset;
+ zend_execute_data *ex = EG(current_execute_data)->prev_execute_data;
if (ZEND_NUM_ARGS()!=1 || zend_get_parameters_ex(1, &z_requested_offset)==FAILURE) {
RETURN_FALSE;
RETURN_FALSE;
}
- p = EG(argument_stack).top_element-1-1;
- arg_count = (int)(zend_uintptr_t) *p; /* this is the amount of arguments passed to func_get_arg(); */
- p -= 1+arg_count;
- if (*p) {
- zend_error(E_ERROR, "func_get_arg(): Can't be used as a function parameter");
- }
- --p;
- if (p<EG(argument_stack).elements) {
+ if (!ex || !ex->function_state.arguments) {
zend_error(E_WARNING, "func_get_arg(): Called from the global scope - no function context");
RETURN_FALSE;
}
- arg_count = (int)(zend_uintptr_t) *p;
- if (requested_offset>=arg_count) {
+ p = ex->function_state.arguments;
+ arg_count = (int)(zend_uintptr_t) *p; /* this is the amount of arguments passed to func_get_arg(); */
+
+ if (requested_offset >= arg_count) {
zend_error(E_WARNING, "func_get_arg(): Argument %ld not passed to function", requested_offset);
RETURN_FALSE;
}
void **p;
int arg_count;
int i;
+ zend_execute_data *ex = EG(current_execute_data)->prev_execute_data;
- p = EG(argument_stack).top_element-1-1;
- arg_count = (int)(zend_uintptr_t) *p; /* this is the amount of arguments passed to func_get_args(); */
- p -= 1+arg_count;
- if (*p) {
- zend_error(E_ERROR, "func_get_args(): Can't be used as a function parameter");
- }
- --p;
-
- if (p<EG(argument_stack).elements) {
+ if (!ex || !ex->function_state.arguments) {
zend_error(E_WARNING, "func_get_args(): Called from the global scope - no function context");
RETURN_FALSE;
}
- arg_count = (int)(zend_uintptr_t) *p;
+ p = ex->function_state.arguments;
+ arg_count = (int)(zend_uintptr_t) *p; /* this is the amount of arguments passed to func_get_args(); */
array_init(return_value);
for (i=0; i<arg_count; i++) {
}
/* }}} */
-static zval *debug_backtrace_get_args(void ***curpos TSRMLS_DC) /* {{{ */
+static zval *debug_backtrace_get_args(void **curpos TSRMLS_DC) /* {{{ */
{
- void **p = *curpos - 2;
+ void **p = curpos;
zval *arg_array, **arg;
int arg_count = (int)(zend_uintptr_t) *p;
- *curpos -= (arg_count+2);
-
MAKE_STD_ZVAL(arg_array);
array_init(arg_array);
p -= arg_count;
}
}
- /* skip args from incomplete frames */
- while ((((*curpos)-1) > EG(argument_stack).elements) && *((*curpos)-1)) {
- (*curpos)--;
- }
-
return arg_array;
}
/* }}} */
char *call_type;
char *include_filename = NULL;
zval *arg_array = NULL;
- void **cur_arg_pos = EG(argument_stack).top_element;
- void **args = cur_arg_pos;
- int arg_stack_consistent = 0;
- int frames_on_stack = 0;
int indent = 0;
if (ZEND_NUM_ARGS()) {
ZEND_WRONG_PARAM_COUNT();
}
- while (--args > EG(argument_stack).elements) {
- if (*args--) {
- break;
- }
- args -= *(ulong*)args;
- frames_on_stack++;
-
- /* skip args from incomplete frames */
- while (((args-1) > EG(argument_stack).elements) && *(args-1)) {
- args--;
- }
-
- if ((args-1) == EG(argument_stack).elements) {
- arg_stack_consistent = 1;
- break;
- }
- }
-
ptr = EG(current_execute_data);
/* skip debug_backtrace() */
ptr = ptr->prev_execute_data;
- cur_arg_pos -= 2;
- frames_on_stack--;
-
- if (arg_stack_consistent) {
- /* skip args from incomplete frames */
- while (((cur_arg_pos-1) > EG(argument_stack).elements) && *(cur_arg_pos-1)) {
- cur_arg_pos--;
- }
- }
while (ptr) {
zstr free_class_name = NULL_ZSTR;
skip->prev_execute_data->opline->opcode != ZEND_DO_FCALL &&
skip->prev_execute_data->opline->opcode != ZEND_DO_FCALL_BY_NAME &&
skip->prev_execute_data->opline->opcode != ZEND_INCLUDE_OR_EVAL) {
- skip = skip->prev_execute_data;
+ skip = skip->prev_execute_data;
}
if (skip->op_array) {
call_type = NULL;
}
if ((! ptr->opline) || ((ptr->opline->opcode == ZEND_DO_FCALL_BY_NAME) || (ptr->opline->opcode == ZEND_DO_FCALL))) {
- if (arg_stack_consistent && (frames_on_stack > 0)) {
- arg_array = debug_backtrace_get_args(&cur_arg_pos TSRMLS_CC);
- frames_on_stack--;
+ if (ptr->function_state.arguments) {
+ arg_array = debug_backtrace_get_args(ptr->function_state.arguments TSRMLS_CC);
}
}
} else {
zstr class_name;
char *include_filename = NULL;
zval *stack_frame;
- void **cur_arg_pos = EG(argument_stack).top_element;
- void **args = cur_arg_pos;
- int arg_stack_consistent = 0;
- int frames_on_stack = 0;
-
- while (--args > EG(argument_stack).elements) {
- if (*args--) {
- break;
- }
- args -= *(ulong*)args;
- frames_on_stack++;
-
- /* skip args from incomplete frames */
- while (((args-1) > EG(argument_stack).elements) && *(args-1)) {
- args--;
- }
-
- if ((args-1) == EG(argument_stack).elements) {
- arg_stack_consistent = 1;
- break;
- }
- }
ptr = EG(current_execute_data);
/* skip debug_backtrace() */
if (skip_last-- && ptr) {
- int arg_count = *((ulong*)(cur_arg_pos - 2));
- cur_arg_pos -= (arg_count + 2);
- frames_on_stack--;
ptr = ptr->prev_execute_data;
-
- if (arg_stack_consistent) {
- /* skip args from incomplete frames */
- while (((cur_arg_pos-1) > EG(argument_stack).elements) && *(cur_arg_pos-1)) {
- cur_arg_pos--;
- }
- }
}
array_init(return_value);
}
if ((! ptr->opline) || ((ptr->opline->opcode == ZEND_DO_FCALL_BY_NAME) || (ptr->opline->opcode == ZEND_DO_FCALL))) {
- if (arg_stack_consistent && (frames_on_stack > 0)) {
- add_ascii_assoc_zval_ex(stack_frame, "args", sizeof("args"), debug_backtrace_get_args(&cur_arg_pos TSRMLS_CC));
- frames_on_stack--;
+ if (ptr->function_state.arguments) {
+ add_assoc_zval_ex(stack_frame, "args", sizeof("args"), debug_backtrace_get_args(ptr->function_state.arguments TSRMLS_CC));
}
}
} else {
typedef struct _zend_function_state {
zend_function *function;
+ void **arguments;
} zend_function_state;
union _temp_variable *Ts;
zval ***CVs;
zend_bool original_in_execution;
- ALLOCA_FLAG(use_heap)
HashTable *symbol_table;
struct _zend_execute_data *prev_execute_data;
zval *old_error_reporting;
EX(opline)++
#define ZEND_VM_EXIT_FROM_EXECUTE_LOOP() \
- free_alloca(EX(CVs), EX(use_heap)); \
EG(in_execution) = EX(original_in_execution); \
EG(current_execute_data) = EX(prev_execute_data); \
- EG(opline_ptr) = NULL;
+ EG(opline_ptr) = NULL; \
+ zend_vm_stack_free(execute_data TSRMLS_CC);
#define ZEND_VM_RETURN_FROM_EXECUTE_LOOP() \
ZEND_VM_EXIT_FROM_EXECUTE_LOOP(); \
ZEND_API int zval_update_constant_ex(zval **pp, void *arg, zend_class_entry *scope TSRMLS_DC);
/* dedicated Zend executor functions - do not use! */
-static inline void zend_ptr_stack_clear_multiple(TSRMLS_D)
+#define ZEND_VM_STACK_PAGE_SIZE (64 * 1024)
+
+struct _zend_vm_stack {
+ void **top;
+ void **end;
+ zend_vm_stack prev;
+ void *elements[1];
+};
+
+#define ZEND_VM_STACK_GROW_IF_NEEDED(count) \
+ do { \
+ if (UNEXPECTED(count > \
+ EG(argument_stack)->end - EG(argument_stack)->top)) { \
+ zend_vm_stack_extend(count TSRMLS_CC); \
+ } \
+ } while (0)
+
+static inline zend_vm_stack zend_vm_stack_new_page(int count) {
+ zend_vm_stack page = emalloc(sizeof(*page)+sizeof(page->elements[0])*(count-1));
+
+ page->top = page->elements;
+ page->end = page->elements + count;
+ page->prev = NULL;
+ return page;
+}
+
+static inline void zend_vm_stack_init(TSRMLS_D)
+{
+ EG(argument_stack) = zend_vm_stack_new_page(ZEND_VM_STACK_PAGE_SIZE);
+}
+
+static inline void zend_vm_stack_destroy(TSRMLS_D)
+{
+ zend_vm_stack stack = EG(argument_stack);
+
+ while (stack != NULL) {
+ zend_vm_stack p = stack->prev;
+ efree(stack);
+ stack = p;
+ }
+}
+
+static inline void zend_vm_stack_extend(int count TSRMLS_DC)
+{
+ zend_vm_stack p = zend_vm_stack_new_page(count >= ZEND_VM_STACK_PAGE_SIZE ? count : ZEND_VM_STACK_PAGE_SIZE);
+ p->prev = EG(argument_stack);
+ EG(argument_stack) = p;
+}
+
+static inline void **zend_vm_stack_top(TSRMLS_D)
+{
+ return EG(argument_stack)->top;
+}
+
+static inline void zend_vm_stack_push(void *ptr TSRMLS_DC)
+{
+ ZEND_VM_STACK_GROW_IF_NEEDED(1);
+ *(EG(argument_stack)->top++) = ptr;
+}
+
+static inline void zend_vm_stack_push_nocheck(void *ptr TSRMLS_DC)
+{
+ *(EG(argument_stack)->top++) = ptr;
+}
+
+static inline void *zend_vm_stack_pop(TSRMLS_D)
+{
+ void *el = *(--EG(argument_stack)->top);
+
+ if (UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->elements)) {
+ zend_vm_stack p = EG(argument_stack);
+ EG(argument_stack) = p->prev;
+ efree(p);
+ }
+ return el;
+}
+
+static inline void *zend_vm_stack_alloc(size_t size TSRMLS_DC)
+{
+ void *ret;
+
+ size = (size + (sizeof(void*) - 1)) / sizeof(void*);
+
+ ZEND_VM_STACK_GROW_IF_NEEDED(size);
+ ret = EG(argument_stack)->top;
+ EG(argument_stack)->top += size;
+ return ret;
+}
+
+static inline void zend_vm_stack_free(void *ptr TSRMLS_DC)
+{
+ if (UNEXPECTED(EG(argument_stack)->elements == ptr)) {
+ zend_vm_stack p = EG(argument_stack);
+
+ EG(argument_stack) = p->prev;
+ efree(p);
+ } else {
+ EG(argument_stack)->top = ptr;
+ }
+}
+
+static inline void** zend_vm_stack_push_args(int count TSRMLS_DC)
+{
+
+ if (UNEXPECTED(EG(argument_stack)->top - EG(argument_stack)->elements < count) ||
+ UNEXPECTED(EG(argument_stack)->top == EG(argument_stack)->end)) {
+ zend_vm_stack p = EG(argument_stack);
+
+ zend_vm_stack_extend(count + 1 TSRMLS_CC);
+
+ EG(argument_stack)->top += count;
+ *(EG(argument_stack)->top) = (void*)(zend_uintptr_t)count;
+ while (count-- > 0) {
+ void *data = *(--p->top);
+
+ if (UNEXPECTED(p->top == p->elements)) {
+ zend_vm_stack r = p;
+
+ EG(argument_stack)->prev = p->prev;
+ p = p->prev;
+ efree(r);
+ }
+ *(EG(argument_stack)->elements + count) = data;
+ }
+ return EG(argument_stack)->top++;
+ }
+ *(EG(argument_stack)->top) = (void*)(zend_uintptr_t)count;
+ return EG(argument_stack)->top++;
+}
+
+static inline void zend_vm_stack_clear_multiple(TSRMLS_D)
{
- void **p = EG(argument_stack).top_element-2;
+ void **p = EG(argument_stack)->top - 1;
int delete_count = (int)(zend_uintptr_t) *p;
- EG(argument_stack).top -= (delete_count+2);
while (--delete_count>=0) {
zval *q = *(zval **)(--p);
*p = NULL;
zval_ptr_dtor(&q);
}
- EG(argument_stack).top_element = p;
+ zend_vm_stack_free(p TSRMLS_CC);
}
-static inline int zend_ptr_stack_get_arg(int requested_arg, void **data TSRMLS_DC)
+static inline zval** zend_vm_stack_get_arg(int requested_arg TSRMLS_DC)
{
- void **p = EG(argument_stack).top_element-2;
+ void **p = EG(current_execute_data)->prev_execute_data->function_state.arguments;
int arg_count = (int)(zend_uintptr_t) *p;
- if (requested_arg>arg_count) {
- return FAILURE;
+ if (UNEXPECTED(requested_arg > arg_count)) {
+ return NULL;
}
- *data = (p-arg_count+requested_arg-1);
- return SUCCESS;
+ return (zval**)p - arg_count + requested_arg - 1;
}
void execute_new_code(TSRMLS_D);
EG(in_autoload) = NULL;
EG(autoload_func) = NULL;
- zend_ptr_stack_init(&EG(argument_stack));
- zend_ptr_stack_push(&EG(argument_stack), (void *) NULL);
+ zend_vm_stack_init(TSRMLS_C);
+ zend_vm_stack_push((void *) NULL TSRMLS_CC);
zend_u_hash_init(&EG(symbol_table), 50, NULL, ZVAL_PTR_DTOR, 0, UG(unicode));
{
}
zend_hash_apply(EG(class_table), (apply_func_t) zend_cleanup_class_data TSRMLS_CC);
- zend_ptr_stack_destroy(&EG(argument_stack));
+ zend_vm_stack_destroy(TSRMLS_C);
/* Destroy all op arrays */
if (EG(full_tables_cleanup)) {
}
}
+ if (call_via_handler) {
+ ZEND_VM_STACK_GROW_IF_NEEDED(2 + 1);
+ } else {
+ ZEND_VM_STACK_GROW_IF_NEEDED(fci->param_count + 1);
+ }
+
for (i=0; i<fci->param_count; i++) {
zval *param;
if (fci->no_separation) {
if(i) {
/* hack to clean up the stack */
- zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) (zend_uintptr_t) i, NULL);
- zend_ptr_stack_clear_multiple(TSRMLS_C);
+ zend_vm_stack_push_nocheck((void *) (zend_uintptr_t)i TSRMLS_CC);
+ zend_vm_stack_clear_multiple(TSRMLS_C);
}
if (old_func_name) {
efree(Z_STRVAL_P(fci->function_name));
if (call_via_handler) {
add_next_index_zval(params_array, param);
} else {
- zend_ptr_stack_push(&EG(argument_stack), param);
+ zend_vm_stack_push_nocheck(param TSRMLS_CC);
}
}
if (call_via_handler) {
- zend_ptr_stack_push(&EG(argument_stack), method_name);
- zend_ptr_stack_push(&EG(argument_stack), params_array);
+ zend_vm_stack_push_nocheck(method_name TSRMLS_CC);
+ zend_vm_stack_push_nocheck(params_array TSRMLS_CC);
fci->param_count = 2;
}
- zend_ptr_stack_2_push(&EG(argument_stack), (void *) (zend_uintptr_t) fci->param_count, NULL);
+ EX(function_state).arguments = zend_vm_stack_top(TSRMLS_C);
+ zend_vm_stack_push_nocheck((void*)(zend_uintptr_t)fci->param_count TSRMLS_CC);
current_scope = EG(scope);
EG(scope) = calling_scope;
*fci->retval_ptr_ptr = NULL;
}
}
- zend_ptr_stack_clear_multiple(TSRMLS_C);
+ zend_vm_stack_clear_multiple(TSRMLS_C);
if (call_via_handler) {
zval_ptr_dtor(&method_name);
zval_ptr_dtor(¶ms_array);
zval ticks;
} zend_declarables;
+typedef struct _zend_vm_stack *zend_vm_stack;
struct _zend_compiler_globals {
zend_stack bp_stack;
HashTable regular_list;
HashTable persistent_list;
- zend_ptr_stack argument_stack;
+ zend_vm_stack argument_stack;
int user_error_handler_error_reporting;
zval *user_error_handler;
}
zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&ex_object, (void**)&EX(fbc));
- zend_ptr_stack_2_push(&EG(argument_stack), (void *)(zend_uintptr_t)opline->extended_value, NULL);
+ EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
if (EX(function_state).function->common.arg_info) {
zend_uint i=0;
- zval **p;
- ulong arg_count;
-
- p = (zval **) EG(argument_stack).top_element-2;
- arg_count = (ulong)(zend_uintptr_t) *p;
+ zval **p = (zval**)EX(function_state).arguments;
+ ulong arg_count = opline->extended_value;
while (arg_count>0) {
zend_verify_arg_type(EX(function_state).function, ++i, *(p-arg_count), 0 TSRMLS_CC);
}
EX(function_state).function = (zend_function *) EX(op_array);
+ EX(function_state).arguments = NULL;
if (EG(This)) {
if (EG(exception) && IS_CTOR_CALL(EX(called_scope))) {
EG(called_scope) = current_called_scope;
}
- zend_ptr_stack_clear_multiple(TSRMLS_C);
+ zend_vm_stack_clear_multiple(TSRMLS_C);
if (EG(exception)) {
zend_throw_exception_internal(NULL TSRMLS_CC);
if (!IS_OP1_TMP_FREE()) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
FREE_OP1_IF_VAR();
}
ZEND_VM_NEXT_OPCODE();
zval_copy_ctor(varptr);
}
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
FREE_OP1(); /* for string offsets */
ZEND_VM_NEXT_OPCODE();
(Z_REFCOUNT_P(varptr) == 1 && (OP1_TYPE == IS_CV || free_op1.var)))) {
Z_SET_ISREF_P(varptr);
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
} else {
zval *valptr;
if (!IS_OP1_TMP_FREE()) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
FREE_OP1_IF_VAR();
ZEND_VM_NEXT_OPCODE();
SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr);
varptr = *varptr_ptr;
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
FREE_OP1_VAR_PTR();
ZEND_VM_NEXT_OPCODE();
ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY)
{
zend_op *opline = EX(opline);
- zval **param;
zend_uint arg_num = Z_LVAL(opline->op1.u.constant);
+ zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
- if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) {
+ if (param == NULL) {
char *space;
zstr class_name = get_active_class_name(&space TSRMLS_CC);
zend_execute_data *ptr = EX(prev_execute_data);
ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST)
{
zend_op *opline = EX(opline);
- zval **param, *assignment_value, **var_ptr;
+ zval *assignment_value, **var_ptr;
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);
- if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) {
+ if (param == NULL) {
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;
int i;
zend_uint catch_op_num;
int catched = 0;
- zval **stack_zval_pp;
zval restored_error_reporting;
-
- stack_zval_pp = (zval **) EG(argument_stack).top_element - 1;
- while (*stack_zval_pp != NULL) {
- zval_ptr_dtor(stack_zval_pp);
- EG(argument_stack).top_element--;
- EG(argument_stack).top--;
- stack_zval_pp--;
+
+ void **stack_frame = (void**)execute_data +
+ (sizeof(zend_execute_data) +
+ sizeof(zval**) * EX(op_array)->last_var +
+ sizeof(temp_variable) * EX(op_array)->T) / sizeof(void*);
+
+ while (zend_vm_stack_top(TSRMLS_C) != stack_frame) {
+ zval *stack_zval_p = zend_vm_stack_pop(TSRMLS_C);
+ zval_ptr_dtor(&stack_zval_p);
}
for (i=0; i<EG(active_op_array)->last_try_catch; i++) {
#define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);
#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC
+#undef EX
+#define EX(element) execute_data->element
+
ZEND_API void execute(zend_op_array *op_array TSRMLS_DC)
{
- zend_execute_data execute_data;
+ zend_execute_data *execute_data;
if (EG(exception)) {
}
/* Initialize execute_data */
+ execute_data = (zend_execute_data *)zend_vm_stack_alloc(
+ sizeof(zend_execute_data) +
+ sizeof(zval**) * op_array->last_var +
+ sizeof(temp_variable) * op_array->T TSRMLS_CC);
+
+ EX(CVs) = (zval***)((char*)execute_data + sizeof(zend_execute_data));
+ memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
+ EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);
EX(fbc) = NULL;
EX(called_scope) = NULL;
EX(object) = NULL;
EX(old_error_reporting) = NULL;
- if (EXPECTED(op_array->T < TEMP_VAR_STACK_LIMIT && op_array->last_var < TEMP_VAR_STACK_LIMIT)) {
- EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var + sizeof(temp_variable) * op_array->T, EX(use_heap));
- } else {
- SET_ALLOCA_FLAG(EX(use_heap));
- EX(CVs) = (zval***)safe_emalloc(sizeof(temp_variable), op_array->T, sizeof(zval**) * op_array->last_var);
- }
- EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);
- memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
EX(op_array) = op_array;
EX(original_in_execution) = EG(in_execution);
EX(symbol_table) = EG(active_symbol_table);
EX(prev_execute_data) = EG(current_execute_data);
- EG(current_execute_data) = &execute_data;
+ EG(current_execute_data) = execute_data;
EG(in_execution) = 1;
if (op_array->start_op) {
EG(opline_ptr) = &EX(opline);
EX(function_state).function = (zend_function *) op_array;
+ EX(function_state).arguments = NULL;
while (1) {
#ifdef ZEND_WIN32
}
#endif
- if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0) {
+ if (EX(opline)->handler(execute_data TSRMLS_CC) > 0) {
return;
}
zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen");
}
-#undef EX
-#define EX(element) execute_data->element
-
static int ZEND_JMP_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
#if DEBUG_ZEND>=2
}
zend_ptr_stack_3_pop(&EG(arg_types_stack), (void*)&EX(called_scope), (void**)&ex_object, (void**)&EX(fbc));
- zend_ptr_stack_2_push(&EG(argument_stack), (void *)(zend_uintptr_t)opline->extended_value, NULL);
+ EX(function_state).arguments = zend_vm_stack_push_args(opline->extended_value TSRMLS_CC);
EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr;
if (EX(function_state).function->common.arg_info) {
zend_uint i=0;
- zval **p;
- ulong arg_count;
-
- p = (zval **) EG(argument_stack).top_element-2;
- arg_count = (ulong)(zend_uintptr_t) *p;
+ zval **p = (zval**)EX(function_state).arguments;
+ ulong arg_count = opline->extended_value;
while (arg_count>0) {
zend_verify_arg_type(EX(function_state).function, ++i, *(p-arg_count), 0 TSRMLS_CC);
}
EX(function_state).function = (zend_function *) EX(op_array);
+ EX(function_state).arguments = NULL;
if (EG(This)) {
if (EG(exception) && IS_CTOR_CALL(EX(called_scope))) {
EG(called_scope) = current_called_scope;
}
- zend_ptr_stack_clear_multiple(TSRMLS_C);
+ zend_vm_stack_clear_multiple(TSRMLS_C);
if (EG(exception)) {
zend_throw_exception_internal(NULL TSRMLS_CC);
static int ZEND_RECV_SPEC_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval **param;
zend_uint arg_num = Z_LVAL(opline->op1.u.constant);
+ zval **param = zend_vm_stack_get_arg(arg_num TSRMLS_CC);
- if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) {
+ if (param == NULL) {
char *space;
zstr class_name = get_active_class_name(&space TSRMLS_CC);
zend_execute_data *ptr = EX(prev_execute_data);
int i;
zend_uint catch_op_num;
int catched = 0;
- zval **stack_zval_pp;
zval restored_error_reporting;
- stack_zval_pp = (zval **) EG(argument_stack).top_element - 1;
- while (*stack_zval_pp != NULL) {
- zval_ptr_dtor(stack_zval_pp);
- EG(argument_stack).top_element--;
- EG(argument_stack).top--;
- stack_zval_pp--;
+ void **stack_frame = (void**)execute_data +
+ (sizeof(zend_execute_data) +
+ sizeof(zval**) * EX(op_array)->last_var +
+ sizeof(temp_variable) * EX(op_array)->T) / sizeof(void*);
+
+ while (zend_vm_stack_top(TSRMLS_C) != stack_frame) {
+ zval *stack_zval_p = zend_vm_stack_pop(TSRMLS_C);
+ zval_ptr_dtor(&stack_zval_p);
}
for (i=0; i<EG(active_op_array)->last_try_catch; i++) {
static int ZEND_RECV_INIT_SPEC_CONST_HANDLER(ZEND_OPCODE_HANDLER_ARGS)
{
zend_op *opline = EX(opline);
- zval **param, *assignment_value, **var_ptr;
+ zval *assignment_value, **var_ptr;
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);
- if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) {
+ if (param == NULL) {
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;
if (!0) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
ZEND_VM_NEXT_OPCODE();
if (!1) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
ZEND_VM_NEXT_OPCODE();
if (!0) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
}
ZEND_VM_NEXT_OPCODE();
zval_copy_ctor(varptr);
}
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}; /* for string offsets */
ZEND_VM_NEXT_OPCODE();
(Z_REFCOUNT_P(varptr) == 1 && (IS_VAR == IS_CV || free_op1.var)))) {
Z_SET_ISREF_P(varptr);
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
} else {
zval *valptr;
if (!0) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
ZEND_VM_NEXT_OPCODE();
SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr);
varptr = *varptr_ptr;
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
if (free_op1.var) {zval_ptr_dtor(&free_op1.var);};
ZEND_VM_NEXT_OPCODE();
if (!0) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
ZEND_VM_NEXT_OPCODE();
zval_copy_ctor(varptr);
}
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
; /* for string offsets */
ZEND_VM_NEXT_OPCODE();
(Z_REFCOUNT_P(varptr) == 1 && (IS_CV == IS_CV || free_op1.var)))) {
Z_SET_ISREF_P(varptr);
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
} else {
zval *valptr;
if (!0) {
zval_copy_ctor(valptr);
}
- zend_ptr_stack_push(&EG(argument_stack), valptr);
+ zend_vm_stack_push(valptr TSRMLS_CC);
}
ZEND_VM_NEXT_OPCODE();
SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr);
varptr = *varptr_ptr;
Z_ADDREF_P(varptr);
- zend_ptr_stack_push(&EG(argument_stack), varptr);
+ zend_vm_stack_push(varptr TSRMLS_CC);
ZEND_VM_NEXT_OPCODE();
}
ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC)
{
- zend_execute_data execute_data;
+ zend_execute_data *execute_data;
{%HELPER_VARS%}
{%INTERNAL_LABELS%}
}
/* Initialize execute_data */
+ execute_data = (zend_execute_data *)zend_vm_stack_alloc(
+ sizeof(zend_execute_data) +
+ sizeof(zval**) * op_array->last_var +
+ sizeof(temp_variable) * op_array->T TSRMLS_CC);
+
+ EX(CVs) = (zval***)((char*)execute_data + sizeof(zend_execute_data));
+ memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
+ EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);
EX(fbc) = NULL;
EX(called_scope) = NULL;
EX(object) = NULL;
EX(old_error_reporting) = NULL;
- if (EXPECTED(op_array->T < TEMP_VAR_STACK_LIMIT && op_array->last_var < TEMP_VAR_STACK_LIMIT)) {
- EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var + sizeof(temp_variable) * op_array->T, EX(use_heap));
- } else {
- SET_ALLOCA_FLAG(EX(use_heap));
- EX(CVs) = (zval***)safe_emalloc(sizeof(temp_variable), op_array->T, sizeof(zval**) * op_array->last_var);
- }
- EX(Ts) = (temp_variable *)(EX(CVs) + op_array->last_var);
- memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var);
EX(op_array) = op_array;
EX(original_in_execution) = EG(in_execution);
EX(symbol_table) = EG(active_symbol_table);
EX(prev_execute_data) = EG(current_execute_data);
- EG(current_execute_data) = &execute_data;
+ EG(current_execute_data) = execute_data;
EG(in_execution) = 1;
if (op_array->start_op) {
EG(opline_ptr) = &EX(opline);
EX(function_state).function = (zend_function *) op_array;
+ EX(function_state).arguments = NULL;
while (1) {
- {%ZEND_VM_CONTINUE_LABEL%}
+ {%ZEND_VM_CONTINUE_LABEL%}
#ifdef ZEND_WIN32
if (EG(timed_out)) {
zend_timeout(0);
"/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
),
array(
- "&execute_data",
+ "execute_data",
"goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL",
"'goto '.helper_name('\\1',$spec,'$op1','$op2')",
"'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
"/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me",
),
array(
- "&execute_data",
+ "execute_data",
"goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER",
"'goto '.helper_name('\\1',$spec,'$op1','$op2')",
"'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'",
out($f,"#define ZEND_VM_RETURN() return 1\n");
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) return zend_vm_get_opcode_handler(opcode, opline)(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);\n\n");
out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n");
+ out($f,"#undef EX\n");
+ out($f,"#define EX(element) execute_data->element\n\n");
break;
case ZEND_VM_KIND_SWITCH:
out($f,"\n");
out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n");
out($f,"#define ZEND_VM_RETURN() return\n");
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) dispatch_handler = zend_vm_get_opcode_handler(opcode, opline); goto zend_vm_dispatch;\n\n");
- out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL &execute_data TSRMLS_CC\n");
+ out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n");
+ out($f,"#undef EX\n");
+ out($f,"#define EX(element) execute_data->element\n\n");
break;
case ZEND_VM_KIND_GOTO:
out($f,"\n");
out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(EX(opline)->handler)\n");
out($f,"#define ZEND_VM_RETURN() return\n");
out($f,"#define ZEND_VM_DISPATCH(opcode, opline) goto *(void**)(zend_vm_get_opcode_handler(opcode, opline));\n\n");
- out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL &execute_data TSRMLS_CC\n");
+ out($f,"#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU_INTERNAL execute_data TSRMLS_CC\n");
+ out($f,"#undef EX\n");
+ out($f,"#define EX(element) execute_data->element\n\n");
break;
}
break;
// Emit code that dispatches to opcode handler
switch ($kind) {
case ZEND_VM_KIND_CALL:
- out($f, $m[1]."if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0)".$m[3]."\n");
+ out($f, $m[1]."if (EX(opline)->handler(execute_data TSRMLS_CC) > 0)".$m[3]."\n");
break;
case ZEND_VM_KIND_SWITCH:
out($f, $m[1]."dispatch_handler = EX(opline)->handler;\nzend_vm_dispatch:\n".$m[1]."switch ((int)dispatch_handler)".$m[3]."\n");
// Unspecialized executor with CALL threading is the same as the
// old one, so we don't need to produce code twitch
if (!$old || ZEND_VM_SPEC || (ZEND_VM_KIND != ZEND_VM_KIND_CALL)) {
- out($f,"#undef EX\n");
- out($f,"#define EX(element) execute_data->element\n\n");
- // Emit executor code
+ // Emit executor code
gen_executor_code($f, $spec, $kind, $m[1]);
}
}
projects / php / commitdiff