From cf36abb2ebbd82e05eebf587fe891177e577d2da Mon Sep 17 00:00:00 2001 From: Andi Gutmans Date: Fri, 18 Oct 2002 21:19:27 +0000 Subject: [PATCH] - Change opcode dispatch mechanism to use a function per opcode and use - a lookup table using the opcode # to call the correct function. - Still have lots of tuning to do. --- Zend/zend.c | 3 + Zend/zend_compile.c | 2 +- Zend/zend_execute.c | 4428 ++++++++++++++++++++++++------------------- 3 files changed, 2532 insertions(+), 1901 deletions(-) diff --git a/Zend/zend.c b/Zend/zend.c index 0311c3ece5..f2de6f4822 100644 --- a/Zend/zend.c +++ b/Zend/zend.c @@ -390,6 +390,7 @@ static void scanner_globals_ctor(zend_scanner_globals *scanner_globals_p TSRMLS_ scanner_globals_p->yy_start_stack = 0; } +void zend_init_opcodes_handlers(); int zend_startup(zend_utility_functions *utility_functions, char **extensions, int start_builtin_functions) { @@ -435,6 +436,8 @@ int zend_startup(zend_utility_functions *utility_functions, char **extensions, i zend_compile_file = compile_file; zend_execute = execute; + zend_init_opcodes_handlers(); + /* set up version */ zend_version_info = strdup(ZEND_CORE_VERSION_INFO); zend_version_info_length = sizeof(ZEND_CORE_VERSION_INFO)-1; diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 914e4484d6..8c7cf27a8f 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -81,7 +81,7 @@ void zend_init_compiler_data_structures(TSRMLS_D) CG(in_compilation) = 0; init_compiler_declarables(TSRMLS_C); CG(throw_list) = NULL; - zend_register_auto_global("GLOBALS", sizeof("GLOBALS")-1 TSRMLS_CC); + zend_register_auto_global("GLOBALS", sizeof("GLOBALS")-1 TSRMLS_CC); CG(in_clone_method) = 0; } diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index 69b858212a..4871c474ef 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -1159,13 +1159,20 @@ static int zend_check_symbol(zval **pz TSRMLS_DC) #define NEXT_OPCODE() \ CHECK_SYMBOL_TABLES() \ EX(opline)++; \ - continue; + return 0; /* CHECK_ME */ #define RETURN_FROM_EXECUTE_LOOP(execute_data) \ free_alloca(EX(Ts)); \ EG(in_execution) = EX(original_in_execution); \ EG(current_execute_data) = EX(prev_execute_data); \ - return; + return 1; /* CHECK_ME */ + +#define ZEND_OPCODE_HANDLER_ARGS zend_execute_data *execute_data, zend_op_array *op_array TSRMLS_DC +#define ZEND_OPCODE_HANDLER_ARGS_PASSTHRU execute_data, op_array TSRMLS_CC + +typedef int (*opcode_handler_t) (ZEND_OPCODE_HANDLER_ARGS); + +opcode_handler_t zend_opcode_handlers[512]; ZEND_API void execute(zend_op_array *op_array TSRMLS_DC) { @@ -1204,7 +1211,7 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC) */ EX(function_state).function_symbol_table = NULL; #endif - + while (1) { #ifdef ZEND_WIN32 if (EG(timed_out)) { @@ -1213,2002 +1220,2623 @@ ZEND_API void execute(zend_op_array *op_array TSRMLS_DC) #endif zend_clean_garbage(TSRMLS_C); + if (zend_opcode_handlers[EX(opline)->opcode](&execute_data, op_array TSRMLS_CC)) { + return; + } + } + zend_error(E_ERROR, "Arrived at end of main loop which shouldn't happen"); +} - switch(EX(opline)->opcode) { - case ZEND_ADD: - EG(binary_op) = add_function; - goto binary_op_addr; - case ZEND_SUB: - EG(binary_op) = sub_function; - goto binary_op_addr; - case ZEND_MUL: - EG(binary_op) = mul_function; - goto binary_op_addr; - case ZEND_DIV: - EG(binary_op) = div_function; - goto binary_op_addr; - case ZEND_MOD: - EG(binary_op) = mod_function; - goto binary_op_addr; - case ZEND_SL: - EG(binary_op) = shift_left_function; - goto binary_op_addr; - case ZEND_SR: - EG(binary_op) = shift_right_function; - goto binary_op_addr; - case ZEND_CONCAT: - EG(binary_op) = concat_function; - goto binary_op_addr; - case ZEND_IS_IDENTICAL: - EG(binary_op) = is_identical_function; - goto binary_op_addr; - case ZEND_IS_NOT_IDENTICAL: - EG(binary_op) = is_not_identical_function; - goto binary_op_addr; - case ZEND_IS_EQUAL: - EG(binary_op) = is_equal_function; - goto binary_op_addr; - case ZEND_IS_NOT_EQUAL: - EG(binary_op) = is_not_equal_function; - goto binary_op_addr; - case ZEND_IS_SMALLER: - EG(binary_op) = is_smaller_function; - goto binary_op_addr; - case ZEND_IS_SMALLER_OR_EQUAL: - EG(binary_op) = is_smaller_or_equal_function; - goto binary_op_addr; - case ZEND_BW_OR: - EG(binary_op) = bitwise_or_function; - goto binary_op_addr; - case ZEND_BW_AND: - EG(binary_op) = bitwise_and_function; - goto binary_op_addr; - case ZEND_BW_XOR: - EG(binary_op) = bitwise_xor_function; - goto binary_op_addr; - case ZEND_BOOL_XOR: - EG(binary_op) = boolean_xor_function; - /* Fall through */ -binary_op_addr: - EG(binary_op)(&EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), - get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - NEXT_OPCODE(); - case ZEND_BW_NOT: - case ZEND_BOOL_NOT: - EG(unary_op) = get_unary_op(EX(opline)->opcode); - EG(unary_op)(&EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R) ); - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - NEXT_OPCODE(); - case ZEND_ASSIGN_ADD: - EG(binary_op) = add_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_SUB: - EG(binary_op) = sub_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_MUL: - EG(binary_op) = mul_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_DIV: - EG(binary_op) = div_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_MOD: - EG(binary_op) = mod_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_SL: - EG(binary_op) = shift_left_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_SR: - EG(binary_op) = shift_right_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_CONCAT: - EG(binary_op) = concat_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_BW_OR: - EG(binary_op) = bitwise_or_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_BW_AND: - EG(binary_op) = bitwise_and_function; - goto binary_assign_op_addr; - case ZEND_ASSIGN_BW_XOR: - EG(binary_op) = bitwise_xor_function; - /* Fall through */ -binary_assign_op_addr: { - zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); - - if (!var_ptr) { - zend_error(E_ERROR, "Cannot use assign-op operators with overloaded objects nor string offsets"); - } - if (*var_ptr == EG(error_zval_ptr)) { - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EG(uninitialized_zval_ptr); - SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr, &EX(opline)->result); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - } - - SEPARATE_ZVAL_IF_NOT_REF(var_ptr); +/* CHECK_ME */ +#undef EX +#define EX(element) execute_data->element - EG(binary_op)(*var_ptr, *var_ptr, get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = var_ptr; - SELECTIVE_PZVAL_LOCK(*var_ptr, &EX(opline)->result); - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - } - NEXT_OPCODE(); +int zend_add_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + add_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - case ZEND_ASSIGN_ADD_OBJ: - EG(binary_op) = add_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_SUB_OBJ: - EG(binary_op) = sub_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_MUL_OBJ: - EG(binary_op) = mul_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_DIV_OBJ: - EG(binary_op) = div_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_MOD_OBJ: - EG(binary_op) = mod_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_SL_OBJ: - EG(binary_op) = shift_left_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_SR_OBJ: - EG(binary_op) = shift_right_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_CONCAT_OBJ: - EG(binary_op) = concat_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_BW_OR_OBJ: - EG(binary_op) = bitwise_or_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_BW_AND_OBJ: - EG(binary_op) = bitwise_and_function; - goto binary_assign_op_addr_obj; - case ZEND_ASSIGN_BW_XOR_OBJ: - EG(binary_op) = bitwise_xor_function; - /* Fall through */ -binary_assign_op_addr_obj: - zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), EG(binary_op) TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_PRE_INC_OBJ: - case ZEND_PRE_DEC_OBJ: { - int (*incdec_op)(zval *op); +int zend_sub_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + sub_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - get_incdec_op(incdec_op, EX(opline)->opcode); - zend_pre_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), incdec_op TSRMLS_CC); - } - NEXT_OPCODE(); - case ZEND_POST_INC_OBJ: - case ZEND_POST_DEC_OBJ: { - int (*incdec_op)(zval *op); +int zend_mul_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + mul_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - get_incdec_op(incdec_op, EX(opline)->opcode); - zend_post_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), incdec_op TSRMLS_CC); - } - NEXT_OPCODE(); - case ZEND_PRE_INC: - case ZEND_PRE_DEC: - case ZEND_POST_INC: - case ZEND_POST_DEC: { - int (*incdec_op)(zval *op); - zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); - - if (!var_ptr) { - zend_error(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); - } - if (*var_ptr == EG(error_zval_ptr)) { - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EG(uninitialized_zval_ptr); - SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr, &EX(opline)->result); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - } +int zend_div_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + div_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - get_incdec_op(incdec_op, EX(opline)->opcode); +int zend_mod_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + mod_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - switch (EX(opline)->opcode) { - case ZEND_POST_INC: - case ZEND_POST_DEC: - EX(Ts)[EX(opline)->result.u.var].tmp_var = **var_ptr; - zendi_zval_copy_ctor(EX(Ts)[EX(opline)->result.u.var].tmp_var); - break; - } - - SEPARATE_ZVAL_IF_NOT_REF(var_ptr); - - incdec_op(*var_ptr); - switch (EX(opline)->opcode) { - case ZEND_PRE_INC: - case ZEND_PRE_DEC: - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = var_ptr; - SELECTIVE_PZVAL_LOCK(*var_ptr, &EX(opline)->result); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - break; - } - } - NEXT_OPCODE(); - case ZEND_PRINT: - zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 1; - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_LONG; - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - NEXT_OPCODE(); - case ZEND_ECHO: - zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - NEXT_OPCODE(); - case ZEND_FETCH_R: - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_W: - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_W TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_RW: - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_RW TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_FUNC_ARG: - if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { - /* Behave like FETCH_W */ - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_W TSRMLS_CC); - } else { - /* Behave like FETCH_R */ - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - } - NEXT_OPCODE(); - case ZEND_FETCH_UNSET: - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); - PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { - SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - } - PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - NEXT_OPCODE(); - case ZEND_FETCH_IS: - zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_IS TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_R: - if (EX(opline)->extended_value == ZEND_FETCH_ADD_LOCK) { - PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); - } - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_W: - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_RW: - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_IS: - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_FUNC_ARG: - if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { - /* Behave like FETCH_DIM_W */ - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); - } else { - /* Behave like FETCH_DIM_R, except for locking used for list() */ - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - } - NEXT_OPCODE(); - case ZEND_FETCH_DIM_UNSET: - /* Not needed in DIM_UNSET - if (EX(opline)->extended_value == ZEND_FETCH_ADD_LOCK) { - PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); - } - */ - zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { - SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - } - PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_R: - zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_W: - zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_RW: - zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_IS: - zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_FUNC_ARG: - if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { - /* Behave like FETCH_OBJ_W */ - zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); - } else { - zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - } - NEXT_OPCODE(); - case ZEND_FETCH_OBJ_UNSET: - zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); +int zend_sl_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + shift_left_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { - SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - } - PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - NEXT_OPCODE(); - case ZEND_FETCH_DIM_TMP_VAR: - zend_fetch_dimension_address_from_tmp_var(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts) TSRMLS_CC); - AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - case ZEND_MAKE_VAR: { - zval *value, *value2; - - value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - switch(EX(opline)->op1.op_type) { - case IS_TMP_VAR: - value2 = value; - ALLOC_ZVAL(value); - *value = *value2; - value->is_ref = 0; - value->refcount = 0; /* lock will increase this */ - break; - case IS_CONST: - value2 = value; - ALLOC_ZVAL(value); - *value = *value2; - zval_copy_ctor(value); - value->is_ref = 0; - value->refcount = 0; /* lock will increase this */ - break; - } - - EX(Ts)[EX(opline)->result.u.var].var.ptr = value; - PZVAL_LOCK(EX(Ts)[EX(opline)->result.u.var].var.ptr); - } - NEXT_OPCODE(); - case ZEND_ASSIGN_OBJ: - zend_assign_to_object(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts) TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_ASSIGN: { - zval *value; - value = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); +int zend_sr_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + shift_right_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - zend_assign_to_variable(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, value, (EG(free_op2)?IS_TMP_VAR:EX(opline)->op2.op_type), EX(Ts) TSRMLS_CC); - /* zend_assign_to_variable() always takes care of op2, never free it! */ - } - NEXT_OPCODE(); - case ZEND_ASSIGN_REF: - { - zval **value_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op2, EX(Ts), BP_VAR_W); +int zend_concat_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + concat_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - zend_assign_to_variable_reference(&EX(opline)->result, get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W), value_ptr_ptr, EX(Ts) TSRMLS_CC); - NEXT_OPCODE(); - } - case ZEND_JMP: -#if DEBUG_ZEND>=2 - printf("Jumping to %d\n", EX(opline)->op1.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op1.u.opline_num]; - continue; - break; - case ZEND_JMPZ: { - znode *op1 = &EX(opline)->op1; - - if (!i_zend_is_true(get_zval_ptr(op1, EX(Ts), &EG(free_op1), BP_VAR_R))) { -#if DEBUG_ZEND>=2 - printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - FREE_OP(EX(Ts), op1, EG(free_op1)); - continue; - } - FREE_OP(EX(Ts), op1, EG(free_op1)); - } - NEXT_OPCODE(); - case ZEND_JMPNZ: { - znode *op1 = &EX(opline)->op1; - - if (zend_is_true(get_zval_ptr(op1, EX(Ts), &EG(free_op1), BP_VAR_R))) { -#if DEBUG_ZEND>=2 - printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - FREE_OP(EX(Ts), op1, EG(free_op1)); - continue; - } - FREE_OP(EX(Ts), op1, EG(free_op1)); - } - NEXT_OPCODE(); - case ZEND_JMPZNZ: { - znode *res = &EX(opline)->op1; - - if (zend_is_true(get_zval_ptr(res, EX(Ts), &EG(free_op1), BP_VAR_R))) { -#if DEBUG_ZEND>=2 - printf("Conditional jmp on true to %d\n", EX(opline)->extended_value); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; - } else { -#if DEBUG_ZEND>=2 - printf("Conditional jmp on false to %d\n", EX(opline)->op2.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - } - FREE_OP(EX(Ts), res, EG(free_op1)); - } - continue; - break; - case ZEND_JMPZ_EX: { - zend_op *original_opline = EX(opline); - int retval = zend_is_true(get_zval_ptr(&original_opline->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); - - FREE_OP(EX(Ts), &original_opline->op1, EG(free_op1)); - EX(Ts)[original_opline->result.u.var].tmp_var.value.lval = retval; - EX(Ts)[original_opline->result.u.var].tmp_var.type = IS_BOOL; - if (!retval) { -#if DEBUG_ZEND>=2 - printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - continue; - } - } - NEXT_OPCODE(); - case ZEND_JMPNZ_EX: { - zend_op *original_opline = EX(opline); - int retval = zend_is_true(get_zval_ptr(&original_opline->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); - - FREE_OP(EX(Ts), &original_opline->op1, EG(free_op1)); - EX(Ts)[original_opline->result.u.var].tmp_var.value.lval = retval; - EX(Ts)[original_opline->result.u.var].tmp_var.type = IS_BOOL; - if (retval) { -#if DEBUG_ZEND>=2 - printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); -#endif - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - continue; - } - } - NEXT_OPCODE(); - case ZEND_FREE: - zendi_zval_dtor(EX(Ts)[EX(opline)->op1.u.var].tmp_var); - NEXT_OPCODE(); - case ZEND_INIT_STRING: - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.val = emalloc(1); - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.val[0] = 0; - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.len = 0; - EX(Ts)[EX(opline)->result.u.var].tmp_var.refcount = 1; - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_STRING; - EX(Ts)[EX(opline)->result.u.var].tmp_var.is_ref = 0; - NEXT_OPCODE(); - case ZEND_ADD_CHAR: - add_char_to_string( &EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), - &EX(opline)->op2.u.constant); - /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ - NEXT_OPCODE(); - case ZEND_ADD_STRING: - add_string_to_string( &EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), - &EX(opline)->op2.u.constant); - /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ - NEXT_OPCODE(); - case ZEND_ADD_VAR: { - zval *var = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - zval var_copy; - int use_copy; - - zend_make_printable_zval(var, &var_copy, &use_copy); - if (use_copy) { - var = &var_copy; - } - add_string_to_string( &EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), - var); - if (use_copy) { - zval_dtor(var); - } - /* 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_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } - NEXT_OPCODE(); - case ZEND_IMPORT_FUNCTION: - { - zend_class_entry *ce; - zend_function *function; - - ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; +int zend_is_identical_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_identical_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - if (EX(opline)->op2.op_type != IS_UNUSED) { - char *function_name_strval; - int function_name_strlen; +int zend_is_not_identical_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_not_identical_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - function_name_strval = EX(opline)->op2.u.constant.value.str.val; - function_name_strlen = EX(opline)->op2.u.constant.value.str.len; +int zend_is_equal_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_equal_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - if (zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen + 1, (void **) &function)==FAILURE) { - zend_error(E_ERROR, "Import: function %s() not found", function_name_strval); - } - if (zend_hash_add(EG(function_table), function_name_strval, function_name_strlen + 1, function, sizeof(zend_function), NULL) == FAILURE) { - zend_error(E_ERROR, "Import: function %s() already exists in current scope", function_name_strval); - } - function_add_ref(function); - } else { - zend_function tmp_zend_function; +int zend_is_not_equal_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_not_equal_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - zend_hash_copy(EG(function_table), &ce->function_table, (copy_ctor_func_t) function_add_ref, &tmp_zend_function, sizeof(zend_function)); - } - NEXT_OPCODE(); - } - case ZEND_IMPORT_CLASS: - { - zend_class_entry *ce; - zend_class_entry **import_ce; - - ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; - - if (EX(opline)->op2.op_type != IS_UNUSED) { - char *class_name_strval; - int class_name_strlen; - - class_name_strval = EX(opline)->op2.u.constant.value.str.val; - class_name_strlen = EX(opline)->op2.u.constant.value.str.len; - - if (zend_hash_find(&ce->class_table, class_name_strval, class_name_strlen + 1, (void **) &import_ce)==FAILURE) { - zend_error(E_ERROR, "Import: class %s not found", class_name_strval); - } - if (zend_hash_add(EG(class_table), class_name_strval, class_name_strlen + 1, import_ce, sizeof(zend_class_entry *), NULL) == FAILURE) { - zend_error(E_ERROR, "Import: class %s already exists in current scope", class_name_strval); - } - zend_class_add_ref(import_ce); - } else { - zend_class_entry *tmp_zend_class_entry; +int zend_is_smaller_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_smaller_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - zend_hash_copy(EG(class_table), &ce->class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_zend_class_entry, sizeof(zend_class_entry *)); - } +int zend_is_smaller_or_equal_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + is_smaller_or_equal_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - NEXT_OPCODE(); - } - case ZEND_IMPORT_CONST: - { - zend_class_entry *ce; - zval **import_constant; - zend_constant c; - - ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; - if (EX(opline)->op2.op_type != IS_UNUSED) { - char *const_name_strval; - int const_name_strlen; - - const_name_strval = EX(opline)->op2.u.constant.value.str.val; - const_name_strlen = EX(opline)->op2.u.constant.value.str.len; - - if (zend_hash_find(&ce->constants_table, const_name_strval, const_name_strlen + 1, (void **) &import_constant)==FAILURE) { - zend_error(E_ERROR, "Import: constant %s not found", const_name_strval); - } - c.value = **import_constant; - zval_copy_ctor(&c.value); - c.flags = CONST_CS; - c.name = zend_strndup(const_name_strval, const_name_strlen); - c.name_len = const_name_strlen + 1; - - if (zend_register_constant(&c TSRMLS_CC) == FAILURE) { - zend_error(E_ERROR, "Import: unable to register constant %s", const_name_strval); - } - } else { - HashPosition pos; - char *key; - uint key_length; - int key_type; - ulong dummy; - - zend_hash_internal_pointer_reset_ex(&ce->constants_table, &pos); - while (zend_hash_get_current_data_ex(&ce->constants_table, (void **)&import_constant, &pos) == SUCCESS) { - key_type = zend_hash_get_current_key_ex(&ce->constants_table, &key, &key_length, &dummy, 0, &pos); - - c.value = **import_constant; - zval_copy_ctor(&c.value); - c.flags = CONST_CS; - c.name = zend_strndup(key, key_length - 1); - c.name_len = key_length; - - if (zend_register_constant(&c TSRMLS_CC) == FAILURE) { - zend_error(E_ERROR, "Import: unable to register constant %s", key); - } - zend_hash_move_forward_ex(&ce->constants_table, &pos); - } - } - NEXT_OPCODE(); - } - case ZEND_FETCH_CLASS: - { - zend_class_entry **pce; - zend_bool is_const; - char *class_name_strval; - zend_uint class_name_strlen; - zval *class_name; - zval tmp; - int retval; - - if (EX(opline)->op1.op_type == IS_UNUSED) { - if (EX(opline)->extended_value == ZEND_FETCH_CLASS_SELF) { - if (!EG(scope)) { - zend_error(E_ERROR, "Cannot fetch self:: when no class scope is active"); - } - EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(scope); - NEXT_OPCODE(); - } else if (EX(opline)->extended_value == ZEND_FETCH_CLASS_MAIN) { - EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(main_class_ptr); - NEXT_OPCODE(); - } else if (EX(opline)->extended_value == ZEND_FETCH_CLASS_PARENT) { - if (!EG(scope)) { - zend_error(E_ERROR, "Cannot fetch parent:: when no class scope is active"); - } - if (!EG(scope)->parent) { - zend_error(E_ERROR, "Cannot fetch parent:: as current class scope has no parent"); - } - EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(scope)->parent; - NEXT_OPCODE(); - } - } +int zend_bw_or_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + bitwise_or_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - is_const = (EX(opline)->op2.op_type == IS_CONST); +int zend_bw_and_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + bitwise_and_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - if (is_const) { - class_name_strval = EX(opline)->op2.u.constant.value.str.val; - class_name_strlen = EX(opline)->op2.u.constant.value.str.len; - } else { - class_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); +int zend_bw_xor_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + bitwise_xor_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - tmp = *class_name; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - zend_str_tolower(tmp.value.str.val, tmp.value.str.len); +int zend_bool_xor_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + boolean_xor_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + NEXT_OPCODE(); +} - class_name_strval = tmp.value.str.val; - class_name_strlen = tmp.value.str.len; - } - - if (EX(opline)->op1.op_type == IS_UNUSED) { - retval = zend_lookup_class(class_name_strval, class_name_strlen, &pce TSRMLS_CC); - } else { - retval = zend_hash_find(&EX(Ts)[EX(opline)->op1.u.var].EA.class_entry->class_table, class_name_strval, class_name_strlen+1, (void **)&pce); - } +int zend_bw_not_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + bitwise_not_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} - if (retval == FAILURE) { - zend_error(E_ERROR, "Class '%s' not found", class_name_strval); - } else { - EX(Ts)[EX(opline)->result.u.var].EA.class_entry = *pce; - } - if (!is_const) { - zval_dtor(&tmp); - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } - NEXT_OPCODE(); - } - case ZEND_INIT_CTOR_CALL: - { - zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); +int zend_bool_not_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + boolean_not_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R) TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} - if (EX(opline)->op1.op_type == IS_VAR) { - SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr, &EX(opline)->op1); - } +inline int zend_binary_assign_op_helper(void *binary_op_arg, ZEND_OPCODE_HANDLER_ARGS) +{ + zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); + int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC) = binary_op_arg; - /* We are not handling overloaded classes right now */ - EX(object) = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - if (!PZVAL_IS_REF(EX(object))) { - EX(object)->refcount++; /* For $this pointer */ - } else { - zval *this_ptr; + if (!var_ptr) { + zend_error(E_ERROR, "Cannot use assign-op operators with overloaded objects nor string offsets"); + } - ALLOC_ZVAL(this_ptr); - *this_ptr = *EX(object); - INIT_PZVAL(this_ptr); - zval_copy_ctor(this_ptr); - EX(object) = this_ptr; - } + if (*var_ptr == EG(error_zval_ptr)) { + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EG(uninitialized_zval_ptr); + SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr, &EX(opline)->result); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); + } + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); - EX(fbc) = EX(fbc_constructor); - if (EX(fbc)->type == ZEND_USER_FUNCTION) { /* HACK!! */ - /* The scope should be the scope of the class where the constructor - was initially declared in */ - EX(calling_scope) = EX(fbc)->common.scope; - } else { - EX(calling_scope) = NULL; - } + binary_op(*var_ptr, *var_ptr, get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = var_ptr; + SELECTIVE_PZVAL_LOCK(*var_ptr, &EX(opline)->result); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); - NEXT_OPCODE(); - } - case ZEND_INIT_METHOD_CALL: - { - zval *function_name; - char *function_name_strval; - int function_name_strlen; - - zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + NEXT_OPCODE(); +} - function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - function_name_strval = function_name->value.str.val; - function_name_strlen = function_name->value.str.len; +int zend_assign_add_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(add_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - EX(calling_scope) = EG(scope); +int zend_assign_sub_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(sub_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - EX(object) = get_obj_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R TSRMLS_CC); - - if (EX(object) && EX(object)->type == IS_OBJECT) { - EX(fbc) = Z_OBJ_HT_P(EX(object))->get_method(EX(object), function_name_strval, function_name_strlen TSRMLS_CC); - } else { - zend_error(E_ERROR, "Call to a member function on a non-object"); - } - if (!EX(fbc)) { - zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); - } +int zend_assign_mul_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(mul_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - if (!PZVAL_IS_REF(EX(object))) { - EX(object)->refcount++; /* For $this pointer */ - } else { - zval *this_ptr; - ALLOC_ZVAL(this_ptr); - *this_ptr = *EX(object); - INIT_PZVAL(this_ptr); - zval_copy_ctor(this_ptr); - EX(object) = this_ptr; - } +int zend_assign_div_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(div_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - if (EX(fbc)->type == ZEND_USER_FUNCTION) { - EX(calling_scope) = EX(fbc)->common.scope; - } else { - EX(calling_scope) = NULL; - } +int zend_assign_mod_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(mod_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - - NEXT_OPCODE(); - } - case ZEND_INIT_STATIC_METHOD_CALL: - { - zval *function_name; - zend_function *function; - zval tmp; - zend_class_entry *ce; - zend_bool is_const; - char *function_name_strval; - int function_name_strlen; - - zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - - is_const = (EX(opline)->op2.op_type == IS_CONST); - - if (is_const) { - function_name_strval = EX(opline)->op2.u.constant.value.str.val; - function_name_strlen = EX(opline)->op2.u.constant.value.str.len; - } else { - function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); +int zend_assign_sl_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(shift_left_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - tmp = *function_name; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - zend_str_tolower(tmp.value.str.val, tmp.value.str.len); +int zend_assign_sr_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(shift_right_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - function_name_strval = tmp.value.str.val; - function_name_strlen = tmp.value.str.len; - } - - if ((EX(object) = EG(This))) { - EX(object)->refcount++; - } +int zend_assign_concat_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(concat_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; +int zend_assign_bw_or_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(bitwise_or_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - EX(calling_scope) = ce; +int zend_assign_bw_and_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(bitwise_and_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - if (zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen+1, (void **) &function)==FAILURE) { - zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); - } +int zend_assign_bw_xor_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_binary_assign_op_helper(bitwise_xor_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - if (!is_const) { - zval_dtor(&tmp); - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } +int zend_assign_add_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), add_function TSRMLS_CC); + NEXT_OPCODE(); +} - EX(fbc) = function; +int zend_assign_sub_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), sub_function TSRMLS_CC); + NEXT_OPCODE(); +} - NEXT_OPCODE(); - } - case ZEND_INIT_FCALL_BY_NAME: - { - zval *function_name; - zend_function *function; - zval tmp; - zend_bool is_const; - char *function_name_strval; - int function_name_strlen; - - zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - - is_const = (EX(opline)->op2.op_type == IS_CONST); - - if (is_const) { - function_name_strval = EX(opline)->op2.u.constant.value.str.val; - function_name_strlen = EX(opline)->op2.u.constant.value.str.len; - } else { - function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); +int zend_assign_mul_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), mul_function TSRMLS_CC); + NEXT_OPCODE(); +} - tmp = *function_name; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - zend_str_tolower(tmp.value.str.val, tmp.value.str.len); +int zend_assign_div_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), div_function TSRMLS_CC); + NEXT_OPCODE(); +} - function_name_strval = tmp.value.str.val; - function_name_strlen = tmp.value.str.len; - } +int zend_assign_mod_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), mod_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_sl_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), shift_left_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_sr_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), shift_right_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_concat_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), concat_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_bw_or_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), bitwise_or_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_bw_and_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), bitwise_and_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_bw_xor_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object_op(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts), bitwise_xor_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_pre_inc_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_pre_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), increment_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_pre_dec_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_pre_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), decrement_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_post_inc_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_post_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), increment_function TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_post_dec_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_post_incdec_property(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), decrement_function TSRMLS_CC); + NEXT_OPCODE(); +} + +inline int zend_incdec_op_helper(void *incdec_op_arg, ZEND_OPCODE_HANDLER_ARGS) +{ + zval **var_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_RW); + int (*incdec_op)(zval *op1) = incdec_op_arg; + + if (!var_ptr) { + zend_error(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); + } + if (*var_ptr == EG(error_zval_ptr)) { + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EG(uninitialized_zval_ptr); + SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr, &EX(opline)->result); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); + } + + switch (EX(opline)->opcode) { + case ZEND_POST_INC: + case ZEND_POST_DEC: + EX(Ts)[EX(opline)->result.u.var].tmp_var = **var_ptr; + zendi_zval_copy_ctor(EX(Ts)[EX(opline)->result.u.var].tmp_var); + break; + } + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + incdec_op(*var_ptr); + + switch (EX(opline)->opcode) { + case ZEND_PRE_INC: + case ZEND_PRE_DEC: + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = var_ptr; + SELECTIVE_PZVAL_LOCK(*var_ptr, &EX(opline)->result); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + break; + } + NEXT_OPCODE(); +} + +int zend_pre_inc_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_incdec_op_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_pre_dec_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_incdec_op_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_post_inc_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_incdec_op_helper(increment_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_post_dec_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_incdec_op_helper(decrement_function, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_print_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 1; + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_LONG; + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} + +int zend_echo_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_print_variable(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} + +int zend_fetch_r_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_w_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_W TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_rw_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_RW TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { + /* Behave like FETCH_W */ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_W TSRMLS_CC); + } else { + /* Behave like FETCH_R */ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + } + NEXT_OPCODE(); +} + +int zend_fetch_unset_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_R TSRMLS_CC); + PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + } + PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + NEXT_OPCODE(); +} + +int zend_fetch_is_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_var_address(EX(opline), EX(Ts), BP_VAR_IS TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_dim_r_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (EX(opline)->extended_value == ZEND_FETCH_ADD_LOCK) { + PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); + } + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_dim_w_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_dim_rw_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_dim_is_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_dim_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { + /* Behave like FETCH_DIM_W */ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); + } else { + /* Behave like FETCH_DIM_R, except for locking used for list() */ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + } + NEXT_OPCODE(); +} + +int zend_fetch_dim_unset_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + /* Not needed in DIM_UNSET + if (EX(opline)->extended_value == ZEND_FETCH_ADD_LOCK) { + PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); + } + */ + zend_fetch_dimension_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + } + PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + NEXT_OPCODE(); +} + +int zend_fetch_obj_r_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_obj_w_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_obj_rw_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_RW TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_fetch_obj_is_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_IS TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_fetch_obj_func_arg_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->extended_value, EX(fbc), EX(fbc)->common.arg_types)) { + /* Behave like FETCH_OBJ_W */ + zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_W TSRMLS_CC); + } else { + zend_fetch_property_address_read(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + } + NEXT_OPCODE(); +} + +int zend_fetch_obj_unset_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_property_address(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts), BP_VAR_R TSRMLS_CC); + + PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + if (EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + } + PZVAL_LOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + NEXT_OPCODE(); +} + +int zend_fetch_dim_tmp_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_fetch_dimension_address_from_tmp_var(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts) TSRMLS_CC); + AI_USE_PTR(EX(Ts)[EX(opline)->result.u.var].var); + NEXT_OPCODE(); +} + +int zend_make_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *value, *value2; + + value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + switch(EX(opline)->op1.op_type) { + case IS_TMP_VAR: + value2 = value; + ALLOC_ZVAL(value); + *value = *value2; + value->is_ref = 0; + value->refcount = 0; /* lock will increase this */ + break; + case IS_CONST: + value2 = value; + ALLOC_ZVAL(value); + *value = *value2; + zval_copy_ctor(value); + value->is_ref = 0; + value->refcount = 0; /* lock will increase this */ + break; + } + + EX(Ts)[EX(opline)->result.u.var].var.ptr = value; + PZVAL_LOCK(EX(Ts)[EX(opline)->result.u.var].var.ptr); + + NEXT_OPCODE(); +} + +int zend_assign_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_assign_to_object(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, EX(Ts)[EX(opline)->extended_value].var.ptr, EX(Ts) TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_assign_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *value; + value = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + zend_assign_to_variable(&EX(opline)->result, &EX(opline)->op1, &EX(opline)->op2, value, (EG(free_op2)?IS_TMP_VAR:EX(opline)->op2.op_type), EX(Ts) TSRMLS_CC); + /* zend_assign_to_variable() always takes care of op2, never free it! */ + + NEXT_OPCODE(); +} + +int zend_assign_ref_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **value_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op2, EX(Ts), BP_VAR_W); + + zend_assign_to_variable_reference(&EX(opline)->result, get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W), value_ptr_ptr, EX(Ts) TSRMLS_CC); + + NEXT_OPCODE(); +} + +int zend_jmp_handler(ZEND_OPCODE_HANDLER_ARGS) +{ +#if DEBUG_ZEND>=2 + printf("Jumping to %d\n", EX(opline)->op1.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op1.u.opline_num]; + return 0; /* CHECK_ME */ +} + +int zend_jmpz_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + znode *op1 = &EX(opline)->op1; + + if (!i_zend_is_true(get_zval_ptr(op1, EX(Ts), &EG(free_op1), BP_VAR_R))) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + FREE_OP(EX(Ts), op1, EG(free_op1)); + return 0; /* CHECK_ME */ + } + FREE_OP(EX(Ts), op1, EG(free_op1)); + + NEXT_OPCODE(); +} + +int zend_jmpnz_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + znode *op1 = &EX(opline)->op1; + + if (zend_is_true(get_zval_ptr(op1, EX(Ts), &EG(free_op1), BP_VAR_R))) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + FREE_OP(EX(Ts), op1, EG(free_op1)); + return 0; /* CHECK_ME */ + } + FREE_OP(EX(Ts), op1, EG(free_op1)); + + NEXT_OPCODE(); +} + +int zend_jmpznz_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + znode *res = &EX(opline)->op1; + + if (zend_is_true(get_zval_ptr(res, EX(Ts), &EG(free_op1), BP_VAR_R))) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp on true to %d\n", EX(opline)->extended_value); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; + } else { +#if DEBUG_ZEND>=2 + printf("Conditional jmp on false to %d\n", EX(opline)->op2.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + } + FREE_OP(EX(Ts), res, EG(free_op1)); + + return 0; /* CHECK_ME */ +} + +int zend_jmpz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_op *original_opline = EX(opline); + int retval = zend_is_true(get_zval_ptr(&original_opline->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); + + FREE_OP(EX(Ts), &original_opline->op1, EG(free_op1)); + EX(Ts)[original_opline->result.u.var].tmp_var.value.lval = retval; + EX(Ts)[original_opline->result.u.var].tmp_var.type = IS_BOOL; + if (!retval) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + return 0; /* CHECK_ME */ + } + NEXT_OPCODE(); +} + +int zend_jmpnz_ex_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_op *original_opline = EX(opline); + int retval = zend_is_true(get_zval_ptr(&original_opline->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); + + FREE_OP(EX(Ts), &original_opline->op1, EG(free_op1)); + EX(Ts)[original_opline->result.u.var].tmp_var.value.lval = retval; + EX(Ts)[original_opline->result.u.var].tmp_var.type = IS_BOOL; + if (retval) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", EX(opline)->op2.u.opline_num); +#endif + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + return 0; /* CHECK_ME */ + } + NEXT_OPCODE(); +} + +int zend_free_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zendi_zval_dtor(EX(Ts)[EX(opline)->op1.u.var].tmp_var); + NEXT_OPCODE(); +} + +int zend_init_string_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.val = emalloc(1); + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.val[0] = 0; + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.str.len = 0; + EX(Ts)[EX(opline)->result.u.var].tmp_var.refcount = 1; + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_STRING; + EX(Ts)[EX(opline)->result.u.var].tmp_var.is_ref = 0; + NEXT_OPCODE(); +} + +int zend_add_char_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + add_char_to_string(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), + &EX(opline)->op2.u.constant); + /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ + NEXT_OPCODE(); +} + +int zend_add_string_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + add_string_to_string(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), + &EX(opline)->op2.u.constant); + /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ + NEXT_OPCODE(); +} + +int zend_add_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *var = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + zval var_copy; + int use_copy; + + zend_make_printable_zval(var, &var_copy, &use_copy); + if (use_copy) { + var = &var_copy; + } + add_string_to_string( &EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_NA), + var); + if (use_copy) { + zval_dtor(var); + } + /* 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_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + + NEXT_OPCODE(); +} + +int zend_import_function_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry *ce; + zend_function *function; + + ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; + + if (EX(opline)->op2.op_type != IS_UNUSED) { + char *function_name_strval; + int function_name_strlen; + + function_name_strval = EX(opline)->op2.u.constant.value.str.val; + function_name_strlen = EX(opline)->op2.u.constant.value.str.len; + + if (zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen + 1, (void **) &function)==FAILURE) { + zend_error(E_ERROR, "Import: function %s() not found", function_name_strval); + } + if (zend_hash_add(EG(function_table), function_name_strval, function_name_strlen + 1, function, sizeof(zend_function), NULL) == FAILURE) { + zend_error(E_ERROR, "Import: function %s() already exists in current scope", function_name_strval); + } + function_add_ref(function); + } else { + zend_function tmp_zend_function; + + zend_hash_copy(EG(function_table), &ce->function_table, (copy_ctor_func_t) function_add_ref, &tmp_zend_function, sizeof(zend_function)); + } + NEXT_OPCODE(); +} + +int zend_import_class_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry *ce; + zend_class_entry **import_ce; + + ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; + + if (EX(opline)->op2.op_type != IS_UNUSED) { + char *class_name_strval; + int class_name_strlen; + + class_name_strval = EX(opline)->op2.u.constant.value.str.val; + class_name_strlen = EX(opline)->op2.u.constant.value.str.len; + + if (zend_hash_find(&ce->class_table, class_name_strval, class_name_strlen + 1, (void **) &import_ce)==FAILURE) { + zend_error(E_ERROR, "Import: class %s not found", class_name_strval); + } + if (zend_hash_add(EG(class_table), class_name_strval, class_name_strlen + 1, import_ce, sizeof(zend_class_entry *), NULL) == FAILURE) { + zend_error(E_ERROR, "Import: class %s already exists in current scope", class_name_strval); + } + zend_class_add_ref(import_ce); + } else { + zend_class_entry *tmp_zend_class_entry; + + zend_hash_copy(EG(class_table), &ce->class_table, (copy_ctor_func_t) zend_class_add_ref, &tmp_zend_class_entry, sizeof(zend_class_entry *)); + } + + NEXT_OPCODE(); +} + +int zend_import_const_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry *ce; + zval **import_constant; + zend_constant c; + + ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; + if (EX(opline)->op2.op_type != IS_UNUSED) { + char *const_name_strval; + int const_name_strlen; + + const_name_strval = EX(opline)->op2.u.constant.value.str.val; + const_name_strlen = EX(opline)->op2.u.constant.value.str.len; + + if (zend_hash_find(&ce->constants_table, const_name_strval, const_name_strlen + 1, (void **) &import_constant)==FAILURE) { + zend_error(E_ERROR, "Import: constant %s not found", const_name_strval); + } + c.value = **import_constant; + zval_copy_ctor(&c.value); + c.flags = CONST_CS; + c.name = zend_strndup(const_name_strval, const_name_strlen); + c.name_len = const_name_strlen + 1; + + if (zend_register_constant(&c TSRMLS_CC) == FAILURE) { + zend_error(E_ERROR, "Import: unable to register constant %s", const_name_strval); + } + } else { + HashPosition pos; + char *key; + uint key_length; + int key_type; + ulong dummy; + + zend_hash_internal_pointer_reset_ex(&ce->constants_table, &pos); + while (zend_hash_get_current_data_ex(&ce->constants_table, (void **)&import_constant, &pos) == SUCCESS) { + key_type = zend_hash_get_current_key_ex(&ce->constants_table, &key, &key_length, &dummy, 0, &pos); + + c.value = **import_constant; + zval_copy_ctor(&c.value); + c.flags = CONST_CS; + c.name = zend_strndup(key, key_length - 1); + c.name_len = key_length; + + if (zend_register_constant(&c TSRMLS_CC) == FAILURE) { + zend_error(E_ERROR, "Import: unable to register constant %s", key); + } + zend_hash_move_forward_ex(&ce->constants_table, &pos); + } + } + NEXT_OPCODE(); +} + +int zend_fetch_class_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry **pce; + zend_bool is_const; + char *class_name_strval; + zend_uint class_name_strlen; + zval *class_name; + zval tmp; + int retval; + + if (EX(opline)->op1.op_type == IS_UNUSED) { + if (EX(opline)->extended_value == ZEND_FETCH_CLASS_SELF) { + if (!EG(scope)) { + zend_error(E_ERROR, "Cannot fetch self:: when no class scope is active"); + } + EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(scope); + NEXT_OPCODE(); + } else if (EX(opline)->extended_value == ZEND_FETCH_CLASS_MAIN) { + EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(main_class_ptr); + NEXT_OPCODE(); + } else if (EX(opline)->extended_value == ZEND_FETCH_CLASS_PARENT) { + if (!EG(scope)) { + zend_error(E_ERROR, "Cannot fetch parent:: when no class scope is active"); + } + if (!EG(scope)->parent) { + zend_error(E_ERROR, "Cannot fetch parent:: as current class scope has no parent"); + } + EX(Ts)[EX(opline)->result.u.var].EA.class_entry = EG(scope)->parent; + NEXT_OPCODE(); + } + } + + is_const = (EX(opline)->op2.op_type == IS_CONST); + + if (is_const) { + class_name_strval = EX(opline)->op2.u.constant.value.str.val; + class_name_strlen = EX(opline)->op2.u.constant.value.str.len; + } else { + class_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + tmp = *class_name; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + zend_str_tolower(tmp.value.str.val, tmp.value.str.len); + + class_name_strval = tmp.value.str.val; + class_name_strlen = tmp.value.str.len; + } + + if (EX(opline)->op1.op_type == IS_UNUSED) { + retval = zend_lookup_class(class_name_strval, class_name_strlen, &pce TSRMLS_CC); + } else { + retval = zend_hash_find(&EX(Ts)[EX(opline)->op1.u.var].EA.class_entry->class_table, class_name_strval, class_name_strlen+1, (void **)&pce); + } + + if (retval == FAILURE) { + zend_error(E_ERROR, "Class '%s' not found", class_name_strval); + } else { + EX(Ts)[EX(opline)->result.u.var].EA.class_entry = *pce; + } + if (!is_const) { + zval_dtor(&tmp); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + } + NEXT_OPCODE(); +} + +int zend_init_ctor_call_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + + if (EX(opline)->op1.op_type == IS_VAR) { + SELECTIVE_PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr, &EX(opline)->op1); + } + + /* We are not handling overloaded classes right now */ + EX(object) = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + if (!PZVAL_IS_REF(EX(object))) { + EX(object)->refcount++; /* For $this pointer */ + } else { + zval *this_ptr; + + ALLOC_ZVAL(this_ptr); + *this_ptr = *EX(object); + INIT_PZVAL(this_ptr); + zval_copy_ctor(this_ptr); + EX(object) = this_ptr; + } + + EX(fbc) = EX(fbc_constructor); + if (EX(fbc)->type == ZEND_USER_FUNCTION) { /* HACK!! */ + /* The scope should be the scope of the class where the constructor + was initially declared in */ + EX(calling_scope) = EX(fbc)->common.scope; + } else { + EX(calling_scope) = NULL; + } + + NEXT_OPCODE(); +} + +int zend_init_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *function_name; + char *function_name_strval; + int function_name_strlen; + + zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + + function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + function_name_strval = function_name->value.str.val; + function_name_strlen = function_name->value.str.len; + + EX(calling_scope) = EG(scope); + + EX(object) = get_obj_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R TSRMLS_CC); + + if (EX(object) && EX(object)->type == IS_OBJECT) { + EX(fbc) = Z_OBJ_HT_P(EX(object))->get_method(EX(object), function_name_strval, function_name_strlen TSRMLS_CC); + } else { + zend_error(E_ERROR, "Call to a member function on a non-object"); + } + if (!EX(fbc)) { + zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); + } + + if (!PZVAL_IS_REF(EX(object))) { + EX(object)->refcount++; /* For $this pointer */ + } else { + zval *this_ptr; + ALLOC_ZVAL(this_ptr); + *this_ptr = *EX(object); + INIT_PZVAL(this_ptr); + zval_copy_ctor(this_ptr); + EX(object) = this_ptr; + } + + if (EX(fbc)->type == ZEND_USER_FUNCTION) { + EX(calling_scope) = EX(fbc)->common.scope; + } else { + EX(calling_scope) = NULL; + } + + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + + NEXT_OPCODE(); +} + +int zend_init_static_method_call_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *function_name; + zend_function *function; + zval tmp; + zend_class_entry *ce; + zend_bool is_const; + char *function_name_strval; + int function_name_strlen; + + zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + + is_const = (EX(opline)->op2.op_type == IS_CONST); + + if (is_const) { + function_name_strval = EX(opline)->op2.u.constant.value.str.val; + function_name_strlen = EX(opline)->op2.u.constant.value.str.len; + } else { + function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + tmp = *function_name; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + zend_str_tolower(tmp.value.str.val, tmp.value.str.len); + + function_name_strval = tmp.value.str.val; + function_name_strlen = tmp.value.str.len; + } + + if ((EX(object) = EG(This))) { + EX(object)->refcount++; + } + + ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; + + EX(calling_scope) = ce; + + if (zend_hash_find(&ce->function_table, function_name_strval, function_name_strlen+1, (void **) &function)==FAILURE) { + zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); + } + + if (!is_const) { + zval_dtor(&tmp); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + } + + EX(fbc) = function; + + NEXT_OPCODE(); +} + +int zend_init_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *function_name; + zend_function *function; + zval tmp; + zend_bool is_const; + char *function_name_strval; + int function_name_strlen; + + zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + + is_const = (EX(opline)->op2.op_type == IS_CONST); + + if (is_const) { + function_name_strval = EX(opline)->op2.u.constant.value.str.val; + function_name_strlen = EX(opline)->op2.u.constant.value.str.len; + } else { + function_name = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + tmp = *function_name; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + zend_str_tolower(tmp.value.str.val, tmp.value.str.len); + + function_name_strval = tmp.value.str.val; + function_name_strlen = tmp.value.str.len; + } + + + do { + /* + if (EG(scope)) { + if (zend_hash_find(&EG(scope)->function_table, function_name_strval, function_name_strlen+1, (void **) &function) == SUCCESS) { + if ((EX(object) = EG(This))) { + EX(object)->refcount++; + } + EX(calling_scope) = EG(scope); + break; + } + } + */ + if (zend_hash_find(EG(function_table), function_name_strval, function_name_strlen+1, (void **) &function)==FAILURE) { + zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); + } + EX(calling_scope) = function->common.scope; + EX(object) = NULL; + } while (0); + + if (!is_const) { + zval_dtor(&tmp); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + } + EX(fbc) = function; + + NEXT_OPCODE(); +} + +int zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **original_return_value; + zend_class_entry *current_scope; + zval *current_this; + int return_value_used = RETURN_VALUE_USED(EX(opline)); + + zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) EX(opline)->extended_value, NULL); + current_scope = EG(scope); + EG(scope) = EX(calling_scope); + + current_this = EG(This); + EG(This) = EX(object); + + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; + + if (EX(function_state).function->type==ZEND_INTERNAL_FUNCTION) { + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + INIT_ZVAL(*(EX(Ts)[EX(opline)->result.u.var].var.ptr)); + ((zend_internal_function *) EX(function_state).function)->handler(EX(opline)->extended_value, EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(object), return_value_used TSRMLS_CC); + EG(current_execute_data) = execute_data; + EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref = 0; + EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount = 1; + if (!return_value_used) { + zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); + } + } else if (EX(function_state).function->type==ZEND_USER_FUNCTION) { + HashTable *calling_symbol_table; + + EX(Ts)[EX(opline)->result.u.var].var.ptr = NULL; + if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { + /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ + EX(function_state).function_symbol_table = *(EG(symtable_cache_ptr)--); + } else { + ALLOC_HASHTABLE(EX(function_state).function_symbol_table); + zend_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0); + /*printf("Cache miss! Initialized %x\n", function_state.function_symbol_table);*/ + } + calling_symbol_table = EG(active_symbol_table); + EG(active_symbol_table) = EX(function_state).function_symbol_table; + original_return_value = EG(return_value_ptr_ptr); + EG(return_value_ptr_ptr) = EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr; + EG(active_op_array) = (zend_op_array *) EX(function_state).function; + + zend_execute(EG(active_op_array) TSRMLS_CC); + + if (return_value_used && !EX(Ts)[EX(opline)->result.u.var].var.ptr) { + if (!EG(exception)) { + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + INIT_ZVAL(*EX(Ts)[EX(opline)->result.u.var].var.ptr); + } + } else if (!return_value_used && EX(Ts)[EX(opline)->result.u.var].var.ptr) { + zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); + } + + EG(opline_ptr) = &EX(opline); + EG(active_op_array) = op_array; + EG(return_value_ptr_ptr)=original_return_value; + if (EG(symtable_cache_ptr)>=EG(symtable_cache_limit)) { + zend_hash_destroy(EX(function_state).function_symbol_table); + FREE_HASHTABLE(EX(function_state).function_symbol_table); + } else { + *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; + zend_hash_clean(*EG(symtable_cache_ptr)); + } + EG(active_symbol_table) = calling_symbol_table; + } else { /* ZEND_OVERLOADED_FUNCTION */ + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + INIT_ZVAL(*(EX(Ts)[EX(opline)->result.u.var].var.ptr)); + + if (EX(object)) { + Z_OBJ_HT_P(EX(object))->call_method(EX(fbc)->common.function_name, EX(opline)->extended_value, EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(object), return_value_used TSRMLS_CC); + } else { + zend_error(E_ERROR, "Cannot call overloaded function for non-object"); + } + + efree(EX(fbc)); + if (!return_value_used) { + zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); + } + } + zend_ptr_stack_n_pop(&EG(arg_types_stack), 3, &EX(calling_scope), &EX(object), &EX(fbc)); + + EX(function_state).function = (zend_function *) op_array; + EG(function_state_ptr) = &EX(function_state); + zend_ptr_stack_clear_multiple(TSRMLS_C); + + EG(scope) = current_scope; + + if (EG(This)) { + zval_ptr_dtor(&EG(This)); + } + + EG(This) = current_this; + + if (EG(exception)) { + if (EX(opline)->op2.u.opline_num == -1) { + RETURN_FROM_EXECUTE_LOOP(execute_data); + } else { + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + return 0; /* CHECK_ME */ + } + } + + NEXT_OPCODE(); +} + +int zend_do_fcall_by_name_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + EX(function_state).function = EX(fbc); + return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_do_fcall_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *fname = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); + + do { + if (EG(scope)) { + if (zend_hash_find(&EG(scope)->function_table, fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function) == SUCCESS) { + if ((EX(object) = EG(This))) { + EX(object)->refcount++; + } + EX(calling_scope) = EG(scope); + break; + } + } + if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) { + zend_error(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); + } + EX(object) = NULL; + EX(calling_scope) = EX(function_state).function->common.scope; + } while (0); + + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + return zend_do_fcall_common_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_return_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *retval_ptr; + zval **retval_ptr_ptr; + + if ((EG(active_op_array)->return_reference == ZEND_RETURN_REF) && + (EX(opline)->op1.op_type != IS_CONST) && + (EX(opline)->op1.op_type != IS_TMP_VAR)) { + + retval_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W); + + if (!retval_ptr_ptr) { + zend_error(E_ERROR, "Cannot return overloaded elements or string offsets by reference"); + } + + SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr); + (*retval_ptr_ptr)->refcount++; + + (*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr); + } else { + retval_ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + if (!EG(free_op1)) { /* Not a temp var */ + if (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0) { + ALLOC_ZVAL(*(EG(return_value_ptr_ptr))); + **EG(return_value_ptr_ptr) = *retval_ptr; + (*EG(return_value_ptr_ptr))->is_ref = 0; + (*EG(return_value_ptr_ptr))->refcount = 1; + zval_copy_ctor(*EG(return_value_ptr_ptr)); + } else { + *EG(return_value_ptr_ptr) = retval_ptr; + retval_ptr->refcount++; + } + } else { + ALLOC_ZVAL(*(EG(return_value_ptr_ptr))); + **EG(return_value_ptr_ptr) = *retval_ptr; + (*EG(return_value_ptr_ptr))->refcount = 1; + (*EG(return_value_ptr_ptr))->is_ref = 0; + } + } + RETURN_FROM_EXECUTE_LOOP(execute_data); +} + +int zend_throw_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *value; + zval *exception; + + value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + if (value->type != IS_OBJECT) { + zend_error(E_ERROR, "Can only throw objects"); + } + /* Not sure if a complete copy is what we want here */ + MAKE_STD_ZVAL(exception); + *exception = *value; + if (!EG(free_op1)) { + zval_copy_ctor(exception); + } + INIT_PZVAL(exception); + EG(exception) = exception; + + if (EX(opline)->op2.u.opline_num == -1) { + RETURN_FROM_EXECUTE_LOOP(execute_data); + } else { + EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; + return 0; /* CHECK_ME */ + } + NEXT_OPCODE(); +} + +int zend_catch_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry *ce; + + /* Check if this is really an exception, if not, jump over code */ + if (EG(exception) == NULL) { + EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; + return 0; /* CHECK_ME */ + } + ce = Z_OBJCE_P(EG(exception)); + if (ce != EX(Ts)[EX(opline)->op1.u.var].EA.class_entry) { + while (ce->parent) { + if (ce->parent == EX(Ts)[EX(opline)->op1.u.var].EA.class_entry) { + goto exception_should_be_taken; + } + ce = ce->parent; + } + EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; + return 0; /* CHECK_ME */ + } + +exception_should_be_taken: + zend_hash_update(EG(active_symbol_table), EX(opline)->op2.u.constant.value.str.val, + EX(opline)->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL); + EG(exception) = NULL; + NEXT_OPCODE(); +} + +int zend_send_val_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (EX(opline)->extended_value==ZEND_DO_FCALL_BY_NAME + && ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { + zend_error(E_ERROR, "Cannot pass parameter %d by reference", EX(opline)->op2.u.opline_num); + } + { + zval *valptr; + zval *value; + + value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + ALLOC_ZVAL(valptr); + *valptr = *value; + if (!EG(free_op1)) { + zval_copy_ctor(valptr); + } + INIT_PZVAL(valptr); + zend_ptr_stack_push(&EG(argument_stack), valptr); + } + NEXT_OPCODE(); +} + +inline int zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *varptr; + varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + if (varptr == &EG(uninitialized_zval)) { + ALLOC_ZVAL(varptr); + INIT_ZVAL(*varptr); + varptr->refcount = 0; + } else if (PZVAL_IS_REF(varptr)) { + zval *original_var = varptr; + + ALLOC_ZVAL(varptr); + *varptr = *original_var; + varptr->is_ref = 0; + varptr->refcount = 0; + zval_copy_ctor(varptr); + } + varptr->refcount++; + zend_ptr_stack_push(&EG(argument_stack), varptr); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); /* for string offsets */ + + NEXT_OPCODE(); +} + +int zend_send_var_no_ref_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (EX(opline)->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ + if (!(EX(opline)->extended_value & ZEND_ARG_SEND_BY_REF)) { + return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } + } else if (!ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { + return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } + { + zval *varptr; + varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + if (varptr != &EG(uninitialized_zval) && (PZVAL_IS_REF(varptr) || varptr->refcount == 1)) { + varptr->is_ref = 1; + varptr->refcount++; + zend_ptr_stack_push(&EG(argument_stack), varptr); + NEXT_OPCODE(); + } + zend_error(E_ERROR, "Only variables can be passed by reference"); + } + NEXT_OPCODE(); +} + +int zend_send_ref_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **varptr_ptr; + zval *varptr; + varptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W); + + if (!varptr_ptr) { + zend_error(E_ERROR, "Only variables can be passed by reference"); + } + + SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr); + varptr = *varptr_ptr; + varptr->refcount++; + zend_ptr_stack_push(&EG(argument_stack), varptr); + + NEXT_OPCODE(); +} + +int zend_send_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if ((EX(opline)->extended_value == ZEND_DO_FCALL_BY_NAME) + && ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { + return zend_send_ref_handler(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); + } + return zend_send_by_var_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_recv_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **param; + + if (zend_ptr_stack_get_arg(EX(opline)->op1.u.constant.value.lval, (void **) ¶m TSRMLS_CC)==FAILURE) { + zend_error(E_WARNING, "Missing argument %d for %s()\n", EX(opline)->op1.u.constant.value.lval, get_active_function_name(TSRMLS_C)); + if (EX(opline)->result.op_type == IS_VAR) { + PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); + } + } else if (PZVAL_IS_REF(*param)) { + zend_assign_to_variable_reference(NULL, get_zval_ptr_ptr(&EX(opline)->result, EX(Ts), BP_VAR_W), param, NULL TSRMLS_CC); + } else { + zend_assign_to_variable(NULL, &EX(opline)->result, NULL, *param, IS_VAR, EX(Ts) TSRMLS_CC); + } + + NEXT_OPCODE(); +} + +int zend_recv_init_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **param, *assignment_value; + + if (zend_ptr_stack_get_arg(EX(opline)->op1.u.constant.value.lval, (void **) ¶m TSRMLS_CC)==FAILURE) { + if (EX(opline)->op2.u.constant.type == IS_CONSTANT || EX(opline)->op2.u.constant.type==IS_CONSTANT_ARRAY) { + zval *default_value; + + ALLOC_ZVAL(default_value); + *default_value = EX(opline)->op2.u.constant; + if (EX(opline)->op2.u.constant.type==IS_CONSTANT_ARRAY) { + zval_copy_ctor(default_value); + } + default_value->refcount=1; + zval_update_constant(&default_value, 0 TSRMLS_CC); + default_value->refcount=0; + default_value->is_ref=0; + param = &default_value; + assignment_value = default_value; + } else { + param = NULL; + assignment_value = &EX(opline)->op2.u.constant; + } + zend_assign_to_variable(NULL, &EX(opline)->result, NULL, assignment_value, IS_VAR, EX(Ts) TSRMLS_CC); + } else { + assignment_value = *param; + if (PZVAL_IS_REF(assignment_value)) { + zend_assign_to_variable_reference(NULL, get_zval_ptr_ptr(&EX(opline)->result, EX(Ts), BP_VAR_W), param, NULL TSRMLS_CC); + } else { + zend_assign_to_variable(NULL, &EX(opline)->result, NULL, assignment_value, IS_VAR, EX(Ts) TSRMLS_CC); + } + } + + NEXT_OPCODE(); +} + +int zend_bool_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */ + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = zend_is_true(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - do { - /* - if (EG(scope)) { - if (zend_hash_find(&EG(scope)->function_table, function_name_strval, function_name_strlen+1, (void **) &function) == SUCCESS) { - if ((EX(object) = EG(This))) { - EX(object)->refcount++; - } - EX(calling_scope) = EG(scope); - break; - } - } - */ - if (zend_hash_find(EG(function_table), function_name_strval, function_name_strlen+1, (void **) &function)==FAILURE) { - zend_error(E_ERROR, "Call to undefined function: %s()", function_name_strval); - } - EX(calling_scope) = function->common.scope; - EX(object) = NULL; - } while (0); - - if (!is_const) { - zval_dtor(&tmp); - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } - EX(fbc) = function; + NEXT_OPCODE(); +} - NEXT_OPCODE(); - } - case ZEND_DO_FCALL_BY_NAME: - EX(function_state).function = EX(fbc); - goto do_fcall_common; - case ZEND_DO_FCALL: { - zval *fname = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - - do { - if (EG(scope)) { - if (zend_hash_find(&EG(scope)->function_table, fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function) == SUCCESS) { - if ((EX(object) = EG(This))) { - EX(object)->refcount++; - } - EX(calling_scope) = EG(scope); - break; - } - } - if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) { - zend_error(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); - } - EX(object) = NULL; - EX(calling_scope) = EX(function_state).function->common.scope; - } while (0); +inline int zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *nest_levels_zval = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + zval tmp; + int array_offset, nest_levels, original_nest_levels; + zend_brk_cont_element *jmp_to; + + if (nest_levels_zval->type != IS_LONG) { + tmp = *nest_levels_zval; + zval_copy_ctor(&tmp); + convert_to_long(&tmp); + nest_levels = tmp.value.lval; + } else { + nest_levels = nest_levels_zval->value.lval; + } + original_nest_levels = nest_levels; + array_offset = EX(opline)->op1.u.opline_num; + do { + if (array_offset==-1) { + zend_error(E_ERROR, "Cannot break/continue %d level%s", original_nest_levels, (original_nest_levels == 1) ? "" : "s"); + } + jmp_to = &op_array->brk_cont_array[array_offset]; + if (nest_levels>1) { + zend_op *brk_opline = &op_array->opcodes[jmp_to->brk]; - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - - goto do_fcall_common; - } -do_fcall_common: - { - zval **original_return_value; - zend_class_entry *current_scope; - zval *current_this; - int return_value_used = RETURN_VALUE_USED(EX(opline)); - - zend_ptr_stack_n_push(&EG(argument_stack), 2, (void *) EX(opline)->extended_value, NULL); - current_scope = EG(scope); - EG(scope) = EX(calling_scope); - - current_this = EG(This); - EG(This) = EX(object); - - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; - - if (EX(function_state).function->type==ZEND_INTERNAL_FUNCTION) { - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - INIT_ZVAL(*(EX(Ts)[EX(opline)->result.u.var].var.ptr)); - ((zend_internal_function *) EX(function_state).function)->handler(EX(opline)->extended_value, EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(object), return_value_used TSRMLS_CC); - EG(current_execute_data) = &execute_data; - EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref = 0; - EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount = 1; - if (!return_value_used) { - zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); - } - } else if (EX(function_state).function->type==ZEND_USER_FUNCTION) { - HashTable *calling_symbol_table; + switch (brk_opline->opcode) { + case ZEND_SWITCH_FREE: + zend_switch_free(brk_opline, EX(Ts) TSRMLS_CC); + break; + case ZEND_FREE: + zendi_zval_dtor(EX(Ts)[brk_opline->op1.u.var].tmp_var); + break; + } + } + array_offset = jmp_to->parent; + } while (--nest_levels > 0); - EX(Ts)[EX(opline)->result.u.var].var.ptr = NULL; - if (EG(symtable_cache_ptr)>=EG(symtable_cache)) { - /*printf("Cache hit! Reusing %x\n", symtable_cache[symtable_cache_ptr]);*/ - EX(function_state).function_symbol_table = *(EG(symtable_cache_ptr)--); - } else { - ALLOC_HASHTABLE(EX(function_state).function_symbol_table); - zend_hash_init(EX(function_state).function_symbol_table, 0, NULL, ZVAL_PTR_DTOR, 0); - /*printf("Cache miss! Initialized %x\n", function_state.function_symbol_table);*/ - } - calling_symbol_table = EG(active_symbol_table); - EG(active_symbol_table) = EX(function_state).function_symbol_table; - original_return_value = EG(return_value_ptr_ptr); - EG(return_value_ptr_ptr) = EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr; - EG(active_op_array) = (zend_op_array *) EX(function_state).function; - - zend_execute(EG(active_op_array) TSRMLS_CC); - - if (return_value_used && !EX(Ts)[EX(opline)->result.u.var].var.ptr) { - if (!EG(exception)) { - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - INIT_ZVAL(*EX(Ts)[EX(opline)->result.u.var].var.ptr); - } - } else if (!return_value_used && EX(Ts)[EX(opline)->result.u.var].var.ptr) { - zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); - } + if (EX(opline)->opcode == ZEND_BRK) { + EX(opline) = op_array->opcodes+jmp_to->brk; + } else { + EX(opline) = op_array->opcodes+jmp_to->cont; + } + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + return 0; /* CHECK_ME */ +} - EG(opline_ptr) = &EX(opline); - EG(active_op_array) = op_array; - EG(return_value_ptr_ptr)=original_return_value; - if (EG(symtable_cache_ptr)>=EG(symtable_cache_limit)) { - zend_hash_destroy(EX(function_state).function_symbol_table); - FREE_HASHTABLE(EX(function_state).function_symbol_table); - } else { - *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; - zend_hash_clean(*EG(symtable_cache_ptr)); - } - EG(active_symbol_table) = calling_symbol_table; - } else { /* ZEND_OVERLOADED_FUNCTION */ - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - INIT_ZVAL(*(EX(Ts)[EX(opline)->result.u.var].var.ptr)); +int zend_brk_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - if (EX(object)) { - Z_OBJ_HT_P(EX(object))->call_method(EX(fbc)->common.function_name, EX(opline)->extended_value, EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(object), return_value_used TSRMLS_CC); - } else { - zend_error(E_ERROR, "Cannot call overloaded function for non-object"); - } - - efree(EX(fbc)); - if (!return_value_used) { - zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); - } - } - zend_ptr_stack_n_pop(&EG(arg_types_stack), 3, &EX(calling_scope), &EX(object), &EX(fbc)); - - EX(function_state).function = (zend_function *) op_array; - EG(function_state_ptr) = &EX(function_state); - zend_ptr_stack_clear_multiple(TSRMLS_C); +int zend_cont_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_brk_cont_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} - EG(scope) = current_scope; +int zend_case_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + int switch_expr_is_overloaded=0; - if (EG(This)) { - zval_ptr_dtor(&EG(This)); - } + if (EX(opline)->op1.op_type==IS_VAR) { + if (EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr) { + PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); + } else { + switch_expr_is_overloaded = 1; + if (EX(Ts)[EX(opline)->op1.u.var].EA.type==IS_STRING_OFFSET) { + EX(Ts)[EX(opline)->op1.u.var].EA.data.str_offset.str->refcount++; + } + } + } + is_equal_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, + get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), + get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); + + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + if (switch_expr_is_overloaded) { + /* We only free op1 if this is a string offset, + * Since if it is a TMP_VAR, it'll be reused by + * other CASE opcodes (whereas string offsets + * are allocated at each get_zval_ptr()) + */ + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr = NULL; + AI_USE_PTR(EX(Ts)[EX(opline)->op1.u.var].var); + } + NEXT_OPCODE(); +} - EG(This) = current_this; - - if (EG(exception)) { - if (EX(opline)->op2.u.opline_num == -1) { - RETURN_FROM_EXECUTE_LOOP(execute_data); - } else { - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - continue; - } - } - } +int zend_switch_free_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC); + NEXT_OPCODE(); +} + +int zend_new_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + object_init_ex(EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(Ts)[EX(opline)->op1.u.var].EA.class_entry); + EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount=1; + EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref=1; + + NEXT_OPCODE(); +} + +int zend_clone_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *obj = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + EX(Ts)[EX(opline)->result.u.var].var.ptr->value.obj = Z_OBJ_HT_P(obj)->clone_obj(obj TSRMLS_CC); + EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_OBJECT; + EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount=1; + EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref=1; + NEXT_OPCODE(); +} + +int zend_fetch_constant_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_class_entry *ce; + zval **value; + + if (EX(opline)->op1.op_type == IS_UNUSED) { + if (EG(scope)) { + ce = EG(scope); + if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { + zval_update_constant(value, (void *) 1 TSRMLS_CC); + EX(Ts)[EX(opline)->result.u.var].tmp_var = **value; + zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); NEXT_OPCODE(); - case ZEND_RETURN: { - zval *retval_ptr; - zval **retval_ptr_ptr; - - if ((EG(active_op_array)->return_reference == ZEND_RETURN_REF) && - (EX(opline)->op1.op_type != IS_CONST) && - (EX(opline)->op1.op_type != IS_TMP_VAR)) { - - retval_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W); - - if (!retval_ptr_ptr) { - zend_error(E_ERROR, "Cannot return overloaded elements or string offsets by reference"); - } + } + } + if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) { + zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", + EX(opline)->op2.u.constant.value.str.val, + EX(opline)->op2.u.constant.value.str.val); + EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant; + zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + } + NEXT_OPCODE(); + } + + ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; + + if (&ce->constants_table == &EG(main_class_ptr)->constants_table) { + if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) { + zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", + EX(opline)->op2.u.constant.value.str.val, + EX(opline)->op2.u.constant.value.str.val); + EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant; + zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + } + NEXT_OPCODE(); + } + if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { + zval_update_constant(value, (void *) 1 TSRMLS_CC); + EX(Ts)[EX(opline)->result.u.var].tmp_var = **value; + zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + } else { + zend_error(E_ERROR, "Undefined class constant '%s'", EX(opline)->op2.u.constant.value.str.val); + } - SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr); - (*retval_ptr_ptr)->refcount++; - - (*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr); - } else { - retval_ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - if (!EG(free_op1)) { /* Not a temp var */ - if (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0) { - ALLOC_ZVAL(*(EG(return_value_ptr_ptr))); - **EG(return_value_ptr_ptr) = *retval_ptr; - (*EG(return_value_ptr_ptr))->is_ref = 0; - (*EG(return_value_ptr_ptr))->refcount = 1; - zval_copy_ctor(*EG(return_value_ptr_ptr)); - } else { - *EG(return_value_ptr_ptr) = retval_ptr; - retval_ptr->refcount++; - } - } else { - ALLOC_ZVAL(*(EG(return_value_ptr_ptr))); - **EG(return_value_ptr_ptr) = *retval_ptr; - (*EG(return_value_ptr_ptr))->refcount = 1; - (*EG(return_value_ptr_ptr))->is_ref = 0; - } - } - RETURN_FROM_EXECUTE_LOOP(execute_data); - } + NEXT_OPCODE(); +} + +inline int zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *array_ptr = &EX(Ts)[EX(opline)->result.u.var].tmp_var; + zval *expr_ptr, **expr_ptr_ptr = NULL; + zval *offset=get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + if (EX(opline)->extended_value) { + expr_ptr_ptr=get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); + expr_ptr = *expr_ptr_ptr; + } else { + expr_ptr=get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + } + + if (EX(opline)->opcode == ZEND_INIT_ARRAY) { + array_init(array_ptr); + if (!expr_ptr) { + NEXT_OPCODE(); + } + } + if (!EX(opline)->extended_value && EG(free_op1)) { /* temporary variable */ + zval *new_expr; + + ALLOC_ZVAL(new_expr); + *new_expr = *expr_ptr; + expr_ptr = new_expr; + INIT_PZVAL(expr_ptr); + } else { + if (EX(opline)->extended_value) { + SEPARATE_ZVAL_TO_MAKE_IS_REF(expr_ptr_ptr); + expr_ptr = *expr_ptr_ptr; + expr_ptr->refcount++; + } else if (PZVAL_IS_REF(expr_ptr)) { + zval *new_expr; + + ALLOC_ZVAL(new_expr); + *new_expr = *expr_ptr; + expr_ptr = new_expr; + zendi_zval_copy_ctor(*expr_ptr); + INIT_PZVAL(expr_ptr); + } else { + expr_ptr->refcount++; + } + } + if (offset) { + switch(offset->type) { + case IS_DOUBLE: + zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL); + break; + case IS_LONG: + zend_hash_index_update(array_ptr->value.ht, offset->value.lval, &expr_ptr, sizeof(zval *), NULL); + break; + case IS_STRING: + zend_hash_update(array_ptr->value.ht, offset->value.str.val, offset->value.str.len+1, &expr_ptr, sizeof(zval *), NULL); + break; + case IS_NULL: + zend_hash_update(array_ptr->value.ht, "", sizeof(""), &expr_ptr, sizeof(zval *), NULL); break; - case ZEND_THROW: - { - zval *value; - zval *exception; + default: + zval_ptr_dtor(&expr_ptr); + /* do nothing */ + break; + } + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + } else { + zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL); + } + NEXT_OPCODE(); +} - value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - if (value->type != IS_OBJECT) { - zend_error(E_ERROR, "Can only throw objects"); - } - /* Not sure if a complete copy is what we want here */ - MAKE_STD_ZVAL(exception); - *exception = *value; - if (!EG(free_op1)) { - zval_copy_ctor(exception); +int zend_init_array_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_add_array_element_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + return zend_init_add_array_helper(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU); +} + +int zend_cast_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + zval *result = &EX(Ts)[EX(opline)->result.u.var].tmp_var; + + *result = *expr; + if (!EG(free_op1)) { + zendi_zval_copy_ctor(*result); + } + switch (EX(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: + convert_to_string(result); + break; + case IS_ARRAY: + convert_to_array(result); + break; + case IS_OBJECT: + convert_to_object(result); + break; + } + NEXT_OPCODE(); +} + +int zend_include_or_eval_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zend_op_array *new_op_array=NULL; + zval **original_return_value = EG(return_value_ptr_ptr); + int return_value_used; + zval *inc_filename = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + zval tmp_inc_filename; + zend_bool failure_retval=0; + + if (inc_filename->type!=IS_STRING) { + tmp_inc_filename = *inc_filename; + zval_copy_ctor(&tmp_inc_filename); + convert_to_string(&tmp_inc_filename); + inc_filename = &tmp_inc_filename; + } + + return_value_used = RETURN_VALUE_USED(EX(opline)); + + switch (EX(opline)->op2.u.constant.value.lval) { + case ZEND_INCLUDE_ONCE: + case ZEND_REQUIRE_ONCE: { + char *opened_path=NULL; + int dummy = 1; + zend_file_handle file_handle; + + file_handle.handle.fp = zend_fopen(inc_filename->value.str.val, &opened_path); + file_handle.type = ZEND_HANDLE_FP; + file_handle.filename = inc_filename->value.str.val; + file_handle.opened_path = opened_path; + file_handle.free_filename = 0; + + if (file_handle.handle.fp) { + if (!opened_path) { + opened_path = file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len); + } + + if (zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) { + new_op_array = zend_compile_file(&file_handle, (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC); + zend_destroy_file_handle(&file_handle TSRMLS_CC); + opened_path = NULL; /* zend_destroy_file_handle() already frees it */ + } else { + fclose(file_handle.handle.fp); + failure_retval=1; } - INIT_PZVAL(exception); - EG(exception) = exception; - - if (EX(opline)->op2.u.opline_num == -1) { - RETURN_FROM_EXECUTE_LOOP(execute_data); + } else { + if (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) { + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filename); } else { - EX(opline) = &op_array->opcodes[EX(opline)->op2.u.opline_num]; - continue; + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle.filename); } } - NEXT_OPCODE(); - case ZEND_CATCH: - { - zend_class_entry *ce; - - /* Check if this is really an exception, if not, jump over code */ - if (EG(exception) == NULL) { - EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; - continue; - } - ce = Z_OBJCE_P(EG(exception)); - if (ce != EX(Ts)[EX(opline)->op1.u.var].EA.class_entry) { - while (ce->parent) { - if (ce->parent == EX(Ts)[EX(opline)->op1.u.var].EA.class_entry) { - goto exception_should_be_taken; - } - ce = ce->parent; + if (opened_path) { + efree(opened_path); + } + break; + } + break; + case ZEND_INCLUDE: + case ZEND_REQUIRE: + new_op_array = compile_filename(EX(opline)->op2.u.constant.value.lval, inc_filename TSRMLS_CC); + break; + case ZEND_EVAL: { + char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); + + new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); + efree(eval_desc); + } + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + if (inc_filename==&tmp_inc_filename) { + zval_dtor(&tmp_inc_filename); + } + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; + if (new_op_array) { + zval *saved_object; + zend_function *saved_function; + + + EG(return_value_ptr_ptr) = EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr; + EG(active_op_array) = new_op_array; + EX(Ts)[EX(opline)->result.u.var].var.ptr = NULL; + + saved_object = EX(object); + saved_function = EX(function_state).function; + + EX(function_state).function = (zend_function *) new_op_array; + EX(object) = NULL; + + zend_execute(new_op_array TSRMLS_CC); + + EX(function_state).function = saved_function; + EX(object) = saved_object; + + if (!return_value_used) { + if (EX(Ts)[EX(opline)->result.u.var].var.ptr) { + zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); + } + } else { /* return value is used */ + if (!EX(Ts)[EX(opline)->result.u.var].var.ptr) { /* there was no return statement */ + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + INIT_PZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + EX(Ts)[EX(opline)->result.u.var].var.ptr->value.lval = 1; + EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_BOOL; + } + } + + EG(opline_ptr) = &EX(opline); + EG(active_op_array) = op_array; + EG(function_state_ptr) = &EX(function_state); + destroy_op_array(new_op_array); + efree(new_op_array); + } else { + if (return_value_used) { + ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); + INIT_ZVAL(*EX(Ts)[EX(opline)->result.u.var].var.ptr); + EX(Ts)[EX(opline)->result.u.var].var.ptr->value.lval = failure_retval; + EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_BOOL; + } + } + EG(return_value_ptr_ptr) = original_return_value; + NEXT_OPCODE(); +} + +int zend_unset_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval tmp, *variable; + HashTable *target_symbol_table; + + variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + + if (variable->type != IS_STRING) { + tmp = *variable; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + variable = &tmp; + } + + target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS, variable TSRMLS_CC); + + zend_hash_del(target_symbol_table, variable->value.str.val, variable->value.str.len+1); + + if (variable == &tmp) { + zval_dtor(&tmp); + } + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} + +int zend_unset_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **container = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); + zval *offset = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + + if (container) { + HashTable *ht; + + if ((*container)->type == IS_ARRAY) { + ht = (*container)->value.ht; + } else { + ht = NULL; + if ((*container)->type == IS_OBJECT) { + Z_OBJ_HT_P(*container)->unset_property(*container, offset TSRMLS_CC); + } + } + if (ht) { + switch (offset->type) { + case IS_DOUBLE: + case IS_RESOURCE: + case IS_BOOL: + case IS_LONG: + { + long index; + + if (offset->type == IS_DOUBLE) { + index = (long) offset->value.lval; + } else { + index = offset->value.lval; } - EX(opline) = &op_array->opcodes[EX(opline)->extended_value]; - continue; + + zend_hash_index_del(ht, index); + break; } -exception_should_be_taken: - zend_hash_update(EG(active_symbol_table), EX(opline)->op2.u.constant.value.str.val, - EX(opline)->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL); - EG(exception) = NULL; - NEXT_OPCODE(); - } - case ZEND_SEND_VAL: - if (EX(opline)->extended_value==ZEND_DO_FCALL_BY_NAME - && ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { - zend_error(E_ERROR, "Cannot pass parameter %d by reference", EX(opline)->op2.u.opline_num); - } - { - zval *valptr; - zval *value; + case IS_STRING: + zend_hash_del(ht, offset->value.str.val, offset->value.str.len+1); + break; + case IS_NULL: + zend_hash_del(ht, "", sizeof("")); + break; + default: + zend_error(E_WARNING, "Illegal offset type in unset"); + break; + } + } + } else { + /* overloaded element */ + } + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + + NEXT_OPCODE(); +} + +int zend_fe_reset_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *array_ptr, **array_ptr_ptr; + HashTable *fe_ht; + + if (EX(opline)->extended_value) { + array_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); + if (array_ptr_ptr == NULL) { + MAKE_STD_ZVAL(array_ptr); + } else { + SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr); + array_ptr = *array_ptr_ptr; + array_ptr->refcount++; + } + } else { + array_ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + if (EG(free_op1)) { /* IS_TMP_VAR */ + zval *tmp; + + ALLOC_ZVAL(tmp); + *tmp = *array_ptr; + INIT_PZVAL(tmp); + array_ptr = tmp; + } else { + array_ptr->refcount++; + } + } + PZVAL_LOCK(array_ptr); + EX(Ts)[EX(opline)->result.u.var].var.ptr = array_ptr; + EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; + + if ((fe_ht = HASH_OF(array_ptr)) != NULL) { + /* probably redundant */ + zend_hash_internal_pointer_reset(fe_ht); + } else { + /* JMP to the end of foreach - TBD */ + } + NEXT_OPCODE(); +} + +int zend_fe_fetch_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *array = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + zval *result = &EX(Ts)[EX(opline)->result.u.var].tmp_var; + zval **value, *key; + char *str_key; + ulong int_key; + HashTable *fe_ht; + + PZVAL_LOCK(array); + + fe_ht = HASH_OF(array); + if (!fe_ht) { + zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + EX(opline) = op_array->opcodes+EX(opline)->op2.u.opline_num; + return 0; /* CHECK_ME */ + } else if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { + EX(opline) = op_array->opcodes+EX(opline)->op2.u.opline_num; + return 0; /* CHECK_ME */ + } + array_init(result); + + + (*value)->refcount++; + zend_hash_index_update(result->value.ht, 0, value, sizeof(zval *), NULL); + + ALLOC_ZVAL(key); + INIT_PZVAL(key); + switch (zend_hash_get_current_key(fe_ht, &str_key, &int_key, 1)) { + case HASH_KEY_IS_STRING: + key->value.str.val = str_key; + key->value.str.len = strlen(str_key); + key->type = IS_STRING; + break; + case HASH_KEY_IS_LONG: + key->value.lval = int_key; + key->type = IS_LONG; + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + zend_hash_index_update(result->value.ht, 1, &key, sizeof(zval *), NULL); + zend_hash_move_forward(fe_ht); + + NEXT_OPCODE(); +} + +int zend_jmp_no_ctor_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *object_zval; + zend_function *constructor; + + if (EX(opline)->op1.op_type == IS_VAR) { + PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); + } + + object_zval = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + constructor = Z_OBJ_HT_P(object_zval)->get_constructor(object_zval TSRMLS_CC); + + EX(fbc_constructor) = NULL; + if (constructor == NULL) { + EX(opline) = op_array->opcodes + EX(opline)->op2.u.opline_num; + return 0; /* CHECK_ME */ + } else { + EX(fbc_constructor) = constructor; + } + + NEXT_OPCODE(); +} + +int zend_isset_isempty_var_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval tmp, *variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + zval **value; + zend_bool isset = 1; + HashTable *target_symbol_table; + + if (variable->type != IS_STRING) { + tmp = *variable; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + variable = &tmp; + } + + target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS, variable TSRMLS_CC); + + if (zend_hash_find(target_symbol_table, variable->value.str.val, variable->value.str.len+1, (void **) &value) == FAILURE) { + isset = 0; + } + + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; + + switch (EX(opline)->extended_value) { + case ZEND_ISSET: + if (isset && Z_TYPE_PP(value) == IS_NULL) { + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 0; + } else { + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = isset; + } + break; + case ZEND_ISEMPTY: + if (!isset || !zend_is_true(*value)) { + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 1; + } else { + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 0; + } + break; + } - value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + if (variable == &tmp) { + zval_dtor(&tmp); + } + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - ALLOC_ZVAL(valptr); - *valptr = *value; - if (!EG(free_op1)) { - zval_copy_ctor(valptr); - } - INIT_PZVAL(valptr); - zend_ptr_stack_push(&EG(argument_stack), valptr); - } - NEXT_OPCODE(); - case ZEND_SEND_VAR_NO_REF: - if (EX(opline)->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ - if (!(EX(opline)->extended_value & ZEND_ARG_SEND_BY_REF)) { - goto send_by_var; - } - } else if (!ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { - goto send_by_var; - } - { - zval *varptr; - varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - if (varptr != &EG(uninitialized_zval) && (PZVAL_IS_REF(varptr) || varptr->refcount == 1)) { - varptr->is_ref = 1; - varptr->refcount++; - zend_ptr_stack_push(&EG(argument_stack), varptr); - NEXT_OPCODE(); - } - zend_error(E_ERROR, "Only variables can be passed by reference"); - } - NEXT_OPCODE(); - case ZEND_SEND_VAR: - if ((EX(opline)->extended_value == ZEND_DO_FCALL_BY_NAME) - && ARG_SHOULD_BE_SENT_BY_REF(EX(opline)->op2.u.opline_num, EX(fbc), EX(fbc)->common.arg_types)) { - goto send_by_ref; - } -send_by_var: - { - zval *varptr; - varptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - if (varptr == &EG(uninitialized_zval)) { - ALLOC_ZVAL(varptr); - INIT_ZVAL(*varptr); - varptr->refcount = 0; - } else if (PZVAL_IS_REF(varptr)) { - zval *original_var = varptr; - - ALLOC_ZVAL(varptr); - *varptr = *original_var; - varptr->is_ref = 0; - varptr->refcount = 0; - zval_copy_ctor(varptr); - } - varptr->refcount++; - zend_ptr_stack_push(&EG(argument_stack), varptr); - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); /* for string offsets */ - } - NEXT_OPCODE(); -send_by_ref: - case ZEND_SEND_REF: { - zval **varptr_ptr; - zval *varptr; - varptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_W); - - if (!varptr_ptr) { - zend_error(E_ERROR, "Only variables can be passed by reference"); - } + NEXT_OPCODE(); +} - SEPARATE_ZVAL_TO_MAKE_IS_REF(varptr_ptr); - varptr = *varptr_ptr; - varptr->refcount++; - zend_ptr_stack_push(&EG(argument_stack), varptr); - } - NEXT_OPCODE(); - case ZEND_RECV: { - zval **param; +int zend_isset_isempty_dim_obj_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval **container = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); + zval *offset = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); + zval **value = NULL; + int result = 0; - if (zend_ptr_stack_get_arg(EX(opline)->op1.u.constant.value.lval, (void **) ¶m TSRMLS_CC)==FAILURE) { - zend_error(E_WARNING, "Missing argument %d for %s()\n", EX(opline)->op1.u.constant.value.lval, get_active_function_name(TSRMLS_C)); - if (EX(opline)->result.op_type == IS_VAR) { - PZVAL_UNLOCK(*EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr); - } - } else if (PZVAL_IS_REF(*param)) { - zend_assign_to_variable_reference(NULL, get_zval_ptr_ptr(&EX(opline)->result, EX(Ts), BP_VAR_W), param, NULL TSRMLS_CC); - } else { - zend_assign_to_variable(NULL, &EX(opline)->result, NULL, *param, IS_VAR, EX(Ts) TSRMLS_CC); - } - } - NEXT_OPCODE(); - case ZEND_RECV_INIT: { - zval **param, *assignment_value; + if (container) { - if (zend_ptr_stack_get_arg(EX(opline)->op1.u.constant.value.lval, (void **) ¶m TSRMLS_CC)==FAILURE) { - if (EX(opline)->op2.u.constant.type == IS_CONSTANT || EX(opline)->op2.u.constant.type==IS_CONSTANT_ARRAY) { - zval *default_value; + if ((*container)->type == IS_ARRAY) { + HashTable *ht; + int isset = 0; - ALLOC_ZVAL(default_value); - *default_value = EX(opline)->op2.u.constant; - if (EX(opline)->op2.u.constant.type==IS_CONSTANT_ARRAY) { - zval_copy_ctor(default_value); - } - default_value->refcount=1; - zval_update_constant(&default_value, 0 TSRMLS_CC); - default_value->refcount=0; - default_value->is_ref=0; - param = &default_value; - assignment_value = default_value; - } else { - param = NULL; - assignment_value = &EX(opline)->op2.u.constant; - } - zend_assign_to_variable(NULL, &EX(opline)->result, NULL, assignment_value, IS_VAR, EX(Ts) TSRMLS_CC); - } else { - assignment_value = *param; - if (PZVAL_IS_REF(assignment_value)) { - zend_assign_to_variable_reference(NULL, get_zval_ptr_ptr(&EX(opline)->result, EX(Ts), BP_VAR_W), param, NULL TSRMLS_CC); - } else { - zend_assign_to_variable(NULL, &EX(opline)->result, NULL, assignment_value, IS_VAR, EX(Ts) TSRMLS_CC); - } - } - } - NEXT_OPCODE(); - case ZEND_BOOL: - /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */ - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = zend_is_true(get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R)); - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - NEXT_OPCODE(); - case ZEND_BRK: - case ZEND_CONT: { - zval *nest_levels_zval = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - zval tmp; - int array_offset, nest_levels, original_nest_levels; - zend_brk_cont_element *jmp_to; - - if (nest_levels_zval->type != IS_LONG) { - tmp = *nest_levels_zval; - zval_copy_ctor(&tmp); - convert_to_long(&tmp); - nest_levels = tmp.value.lval; - } else { - nest_levels = nest_levels_zval->value.lval; - } - original_nest_levels = nest_levels; - array_offset = EX(opline)->op1.u.opline_num; - do { - if (array_offset==-1) { - zend_error(E_ERROR, "Cannot break/continue %d level%s", original_nest_levels, (original_nest_levels == 1) ? "" : "s"); - } - jmp_to = &op_array->brk_cont_array[array_offset]; - if (nest_levels>1) { - zend_op *brk_opline = &op_array->opcodes[jmp_to->brk]; - - switch (brk_opline->opcode) { - case ZEND_SWITCH_FREE: - zend_switch_free(brk_opline, EX(Ts) TSRMLS_CC); - break; - case ZEND_FREE: - zendi_zval_dtor(EX(Ts)[brk_opline->op1.u.var].tmp_var); - break; - } - } - array_offset = jmp_to->parent; - } while (--nest_levels > 0); + ht = (*container)->value.ht; - if (EX(opline)->opcode == ZEND_BRK) { - EX(opline) = op_array->opcodes+jmp_to->brk; - } else { - EX(opline) = op_array->opcodes+jmp_to->cont; - } - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - continue; - } - /* Never reaches this point */ - case ZEND_CASE: { - int switch_expr_is_overloaded=0; + switch (offset->type) { + case IS_DOUBLE: + case IS_RESOURCE: + case IS_BOOL: + case IS_LONG: + { + long index; - if (EX(opline)->op1.op_type==IS_VAR) { - if (EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr) { - PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); + if (offset->type == IS_DOUBLE) { + index = (long) offset->value.lval; } else { - switch_expr_is_overloaded = 1; - if (EX(Ts)[EX(opline)->op1.u.var].EA.type==IS_STRING_OFFSET) { - EX(Ts)[EX(opline)->op1.u.var].EA.data.str_offset.str->refcount++; - } - } - } - is_equal_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, - get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R), - get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R) TSRMLS_CC); - - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - if (switch_expr_is_overloaded) { - /* We only free op1 if this is a string offset, - * Since if it is a TMP_VAR, it'll be reused by - * other CASE opcodes (whereas string offsets - * are allocated at each get_zval_ptr()) - */ - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr = NULL; - AI_USE_PTR(EX(Ts)[EX(opline)->op1.u.var].var); - } - } - NEXT_OPCODE(); - case ZEND_SWITCH_FREE: - zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC); - NEXT_OPCODE(); - case ZEND_NEW: - { - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - object_init_ex(EX(Ts)[EX(opline)->result.u.var].var.ptr, EX(Ts)[EX(opline)->op1.u.var].EA.class_entry); - EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount=1; - EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref=1; - } - NEXT_OPCODE(); - case ZEND_CLONE: - { - zval *obj = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - EX(Ts)[EX(opline)->result.u.var].var.ptr->value.obj = Z_OBJ_HT_P(obj)->clone_obj(obj TSRMLS_CC); - EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_OBJECT; - EX(Ts)[EX(opline)->result.u.var].var.ptr->refcount=1; - EX(Ts)[EX(opline)->result.u.var].var.ptr->is_ref=1; - NEXT_OPCODE(); - } - case ZEND_FETCH_CONSTANT: - { - zend_class_entry *ce; - zval **value; - - if (EX(opline)->op1.op_type == IS_UNUSED) { - if (EG(scope)) { - ce = EG(scope); - if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { - zval_update_constant(value, (void *) 1 TSRMLS_CC); - EX(Ts)[EX(opline)->result.u.var].tmp_var = **value; - zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); - NEXT_OPCODE(); - } - } - if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) { - zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", - EX(opline)->op2.u.constant.value.str.val, - EX(opline)->op2.u.constant.value.str.val); - EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant; - zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + index = offset->value.lval; } - NEXT_OPCODE(); - } - - ce = EX(Ts)[EX(opline)->op1.u.var].EA.class_entry; - - if (&ce->constants_table == &EG(main_class_ptr)->constants_table) { - if (!zend_get_constant(EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len, &EX(Ts)[EX(opline)->result.u.var].tmp_var TSRMLS_CC)) { - zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", - EX(opline)->op2.u.constant.value.str.val, - EX(opline)->op2.u.constant.value.str.val); - EX(Ts)[EX(opline)->result.u.var].tmp_var = EX(opline)->op2.u.constant; - zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) { + isset = 1; } - NEXT_OPCODE(); + break; } - if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { - zval_update_constant(value, (void *) 1 TSRMLS_CC); - EX(Ts)[EX(opline)->result.u.var].tmp_var = **value; - zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); - } else { - zend_error(E_ERROR, "Undefined class constant '%s'", EX(opline)->op2.u.constant.value.str.val); + case IS_STRING: + if (zend_hash_find(ht, offset->value.str.val, offset->value.str.len+1, (void **) &value) == SUCCESS) { + isset = 1; } - } - NEXT_OPCODE(); - case ZEND_INIT_ARRAY: - case ZEND_ADD_ARRAY_ELEMENT: { - zval *array_ptr = &EX(Ts)[EX(opline)->result.u.var].tmp_var; - zval *expr_ptr, **expr_ptr_ptr = NULL; - zval *offset=get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - - if (EX(opline)->extended_value) { - expr_ptr_ptr=get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); - expr_ptr = *expr_ptr_ptr; - } else { - expr_ptr=get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + break; + case IS_NULL: + if (zend_hash_find(ht, "", sizeof(""), (void **) &value) == SUCCESS) { + isset = 1; } + break; + default: + zend_error(E_WARNING, "Illegal offset type in unset"); - if (EX(opline)->opcode==ZEND_INIT_ARRAY) { - array_init(array_ptr); - if (!expr_ptr) { - NEXT_OPCODE(); - } - } - if (!EX(opline)->extended_value && EG(free_op1)) { /* temporary variable */ - zval *new_expr; - - ALLOC_ZVAL(new_expr); - *new_expr = *expr_ptr; - expr_ptr = new_expr; - INIT_PZVAL(expr_ptr); + break; + } + + switch (EX(opline)->extended_value) { + case ZEND_ISSET: + if (isset && Z_TYPE_PP(value) == IS_NULL) { + result = 0; } else { - if (EX(opline)->extended_value) { - SEPARATE_ZVAL_TO_MAKE_IS_REF(expr_ptr_ptr); - expr_ptr = *expr_ptr_ptr; - expr_ptr->refcount++; - } else if (PZVAL_IS_REF(expr_ptr)) { - zval *new_expr; - - ALLOC_ZVAL(new_expr); - *new_expr = *expr_ptr; - expr_ptr = new_expr; - zendi_zval_copy_ctor(*expr_ptr); - INIT_PZVAL(expr_ptr); - } else { - expr_ptr->refcount++; - } + result = isset; } - if (offset) { - switch(offset->type) { - case IS_DOUBLE: - zend_hash_index_update(array_ptr->value.ht, (long) offset->value.dval, &expr_ptr, sizeof(zval *), NULL); - break; - case IS_LONG: - zend_hash_index_update(array_ptr->value.ht, offset->value.lval, &expr_ptr, sizeof(zval *), NULL); - break; - case IS_STRING: - zend_hash_update(array_ptr->value.ht, offset->value.str.val, offset->value.str.len+1, &expr_ptr, sizeof(zval *), NULL); - break; - case IS_NULL: - zend_hash_update(array_ptr->value.ht, "", sizeof(""), &expr_ptr, sizeof(zval *), NULL); - break; - default: - zval_ptr_dtor(&expr_ptr); - /* do nothing */ - break; - } - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); + break; + case ZEND_ISEMPTY: + if (!isset || !zend_is_true(*value)) { + result = 0; } else { - zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL); - } - } - NEXT_OPCODE(); - case ZEND_CAST: { - zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - zval *result = &EX(Ts)[EX(opline)->result.u.var].tmp_var; - - *result = *expr; - if (!EG(free_op1)) { - zendi_zval_copy_ctor(*result); - } - switch (EX(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: - convert_to_string(result); - break; - case IS_ARRAY: - convert_to_array(result); - break; - case IS_OBJECT: - convert_to_object(result); - break; + result = 1; } - } - NEXT_OPCODE(); - case ZEND_INCLUDE_OR_EVAL: { - zend_op_array *new_op_array=NULL; - zval **original_return_value = EG(return_value_ptr_ptr); - int return_value_used; - zval *inc_filename = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - zval tmp_inc_filename; - zend_bool failure_retval=0; - - if (inc_filename->type!=IS_STRING) { - tmp_inc_filename = *inc_filename; - zval_copy_ctor(&tmp_inc_filename); - convert_to_string(&tmp_inc_filename); - inc_filename = &tmp_inc_filename; - } - - return_value_used = RETURN_VALUE_USED(EX(opline)); - - switch (EX(opline)->op2.u.constant.value.lval) { - case ZEND_INCLUDE_ONCE: - case ZEND_REQUIRE_ONCE: { - char *opened_path=NULL; - int dummy = 1; - zend_file_handle file_handle; - - file_handle.handle.fp = zend_fopen(inc_filename->value.str.val, &opened_path); - file_handle.type = ZEND_HANDLE_FP; - file_handle.filename = inc_filename->value.str.val; - file_handle.opened_path = opened_path; - file_handle.free_filename = 0; - - if (file_handle.handle.fp) { - if (!opened_path) { - opened_path = file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len); - } - - if (zend_hash_add(&EG(included_files), opened_path, strlen(opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) { - new_op_array = zend_compile_file(&file_handle, (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC); - zend_destroy_file_handle(&file_handle TSRMLS_CC); - opened_path = NULL; /* zend_destroy_file_handle() already frees it */ - } else { - fclose(file_handle.handle.fp); - failure_retval=1; - } - } else { - if (EX(opline)->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) { - zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, file_handle.filename); - } else { - zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, file_handle.filename); - } - } - if (opened_path) { - efree(opened_path); - } - break; - } - break; - case ZEND_INCLUDE: - case ZEND_REQUIRE: - new_op_array = compile_filename(EX(opline)->op2.u.constant.value.lval, inc_filename TSRMLS_CC); - break; - case ZEND_EVAL: { - char *eval_desc = zend_make_compiled_string_description("eval()'d code" TSRMLS_CC); + break; + } + } else { + if ((*container)->type == IS_OBJECT) { + result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (EX(opline)->extended_value == ZEND_ISEMPTY) TSRMLS_CC); + } + } + } else { + /* string offsets */ + } + + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; - new_op_array = compile_string(inc_filename, eval_desc TSRMLS_CC); - efree(eval_desc); - } - break; - EMPTY_SWITCH_DEFAULT_CASE() - } - if (inc_filename==&tmp_inc_filename) { - zval_dtor(&tmp_inc_filename); - } - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; - if (new_op_array) { - zval *saved_object; - zend_function *saved_function; - - - EG(return_value_ptr_ptr) = EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr; - EG(active_op_array) = new_op_array; - EX(Ts)[EX(opline)->result.u.var].var.ptr = NULL; - - saved_object = EX(object); - saved_function = EX(function_state).function; - - EX(function_state).function = (zend_function *) new_op_array; - EX(object) = NULL; - - zend_execute(new_op_array TSRMLS_CC); - - EX(function_state).function = saved_function; - EX(object) = saved_object; - - if (!return_value_used) { - if (EX(Ts)[EX(opline)->result.u.var].var.ptr) { - zval_ptr_dtor(&EX(Ts)[EX(opline)->result.u.var].var.ptr); - } - } else { /* return value is used */ - if (!EX(Ts)[EX(opline)->result.u.var].var.ptr) { /* there was no return statement */ - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - INIT_PZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - EX(Ts)[EX(opline)->result.u.var].var.ptr->value.lval = 1; - EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_BOOL; - } - } + switch (EX(opline)->extended_value) { + case ZEND_ISSET: + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = result; + break; + case ZEND_ISEMPTY: + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = !result; + break; + } - EG(opline_ptr) = &EX(opline); - EG(active_op_array) = op_array; - EG(function_state_ptr) = &EX(function_state); - destroy_op_array(new_op_array); - efree(new_op_array); - } else { - if (return_value_used) { - ALLOC_ZVAL(EX(Ts)[EX(opline)->result.u.var].var.ptr); - INIT_ZVAL(*EX(Ts)[EX(opline)->result.u.var].var.ptr); - EX(Ts)[EX(opline)->result.u.var].var.ptr->value.lval = failure_retval; - EX(Ts)[EX(opline)->result.u.var].var.ptr->type = IS_BOOL; - } - } - EG(return_value_ptr_ptr) = original_return_value; - } - NEXT_OPCODE(); - case ZEND_UNSET_VAR: - { - zval tmp, *variable; - HashTable *target_symbol_table; - - variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - if (variable->type != IS_STRING) { - tmp = *variable; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - variable = &tmp; - } + NEXT_OPCODE(); +} - target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS, variable TSRMLS_CC); +int zend_exit_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (EX(opline)->op1.op_type != IS_UNUSED) { + zval *ptr; - zend_hash_del(target_symbol_table, variable->value.str.val, variable->value.str.len+1); + ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + if (Z_TYPE_P(ptr) == IS_LONG) { + EG(exit_status) = Z_LVAL_P(ptr); + } else { + zend_print_variable(ptr); + } + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + } + zend_bailout(); + NEXT_OPCODE(); +} - if (variable == &tmp) { - zval_dtor(&tmp); - } - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - } - NEXT_OPCODE(); - case ZEND_UNSET_DIM_OBJ: { - zval **container = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); - zval *offset = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - - if (container) { - HashTable *ht; +int zend_begin_silence_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = EG(error_reporting); + EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_LONG; /* shouldn't be necessary */ + EG(error_reporting) = 0; + NEXT_OPCODE(); +} - if ((*container)->type == IS_ARRAY) { - ht = (*container)->value.ht; - } else { - ht = NULL; - if ((*container)->type == IS_OBJECT) { - Z_OBJ_HT_P(*container)->unset_property(*container, offset TSRMLS_CC); - } - } - if (ht) { - switch (offset->type) { - case IS_DOUBLE: - case IS_RESOURCE: - case IS_BOOL: - case IS_LONG: - { - long index; - - if (offset->type == IS_DOUBLE) { - index = (long) offset->value.lval; - } else { - index = offset->value.lval; - } - - zend_hash_index_del(ht, index); - break; - } - case IS_STRING: - zend_hash_del(ht, offset->value.str.val, offset->value.str.len+1); - break; - case IS_NULL: - zend_hash_del(ht, "", sizeof("")); - break; - default: - zend_error(E_WARNING, "Illegal offset type in unset"); - break; - } - } - } else { - /* overloaded element */ - } - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } - NEXT_OPCODE(); - case ZEND_FE_RESET: { - zval *array_ptr, **array_ptr_ptr; - HashTable *fe_ht; - - if (EX(opline)->extended_value) { - array_ptr_ptr = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); - if (array_ptr_ptr == NULL) { - MAKE_STD_ZVAL(array_ptr); - } else { - SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr); - array_ptr = *array_ptr_ptr; - array_ptr->refcount++; - } - } else { - array_ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - if (EG(free_op1)) { /* IS_TMP_VAR */ - zval *tmp; - - ALLOC_ZVAL(tmp); - *tmp = *array_ptr; - INIT_PZVAL(tmp); - array_ptr = tmp; - } else { - array_ptr->refcount++; - } - } - PZVAL_LOCK(array_ptr); - EX(Ts)[EX(opline)->result.u.var].var.ptr = array_ptr; - EX(Ts)[EX(opline)->result.u.var].var.ptr_ptr = &EX(Ts)[EX(opline)->result.u.var].var.ptr; +int zend_end_silence_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + EG(error_reporting) = EX(Ts)[EX(opline)->op1.u.var].tmp_var.value.lval; + NEXT_OPCODE(); +} - if ((fe_ht = HASH_OF(array_ptr)) != NULL) { - /* probably redundant */ - zend_hash_internal_pointer_reset(fe_ht); - } else { - /* JMP to the end of foreach - TBD */ - } - } - NEXT_OPCODE(); - case ZEND_FE_FETCH: { - zval *array = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - zval *result = &EX(Ts)[EX(opline)->result.u.var].tmp_var; - zval **value, *key; - char *str_key; - ulong int_key; - HashTable *fe_ht; - - PZVAL_LOCK(array); - - fe_ht = HASH_OF(array); - if (!fe_ht) { - zend_error(E_WARNING, "Invalid argument supplied for foreach()"); - EX(opline) = op_array->opcodes+EX(opline)->op2.u.opline_num; - continue; - } else if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { - EX(opline) = op_array->opcodes+EX(opline)->op2.u.opline_num; - continue; - } - array_init(result); +int zend_qm_assign_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + EX(Ts)[EX(opline)->result.u.var].tmp_var = *value; + if (!EG(free_op1)) { + zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); + } + NEXT_OPCODE(); +} - (*value)->refcount++; - zend_hash_index_update(result->value.ht, 0, value, sizeof(zval *), NULL); +int zend_ext_stmt_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_statement_handler, op_array TSRMLS_CC); + } + NEXT_OPCODE(); +} - ALLOC_ZVAL(key); - INIT_PZVAL(key); - switch (zend_hash_get_current_key(fe_ht, &str_key, &int_key, 1)) { - case HASH_KEY_IS_STRING: - key->value.str.val = str_key; - key->value.str.len = strlen(str_key); - key->type = IS_STRING; - break; - case HASH_KEY_IS_LONG: - key->value.lval = int_key; - key->type = IS_LONG; - break; - EMPTY_SWITCH_DEFAULT_CASE() - } - zend_hash_index_update(result->value.ht, 1, &key, sizeof(zval *), NULL); - zend_hash_move_forward(fe_ht); - } - NEXT_OPCODE(); - case ZEND_JMP_NO_CTOR: { - zval *object_zval; - zend_function *constructor; +int zend_ext_fcall_begin_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, op_array TSRMLS_CC); + } + NEXT_OPCODE(); +} - if (EX(opline)->op1.op_type == IS_VAR) { - PZVAL_LOCK(*EX(Ts)[EX(opline)->op1.u.var].var.ptr_ptr); - } - - object_zval = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - constructor = Z_OBJ_HT_P(object_zval)->get_constructor(object_zval TSRMLS_CC); +int zend_ext_fcall_end_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_end_handler, op_array TSRMLS_CC); + } + NEXT_OPCODE(); +} - EX(fbc_constructor) = NULL; - if (constructor == NULL) { - EX(opline) = op_array->opcodes + EX(opline)->op2.u.opline_num; - continue; - } else { - EX(fbc_constructor) = constructor; - } - - } - NEXT_OPCODE(); - case ZEND_ISSET_ISEMPTY_VAR: - { - zval tmp, *variable = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - zval **value; - zend_bool isset = 1; - HashTable *target_symbol_table; - - if (variable->type != IS_STRING) { - tmp = *variable; - zval_copy_ctor(&tmp); - convert_to_string(&tmp); - variable = &tmp; - } - - target_symbol_table = zend_get_target_symbol_table(EX(opline), EX(Ts), BP_VAR_IS, variable TSRMLS_CC); +int zend_declare_class_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + do_bind_class(EX(opline), EG(function_table), EG(class_table)); + NEXT_OPCODE(); +} - if (zend_hash_find(target_symbol_table, variable->value.str.val, variable->value.str.len+1, (void **) &value) == FAILURE) { - isset = 0; - } - - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; +int zend_declare_inherited_class_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX(Ts)[EX(opline)->extended_value].EA.class_entry); + NEXT_OPCODE(); +} - switch (EX(opline)->extended_value) { - case ZEND_ISSET: - if (isset && Z_TYPE_PP(value) == IS_NULL) { - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 0; - } else { - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = isset; - } - break; - case ZEND_ISEMPTY: - if (!isset || !zend_is_true(*value)) { - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 1; - } else { - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = 0; - } - break; - } +int zend_declare_function_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + do_bind_function(EX(opline), EG(function_table), EG(class_table), 0); + NEXT_OPCODE(); +} - if (variable == &tmp) { - zval_dtor(&tmp); - } - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - } - NEXT_OPCODE(); - case ZEND_ISSET_ISEMPTY_DIM_OBJ: - { - zval **container = get_zval_ptr_ptr(&EX(opline)->op1, EX(Ts), BP_VAR_R); - zval *offset = get_zval_ptr(&EX(opline)->op2, EX(Ts), &EG(free_op2), BP_VAR_R); - zval **value = NULL; - int result = 0; - - if (container) { - - if ((*container)->type == IS_ARRAY) { - HashTable *ht; - int isset = 0; - - ht = (*container)->value.ht; - - switch (offset->type) { - case IS_DOUBLE: - case IS_RESOURCE: - case IS_BOOL: - case IS_LONG: - { - long index; - - if (offset->type == IS_DOUBLE) { - index = (long) offset->value.lval; - } else { - index = offset->value.lval; - } - if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) { - isset = 1; - } - break; - } - case IS_STRING: - if (zend_hash_find(ht, offset->value.str.val, offset->value.str.len+1, (void **) &value) == SUCCESS) { - isset = 1; - } - break; - case IS_NULL: - if (zend_hash_find(ht, "", sizeof(""), (void **) &value) == SUCCESS) { - isset = 1; - } - break; - default: - zend_error(E_WARNING, "Illegal offset type in unset"); - - break; - } - - switch (EX(opline)->extended_value) { - case ZEND_ISSET: - if (isset && Z_TYPE_PP(value) == IS_NULL) { - result = 0; - } else { - result = isset; - } - break; - case ZEND_ISEMPTY: - if (!isset || !zend_is_true(*value)) { - result = 0; - } else { - result = 1; - } - break; - } - } else { - if ((*container)->type == IS_OBJECT) { - result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (EX(opline)->extended_value == ZEND_ISEMPTY) TSRMLS_CC); - } - } - } else { - /* string offsets */ - } - - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_BOOL; +int zend_ticks_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + if (++EG(ticks_count)>=EX(opline)->op1.u.constant.value.lval) { + EG(ticks_count)=0; + if (zend_ticks_function) { + zend_ticks_function(EX(opline)->op1.u.constant.value.lval); + } + } + NEXT_OPCODE(); +} - switch (EX(opline)->extended_value) { - case ZEND_ISSET: - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = result; - break; - case ZEND_ISEMPTY: - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = !result; - break; - } +int zend_is_class_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); + is_class_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, expr, + EX(Ts)[EX(opline)->op2.u.var].EA.class_entry TSRMLS_CC); + FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); + NEXT_OPCODE(); +} - FREE_OP(EX(Ts), &EX(opline)->op2, EG(free_op2)); - } - NEXT_OPCODE(); - break; - case ZEND_EXIT: - if (EX(opline)->op1.op_type != IS_UNUSED) { - zval *ptr; +int zend_ext_nop_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + NEXT_OPCODE(); +} - ptr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - if (Z_TYPE_P(ptr) == IS_LONG) { - EG(exit_status) = Z_LVAL_P(ptr); - } else { - zend_print_variable(ptr); - } - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - } - zend_bailout(); - NEXT_OPCODE(); - case ZEND_BEGIN_SILENCE: - EX(Ts)[EX(opline)->result.u.var].tmp_var.value.lval = EG(error_reporting); - EX(Ts)[EX(opline)->result.u.var].tmp_var.type = IS_LONG; /* shouldn't be necessary */ - EG(error_reporting) = 0; - NEXT_OPCODE(); - case ZEND_END_SILENCE: - EG(error_reporting) = EX(Ts)[EX(opline)->op1.u.var].tmp_var.value.lval; - NEXT_OPCODE(); - case ZEND_QM_ASSIGN: { - zval *value = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); +int zend_nop_handler(ZEND_OPCODE_HANDLER_ARGS) +{ + NEXT_OPCODE(); +} - EX(Ts)[EX(opline)->result.u.var].tmp_var = *value; - if (!EG(free_op1)) { - zval_copy_ctor(&EX(Ts)[EX(opline)->result.u.var].tmp_var); - } - } - NEXT_OPCODE(); - case ZEND_EXT_STMT: - if (!EG(no_extensions)) { - zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_statement_handler, op_array TSRMLS_CC); - } - NEXT_OPCODE(); - case ZEND_EXT_FCALL_BEGIN: - if (!EG(no_extensions)) { - zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, op_array TSRMLS_CC); - } - NEXT_OPCODE(); - case ZEND_EXT_FCALL_END: - if (!EG(no_extensions)) { - zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_end_handler, op_array TSRMLS_CC); - } - NEXT_OPCODE(); - case ZEND_DECLARE_CLASS: - do_bind_class(EX(opline), EG(function_table), EG(class_table)); - NEXT_OPCODE() - break; - case ZEND_DECLARE_INHERITED_CLASS: - do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX(Ts)[EX(opline)->extended_value].EA.class_entry); - NEXT_OPCODE(); - break; - case ZEND_DECLARE_FUNCTION: - do_bind_function(EX(opline), EG(function_table), EG(class_table), 0); - NEXT_OPCODE(); - case ZEND_TICKS: - if (++EG(ticks_count)>=EX(opline)->op1.u.constant.value.lval) { - EG(ticks_count)=0; - if (zend_ticks_function) { - zend_ticks_function(EX(opline)->op1.u.constant.value.lval); - } - } - NEXT_OPCODE(); - case ZEND_IS_CLASS: { - zval *expr = get_zval_ptr(&EX(opline)->op1, EX(Ts), &EG(free_op1), BP_VAR_R); - is_class_function(&EX(Ts)[EX(opline)->result.u.var].tmp_var, expr, - EX(Ts)[EX(opline)->op2.u.var].EA.class_entry TSRMLS_CC); - FREE_OP(EX(Ts), &EX(opline)->op1, EG(free_op1)); - } - NEXT_OPCODE(); - case ZEND_EXT_NOP: - case ZEND_NOP: - NEXT_OPCODE(); - EMPTY_SWITCH_DEFAULT_CASE() - } - } - zend_error(E_ERROR, "Arrived at end of main loop which shouldn't happen"); +void zend_init_opcodes_handlers() +{ + zend_opcode_handlers[ZEND_NOP] = zend_nop_handler; + zend_opcode_handlers[ZEND_ADD] = zend_add_handler; + zend_opcode_handlers[ZEND_SUB] = zend_sub_handler; + zend_opcode_handlers[ZEND_MUL] = zend_mul_handler; + zend_opcode_handlers[ZEND_DIV] = zend_div_handler; + zend_opcode_handlers[ZEND_MOD] = zend_mod_handler; + zend_opcode_handlers[ZEND_SL] = zend_sl_handler; + zend_opcode_handlers[ZEND_SR] = zend_sr_handler; + zend_opcode_handlers[ZEND_CONCAT] = zend_concat_handler; + zend_opcode_handlers[ZEND_BW_OR] = zend_bw_or_handler; + zend_opcode_handlers[ZEND_BW_AND] = zend_bw_and_handler; + zend_opcode_handlers[ZEND_BW_XOR] = zend_bw_xor_handler; + zend_opcode_handlers[ZEND_BW_NOT] = zend_bw_not_handler; + zend_opcode_handlers[ZEND_BOOL_NOT] = zend_bool_not_handler; + zend_opcode_handlers[ZEND_BOOL_XOR] = zend_bool_xor_handler; + zend_opcode_handlers[ZEND_IS_IDENTICAL] = zend_is_identical_handler; + zend_opcode_handlers[ZEND_IS_NOT_IDENTICAL] = zend_is_not_identical_handler; + zend_opcode_handlers[ZEND_IS_EQUAL] = zend_is_equal_handler; + zend_opcode_handlers[ZEND_IS_NOT_EQUAL] = zend_is_not_equal_handler; + zend_opcode_handlers[ZEND_IS_SMALLER] = zend_is_smaller_handler; + zend_opcode_handlers[ZEND_IS_SMALLER_OR_EQUAL] = zend_is_smaller_or_equal_handler; + zend_opcode_handlers[ZEND_CAST] = zend_cast_handler; + zend_opcode_handlers[ZEND_QM_ASSIGN] = zend_qm_assign_handler; + + zend_opcode_handlers[ZEND_ASSIGN_ADD] = zend_assign_add_handler; + zend_opcode_handlers[ZEND_ASSIGN_SUB] = zend_assign_sub_handler; + zend_opcode_handlers[ZEND_ASSIGN_MUL] = zend_assign_mul_handler; + zend_opcode_handlers[ZEND_ASSIGN_DIV] = zend_assign_div_handler; + zend_opcode_handlers[ZEND_ASSIGN_MOD] = zend_assign_mod_handler; + zend_opcode_handlers[ZEND_ASSIGN_SL] = zend_assign_sl_handler; + zend_opcode_handlers[ZEND_ASSIGN_SR] = zend_assign_sr_handler; + zend_opcode_handlers[ZEND_ASSIGN_CONCAT] = zend_assign_concat_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_OR] = zend_assign_bw_or_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_AND] = zend_assign_bw_and_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_XOR] = zend_assign_bw_xor_handler; + + zend_opcode_handlers[ZEND_PRE_INC] = zend_pre_inc_handler; + zend_opcode_handlers[ZEND_PRE_DEC] = zend_pre_dec_handler; + zend_opcode_handlers[ZEND_POST_INC] = zend_post_inc_handler; + zend_opcode_handlers[ZEND_POST_DEC] = zend_post_dec_handler; + + zend_opcode_handlers[ZEND_ASSIGN] = zend_assign_handler; + zend_opcode_handlers[ZEND_ASSIGN_REF] = zend_assign_ref_handler; + + zend_opcode_handlers[ZEND_ECHO] = zend_echo_handler; + zend_opcode_handlers[ZEND_PRINT] = zend_print_handler; + + zend_opcode_handlers[ZEND_JMP] = zend_jmp_handler; + zend_opcode_handlers[ZEND_JMPZ] = zend_jmpz_handler; + zend_opcode_handlers[ZEND_JMPNZ] = zend_jmpnz_handler; + zend_opcode_handlers[ZEND_JMPZNZ] = zend_jmpznz_handler; + zend_opcode_handlers[ZEND_JMPZ_EX] = zend_jmpz_ex_handler; + zend_opcode_handlers[ZEND_JMPNZ_EX] = zend_jmpnz_ex_handler; + zend_opcode_handlers[ZEND_CASE] = zend_case_handler; + zend_opcode_handlers[ZEND_SWITCH_FREE] = zend_switch_free_handler; + zend_opcode_handlers[ZEND_BRK] = zend_brk_handler; + zend_opcode_handlers[ZEND_CONT] = zend_cont_handler; + zend_opcode_handlers[ZEND_BOOL] = zend_bool_handler; + + zend_opcode_handlers[ZEND_INIT_STRING] = zend_init_string_handler; + zend_opcode_handlers[ZEND_ADD_CHAR] = zend_add_char_handler; + zend_opcode_handlers[ZEND_ADD_STRING] = zend_add_string_handler; + zend_opcode_handlers[ZEND_ADD_VAR] = zend_add_var_handler; + + zend_opcode_handlers[ZEND_BEGIN_SILENCE] = zend_begin_silence_handler; + zend_opcode_handlers[ZEND_END_SILENCE] = zend_end_silence_handler; + + zend_opcode_handlers[ZEND_INIT_FCALL_BY_NAME] = zend_init_fcall_by_name_handler; + zend_opcode_handlers[ZEND_DO_FCALL] = zend_do_fcall_handler; + zend_opcode_handlers[ZEND_DO_FCALL_BY_NAME] = zend_do_fcall_by_name_handler; + zend_opcode_handlers[ZEND_RETURN] = zend_return_handler; + + zend_opcode_handlers[ZEND_RECV] = zend_recv_handler; + zend_opcode_handlers[ZEND_RECV_INIT] = zend_recv_init_handler; + + zend_opcode_handlers[ZEND_SEND_VAL] = zend_send_val_handler; + zend_opcode_handlers[ZEND_SEND_VAR] = zend_send_var_handler; + zend_opcode_handlers[ZEND_SEND_REF] = zend_send_ref_handler; + + zend_opcode_handlers[ZEND_NEW] = zend_new_handler; + zend_opcode_handlers[ZEND_JMP_NO_CTOR] = zend_jmp_no_ctor_handler; + zend_opcode_handlers[ZEND_FREE] = zend_free_handler; + + zend_opcode_handlers[ZEND_INIT_ARRAY] = zend_init_array_handler; + zend_opcode_handlers[ZEND_ADD_ARRAY_ELEMENT] = zend_add_array_element_handler; + + zend_opcode_handlers[ZEND_INCLUDE_OR_EVAL] = zend_include_or_eval_handler; + + zend_opcode_handlers[ZEND_UNSET_VAR] = zend_unset_var_handler; + zend_opcode_handlers[ZEND_UNSET_DIM_OBJ] = zend_unset_dim_obj_handler; + + zend_opcode_handlers[ZEND_FE_RESET] = zend_fe_reset_handler; + zend_opcode_handlers[ZEND_FE_FETCH] = zend_fe_fetch_handler; + + zend_opcode_handlers[ZEND_EXIT] = zend_exit_handler; + + zend_opcode_handlers[ZEND_FETCH_R] = zend_fetch_r_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_R] = zend_fetch_dim_r_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_R] = zend_fetch_obj_r_handler; + zend_opcode_handlers[ZEND_FETCH_W] = zend_fetch_w_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_W] = zend_fetch_dim_w_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_W] = zend_fetch_obj_w_handler; + zend_opcode_handlers[ZEND_FETCH_RW] = zend_fetch_rw_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_RW] = zend_fetch_dim_rw_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_RW] = zend_fetch_obj_rw_handler; + zend_opcode_handlers[ZEND_FETCH_IS] = zend_fetch_is_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_IS] = zend_fetch_dim_is_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_IS] = zend_fetch_obj_is_handler; + zend_opcode_handlers[ZEND_FETCH_FUNC_ARG] = zend_fetch_func_arg_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_FUNC_ARG] = zend_fetch_dim_func_arg_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_FUNC_ARG] = zend_fetch_obj_func_arg_handler; + zend_opcode_handlers[ZEND_FETCH_UNSET] = zend_fetch_unset_handler; + zend_opcode_handlers[ZEND_FETCH_DIM_UNSET] = zend_fetch_dim_unset_handler; + zend_opcode_handlers[ZEND_FETCH_OBJ_UNSET] = zend_fetch_obj_unset_handler; + + zend_opcode_handlers[ZEND_FETCH_DIM_TMP_VAR] = zend_fetch_dim_tmp_var_handler; + zend_opcode_handlers[ZEND_FETCH_CONSTANT] = zend_fetch_constant_handler; + + zend_opcode_handlers[ZEND_EXT_STMT] = zend_ext_stmt_handler; + zend_opcode_handlers[ZEND_EXT_FCALL_BEGIN] = zend_ext_fcall_begin_handler; + zend_opcode_handlers[ZEND_EXT_FCALL_END] = zend_ext_fcall_end_handler; + zend_opcode_handlers[ZEND_EXT_NOP] = zend_ext_nop_handler; + + zend_opcode_handlers[ZEND_TICKS] = zend_ticks_handler; + + zend_opcode_handlers[ZEND_SEND_VAR_NO_REF] = zend_send_var_no_ref_handler; + + zend_opcode_handlers[ZEND_CATCH] = zend_catch_handler; + zend_opcode_handlers[ZEND_THROW] = zend_throw_handler; + + zend_opcode_handlers[ZEND_FETCH_CLASS] = zend_fetch_class_handler; + + zend_opcode_handlers[ZEND_CLONE] = zend_clone_handler; + + zend_opcode_handlers[ZEND_INIT_CTOR_CALL] = zend_init_ctor_call_handler; + zend_opcode_handlers[ZEND_INIT_METHOD_CALL] = zend_init_method_call_handler; + zend_opcode_handlers[ZEND_INIT_STATIC_METHOD_CALL] = zend_init_static_method_call_handler; + + zend_opcode_handlers[ZEND_ISSET_ISEMPTY_VAR] = zend_isset_isempty_var_handler; + zend_opcode_handlers[ZEND_ISSET_ISEMPTY_DIM_OBJ] = zend_isset_isempty_dim_obj_handler; + + zend_opcode_handlers[ZEND_IMPORT_FUNCTION] = zend_import_function_handler; + zend_opcode_handlers[ZEND_IMPORT_CLASS] = zend_import_class_handler; + zend_opcode_handlers[ZEND_IMPORT_CONST] = zend_import_const_handler; + + zend_opcode_handlers[ZEND_ASSIGN_ADD_OBJ] = zend_assign_add_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_SUB_OBJ] = zend_assign_sub_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_MUL_OBJ] = zend_assign_mul_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_DIV_OBJ] = zend_assign_div_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_MOD_OBJ] = zend_assign_mod_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_SL_OBJ] = zend_assign_sl_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_SR_OBJ] = zend_assign_sr_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_CONCAT_OBJ] = zend_assign_concat_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_OR_OBJ] = zend_assign_bw_or_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_AND_OBJ] = zend_assign_bw_and_obj_handler; + zend_opcode_handlers[ZEND_ASSIGN_BW_XOR_OBJ] = zend_assign_bw_xor_obj_handler; + + zend_opcode_handlers[ZEND_PRE_INC_OBJ] = zend_pre_inc_obj_handler; + zend_opcode_handlers[ZEND_PRE_DEC_OBJ] = zend_pre_dec_obj_handler; + zend_opcode_handlers[ZEND_POST_INC_OBJ] = zend_post_inc_obj_handler; + zend_opcode_handlers[ZEND_POST_DEC_OBJ] = zend_post_dec_obj_handler; + + zend_opcode_handlers[ZEND_ASSIGN_OBJ] = zend_assign_obj_handler; + zend_opcode_handlers[ZEND_MAKE_VAR] = zend_make_var_handler; + + zend_opcode_handlers[ZEND_IS_CLASS] = zend_is_class_handler; + + zend_opcode_handlers[ZEND_DECLARE_CLASS] = zend_declare_class_handler; + zend_opcode_handlers[ZEND_DECLARE_INHERITED_CLASS] = zend_declare_inherited_class_handler; + zend_opcode_handlers[ZEND_DECLARE_FUNCTION] = zend_declare_function_handler; } -- 2.50.1