From: Andi Gutmans Date: Fri, 22 Oct 2004 21:42:14 +0000 (+0000) Subject: - Commit new VM X-Git-Tag: RELEASE_0_2~843 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e50a6fde116a76e1f4d0b8d62873d885eb36851e;p=php - Commit new VM - Old one is tagged as PRE_NEW_VM_GEN_PATCH - Still doing work so more commits to come. Don't complain (yet) :) --- diff --git a/Zend/Makefile.frag b/Zend/Makefile.frag index f87f1dd915..5c78571f16 100755 --- a/Zend/Makefile.frag +++ b/Zend/Makefile.frag @@ -1 +1 @@ -Zend/zend_execute.lo: $(srcdir)/zend_vm_spec.h $(srcdir)/zend_vm_handlers.h +Zend/zend_execute.lo: $(srcdir)/zend_vm_execute.h diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c index bc2888f471..b0115d54e6 100644 --- a/Zend/zend_execute.c +++ b/Zend/zend_execute.c @@ -36,6 +36,21 @@ #include "zend_exceptions.h" #include "zend_vm.h" +#define _CONST_CODE 0 +#define _TMP_CODE 1 +#define _VAR_CODE 2 +#define _UNUSED_CODE 3 +#define _CV_CODE 4 + +#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(ZEND_VM_OLD_EXECUTOR) +# define ZEND_VM_ALWAYS_INLINE __attribute__ ((always_inline)) +void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn)); +/*extern void zend_error_noreturn(int type, const char *format, ...) __asm__("zend_error") __attribute__ ((noreturn));*/ +#else +# define ZEND_VM_ALWAYS_INLINE +# define zend_error_noreturn zend_error +#endif + typedef int (*incdec_t)(zval *); #define get_zval_ptr(node, Ts, should_free, type) _get_zval_ptr(node, Ts, should_free, type TSRMLS_CC) @@ -260,8 +275,6 @@ static inline zval **_get_zval_ptr_ptr(znode *node, temp_variable *Ts, zend_free } } -#ifdef ZEND_VM_SPEC - static inline zval *_get_zval_ptr_const(znode *node, temp_variable *Ts, zend_free_op *should_free TSRMLS_DC) { return &node->u.constant; @@ -453,7 +466,6 @@ static inline zval **_get_obj_zval_ptr_ptr_unused(znode *op, temp_variable *Ts, return NULL; } } -#endif static inline void zend_switch_free(zend_op *opline, temp_variable *Ts TSRMLS_DC) { @@ -1427,265 +1439,38 @@ ZEND_API void execute_internal(zend_execute_data *execute_data_ptr, int return_v ((zend_internal_function *) execute_data_ptr->function_state.function)->handler(execute_data_ptr->opline->extended_value, (*(temp_variable *)((char *) execute_data_ptr->Ts + execute_data_ptr->opline->result.u.var)).var.ptr, execute_data_ptr->object, return_value_used TSRMLS_CC); } -ZEND_API void execute(zend_op_array *op_array TSRMLS_DC) -{ - zend_execute_data execute_data; - ZEND_VM_HELPER_VAR(int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC)) - ZEND_VM_HELPER_VAR(incdec_t incdec_op) - ZEND_VM_HELPER_VAR(int prop_dim) - ZEND_VM_HELPER_VAR(int type) - -#if ZEND_VM_KIND == ZEND_VM_KIND_GOTO - if (op_array == NULL) { - goto init_labels; - } -#endif - - /* Initialize execute_data */ - EX(fbc) = NULL; - EX(object) = NULL; - if (op_array->T < TEMP_VAR_STACK_LIMIT) { - EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable) * op_array->T); - } else { - EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0); - } - EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var); - memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var); - EX(op_array) = op_array; - EX(original_in_execution) = EG(in_execution); - EX(symbol_table) = EG(active_symbol_table); - EX(prev_execute_data) = EG(current_execute_data); - EG(current_execute_data) = &execute_data; - - EG(in_execution) = 1; - if (op_array->start_op) { - ZEND_VM_SET_OPCODE(op_array->start_op); - } else { - ZEND_VM_SET_OPCODE(op_array->opcodes); - } - - if (op_array->uses_this && EG(This)) { - EG(This)->refcount++; /* For $this pointer */ - if (zend_hash_add(EG(active_symbol_table), "this", sizeof("this"), &EG(This), sizeof(zval *), NULL)==FAILURE) { - EG(This)->refcount--; - } - } - - EG(opline_ptr) = &EX(opline); - - EX(function_state).function = (zend_function *) op_array; - EG(function_state_ptr) = &EX(function_state); -#if ZEND_DEBUG - /* function_state.function_symbol_table is saved as-is to a stack, - * which is an intentional UMR. Shut it up if we're in DEBUG. - */ - EX(function_state).function_symbol_table = NULL; -#endif - - while (1) { -ZEND_VM_CONTINUE_LABEL -#ifdef ZEND_WIN32 - if (EG(timed_out)) { - zend_timeout(0); - } -#endif - - ZEND_VM_DISPATCH() { -#if ZEND_VM_KIND == ZEND_VM_KIND_CALL - return; -#else -# include "zend_vm_spec.h" -#endif - } - - } - zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen"); -#if ZEND_VM_KIND == ZEND_VM_KIND_GOTO - { - static const opcode_handler_t labels[] = {ZEND_VM_LABELS}; - - init_labels: - zend_opcode_handlers = (opcode_handler_t*)labels; - return; - } -#endif -} - -#if ZEND_VM_KIND == ZEND_VM_KIND_CALL -# undef EX -# define EX(element) execute_data->element -# include"zend_vm_spec.h" -#endif - -void zend_init_opcodes_handlers() -{ -#if ZEND_VM_KIND == ZEND_VM_KIND_GOTO - TSRMLS_FETCH(); - zend_execute(NULL TSRMLS_CC); -#else - static const opcode_handler_t labels[] = {ZEND_VM_LABELS}; - - zend_opcode_handlers = (opcode_handler_t*)labels; -#endif -} - -#ifdef ZEND_VM_HAVE_OLD_EXECUTOR -/* Old Style Executor */ -/* TODO: remove it */ - -# undef EX -# define EX(element) execute_data.element - -/* Hack */ -# define ZEND_VM_OLD_EXECUTOR -# undef ZEND_VM_H -# undef ZEND_VM_KIND -# define ZEND_VM_KIND ZEND_VM_KIND_CALL -# undef ZEND_VM_SPEC -# undef ZEND_VM_ALWAYS_INLINE -# undef zend_error_noreturn -# undef ZEND_VM_CODE -# undef ZEND_VM_SPEC_OPCODE -# undef ZEND_VM_SET_OPCODE_HANDLER -# undef EXECUTE_DATA -# undef ZEND_VM_HELPER_VAR -# undef ZEND_VM_DISPATCH -# undef ZEND_VM_HANDLER -# undef ZEND_VM_HANDLER_EX -# undef ZEND_VM_HELPER -# undef ZEND_VM_HELPER_EX -# undef ZEND_VM_SPEC_HANDLER -# undef ZEND_VM_SPEC_HANDLER_EX -# undef ZEND_VM_SPEC_HELPER -# undef ZEND_VM_SPEC_HELPER_EX -# undef ZEND_VM_NULL_HANDLER -# undef ZEND_VM_DISPATCH_TO_HANDLER -# undef ZEND_VM_DISPATCH_TO_HELPER -# undef ZEND_VM_DISPATCH_TO_HELPER_EX -# undef ZEND_VM_SPEC_DISPATCH_TO_HANDLER -# undef ZEND_VM_SPEC_DISPATCH_TO_HELPER -# undef ZEND_VM_SPEC_DISPATCH_TO_HELPER_EX -# undef ZEND_VM_CONTINUE -# undef ZEND_VM_NEXT_OPCODE -# undef ZEND_VM_RETURN_FROM_EXECUTE_LOOP -# undef ZEND_VM_LABEL -# undef ZEND_VM_NULL_LABEL -# undef ZEND_VM_SPEC_LABEL -# undef ZEND_VM_SPEC_NULL_LABEL -# undef ZEND_VM_CONTINUE_LABEL - -# include "zend_vm.h" - -static void old_execute(zend_op_array *op_array TSRMLS_DC) -{ - zend_execute_data execute_data; - - /* Initialize execute_data */ - EX(fbc) = NULL; - EX(object) = NULL; - if (op_array->T < TEMP_VAR_STACK_LIMIT) { - EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable) * op_array->T); - } else { - EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0); - } - EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var); - memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var); - EX(op_array) = op_array; - EX(original_in_execution) = EG(in_execution); - EX(symbol_table) = EG(active_symbol_table); - EX(prev_execute_data) = EG(current_execute_data); - EG(current_execute_data) = &execute_data; - - EG(in_execution) = 1; - if (op_array->start_op) { - ZEND_VM_SET_OPCODE(op_array->start_op); - } else { - ZEND_VM_SET_OPCODE(op_array->opcodes); - } - - if (op_array->uses_this && EG(This)) { - EG(This)->refcount++; /* For $this pointer */ - if (zend_hash_add(EG(active_symbol_table), "this", sizeof("this"), &EG(This), sizeof(zval *), NULL)==FAILURE) { - EG(This)->refcount--; - } - } - - EG(opline_ptr) = &EX(opline); - - EX(function_state).function = (zend_function *) op_array; - EG(function_state_ptr) = &EX(function_state); -#if ZEND_DEBUG - /* function_state.function_symbol_table is saved as-is to a stack, - * which is an intentional UMR. Shut it up if we're in DEBUG. - */ - EX(function_state).function_symbol_table = NULL; -#endif - - while (1) { -#ifdef ZEND_WIN32 - if (EG(timed_out)) { - zend_timeout(0); - } -#endif - - ZEND_VM_DISPATCH() { - return; - } - - } - zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen"); -} -# undef EX -# define EX(element) execute_data->element - -/* Hack */ -# undef OP1_OP2_MASK -# undef HAVE_OP -# undef ZEND_VM_C_GOTO -# undef ZEND_VM_C_LABEL - -# include"zend_vm_spec.h" - -ZEND_API int zend_vm_old_executor = 0; - -void zend_vm_set_opcode_handler(zend_op* op) -{ - if (zend_vm_old_executor) { - op->handler = zend_opcode_handlers[op->opcode]; - } else { - static const int zend_vm_decode[] = { - _UNUSED_CODE, /* 0 */ - _CONST_CODE, /* 1 = IS_CONST */ - _TMP_CODE, /* 2 = IS_TMP_VAR */ - _UNUSED_CODE, /* 3 */ - _VAR_CODE, /* 4 = IS_VAR */ - _UNUSED_CODE, /* 5 */ - _UNUSED_CODE, /* 6 */ - _UNUSED_CODE, /* 7 */ - _UNUSED_CODE, /* 8 = IS_UNUSED */ - _UNUSED_CODE, /* 9 */ - _UNUSED_CODE, /* 10 */ - _UNUSED_CODE, /* 11 */ - _UNUSED_CODE, /* 12 */ - _UNUSED_CODE, /* 13 */ - _UNUSED_CODE, /* 14 */ - _UNUSED_CODE, /* 15 */ - _CV_CODE /* 16 = IS_CV */ - }; - op->handler = zend_opcode_handlers[op->opcode * 25 + zend_vm_decode[op->op1.op_type] * 5 + zend_vm_decode[op->op2.op_type]]; - } -} - - -ZEND_API void zend_vm_use_old_executor() -{ - static opcode_handler_t labels[512] = {ZEND_VM_LABELS}; - - zend_vm_old_executor = 1; - zend_opcode_handlers = (opcode_handler_t*)labels; - zend_execute = old_execute; -} -#endif +#define ZEND_VM_NEXT_OPCODE() \ + CHECK_SYMBOL_TABLES() \ + EX(opline)++; \ + ZEND_VM_CONTINUE() + +#define ZEND_VM_SET_OPCODE(new_op) \ + CHECK_SYMBOL_TABLES() \ + EX(opline) = new_op + +#define ZEND_VM_INC_OPCODE() \ + if (!EG(exception)) { \ + CHECK_SYMBOL_TABLES() \ + EX(opline)++; \ + } + +#define ZEND_VM_RETURN_FROM_EXECUTE_LOOP() \ + free_alloca(EX(CVs)); \ + if (EX(op_array)->T < TEMP_VAR_STACK_LIMIT) { \ + free_alloca(EX(Ts)); \ + } else { \ + efree(EX(Ts)); \ + } \ + EG(in_execution) = EX(original_in_execution); \ + EG(current_execute_data) = EX(prev_execute_data); \ + ZEND_VM_RETURN() + +#define ZEND_VM_CONTINUE_JMP() \ + ZEND_VM_CONTINUE() + +static int zend_vm_old_executor = 0; + +#include "zend_vm_execute.h" /* * Local variables: diff --git a/Zend/zend_vm.h b/Zend/zend_vm.h index 7f888c917c..b205903a85 100644 --- a/Zend/zend_vm.h +++ b/Zend/zend_vm.h @@ -21,373 +21,9 @@ #ifndef ZEND_VM_H #define ZEND_VM_H -#define ZEND_VM_HAVE_OLD_EXECUTOR - -#define ZEND_VM_KIND_CALL 1 -#define ZEND_VM_KIND_SWITCH 2 -#define ZEND_VM_KIND_GOTO 3 - -#ifndef ZEND_VM_OLD_EXECUTOR -/*# define ZEND_VM_KIND ZEND_VM_KIND_CALL */ -# define ZEND_VM_SPEC -#endif - -/* don't edit the rest of the file */ - -#ifdef ZEND_VM_HAVE_OLD_EXECUTOR ZEND_API void zend_vm_use_old_executor(); void zend_vm_set_opcode_handler(zend_op* opcode); -#endif - -#define _CONST_CODE 0 -#define _TMP_CODE 1 -#define _VAR_CODE 2 -#define _UNUSED_CODE 3 -#define _CV_CODE 4 - -#ifndef ZEND_VM_KIND -# ifdef __GNUC__ -# define ZEND_VM_KIND ZEND_VM_KIND_GOTO -# else -# define ZEND_VM_KIND ZEND_VM_KIND_CALL -# endif -#endif - -#if defined(__GNUC__) && !defined(__INTEL_COMPILER) && !defined(ZEND_VM_OLD_EXECUTOR) -# define ZEND_VM_ALWAYS_INLINE __attribute__ ((always_inline)) -void zend_error_noreturn(int type, const char *format, ...) __attribute__ ((alias("zend_error"),noreturn)); -/*extern void zend_error_noreturn(int type, const char *format, ...) __asm__("zend_error") __attribute__ ((noreturn));*/ -#else -# define ZEND_VM_ALWAYS_INLINE -# define zend_error_noreturn zend_error -#endif - -#ifndef ZEND_VM_SPEC -# define ZEND_VM_CODE(opcode, op1, op2) opcode -# define ZEND_VM_SPEC_OPCODE(opcode, op1, op2) opcode -# ifdef ZEND_VM_HAVE_OLD_EXECUTOR -# define ZEND_VM_SET_OPCODE_HANDLER(opline) \ - zend_vm_set_opcode_handler(opline) -# else -# define ZEND_VM_SET_OPCODE_HANDLER(opline) \ - opline->handler = zend_opcode_handlers[opline->opcode] -# endif -#else -static const int zend_vm_decode[] = { - _UNUSED_CODE, /* 0 */ - _CONST_CODE, /* 1 = IS_CONST */ - _TMP_CODE, /* 2 = IS_TMP_VAR */ - _UNUSED_CODE, /* 3 */ - _VAR_CODE, /* 4 = IS_VAR */ - _UNUSED_CODE, /* 5 */ - _UNUSED_CODE, /* 6 */ - _UNUSED_CODE, /* 7 */ - _UNUSED_CODE, /* 8 = IS_UNUSED */ - _UNUSED_CODE, /* 9 */ - _UNUSED_CODE, /* 10 */ - _UNUSED_CODE, /* 11 */ - _UNUSED_CODE, /* 12 */ - _UNUSED_CODE, /* 13 */ - _UNUSED_CODE, /* 14 */ - _UNUSED_CODE, /* 15 */ - _CV_CODE /* 16 = IS_CV */ -}; - -# define ZEND_VM_CODE(opcode, op1, op2) \ - opcode * 25 + op1 * 5 + op2 -# define ZEND_VM_SPEC_OPCODE(opcode, op1, op2) \ - ZEND_VM_CODE(opcode, zend_vm_decode[op1], zend_vm_decode[op2]) -# ifdef ZEND_VM_HAVE_OLD_EXECUTOR -# define ZEND_VM_SET_OPCODE_HANDLER(opline) \ - zend_vm_set_opcode_handler(opline) -# else -# define ZEND_VM_SET_OPCODE_HANDLER(opline) \ - opline->handler = zend_opcode_handlers[ZEND_VM_SPEC_OPCODE(opline->opcode, opline->op1.op_type, opline->op2.op_type)] -# endif -#endif - - -#if ZEND_VM_KIND == ZEND_VM_KIND_CALL - -# define EXECUTE_DATA execute_data - -# define ZEND_VM_HELPER_VAR(X) - -# define ZEND_VM_DISPATCH() \ - if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0) - -# define ZEND_VM_CONTINUE_LABEL - -# define ZEND_VM_HANDLER(OP) \ - static int OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_HANDLER_EX(OP) \ - static int OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_HELPER(NAME) \ - static int NAME(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_HELPER_EX(NAME,PARAM) \ - static int NAME(PARAM, ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_SPEC_HANDLER(OP, CODE) \ - static int OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_SPEC_HANDLER_EX(OP, CODE) \ - static int OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_SPEC_HELPER(NAME) \ - static int NAME(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_SPEC_HELPER_EX(NAME,PARAM) \ - static int NAME(PARAM, ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_NULL_HANDLER() \ - int ZEND_VM_NULL(ZEND_OPCODE_HANDLER_ARGS) - -# define ZEND_VM_DISPATCH_TO_HANDLER(OP) \ - return OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_DISPATCH_TO_HELPER(NAME) \ - return NAME(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - return NAME(VAL, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_SPEC_DISPATCH_TO_HANDLER(OP) \ - return OP##_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER(NAME) \ - return NAME(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - return NAME(VAL, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU) - -# define ZEND_VM_CONTINUE() \ - return 0 - -# define ZEND_VM_NEXT_OPCODE() \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - return 0 - -# define ZEND_VM_SET_OPCODE(new_op) \ - CHECK_SYMBOL_TABLES() \ - EX(opline) = new_op - -# define ZEND_VM_INC_OPCODE() \ - if (!EG(exception)) { \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - } - -# define ZEND_VM_RETURN_FROM_EXECUTE_LOOP() \ - free_alloca(EX(CVs)); \ - if (EX(op_array)->T < TEMP_VAR_STACK_LIMIT) { \ - free_alloca(EX(Ts)); \ - } else { \ - efree(EX(Ts)); \ - } \ - EG(in_execution) = EX(original_in_execution); \ - EG(current_execute_data) = EX(prev_execute_data); \ - return 1; - -# define ZEND_VM_LABEL(OP) OP##_HANDLER -# define ZEND_VM_NULL_LABEL ZEND_VM_NULL -# define ZEND_VM_SPEC_LABEL(OP,CODE) OP##_HANDLER -# define ZEND_VM_SPEC_NULL_LABEL ZEND_VM_NULL - -#elif ZEND_VM_KIND == ZEND_VM_KIND_SWITCH - -# define EXECUTE_DATA &execute_data - -# define ZEND_VM_HELPER_VAR(X) X; - -# define ZEND_VM_DISPATCH() \ - switch ((int)EX(opline)->handler) - -# define ZEND_VM_CONTINUE_LABEL \ - zend_vm_continue: - -# define ZEND_VM_HANDLER(OP) \ - case OP: - -# define ZEND_VM_HANDLER_EX(OP) \ - case OP: \ - OP##_LABEL: - -# define ZEND_VM_HELPER(NAME) \ - NAME: - -# define ZEND_VM_HELPER_EX(NAME,PARAM) \ - NAME: - -# define ZEND_VM_SPEC_HANDLER(OP, CODE) \ - case CODE: - -# define ZEND_VM_SPEC_HANDLER_EX(OP, CODE) \ - case CODE: \ - OP##_LABEL: - -# define ZEND_VM_SPEC_HELPER(NAME) \ - NAME: - -# define ZEND_VM_SPEC_HELPER_EX(NAME,PARAM) \ - NAME: - -# define ZEND_VM_NULL_HANDLER() \ - default: - -# define ZEND_VM_DISPATCH_TO_HANDLER(OP) \ - goto OP##_LABEL - -# define ZEND_VM_DISPATCH_TO_HELPER(NAME) \ - goto NAME - -# define ZEND_VM_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - VAR = VAL; \ - goto NAME - -# define ZEND_VM_SPEC_DISPATCH_TO_HANDLER(OP) \ - goto OP##_LABEL - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER(NAME) \ - goto NAME - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - VAR = VAL; \ - goto NAME - -# define ZEND_VM_CONTINUE() \ - goto zend_vm_continue - -# define ZEND_VM_NEXT_OPCODE() \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - ZEND_VM_CONTINUE() - -# define ZEND_VM_SET_OPCODE(new_op) \ - CHECK_SYMBOL_TABLES() \ - EX(opline) = new_op - -# define ZEND_VM_INC_OPCODE() \ - if (!EG(exception)) { \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - } - -# define ZEND_VM_RETURN_FROM_EXECUTE_LOOP() \ - free_alloca(EX(CVs)); \ - if (EX(op_array)->T < TEMP_VAR_STACK_LIMIT) { \ - free_alloca(EX(Ts)); \ - } else { \ - efree(EX(Ts)); \ - } \ - EG(in_execution) = EX(original_in_execution); \ - EG(current_execute_data) = EX(prev_execute_data); \ - return; - -# define ZEND_VM_LABEL(OP) (opcode_handler_t)OP -# define ZEND_VM_NULL_LABEL (opcode_handler_t)-1 -# define ZEND_VM_SPEC_LABEL(OP,CODE) (opcode_handler_t)(CODE) -# define ZEND_VM_SPEC_NULL_LABEL (opcode_handler_t)-1 - -#elif ZEND_VM_KIND == ZEND_VM_KIND_GOTO - -# define EXECUTE_DATA &execute_data - -# define ZEND_VM_HELPER_VAR(X) X; - -# define ZEND_VM_DISPATCH() \ - goto *(void**)(EX(opline)->handler); - -# define ZEND_VM_CONTINUE_LABEL - -# define ZEND_VM_HANDLER(OP) \ - OP##_HANDLER: - -# define ZEND_VM_HANDLER_EX(OP) \ - OP##_HANDLER: - -# define ZEND_VM_HELPER(NAME) \ - NAME: - -# define ZEND_VM_HELPER_EX(NAME,PARAM) \ - NAME: - -# define ZEND_VM_SPEC_HANDLER(OP, CODE) \ - OP##_HANDLER: - -# define ZEND_VM_SPEC_HANDLER_EX(OP, CODE) \ - OP##_HANDLER: - -# define ZEND_VM_SPEC_HELPER(NAME) \ - NAME: - -# define ZEND_VM_SPEC_HELPER_EX(NAME,PARAM) \ - NAME: - -# define ZEND_VM_NULL_HANDLER() \ - ZEND_VM_NULL: - -# define ZEND_VM_DISPATCH_TO_HANDLER(OP) \ - goto OP##_HANDLER - -# define ZEND_VM_DISPATCH_TO_HELPER(NAME) \ - goto NAME - -# define ZEND_VM_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - VAR = VAL; \ - goto NAME - -# define ZEND_VM_SPEC_DISPATCH_TO_HANDLER(OP) \ - goto OP##_HANDLER - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER(NAME) \ - goto NAME - -# define ZEND_VM_SPEC_DISPATCH_TO_HELPER_EX(NAME,VAR,VAL) \ - VAR = VAL; \ - goto NAME - -# define ZEND_VM_CONTINUE() \ - goto *(void**)(EX(opline)->handler) - -# define ZEND_VM_NEXT_OPCODE() \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - ZEND_VM_CONTINUE() - -# define ZEND_VM_SET_OPCODE(new_op) \ - CHECK_SYMBOL_TABLES() \ - EX(opline) = new_op - -# define ZEND_VM_INC_OPCODE() \ - if (!EG(exception)) { \ - CHECK_SYMBOL_TABLES() \ - EX(opline)++; \ - } - -# define ZEND_VM_RETURN_FROM_EXECUTE_LOOP() \ - free_alloca(EX(CVs)); \ - if (EX(op_array)->T < TEMP_VAR_STACK_LIMIT) { \ - free_alloca(EX(Ts)); \ - } else { \ - efree(EX(Ts)); \ - } \ - EG(in_execution) = EX(original_in_execution); \ - EG(current_execute_data) = EX(prev_execute_data); \ - return; - -# define ZEND_VM_LABEL(OP) (opcode_handler_t)&&OP##_HANDLER -# define ZEND_VM_NULL_LABEL &&ZEND_VM_NULL -# define ZEND_VM_SPEC_LABEL(OP,CODE) (opcode_handler_t)&&OP##_HANDLER -# define ZEND_VM_SPEC_NULL_LABEL &&ZEND_VM_NULL - -#else -# error "Unknown ZEND_VM_KIND" -#endif -#define ZEND_VM_CONTINUE_JMP() ZEND_VM_CONTINUE() +#define ZEND_VM_SET_OPCODE_HANDLER(opline) zend_vm_set_opcode_handler(opline) #endif diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h new file mode 100644 index 0000000000..5bc21d6cf0 --- /dev/null +++ b/Zend/zend_vm_def.h @@ -0,0 +1,3423 @@ +ZEND_VM_HANDLER(1, ZEND_ADD, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + add_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(2, ZEND_SUB, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + sub_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(3, ZEND_MUL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + mul_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(4, ZEND_DIV, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + div_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(5, ZEND_MOD, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + mod_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(6, ZEND_SL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + shift_left_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(7, ZEND_SR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + shift_right_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(8, ZEND_CONCAT, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + concat_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(15, ZEND_IS_IDENTICAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_identical_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(16, ZEND_IS_NOT_IDENTICAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_not_identical_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(17, ZEND_IS_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_equal_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(18, ZEND_IS_NOT_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_not_equal_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(19, ZEND_IS_SMALLER, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_smaller_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(20, ZEND_IS_SMALLER_OR_EQUAL, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + is_smaller_or_equal_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(9, ZEND_BW_OR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + bitwise_or_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(10, ZEND_BW_AND, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + bitwise_and_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(11, ZEND_BW_XOR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + bitwise_xor_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(14, ZEND_BOOL_XOR, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + boolean_xor_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(12, ZEND_BW_NOT, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + bitwise_not_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(13, ZEND_BOOL_NOT, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + boolean_not_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER_EX(zend_binary_assign_op_obj_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC)) +{ + zend_op *opline = EX(opline); + zend_op *op_data = opline+1; + zend_free_op free_op1, free_op2, free_op_data1; + zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + zval *object; + zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R); + zval *value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R); + zval tmp; + znode *result = &opline->result; + zval **retval = &EX_T(result->u.var).var.ptr; + int have_get_ptr = 0; + + EX_T(result->u.var).var.ptr_ptr = NULL; + make_real_object(object_ptr TSRMLS_CC); + object = *object_ptr; + + if (object->type != IS_OBJECT) { + zend_error(E_WARNING, "Attempt to assign property of non-object"); + FREE_OP2(); + FREE_OP(free_op_data1); + + if (!RETURN_VALUE_UNUSED(result)) { + *retval = EG(uninitialized_zval_ptr); + PZVAL_LOCK(*retval); + } + } else { + /* here we are sure we are dealing with an object */ + switch (OP2_TYPE) { + case IS_CONST: + /* already a constant string */ + break; + case IS_CV: + case IS_VAR: + tmp = *property; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + property = &tmp; + break; + case IS_TMP_VAR: + convert_to_string(property); + break; + } + + /* here property is a string */ + if (opline->extended_value == ZEND_ASSIGN_OBJ + && Z_OBJ_HT_P(object)->get_property_ptr_ptr) { + zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC); + if (zptr != NULL) { /* NULL means no success in getting PTR */ + SEPARATE_ZVAL_IF_NOT_REF(zptr); + + have_get_ptr = 1; + binary_op(*zptr, *zptr, value TSRMLS_CC); + if (!RETURN_VALUE_UNUSED(result)) { + *retval = *zptr; + PZVAL_LOCK(*retval); + } + } + } + + if (!have_get_ptr) { + zval *z; + + switch (opline->extended_value) { + case ZEND_ASSIGN_OBJ: + z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC); + break; + case ZEND_ASSIGN_DIM: + z = Z_OBJ_HT_P(object)->read_dimension(object, property, BP_VAR_RW TSRMLS_CC); + break; + } + if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) { + zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC); + + if (z->refcount == 0) { + zval_dtor(z); + FREE_ZVAL(z); + } + z = value; + } + z->refcount++; + SEPARATE_ZVAL_IF_NOT_REF(&z); + binary_op(z, z, value TSRMLS_CC); + switch (opline->extended_value) { + case ZEND_ASSIGN_OBJ: + Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC); + break; + case ZEND_ASSIGN_DIM: + Z_OBJ_HT_P(object)->write_dimension(object, property, z TSRMLS_CC); + break; + } + if (!RETURN_VALUE_UNUSED(result)) { + *retval = z; + PZVAL_LOCK(*retval); + } + zval_ptr_dtor(&z); + } + + if (property == &tmp) { + zval_dtor(property); + } + + FREE_OP2(); + FREE_OP(free_op_data1); + } + + FREE_OP1_VAR_PTR(); + /* assign_obj has two opcodes! */ + ZEND_VM_INC_OPCODE(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER_EX(zend_binary_assign_op_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, int (*binary_op)(zval *result, zval *op1, zval *op2 TSRMLS_DC)) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2, free_op_data2, free_op_data1; + zval **var_ptr; + zval *value; + zend_bool increment_opline = 0; + + switch (opline->extended_value) { + case ZEND_ASSIGN_OBJ: + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_obj_helper, binary_op, binary_op); + break; + case ZEND_ASSIGN_DIM: { + zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + + if(OP1_TYPE != IS_CV) { + (*object_ptr)->refcount++; /* undo the effect of get_obj_zval_ptr_ptr() */ + } + + if ((*object_ptr)->type == IS_OBJECT) { + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_obj_helper, binary_op, binary_op); + } else { + zend_op *op_data = opline+1; + + zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_RW TSRMLS_CC); + value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R); + var_ptr = get_zval_ptr_ptr(&op_data->op2, EX(Ts), &free_op_data2, BP_VAR_RW); + increment_opline = 1; + } + } + break; + default: + value = GET_OP2_ZVAL_PTR(BP_VAR_R); + var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW); + /* do nothing */ + break; + } + + if (!var_ptr) { + zend_error_noreturn(E_ERROR, "Cannot use assign-op operators with overloaded objects nor string offsets"); + } + + if (*var_ptr == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP2(); + FREE_OP1_VAR_PTR(); + if (increment_opline) { + ZEND_VM_INC_OPCODE(); + } + ZEND_VM_NEXT_OPCODE(); + } + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) + && Z_OBJ_HANDLER_PP(var_ptr, set)) { + /* proxy object */ + zval *objval = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); + objval->refcount++; + binary_op(objval, objval, value TSRMLS_CC); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, objval TSRMLS_CC); + zval_ptr_dtor(&objval); + } else { + binary_op(*var_ptr, *var_ptr, value TSRMLS_CC); + } + + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = var_ptr; + PZVAL_LOCK(*var_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP2(); + + if (increment_opline) { + ZEND_VM_INC_OPCODE(); + FREE_OP_VAR_PTR(free_op_data2); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(23, ZEND_ASSIGN_ADD, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, add_function); +} + +ZEND_VM_HANDLER(24, ZEND_ASSIGN_SUB, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, sub_function); +} + +ZEND_VM_HANDLER(25, ZEND_ASSIGN_MUL, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, mul_function); +} + +ZEND_VM_HANDLER(26, ZEND_ASSIGN_DIV, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, div_function); +} + +ZEND_VM_HANDLER(27, ZEND_ASSIGN_MOD, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, mod_function); +} + +ZEND_VM_HANDLER(28, ZEND_ASSIGN_SL, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, shift_left_function); +} + +ZEND_VM_HANDLER(29, ZEND_ASSIGN_SR, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, shift_right_function); +} + +ZEND_VM_HANDLER(30, ZEND_ASSIGN_CONCAT, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, concat_function); +} + +ZEND_VM_HANDLER(31, ZEND_ASSIGN_BW_OR, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_or_function); +} + +ZEND_VM_HANDLER(32, ZEND_ASSIGN_BW_AND, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_and_function); +} + +ZEND_VM_HANDLER(33, ZEND_ASSIGN_BW_XOR, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_binary_assign_op_helper, binary_op, bitwise_xor_function); +} + +ZEND_VM_HELPER_EX(zend_pre_incdec_property_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, incdec_t incdec_op) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + zval *object; + zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R); + zval **retval = &EX_T(opline->result.u.var).var.ptr; + int have_get_ptr = 0; + + make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */ + object = *object_ptr; + + if (object->type != IS_OBJECT) { + zend_error(E_WARNING, "Attempt to increment/decrement property of non-object"); + FREE_OP2(); + if (!RETURN_VALUE_UNUSED(&opline->result)) { + *retval = EG(uninitialized_zval_ptr); + PZVAL_LOCK(*retval); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + /* here we are sure we are dealing with an object */ + + if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) { + zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC); + if (zptr != NULL) { /* NULL means no success in getting PTR */ + SEPARATE_ZVAL_IF_NOT_REF(zptr); + + have_get_ptr = 1; + incdec_op(*zptr); + if (!RETURN_VALUE_UNUSED(&opline->result)) { + *retval = *zptr; + PZVAL_LOCK(*retval); + } + } + } + + if (!have_get_ptr) { + zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC); + + if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) { + zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC); + + if (z->refcount == 0) { + zval_dtor(z); + FREE_ZVAL(z); + } + z = value; + } + z->refcount++; + SEPARATE_ZVAL_IF_NOT_REF(&z); + incdec_op(z); + *retval = z; + Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC); + SELECTIVE_PZVAL_LOCK(*retval, &opline->result); + zval_ptr_dtor(&z); + } + + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(132, ZEND_PRE_INC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_pre_incdec_property_helper, incdec_op, increment_function); +} + +ZEND_VM_HANDLER(133, ZEND_PRE_DEC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_pre_incdec_property_helper, incdec_op, decrement_function); +} + +ZEND_VM_HELPER_EX(zend_post_incdec_property_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, incdec_t incdec_op) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + zval *object; + zval *property = GET_OP2_ZVAL_PTR(BP_VAR_R); + zval *retval = &EX_T(opline->result.u.var).tmp_var; + int have_get_ptr = 0; + + make_real_object(object_ptr TSRMLS_CC); /* this should modify object only if it's empty */ + object = *object_ptr; + + if (object->type != IS_OBJECT) { + zend_error(E_WARNING, "Attempt to increment/decrement property of non-object"); + FREE_OP2(); + *retval = *EG(uninitialized_zval_ptr); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + /* here we are sure we are dealing with an object */ + + if (Z_OBJ_HT_P(object)->get_property_ptr_ptr) { + zval **zptr = Z_OBJ_HT_P(object)->get_property_ptr_ptr(object, property TSRMLS_CC); + if (zptr != NULL) { /* NULL means no success in getting PTR */ + have_get_ptr = 1; + SEPARATE_ZVAL_IF_NOT_REF(zptr); + + *retval = **zptr; + zendi_zval_copy_ctor(*retval); + + incdec_op(*zptr); + + } + } + + if (!have_get_ptr) { + zval *z = Z_OBJ_HT_P(object)->read_property(object, property, BP_VAR_RW TSRMLS_CC); + + if (z->type == IS_OBJECT && Z_OBJ_HT_P(z)->get) { + zval *value = Z_OBJ_HT_P(z)->get(z TSRMLS_CC); + + if (z->refcount == 0) { + zval_dtor(z); + FREE_ZVAL(z); + } + z = value; + } + *retval = *z; + zendi_zval_copy_ctor(*retval); + incdec_op(z); + z->refcount++; + Z_OBJ_HT_P(object)->write_property(object, property, z TSRMLS_CC); + zval_ptr_dtor(&z); + } + + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(134, ZEND_POST_INC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_post_incdec_property_helper, incdec_op, increment_function); +} + +ZEND_VM_HANDLER(135, ZEND_POST_DEC_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_post_incdec_property_helper, incdec_op, decrement_function); +} + +ZEND_VM_HANDLER(34, ZEND_PRE_INC, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval **var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW); + + if (!var_ptr) { + zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); + } + if (*var_ptr == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) + && Z_OBJ_HANDLER_PP(var_ptr, set)) { + /* proxy object */ + zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); + val->refcount++; + increment_function(val); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC); + zval_ptr_dtor(&val); + } else { + increment_function(*var_ptr); + } + + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = var_ptr; + PZVAL_LOCK(*var_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(35, ZEND_PRE_DEC, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval **var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW); + + if (!var_ptr) { + zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); + } + if (*var_ptr == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) + && Z_OBJ_HANDLER_PP(var_ptr, set)) { + /* proxy object */ + zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); + val->refcount++; + decrement_function(val); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC); + zval_ptr_dtor(&val); + } else { + decrement_function(*var_ptr); + } + + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = var_ptr; + PZVAL_LOCK(*var_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(36, ZEND_POST_INC, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval **var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW); + + if (!var_ptr) { + zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); + } + if (*var_ptr == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + EX_T(opline->result.u.var).tmp_var = **var_ptr; + zendi_zval_copy_ctor(EX_T(opline->result.u.var).tmp_var); + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) + && Z_OBJ_HANDLER_PP(var_ptr, set)) { + /* proxy object */ + zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); + val->refcount++; + increment_function(val); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC); + zval_ptr_dtor(&val); + } else { + increment_function(*var_ptr); + } + + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(37, ZEND_POST_DEC, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval **var_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW); + + if (!var_ptr) { + zend_error_noreturn(E_ERROR, "Cannot increment/decrement overloaded objects nor string offsets"); + } + if (*var_ptr == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } + + EX_T(opline->result.u.var).tmp_var = **var_ptr; + zendi_zval_copy_ctor(EX_T(opline->result.u.var).tmp_var); + + SEPARATE_ZVAL_IF_NOT_REF(var_ptr); + + if(Z_TYPE_PP(var_ptr) == IS_OBJECT && Z_OBJ_HANDLER_PP(var_ptr, get) + && Z_OBJ_HANDLER_PP(var_ptr, set)) { + /* proxy object */ + zval *val = Z_OBJ_HANDLER_PP(var_ptr, get)(*var_ptr TSRMLS_CC); + val->refcount++; + decrement_function(val); + Z_OBJ_HANDLER_PP(var_ptr, set)(var_ptr, val TSRMLS_CC); + zval_ptr_dtor(&val); + } else { + decrement_function(*var_ptr); + } + + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(40, ZEND_ECHO, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval z_copy; + zval *z = GET_OP1_ZVAL_PTR(BP_VAR_R); + + if (Z_TYPE_P(z) == IS_OBJECT && Z_OBJ_HT_P(z)->get_method != NULL && + zend_std_cast_object_tostring(z, &z_copy, IS_STRING, 0 TSRMLS_CC) == SUCCESS) { + zend_print_variable(&z_copy); + zval_dtor(&z_copy); + } else { + zend_print_variable(z); + } + + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(41, ZEND_PRINT, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + + EX_T(opline->result.u.var).tmp_var.value.lval = 1; + EX_T(opline->result.u.var).tmp_var.type = IS_LONG; + + ZEND_VM_DISPATCH_TO_HANDLER(ZEND_ECHO); +} + +ZEND_VM_HELPER_EX(zend_fetch_var_address_helper, CONST|TMP|VAR|CV, ANY, int type) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *varname = GET_OP1_ZVAL_PTR(BP_VAR_R); + zval **retval; + zval tmp_varname; + HashTable *target_symbol_table; + + if (varname->type != IS_STRING) { + tmp_varname = *varname; + zval_copy_ctor(&tmp_varname); + convert_to_string(&tmp_varname); + varname = &tmp_varname; + } + + if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { + retval = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC); + } else { + if (opline->op2.u.EA.type == ZEND_FETCH_GLOBAL && opline->op1.op_type == IS_VAR) { + varname->refcount++; + } + target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), type, varname TSRMLS_CC); +/* + if (!target_symbol_table) { + ZEND_VM_NEXT_OPCODE(); + } +*/ + if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &retval) == FAILURE) { + switch (type) { + case BP_VAR_R: + case BP_VAR_UNSET: + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + /* break missing intentionally */ + case BP_VAR_IS: + retval = &EG(uninitialized_zval_ptr); + break; + case BP_VAR_RW: + zend_error(E_NOTICE,"Undefined variable: %s", varname->value.str.val); + /* break missing intentionally */ + case BP_VAR_W: { + zval *new_zval = &EG(uninitialized_zval); + + new_zval->refcount++; + zend_hash_update(target_symbol_table, varname->value.str.val, varname->value.str.len+1, &new_zval, sizeof(zval *), (void **) &retval); + } + break; + EMPTY_SWITCH_DEFAULT_CASE() + } + } + switch (opline->op2.u.EA.type) { + case ZEND_FETCH_GLOBAL: + case ZEND_FETCH_LOCAL: + FREE_OP1(); + break; + case ZEND_FETCH_STATIC: + zval_update_constant(retval, (void*) 1 TSRMLS_CC); + break; + } + } + + + if (varname == &tmp_varname) { + zval_dtor(varname); + } + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = retval; + PZVAL_LOCK(*retval); + switch (type) { + case BP_VAR_R: + case BP_VAR_IS: + AI_USE_PTR(EX_T(opline->result.u.var).var); + break; + case BP_VAR_UNSET: { + zend_free_op free_res; + + PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res); + if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr); + } + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + FREE_OP_VAR_PTR(free_res); + break; + } + } + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(80, ZEND_FETCH_R, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_R); +} + +ZEND_VM_HANDLER(83, ZEND_FETCH_W, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_W); +} + +ZEND_VM_HANDLER(86, ZEND_FETCH_RW, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_RW); +} + +ZEND_VM_HANDLER(92, ZEND_FETCH_FUNC_ARG, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, + ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), EX(opline)->extended_value)?BP_VAR_W:BP_VAR_R); +} + +ZEND_VM_HANDLER(95, ZEND_FETCH_UNSET, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_UNSET); +} + +ZEND_VM_HANDLER(89, ZEND_FETCH_IS, CONST|TMP|VAR|CV, ANY) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_var_address_helper, type, BP_VAR_IS); +} + +ZEND_VM_HANDLER(81, ZEND_FETCH_DIM_R, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + if (opline->extended_value == ZEND_FETCH_ADD_LOCK && OP1_TYPE != IS_CV) { + PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr); + } + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_R), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_R TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(84, ZEND_FETCH_DIM_W, VAR|CV, CONST|TMP|VAR|UNUSED|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_W), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_W TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(87, ZEND_FETCH_DIM_RW, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_RW TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(90, ZEND_FETCH_DIM_IS, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_RW), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_IS TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(93, ZEND_FETCH_DIM_FUNC_ARG, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + int type = ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)?BP_VAR_W:BP_VAR_R; + + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(type), GET_OP2_ZVAL_PTR(BP_VAR_R), type TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(96, ZEND_FETCH_DIM_UNSET, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + /* Not needed in DIM_UNSET + if (opline->extended_value == ZEND_FETCH_ADD_LOCK) { + PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr); + } + */ + zend_fetch_dimension_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_UNSET), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_UNSET TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + if (EX_T(opline->result.u.var).var.ptr_ptr == NULL) { + zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); + } else { + zend_free_op free_res; + + PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res); + if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr); + } + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + FREE_OP_VAR_PTR(free_res); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER_EX(zend_fetch_property_address_read_helper, VAR|UNUSED|CV, CONST|TMP|VAR|CV, int type) +{ + zend_op *opline = EX(opline); + zval *container; + zval **retval; + zend_free_op free_op1; + + retval = &EX_T(opline->result.u.var).var.ptr; + EX_T(opline->result.u.var).var.ptr_ptr = retval; + + container = GET_OP1_OBJ_ZVAL_PTR(type); + + if (container == EG(error_zval_ptr)) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + *retval = EG(error_zval_ptr); + PZVAL_LOCK(*retval); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); + } + + + if (container->type != IS_OBJECT) { + zend_error(E_NOTICE, "Trying to get property of non-object"); + *retval = EG(uninitialized_zval_ptr); + } else { + zend_free_op free_op2; + zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R); + zval tmp; + + switch (OP2_TYPE) { + case IS_CONST: + /* already a constant string */ + break; + case IS_CV: + case IS_VAR: + tmp = *offset; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + offset = &tmp; + break; + case IS_TMP_VAR: + convert_to_string(offset); + break; + } + + /* here we are sure we are dealing with an object */ + *retval = Z_OBJ_HT_P(container)->read_property(container, offset, type TSRMLS_CC); + if (offset == &tmp) { + zval_dtor(offset); + } + FREE_OP2(); + + if (RETURN_VALUE_UNUSED(&opline->result) && ((*retval)->refcount == 0)) { + zval_dtor(*retval); + FREE_ZVAL(*retval); + ZEND_VM_NEXT_OPCODE(); + } + } + + SELECTIVE_PZVAL_LOCK(*retval, &opline->result); + AI_USE_PTR(EX_T(opline->result.u.var).var); + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(82, ZEND_FETCH_OBJ_R, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_property_address_read_helper, type, BP_VAR_R); +} + +ZEND_VM_HANDLER(85, ZEND_FETCH_OBJ_W, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + if (opline->extended_value == ZEND_FETCH_ADD_LOCK && OP1_TYPE != IS_CV) { + PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr); + EX_T(opline->op1.u.var).var.ptr = *EX_T(opline->op1.u.var).var.ptr_ptr; + } + zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_W TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(88, ZEND_FETCH_OBJ_RW, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + + zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_RW), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_RW TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(91, ZEND_FETCH_OBJ_IS, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_property_address_read_helper, type, BP_VAR_IS); +} + +ZEND_VM_HANDLER(94, ZEND_FETCH_OBJ_FUNC_ARG, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + + if (ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->extended_value)) { + /* Behave like FETCH_OBJ_W */ + zend_free_op free_op1, free_op2; + + zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_W TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); + } else { + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_fetch_property_address_read_helper, type, BP_VAR_R); + } +} + +ZEND_VM_HANDLER(97, ZEND_FETCH_OBJ_UNSET, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2, free_res; + + zend_fetch_property_address(RETURN_VALUE_UNUSED(&opline->result)?NULL:&EX_T(opline->result.u.var), GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_R), GET_OP2_ZVAL_PTR(BP_VAR_R), OP2_TYPE, BP_VAR_R TSRMLS_CC); + FREE_OP2(); + FREE_OP1_VAR_PTR(); + + PZVAL_UNLOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &free_res); + if (EX_T(opline->result.u.var).var.ptr_ptr != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(EX_T(opline->result.u.var).var.ptr_ptr); + } + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + FREE_OP_VAR_PTR(free_res); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(98, ZEND_FETCH_DIM_TMP_VAR, TMP, CONST) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *container = GET_OP1_ZVAL_PTR(BP_VAR_R); + + if (container->type != IS_ARRAY) { + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); + PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr); + } + } else { + zend_free_op free_op2; + zval *dim = GET_OP2_ZVAL_PTR(BP_VAR_R); + + EX_T(opline->result.u.var).var.ptr_ptr = zend_fetch_dimension_address_inner(container->value.ht, dim, BP_VAR_R TSRMLS_CC); + SELECTIVE_PZVAL_LOCK(*EX_T(opline->result.u.var).var.ptr_ptr, &opline->result); + FREE_OP2(); + } + AI_USE_PTR(EX_T(opline->result.u.var).var); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(136, ZEND_ASSIGN_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_op *op_data = opline+1; + zend_free_op free_op1; + zval **object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + + zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_OBJ TSRMLS_CC); + FREE_OP1_VAR_PTR(); + /* assign_obj has two opcodes! */ + ZEND_VM_INC_OPCODE(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(147, ZEND_ASSIGN_DIM, VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV) +{ + zend_op *opline = EX(opline); + zend_op *op_data = opline+1; + zend_free_op free_op1; + zval **object_ptr; + + if (OP1_TYPE == IS_CV || EX_T(opline->op1.u.var).var.ptr_ptr) { + /* not an array offset */ + object_ptr = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_W); + } else { + object_ptr = NULL; + } + + if (object_ptr && (*object_ptr)->type == IS_OBJECT) { + zend_assign_to_object(&opline->result, object_ptr, &opline->op2, &op_data->op1, EX(Ts), ZEND_ASSIGN_DIM TSRMLS_CC); + } else { + zend_free_op free_op2, free_op_data1; + zval *value; + + if (object_ptr && OP1_TYPE != IS_CV) { + (*object_ptr)->refcount++; /* undo the effect of get_obj_zval_ptr_ptr() */ + } + zend_fetch_dimension_address(&EX_T(op_data->op2.u.var), GET_OP1_ZVAL_PTR_PTR(BP_VAR_W), GET_OP2_ZVAL_PTR(BP_VAR_R), BP_VAR_W TSRMLS_CC); + FREE_OP2(); + + value = get_zval_ptr(&op_data->op1, EX(Ts), &free_op_data1, BP_VAR_R); + zend_assign_to_variable(&opline->result, &op_data->op2, &op_data->op1, value, (IS_TMP_FREE(free_op_data1)?IS_TMP_VAR:op_data->op1.op_type), EX(Ts) TSRMLS_CC); + FREE_OP_IF_VAR(free_op_data1); + } + FREE_OP1_VAR_PTR(); + /* assign_dim has two opcodes! */ + ZEND_VM_INC_OPCODE(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(38, ZEND_ASSIGN, VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op2; + zval *value = GET_OP2_ZVAL_PTR(BP_VAR_R); + + zend_assign_to_variable(&opline->result, &opline->op1, &opline->op2, value, (IS_OP2_TMP_FREE()?IS_TMP_VAR:OP2_TYPE), EX(Ts) TSRMLS_CC); + /* zend_assign_to_variable() always takes care of op2, never free it! */ + FREE_OP2_IF_VAR(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(39, ZEND_ASSIGN_REF, VAR|CV, VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval **variable_ptr_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W); + zval **value_ptr_ptr = GET_OP2_ZVAL_PTR_PTR(BP_VAR_W); + + zend_assign_to_variable_reference(variable_ptr_ptr, value_ptr_ptr TSRMLS_CC); + + if (!RETURN_VALUE_UNUSED(&opline->result)) { + EX_T(opline->result.u.var).var.ptr_ptr = variable_ptr_ptr; + PZVAL_LOCK(*variable_ptr_ptr); + AI_USE_PTR(EX_T(opline->result.u.var).var); + } + + FREE_OP1_VAR_PTR(); + FREE_OP2_VAR_PTR(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(42, ZEND_JMP, ANY, ANY) +{ +#if DEBUG_ZEND>=2 + printf("Jumping to %d\n", opline->op1.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(EX(opline)->op1.u.jmp_addr); + ZEND_VM_CONTINUE(); /* CHECK_ME */ +} + +ZEND_VM_HANDLER(43, ZEND_JMPZ, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + int ret = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + + FREE_OP1(); + if (!ret) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", opline->op2.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); + ZEND_VM_CONTINUE_JMP(); + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(44, ZEND_JMPNZ, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + int ret = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + + FREE_OP1(); + if (ret) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", opline->op2.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); + ZEND_VM_CONTINUE_JMP(); + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(45, ZEND_JMPZNZ, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + int retval = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + + FREE_OP1(); + if (retval) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp on true to %d\n", opline->extended_value); +#endif + ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]); + ZEND_VM_CONTINUE(); /* CHECK_ME */ + } else { +#if DEBUG_ZEND>=2 + printf("Conditional jmp on false to %d\n", opline->op2.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->op2.u.opline_num]); + ZEND_VM_CONTINUE_JMP(); + } +} + +ZEND_VM_HANDLER(46, ZEND_JMPZ_EX, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + int retval = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + + FREE_OP1(); + EX_T(opline->result.u.var).tmp_var.value.lval = retval; + EX_T(opline->result.u.var).tmp_var.type = IS_BOOL; + if (!retval) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", opline->op2.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); + ZEND_VM_CONTINUE_JMP(); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(47, ZEND_JMPNZ_EX, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + int retval = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + + FREE_OP1(); + EX_T(opline->result.u.var).tmp_var.value.lval = retval; + EX_T(opline->result.u.var).tmp_var.type = IS_BOOL; + if (retval) { +#if DEBUG_ZEND>=2 + printf("Conditional jmp to %d\n", opline->op2.u.opline_num); +#endif + ZEND_VM_SET_OPCODE(opline->op2.u.jmp_addr); + ZEND_VM_CONTINUE_JMP(); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(70, ZEND_FREE, TMP, ANY) +{ + zendi_zval_dtor(EX_T(EX(opline)->op1.u.var).tmp_var); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(53, ZEND_INIT_STRING, ANY, ANY) +{ + zval *tmp = &EX_T(EX(opline)->result.u.var).tmp_var; + + tmp->value.str.val = emalloc(1); + tmp->value.str.val[0] = 0; + tmp->value.str.len = 0; + tmp->refcount = 1; + tmp->type = IS_STRING; + tmp->is_ref = 0; + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(54, ZEND_ADD_CHAR, TMP, CONST) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + add_char_to_string(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_NA), + &opline->op2.u.constant); + /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(55, ZEND_ADD_STRING, TMP, CONST) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + add_string_to_string(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_NA), + &opline->op2.u.constant); + /* FREE_OP is missing intentionally here - we're always working on the same temporary variable */ + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(56, ZEND_ADD_VAR, TMP, TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval *var = GET_OP2_ZVAL_PTR(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_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(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_OP2(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(109, ZEND_FETCH_CLASS, ANY, CONST|TMP|VAR|UNUSED|CV) +{ + zend_op *opline = EX(opline); + zval *class_name; + zend_free_op free_op2; + + + if (OP2_TYPE == IS_UNUSED) { + EX_T(opline->result.u.var).class_entry = zend_fetch_class(NULL, 0, opline->extended_value TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); + } + + class_name = GET_OP2_ZVAL_PTR(BP_VAR_R); + + switch (class_name->type) { + case IS_OBJECT: + EX_T(opline->result.u.var).class_entry = Z_OBJCE_P(class_name); + break; + case IS_STRING: + EX_T(opline->result.u.var).class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC); + break; + default: + zend_error_noreturn(E_ERROR, "Class name must be a valid object or a string"); + break; + } + + FREE_OP2(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(111, ZEND_INIT_CTOR_CALL, TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope)); + + if (OP1_TYPE == IS_VAR) { + SELECTIVE_PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr, &opline->op1); + } + + /* We are not handling overloaded classes right now */ + EX(object) = GET_OP1_ZVAL_PTR(BP_VAR_R); + + /* New always returns the object as is_ref=0, therefore, we can just increment the reference count */ + EX(object)->refcount++; /* For $this pointer */ + + EX(fbc) = EX(fbc_constructor); + + if (EX(fbc)->type == ZEND_USER_FUNCTION) { /* HACK!! */ + EX(calling_scope) = EX(fbc)->common.scope; + } else { + EX(calling_scope) = NULL; + } + + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(112, ZEND_INIT_METHOD_CALL, TMP|VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zval *function_name; + char *function_name_strval; + int function_name_strlen; + zend_free_op free_op1, free_op2; + + zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope)); + + function_name = GET_OP2_ZVAL_PTR(BP_VAR_R); + + if (Z_TYPE_P(function_name)!=IS_STRING) { + zend_error_noreturn(E_ERROR, "Method name must be a string"); + } + + function_name_strval = function_name->value.str.val; + function_name_strlen = function_name->value.str.len; + + EX(calling_scope) = EG(scope); + + EX(object) = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R); + + if (EX(object) && EX(object)->type == IS_OBJECT) { + if (Z_OBJ_HT_P(EX(object))->get_method == NULL) { + zend_error_noreturn(E_ERROR, "Object does not support method calls"); + } + + /* First, locate the function. */ + EX(fbc) = Z_OBJ_HT_P(EX(object))->get_method(EX(object), function_name_strval, function_name_strlen TSRMLS_CC); + if (!EX(fbc)) { + zend_error_noreturn(E_ERROR, "Call to undefined method %s::%s()", Z_OBJ_CLASS_NAME_P(EX(object)), function_name_strval); + } + } else { + zend_error_noreturn(E_ERROR, "Call to a member function %s() on a non-object", function_name_strval); + } + + if (EX(fbc)->common.fn_flags & ZEND_ACC_STATIC) { + EX(object) = NULL; + } else { + if (!PZVAL_IS_REF(EX(object))) { + EX(object)->refcount++; /* For $this pointer */ + } else { + zval *this_ptr; + ALLOC_ZVAL(this_ptr); + INIT_PZVAL_COPY(this_ptr, EX(object)); + 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_OP2(); + FREE_OP1_IF_VAR(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(113, ZEND_INIT_STATIC_METHOD_CALL, ANY, CONST|TMP|VAR|UNUSED|CV) +{ + zend_op *opline = EX(opline); + zval *function_name; + zend_class_entry *ce; + + zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope)); + + ce = EX_T(opline->op1.u.var).class_entry; + if(OP2_TYPE != IS_UNUSED) { + char *function_name_strval; + int function_name_strlen; + zend_bool is_const = (OP2_TYPE == IS_CONST); + zend_free_op free_op2; + + if (is_const) { + function_name_strval = opline->op2.u.constant.value.str.val; + function_name_strlen = opline->op2.u.constant.value.str.len; + } else { + function_name = GET_OP2_ZVAL_PTR(BP_VAR_R); + + if (Z_TYPE_P(function_name) != IS_STRING) { + zend_error_noreturn(E_ERROR, "Function name must be a string"); + } + function_name_strval = zend_str_tolower_dup(function_name->value.str.val, function_name->value.str.len); + function_name_strlen = function_name->value.str.len; + } + + EX(fbc) = zend_std_get_static_method(ce, function_name_strval, function_name_strlen TSRMLS_CC); + + if (!is_const) { + efree(function_name_strval); + FREE_OP2(); + } + } else { + if(!ce->constructor) { + zend_error_noreturn(E_ERROR, "Can not call constructor"); + } + EX(fbc) = ce->constructor; + } + + EX(calling_scope) = EX(fbc)->common.scope; + + if (EX(fbc)->common.fn_flags & ZEND_ACC_STATIC) { + EX(object) = NULL; + } else { + if ((EX(object) = EG(This))) { + EX(object)->refcount++; + } + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(59, ZEND_INIT_FCALL_BY_NAME, ANY, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zval *function_name; + zend_function *function; + char *function_name_strval, *lcname; + int function_name_strlen; + zend_free_op free_op2; + + zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope)); + + if (OP2_TYPE == IS_CONST) { +#ifndef ZEND_VM_SPEC + free_op2.var = NULL; +#endif + function_name_strval = opline->op2.u.constant.value.str.val; + function_name_strlen = opline->op2.u.constant.value.str.len; + } else { + function_name = GET_OP2_ZVAL_PTR(BP_VAR_R); + + if (Z_TYPE_P(function_name) != IS_STRING) { + zend_error_noreturn(E_ERROR, "Function name must be a string"); + } + function_name_strval = function_name->value.str.val; + function_name_strlen = function_name->value.str.len; + } + + lcname = zend_str_tolower_dup(function_name_strval, function_name_strlen); + if (zend_hash_find(EG(function_table), lcname, function_name_strlen+1, (void **) &function)==FAILURE) { + efree(lcname); + zend_error_noreturn(E_ERROR, "Call to undefined function %s()", function_name_strval); + } + + efree(lcname); + FREE_OP2(); + + EX(calling_scope) = function->common.scope; + EX(object) = NULL; + + EX(fbc) = function; + + ZEND_VM_NEXT_OPCODE(); +} + + +ZEND_VM_HELPER(zend_do_fcall_common_helper, ANY, ANY) +{ + zend_op *opline = EX(opline); + zval **original_return_value; + zend_class_entry *current_scope; + zval *current_this; + int return_value_used = RETURN_VALUE_USED(opline); + zend_bool should_change_scope; + + if (EX(function_state).function->common.fn_flags & ZEND_ACC_ABSTRACT) { + zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name); + ZEND_VM_NEXT_OPCODE(); /* Never reached */ + } + + zend_ptr_stack_2_push(&EG(argument_stack), (void *) opline->extended_value, NULL); + + EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; + + if (EX(function_state).function->type == ZEND_USER_FUNCTION + || EX(function_state).function->common.scope) { + should_change_scope = 1; + current_this = EG(This); + EG(This) = EX(object); + current_scope = EG(scope); + EG(scope) = EX(calling_scope); + } else { + should_change_scope = 0; + } + + EX_T(opline->result.u.var).var.fcall_returned_reference = 0; + + if (EX(function_state).function->common.scope) { + if (!EG(This) && !(EX(function_state).function->common.fn_flags & ZEND_ACC_STATIC)) { + int severity; + char *severity_word; + if (EX(function_state).function->common.fn_flags & ZEND_ACC_ALLOW_STATIC) { + severity = E_STRICT; + severity_word = "should not"; + } else { + severity = E_ERROR; + severity_word = "cannot"; + } + zend_error(severity, "Non-static method %s::%s() %s be called statically", EX(function_state).function->common.scope->name, EX(function_state).function->common.function_name, severity_word); + } + } + if (EX(function_state).function->type == ZEND_INTERNAL_FUNCTION) { + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr)); + + if (EX(function_state).function->common.arg_info) { + zend_uint i=0; + zval **p; + ulong arg_count; + + p = (zval **) EG(argument_stack).top_element-2; + arg_count = (ulong) *p; + + while (arg_count>0) { + zend_verify_arg_type(EX(function_state).function, ++i, *(p-arg_count) TSRMLS_CC); + arg_count--; + } + } + if (!zend_execute_internal) { + /* saves one function call if zend_execute_internal is not used */ + ((zend_internal_function *) EX(function_state).function)->handler(opline->extended_value, EX_T(opline->result.u.var).var.ptr, EX(object), return_value_used TSRMLS_CC); + } else { + zend_execute_internal(EXECUTE_DATA, return_value_used TSRMLS_CC); + } + + EG(current_execute_data) = EXECUTE_DATA; + EX_T(opline->result.u.var).var.ptr->is_ref = 0; + EX_T(opline->result.u.var).var.ptr->refcount = 1; + if (!return_value_used) { + zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); + } + } else if (EX(function_state).function->type == ZEND_USER_FUNCTION) { + HashTable *calling_symbol_table; + + EX_T(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_T(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); + EX_T(opline->result.u.var).var.fcall_returned_reference = EG(active_op_array)->return_reference; + + if (return_value_used && !EX_T(opline->result.u.var).var.ptr) { + if (!EG(exception)) { + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + INIT_ZVAL(*EX_T(opline->result.u.var).var.ptr); + } + } else if (!return_value_used && EX_T(opline->result.u.var).var.ptr) { + zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); + } + + EG(opline_ptr) = &EX(opline); + EG(active_op_array) = EX(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 { + /* clean before putting into the cache, since clean + could call dtors, which could use cached hash */ + zend_hash_clean(EX(function_state).function_symbol_table); + *(++EG(symtable_cache_ptr)) = EX(function_state).function_symbol_table; + } + EG(active_symbol_table) = calling_symbol_table; + } else { /* ZEND_OVERLOADED_FUNCTION */ + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + INIT_ZVAL(*(EX_T(opline->result.u.var).var.ptr)); + + /* Not sure what should be done here if it's a static method */ + if (EX(object)) { + Z_OBJ_HT_P(EX(object))->call_method(EX(fbc)->common.function_name, opline->extended_value, EX_T(opline->result.u.var).var.ptr, EX(object), return_value_used TSRMLS_CC); + } else { + zend_error_noreturn(E_ERROR, "Cannot call overloaded function for non-object"); + } + + if (EX(function_state).function->type == ZEND_OVERLOADED_FUNCTION_TEMPORARY) { + efree(EX(function_state).function->common.function_name); + } + efree(EX(fbc)); + + if (!return_value_used) { + zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); + } else { + EX_T(opline->result.u.var).var.ptr->is_ref = 0; + EX_T(opline->result.u.var).var.ptr->refcount = 1; + } + } + + if (EG(This)) { + if (EG(exception) && EX(fbc) && EX(fbc)->common.fn_flags&ZEND_ACC_CTOR) { + EG(This)->refcount--; + if (EG(This)->refcount == 1) { + zend_object_store_ctor_failed(EG(This) TSRMLS_CC); + } + zval_ptr_dtor(&EG(This)); + } else if (should_change_scope) { + zval_ptr_dtor(&EG(This)); + } + } + + if (should_change_scope) { + EG(This) = current_this; + EG(scope) = current_scope; + } + zend_ptr_stack_3_pop(&EG(arg_types_stack), (void**)&EX(calling_scope), (void**)&EX(object), (void**)&EX(fbc)); + + EX(function_state).function = (zend_function *) EX(op_array); + EG(function_state_ptr) = &EX(function_state); + zend_ptr_stack_clear_multiple(TSRMLS_C); + + if (EG(exception)) { + zend_throw_exception_internal(NULL TSRMLS_CC); + if (return_value_used && EX_T(opline->result.u.var).var.ptr) { + zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); + } + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(61, ZEND_DO_FCALL_BY_NAME, ANY, ANY) +{ + EX(function_state).function = EX(fbc); + ZEND_VM_DISPATCH_TO_HELPER(zend_do_fcall_common_helper); +} + +ZEND_VM_HANDLER(60, ZEND_DO_FCALL, CONST, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *fname = GET_OP1_ZVAL_PTR(BP_VAR_R); + + zend_ptr_stack_3_push(&EG(arg_types_stack), EX(fbc), EX(object), EX(calling_scope)); + + if (zend_hash_find(EG(function_table), fname->value.str.val, fname->value.str.len+1, (void **) &EX(function_state).function)==FAILURE) { + zend_error_noreturn(E_ERROR, "Unknown function: %s()\n", fname->value.str.val); + } + EX(object) = NULL; + EX(calling_scope) = EX(function_state).function->common.scope; + + FREE_OP1(); + + ZEND_VM_DISPATCH_TO_HELPER(zend_do_fcall_common_helper); +} + +ZEND_VM_HANDLER(62, ZEND_RETURN, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zval *retval_ptr; + zval **retval_ptr_ptr; + zend_free_op free_op1; + + if (EG(active_op_array)->return_reference == ZEND_RETURN_REF) { + + if (OP1_TYPE == IS_CONST || OP1_TYPE == IS_TMP_VAR) { + /* Not supposed to happen, but we'll allow it */ + zend_error(E_STRICT, "Only variable references should be returned by reference"); + ZEND_VM_C_GOTO(return_by_value); + } + + retval_ptr_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W); + + if (!retval_ptr_ptr) { + zend_error_noreturn(E_ERROR, "Cannot return string offsets by reference"); + } + + if (!(*retval_ptr_ptr)->is_ref) { + if (EX_T(opline->op1.u.var).var.ptr_ptr == &EX_T(opline->op1.u.var).var.ptr + || (opline->extended_value == ZEND_RETURNS_FUNCTION && !EX_T(opline->op1.u.var).var.fcall_returned_reference)) { + zend_error(E_STRICT, "Only variable references should be returned by reference"); + PZVAL_LOCK(*retval_ptr_ptr); /* undo the effect of get_zval_ptr_ptr() */ + ZEND_VM_C_GOTO(return_by_value); + } + } + + SEPARATE_ZVAL_TO_MAKE_IS_REF(retval_ptr_ptr); + (*retval_ptr_ptr)->refcount++; + + (*EG(return_value_ptr_ptr)) = (*retval_ptr_ptr); + } else { +ZEND_VM_C_LABEL(return_by_value): + + retval_ptr = GET_OP1_ZVAL_PTR(BP_VAR_R); + + if (EG(ze1_compatibility_mode) && Z_TYPE_P(retval_ptr) == IS_OBJECT) { + zval *ret; + + ALLOC_ZVAL(ret); + INIT_PZVAL_COPY(ret, retval_ptr); + if (Z_OBJ_HT_P(retval_ptr)->clone_obj == NULL) { + zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object of class %s", Z_OBJCE_P(retval_ptr)->name); + } + zend_error(E_STRICT, "Implicit cloning object of class '%s' because of 'zend.ze1_compatibility_mode'", Z_OBJCE_P(retval_ptr)->name); + ret->value.obj = Z_OBJ_HT_P(retval_ptr)->clone_obj(retval_ptr TSRMLS_CC); + *EG(return_value_ptr_ptr) = ret; + } else if (!IS_OP1_TMP_FREE()) { /* Not a temp var */ + if (PZVAL_IS_REF(retval_ptr) && retval_ptr->refcount > 0) { + zval *ret; + + ALLOC_ZVAL(ret); + INIT_PZVAL_COPY(ret, retval_ptr); + zval_copy_ctor(ret); + *EG(return_value_ptr_ptr) = ret; + } else { + *EG(return_value_ptr_ptr) = retval_ptr; + retval_ptr->refcount++; + } + } else { + zval *ret; + + ALLOC_ZVAL(ret); + INIT_PZVAL_COPY(ret, retval_ptr); + *EG(return_value_ptr_ptr) = ret; + } + } + FREE_OP1_IF_VAR(); + ZEND_VM_RETURN_FROM_EXECUTE_LOOP(); +} + +ZEND_VM_HANDLER(108, ZEND_THROW, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zval *value; + zval *exception; + zend_free_op free_op1; + + value = GET_OP1_ZVAL_PTR(BP_VAR_R); + + if (value->type != IS_OBJECT) { + zend_error_noreturn(E_ERROR, "Can only throw objects"); + } + /* Not sure if a complete copy is what we want here */ + ALLOC_ZVAL(exception); + INIT_PZVAL_COPY(exception, value); + if (!IS_OP1_TMP_FREE()) { + zval_copy_ctor(exception); + } + + zend_throw_exception_object(exception TSRMLS_CC); + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(107, ZEND_CATCH, ANY, ANY) +{ + zend_op *opline = EX(opline); + zend_class_entry *ce; + + /* Check whether an exception has been thrown, if not, jump over code */ + if (EG(exception) == NULL) { + ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]); + ZEND_VM_CONTINUE(); /* CHECK_ME */ + } + ce = Z_OBJCE_P(EG(exception)); + if (ce != EX_T(opline->op1.u.var).class_entry) { + if (!instanceof_function(ce, EX_T(opline->op1.u.var).class_entry TSRMLS_CC)) { + if (opline->op1.u.EA.type) { + zend_throw_exception_internal(NULL TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); + } + ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[opline->extended_value]); + ZEND_VM_CONTINUE(); /* CHECK_ME */ + } + } + + zend_hash_update(EG(active_symbol_table), opline->op2.u.constant.value.str.val, + opline->op2.u.constant.value.str.len+1, &EG(exception), sizeof(zval *), (void **) NULL); + EG(exception) = NULL; + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(65, ZEND_SEND_VAL, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + if (opline->extended_value==ZEND_DO_FCALL_BY_NAME + && ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) { + zend_error_noreturn(E_ERROR, "Cannot pass parameter %d by reference", opline->op2.u.opline_num); + } + { + zval *valptr; + zval *value; + zend_free_op free_op1; + + value = GET_OP1_ZVAL_PTR(BP_VAR_R); + + ALLOC_ZVAL(valptr); + INIT_PZVAL_COPY(valptr, value); + if (!IS_OP1_TMP_FREE()) { + zval_copy_ctor(valptr); + } + zend_ptr_stack_push(&EG(argument_stack), valptr); + FREE_OP1_IF_VAR(); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER(zend_send_by_var_helper, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zval *varptr; + zend_free_op free_op1; + varptr = GET_OP1_ZVAL_PTR(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_OP1(); /* for string offsets */ + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(106, ZEND_SEND_VAR_NO_REF, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + if (opline->extended_value & ZEND_ARG_COMPILE_TIME_BOUND) { /* Had function_ptr at compile_time */ + if (!(opline->extended_value & ZEND_ARG_SEND_BY_REF)) { + ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper); + } + } else if (!ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) { + ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper); + } + { + zval *varptr; + zend_free_op free_op1; + varptr = GET_OP1_ZVAL_PTR(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); + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); + } + zend_error_noreturn(E_ERROR, "Only variables can be passed by reference"); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(67, ZEND_SEND_REF, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval **varptr_ptr; + zval *varptr; + varptr_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_W); + + if (!varptr_ptr) { + zend_error_noreturn(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); + + FREE_OP1_VAR_PTR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(66, ZEND_SEND_VAR, VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + + if ((opline->extended_value == ZEND_DO_FCALL_BY_NAME) + && ARG_SHOULD_BE_SENT_BY_REF(EX(fbc), opline->op2.u.opline_num)) { + ZEND_VM_DISPATCH_TO_HANDLER(ZEND_SEND_REF); + } + ZEND_VM_DISPATCH_TO_HELPER(zend_send_by_var_helper); +} + +ZEND_VM_HANDLER(63, ZEND_RECV, ANY, ANY) +{ + zend_op *opline = EX(opline); + zval **param; + zend_uint arg_num = opline->op1.u.constant.value.lval; + + if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) { + char *space; + char *class_name = get_active_class_name(&space TSRMLS_CC); + zend_execute_data *ptr = EX(prev_execute_data); + + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, NULL TSRMLS_CC); + if(ptr && ptr->op_array) { + zend_error(E_WARNING, "Missing argument %ld for %s%s%s(), called in %s on line %d and defined", opline->op1.u.constant.value.lval, class_name, space, get_active_function_name(TSRMLS_C), ptr->op_array->filename, ptr->opline->lineno); + } else { + zend_error(E_WARNING, "Missing argument %ld for %s%s%s()", opline->op1.u.constant.value.lval, class_name, space, get_active_function_name(TSRMLS_C)); + } + if (opline->result.op_type == IS_VAR) { + PZVAL_UNLOCK_FREE(*EX_T(opline->result.u.var).var.ptr_ptr); + } + } else { + zend_free_op free_res; + zval **var_ptr; + + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, *param TSRMLS_CC); + var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); + if (PZVAL_IS_REF(*param)) { + zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); + } else { + zend_receive(var_ptr, *param TSRMLS_CC); + } + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(64, ZEND_RECV_INIT, ANY, CONST) +{ + zend_op *opline = EX(opline); + zval **param, *assignment_value; + zend_uint arg_num = opline->op1.u.constant.value.lval; + zend_free_op free_res; + zval **var_ptr = get_zval_ptr_ptr(&opline->result, EX(Ts), &free_res, BP_VAR_W); + + if (zend_ptr_stack_get_arg(arg_num, (void **) ¶m TSRMLS_CC)==FAILURE) { + if (opline->op2.u.constant.type == IS_CONSTANT || opline->op2.u.constant.type==IS_CONSTANT_ARRAY) { + zval *default_value; + + ALLOC_ZVAL(default_value); + *default_value = opline->op2.u.constant; + if (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 = &opline->op2.u.constant; + } + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value TSRMLS_CC); + zend_receive(var_ptr, assignment_value TSRMLS_CC); + } else { + assignment_value = *param; + zend_verify_arg_type((zend_function *) EG(active_op_array), arg_num, assignment_value TSRMLS_CC); + if (PZVAL_IS_REF(assignment_value)) { + zend_assign_to_variable_reference(var_ptr, param TSRMLS_CC); + } else { + zend_receive(var_ptr, assignment_value TSRMLS_CC); + } + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(52, ZEND_BOOL, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + + /* PHP 3.0 returned "" for false and 1 for true, here we use 0 and 1 for now */ + EX_T(opline->result.u.var).tmp_var.value.lval = i_zend_is_true(GET_OP1_ZVAL_PTR(BP_VAR_R)); + EX_T(opline->result.u.var).tmp_var.type = IS_BOOL; + FREE_OP1(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(50, ZEND_BRK, ANY, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op2; + + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + + zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), + opline->op1.u.opline_num, + EX(op_array), EX(Ts) TSRMLS_CC)->brk); + FREE_OP2(); + ZEND_VM_CONTINUE(); /* CHECK_ME */ +} + +ZEND_VM_HANDLER(51, ZEND_CONT, ANY, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op2; + + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + + zend_brk_cont(GET_OP2_ZVAL_PTR(BP_VAR_R), + opline->op1.u.opline_num, + EX(op_array), EX(Ts) TSRMLS_CC)->cont); + FREE_OP2(); + ZEND_VM_CONTINUE(); /* CHECK_ME */ +} + +ZEND_VM_HANDLER(48, ZEND_CASE, CONST|TMP|VAR|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + int switch_expr_is_overloaded=0; + zend_free_op free_op1, free_op2; + + if (OP1_TYPE==IS_VAR) { + if (EX_T(opline->op1.u.var).var.ptr_ptr) { + PZVAL_LOCK(EX_T(opline->op1.u.var).var.ptr); + } else { + switch_expr_is_overloaded = 1; + EX_T(opline->op1.u.var).str_offset.str->refcount++; + } + } + is_equal_function(&EX_T(opline->result.u.var).tmp_var, + GET_OP1_ZVAL_PTR(BP_VAR_R), + GET_OP2_ZVAL_PTR(BP_VAR_R) TSRMLS_CC); + + 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_OP1(); + EX_T(opline->op1.u.var).var.ptr_ptr = NULL; + AI_USE_PTR(EX_T(opline->op1.u.var).var); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(49, ZEND_SWITCH_FREE, TMP|VAR, ANY) +{ + zend_switch_free(EX(opline), EX(Ts) TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(68, ZEND_NEW, ANY, ANY) +{ + zend_op *opline = EX(opline); + + if (EX_T(opline->op1.u.var).class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_IMPLICIT_ABSTRACT_CLASS|ZEND_ACC_EXPLICIT_ABSTRACT_CLASS)) { + char *class_type; + + if (EX_T(opline->op1.u.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) { + class_type = "interface"; + } else { + class_type = "abstract class"; + } + zend_error_noreturn(E_ERROR, "Cannot instantiate %s %s", class_type, EX_T(opline->op1.u.var).class_entry->name); + } + EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + object_init_ex(EX_T(opline->result.u.var).var.ptr, EX_T(opline->op1.u.var).class_entry); + EX_T(opline->result.u.var).var.ptr->refcount=1; + EX_T(opline->result.u.var).var.ptr->is_ref=0; + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(110, ZEND_CLONE, CONST|TMP|VAR|UNUSED|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *obj = GET_OP1_OBJ_ZVAL_PTR(BP_VAR_R); + zend_class_entry *ce; + zend_function *clone; + zend_object_clone_obj_t clone_call; + + if (!obj || Z_TYPE_P(obj) != IS_OBJECT) { + zend_error(E_WARNING, "__clone method called on non-object"); + EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr); + EX_T(opline->result.u.var).var.ptr->refcount++; + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); + } + + ce = Z_OBJCE_P(obj); + clone = ce ? ce->clone : NULL; + clone_call = Z_OBJ_HT_P(obj)->clone_obj; + if (!clone_call) { + zend_error_noreturn(E_ERROR, "Trying to clone an uncloneable object of class %s", ce->name); + EX_T(opline->result.u.var).var.ptr = EG(error_zval_ptr); + EX_T(opline->result.u.var).var.ptr->refcount++; + } + + if (ce && clone) { + if (clone->op_array.fn_flags & ZEND_ACC_PRIVATE) { + /* Ensure that if we're calling a private function, we're allowed to do so. + */ + if (ce != EG(scope)) { + zend_error_noreturn(E_ERROR, "Call to private %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : ""); + } + } else if ((clone->common.fn_flags & ZEND_ACC_PROTECTED)) { + /* Ensure that if we're calling a protected function, we're allowed to do so. + */ + if (!zend_check_protected(clone->common.scope, EG(scope))) { + zend_error_noreturn(E_ERROR, "Call to protected %s::__clone() from context '%s'", ce->name, EG(scope) ? EG(scope)->name : ""); + } + } + } + + EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + EX_T(opline->result.u.var).var.ptr->value.obj = clone_call(obj TSRMLS_CC); + if (EG(exception)) { + FREE_ZVAL(EX_T(opline->result.u.var).var.ptr); + } else { + EX_T(opline->result.u.var).var.ptr->type = IS_OBJECT; + EX_T(opline->result.u.var).var.ptr->refcount=1; + EX_T(opline->result.u.var).var.ptr->is_ref=1; + } + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(99, ZEND_FETCH_CONSTANT, CONST|UNUSED, CONST) +{ + zend_op *opline = EX(opline); + zend_class_entry *ce = NULL; + zval **value; + + if (OP1_TYPE == IS_UNUSED) { +/* This seems to be a reminant of namespaces + if (EG(scope)) { + ce = EG(scope); + if (zend_hash_find(&ce->constants_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { + zval_update_constant(value, (void *) 1 TSRMLS_CC); + EX_T(opline->result.u.var).tmp_var = **value; + zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var); + ZEND_VM_NEXT_OPCODE(); + } + } +*/ + if (!zend_get_constant(opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len, &EX_T(opline->result.u.var).tmp_var TSRMLS_CC)) { + zend_error(E_NOTICE, "Use of undefined constant %s - assumed '%s'", + opline->op2.u.constant.value.str.val, + opline->op2.u.constant.value.str.val); + EX_T(opline->result.u.var).tmp_var = opline->op2.u.constant; + zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var); + } + ZEND_VM_NEXT_OPCODE(); + } + + ce = EX_T(opline->op1.u.var).class_entry; + + if (zend_hash_find(&ce->constants_table, opline->op2.u.constant.value.str.val, opline->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { + zval_update_constant(value, (void *) 1 TSRMLS_CC); + EX_T(opline->result.u.var).tmp_var = **value; + zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var); + } else { + zend_error_noreturn(E_ERROR, "Undefined class constant '%s'", opline->op2.u.constant.value.str.val); + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER(zend_init_add_array_helper, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval *array_ptr = &EX_T(opline->result.u.var).tmp_var; + zval *expr_ptr, **expr_ptr_ptr = NULL; + zval *offset=GET_OP2_ZVAL_PTR(BP_VAR_R); + + if (opline->extended_value) { + expr_ptr_ptr=GET_OP1_ZVAL_PTR_PTR(BP_VAR_W); + expr_ptr = *expr_ptr_ptr; + } else { + expr_ptr=GET_OP1_ZVAL_PTR(BP_VAR_R); + } + + if (opline->opcode == ZEND_INIT_ARRAY) { + array_init(array_ptr); + if (!expr_ptr) { + ZEND_VM_NEXT_OPCODE(); + } + } + if (!opline->extended_value && IS_OP1_TMP_FREE()) { /* temporary variable */ + zval *new_expr; + + ALLOC_ZVAL(new_expr); + INIT_PZVAL_COPY(new_expr, expr_ptr); + expr_ptr = new_expr; + } else { + if (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); + INIT_PZVAL_COPY(new_expr, expr_ptr); + expr_ptr = new_expr; + zendi_zval_copy_ctor(*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: + case IS_BOOL: + zend_hash_index_update(array_ptr->value.ht, offset->value.lval, &expr_ptr, sizeof(zval *), NULL); + break; + case IS_STRING: + zend_symtable_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: + zend_error(E_WARNING, "Illegal offset type"); + zval_ptr_dtor(&expr_ptr); + /* do nothing */ + break; + } + FREE_OP2(); + } else { + zend_hash_next_index_insert(array_ptr->value.ht, &expr_ptr, sizeof(zval *), NULL); + } + if (opline->extended_value) { + FREE_OP1_VAR_PTR(); + } else { + FREE_OP1_IF_VAR(); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(71, ZEND_INIT_ARRAY, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER(zend_init_add_array_helper); +} + +ZEND_VM_HANDLER(72, ZEND_ADD_ARRAY_ELEMENT, CONST|TMP|VAR|UNUSED|CV, CONST|TMP|VAR|UNUSED|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER(zend_init_add_array_helper); +} + +ZEND_VM_HANDLER(21, ZEND_CAST, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *expr = GET_OP1_ZVAL_PTR(BP_VAR_R); + zval *result = &EX_T(opline->result.u.var).tmp_var; + + *result = *expr; + if (!IS_OP1_TMP_FREE()) { + zendi_zval_copy_ctor(*result); + } + switch (opline->extended_value) { + case IS_NULL: + convert_to_null(result); + break; + case IS_BOOL: + convert_to_boolean(result); + break; + case IS_LONG: + convert_to_long(result); + break; + case IS_DOUBLE: + convert_to_double(result); + break; + case IS_STRING: { + zval var_copy; + int use_copy; + + zend_make_printable_zval(result, &var_copy, &use_copy); + if (use_copy) { + zval_dtor(result); + *result = var_copy; + } + break; + } + case IS_ARRAY: + convert_to_array(result); + break; + case IS_OBJECT: + convert_to_object(result); + break; + } + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(73, ZEND_INCLUDE_OR_EVAL, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_op_array *new_op_array=NULL; + zval **original_return_value = EG(return_value_ptr_ptr); + int return_value_used; + zend_free_op free_op1; + zval *inc_filename = GET_OP1_ZVAL_PTR(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(opline); + + switch (opline->op2.u.constant.value.lval) { + case ZEND_INCLUDE_ONCE: + case ZEND_REQUIRE_ONCE: { + int dummy = 1; + zend_file_handle file_handle; + + if (SUCCESS == zend_stream_open(inc_filename->value.str.val, &file_handle TSRMLS_CC)) { + + if (!file_handle.opened_path) { + file_handle.opened_path = estrndup(inc_filename->value.str.val, inc_filename->value.str.len); + } + + if (zend_hash_add(&EG(included_files), file_handle.opened_path, strlen(file_handle.opened_path)+1, (void *)&dummy, sizeof(int), NULL)==SUCCESS) { + new_op_array = zend_compile_file(&file_handle, (opline->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE?ZEND_INCLUDE:ZEND_REQUIRE) TSRMLS_CC); + zend_destroy_file_handle(&file_handle TSRMLS_CC); + } else { + zend_file_handle_dtor(&file_handle); + failure_retval=1; + } + } else { + if (opline->op2.u.constant.value.lval==ZEND_INCLUDE_ONCE) { + zend_message_dispatcher(ZMSG_FAILED_INCLUDE_FOPEN, inc_filename->value.str.val); + } else { + zend_message_dispatcher(ZMSG_FAILED_REQUIRE_FOPEN, inc_filename->value.str.val); + } + } + break; + } + break; + case ZEND_INCLUDE: + case ZEND_REQUIRE: + new_op_array = compile_filename(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_OP1(); + EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; + if (new_op_array) { + zval *saved_object; + zend_function *saved_function; + + EG(return_value_ptr_ptr) = EX_T(opline->result.u.var).var.ptr_ptr; + EG(active_op_array) = new_op_array; + EX_T(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_T(opline->result.u.var).var.ptr) { + zval_ptr_dtor(&EX_T(opline->result.u.var).var.ptr); + } + } else { /* return value is used */ + if (!EX_T(opline->result.u.var).var.ptr) { /* there was no return statement */ + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + INIT_PZVAL(EX_T(opline->result.u.var).var.ptr); + EX_T(opline->result.u.var).var.ptr->value.lval = 1; + EX_T(opline->result.u.var).var.ptr->type = IS_BOOL; + } + } + + EG(opline_ptr) = &EX(opline); + EG(active_op_array) = EX(op_array); + EG(function_state_ptr) = &EX(function_state); + destroy_op_array(new_op_array TSRMLS_CC); + efree(new_op_array); + if (EG(exception)) { + zend_throw_exception_internal(NULL TSRMLS_CC); + } + } else { + if (return_value_used) { + ALLOC_ZVAL(EX_T(opline->result.u.var).var.ptr); + INIT_ZVAL(*EX_T(opline->result.u.var).var.ptr); + EX_T(opline->result.u.var).var.ptr->value.lval = failure_retval; + EX_T(opline->result.u.var).var.ptr->type = IS_BOOL; + } + } + EG(return_value_ptr_ptr) = original_return_value; + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(74, ZEND_UNSET_VAR, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zval tmp, *varname; + HashTable *target_symbol_table; + zend_free_op free_op1; + + varname = GET_OP1_ZVAL_PTR(BP_VAR_R); + + if (varname->type != IS_STRING) { + tmp = *varname; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + varname = &tmp; + } + + if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { + zend_std_unset_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname) TSRMLS_CC); + } else { + target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), BP_VAR_IS, varname TSRMLS_CC); + if (zend_hash_del(target_symbol_table, varname->value.str.val, varname->value.str.len+1) == SUCCESS) { + zend_execute_data *ex = EXECUTE_DATA; + ulong hash_value = zend_inline_hash_func(varname->value.str.val, varname->value.str.len+1); + + do { + int i; + + for (i = 0; i < ex->op_array->last_var; i++) { + if (ex->op_array->vars[i].hash_value == hash_value && + ex->op_array->vars[i].name_len == varname->value.str.len && + !memcmp(ex->op_array->vars[i].name, varname->value.str.val, varname->value.str.len)) { + ex->CVs[i] = NULL; + break; + } + } + ex = ex->prev_execute_data; + } while (ex && ex->symbol_table == target_symbol_table); + } + } + + if (varname == &tmp) { + zval_dtor(&tmp); + } + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(75, ZEND_UNSET_DIM_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_UNSET); + zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R); + long index; + + if (container) { + HashTable *ht; + + if (OP1_TYPE == IS_CV && container != &EG(uninitialized_zval_ptr)) { + SEPARATE_ZVAL_IF_NOT_REF(container); + } + if (opline->extended_value == ZEND_UNSET_DIM) { + switch (Z_TYPE_PP(container)) { + case IS_ARRAY: + ht = Z_ARRVAL_PP(container); + break; + case IS_OBJECT: + ht = NULL; + if (!Z_OBJ_HT_P(*container)->unset_dimension) { + zend_error_noreturn(E_ERROR, "Cannot use object as array"); + } + Z_OBJ_HT_P(*container)->unset_dimension(*container, offset TSRMLS_CC); + break; + case IS_STRING: + zend_error_noreturn(E_ERROR, "Cannot unset string offsets"); + ZEND_VM_CONTINUE(); /* bailed out before */ + default: + ht = NULL; + break; + } + } else { /* ZEND_UNSET_OBJ */ + ht = NULL; + if (Z_TYPE_PP(container) == 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: + if (offset->type == IS_DOUBLE) { + index = (long) offset->value.dval; + } else { + index = offset->value.lval; + } + + zend_hash_index_del(ht, index); + break; + case IS_STRING: + if (zend_symtable_del(ht, offset->value.str.val, offset->value.str.len+1) == SUCCESS && + ht == &EG(symbol_table)) { + zend_execute_data *ex; + ulong hash_value = zend_inline_hash_func(offset->value.str.val, offset->value.str.len+1); + + for (ex = EXECUTE_DATA; ex; ex = ex->prev_execute_data) { + if (ex->symbol_table == ht) { + int i; + + for (i = 0; i < ex->op_array->last_var; i++) { + if (ex->op_array->vars[i].hash_value == hash_value && + ex->op_array->vars[i].name_len == offset->value.str.len && + !memcmp(ex->op_array->vars[i].name, offset->value.str.val, offset->value.str.len)) { + ex->CVs[i] = NULL; + break; + } + } + } + } + } + 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_OP2(); + FREE_OP1_VAR_PTR(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(77, ZEND_FE_RESET, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *array_ptr, **array_ptr_ptr; + HashTable *fe_ht; + zend_object_iterator *iter = NULL; + zend_class_entry *ce = NULL; + + if (opline->extended_value) { + array_ptr_ptr = GET_OP1_ZVAL_PTR_PTR(BP_VAR_R); + if (array_ptr_ptr == NULL) { + ALLOC_INIT_ZVAL(array_ptr); + } else if (Z_TYPE_PP(array_ptr_ptr) == IS_OBJECT) { + ce = Z_OBJCE_PP(array_ptr_ptr); + if (!ce || ce->get_iterator == NULL) { + SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr); + (*array_ptr_ptr)->refcount++; + } + array_ptr = *array_ptr_ptr; + } else { + SEPARATE_ZVAL_IF_NOT_REF(array_ptr_ptr); + array_ptr = *array_ptr_ptr; + array_ptr->refcount++; + } + } else { + array_ptr = GET_OP1_ZVAL_PTR(BP_VAR_R); + if (IS_OP1_TMP_FREE()) { /* IS_TMP_VAR */ + zval *tmp; + + ALLOC_ZVAL(tmp); + INIT_PZVAL_COPY(tmp, array_ptr); + array_ptr = tmp; + } else if (Z_TYPE_P(array_ptr) == IS_OBJECT) { + ce = Z_OBJCE_P(array_ptr); + } else { + array_ptr->refcount++; + } + } + + if (ce && ce->get_iterator) { + iter = ce->get_iterator(ce, array_ptr TSRMLS_CC); + + if (iter) { + array_ptr = zend_iterator_wrap(iter TSRMLS_CC); + } else { + array_ptr->refcount++; + } + } + + PZVAL_LOCK(array_ptr); + EX_T(opline->result.u.var).var.ptr = array_ptr; + EX_T(opline->result.u.var).var.ptr_ptr = &EX_T(opline->result.u.var).var.ptr; + + if (iter) { + iter->index = 0; + if (iter->funcs->rewind) { + iter->funcs->rewind(iter TSRMLS_CC); + } + } else if ((fe_ht = HASH_OF(array_ptr)) != NULL) { + /* probably redundant */ + zend_hash_internal_pointer_reset(fe_ht); + } else { + zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + + opline++; + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + if (opline->extended_value) { + FREE_OP1_VAR_PTR(); + } else { + FREE_OP1_IF_VAR(); + } + ZEND_VM_CONTINUE_JMP(); + } + + if (opline->extended_value) { + FREE_OP1_VAR_PTR(); + } else { + FREE_OP1_IF_VAR(); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(78, ZEND_FE_FETCH, VAR, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *array = GET_OP1_ZVAL_PTR(BP_VAR_R); + zval **value, *key; + char *str_key; + uint str_key_len; + ulong int_key; + HashTable *fe_ht; + zend_object_iterator *iter = NULL; + int key_type; + zend_bool use_key = opline->extended_value & ZEND_FE_FETCH_WITH_KEY; + + PZVAL_LOCK(array); + + switch (zend_iterator_unwrap(array, &iter TSRMLS_CC)) { + default: + case ZEND_ITER_INVALID: + zend_error(E_WARNING, "Invalid argument supplied for foreach()"); + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + + case ZEND_ITER_PLAIN_OBJECT: { + char *class_name, *prop_name; + zend_object *zobj = zend_objects_get_address(array TSRMLS_CC); + + fe_ht = HASH_OF(array); + do { + if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { + /* reached end of iteration */ + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + } + key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 0, NULL); + + zend_hash_move_forward(fe_ht); + } while (key_type != HASH_KEY_IS_STRING || zend_check_property_access(zobj, str_key TSRMLS_CC) != SUCCESS); + if (use_key) { + zend_unmangle_property_name(str_key, &class_name, &prop_name); + str_key_len = strlen(prop_name); + str_key = estrndup(prop_name, str_key_len); + str_key_len++; + } + break; + } + + case ZEND_ITER_PLAIN_ARRAY: + fe_ht = HASH_OF(array); + if (zend_hash_get_current_data(fe_ht, (void **) &value)==FAILURE) { + /* reached end of iteration */ + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + } + if (use_key) { + key_type = zend_hash_get_current_key_ex(fe_ht, &str_key, &str_key_len, &int_key, 1, NULL); + } + zend_hash_move_forward(fe_ht); + break; + + case ZEND_ITER_OBJECT: + /* !iter happens from exception */ + if (iter && iter->index++) { + /* This could cause an endless loop if index becomes zero again. + * In case that ever happens we need an additional flag. */ + iter->funcs->move_forward(iter TSRMLS_CC); + } + if (!iter || iter->funcs->valid(iter TSRMLS_CC) == FAILURE) { + /* reached end of iteration */ + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + } + iter->funcs->get_current_data(iter, &value TSRMLS_CC); + if (!value) { + /* failure in get_current_data */ + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes+opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + } + if (use_key) { + if (iter->funcs->get_current_key) { + key_type = iter->funcs->get_current_key(iter, &str_key, &str_key_len, &int_key TSRMLS_CC); + } else { + key_type = HASH_KEY_IS_LONG; + int_key = iter->index; + } + } + + break; + } + + if (opline->extended_value & ZEND_FE_FETCH_BYREF) { + SEPARATE_ZVAL_IF_NOT_REF(value); + (*value)->is_ref = 1; + } + + if (!use_key) { + if (opline->extended_value & ZEND_FE_FETCH_BYREF) { + EX_T(opline->result.u.var).var.ptr_ptr = value; + (*value)->refcount++; + } else { + zval *result = &EX_T(opline->result.u.var).tmp_var; + + *result = **value; + zval_copy_ctor(result); + } + } else { + zval *result = &EX_T(opline->result.u.var).tmp_var; + + (*value)->refcount++; + + array_init(result); + + zend_hash_index_update(result->value.ht, 0, value, sizeof(zval *), NULL); + + ALLOC_ZVAL(key); + INIT_PZVAL(key); + + switch (key_type) { + case HASH_KEY_IS_STRING: + key->value.str.val = str_key; + key->value.str.len = str_key_len-1; + 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_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(69, ZEND_JMP_NO_CTOR, TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zval *object_zval; + zend_function *constructor; + zend_free_op free_op1; + + if (OP1_TYPE == IS_VAR) { + PZVAL_LOCK(*EX_T(opline->op1.u.var).var.ptr_ptr); + } + + object_zval = GET_OP1_ZVAL_PTR(BP_VAR_R); + constructor = Z_OBJ_HT_P(object_zval)->get_constructor(object_zval TSRMLS_CC); + + EX(fbc_constructor) = NULL; + if (constructor == NULL) { + if(opline->op1.u.EA.type & EXT_TYPE_UNUSED) { + zval_ptr_dtor(EX_T(opline->op1.u.var).var.ptr_ptr); + } + ZEND_VM_SET_OPCODE(EX(op_array)->opcodes + opline->op2.u.opline_num); + ZEND_VM_CONTINUE_JMP(); + } else { + EX(fbc_constructor) = constructor; + } + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(114, ZEND_ISSET_ISEMPTY_VAR, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval tmp, *varname = GET_OP1_ZVAL_PTR(BP_VAR_IS); + zval **value; + zend_bool isset = 1; + HashTable *target_symbol_table; + + if (varname->type != IS_STRING) { + tmp = *varname; + zval_copy_ctor(&tmp); + convert_to_string(&tmp); + varname = &tmp; + } + + if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { + value = zend_std_get_static_property(EX_T(opline->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC); + if (!value) { + isset = 0; + } + } else { + target_symbol_table = zend_get_target_symbol_table(opline, EX(Ts), BP_VAR_IS, varname TSRMLS_CC); + if (zend_hash_find(target_symbol_table, varname->value.str.val, varname->value.str.len+1, (void **) &value) == FAILURE) { + isset = 0; + } + } + + EX_T(opline->result.u.var).tmp_var.type = IS_BOOL; + + switch (opline->extended_value) { + case ZEND_ISSET: + if (isset && Z_TYPE_PP(value) == IS_NULL) { + EX_T(opline->result.u.var).tmp_var.value.lval = 0; + } else { + EX_T(opline->result.u.var).tmp_var.value.lval = isset; + } + break; + case ZEND_ISEMPTY: + if (!isset || !i_zend_is_true(*value)) { + EX_T(opline->result.u.var).tmp_var.value.lval = 1; + } else { + EX_T(opline->result.u.var).tmp_var.value.lval = 0; + } + break; + } + + if (varname == &tmp) { + zval_dtor(&tmp); + } + FREE_OP1(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, VAR|UNUSED|CV, CONST|TMP|VAR|CV, int prop_dim) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1, free_op2; + zval **container = GET_OP1_OBJ_ZVAL_PTR_PTR(BP_VAR_IS); + zval *offset = GET_OP2_ZVAL_PTR(BP_VAR_R); + zval **value = NULL; + int result = 0; + long index; + + 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: + if (offset->type == IS_DOUBLE) { + index = (long) offset->value.dval; + } else { + index = offset->value.lval; + } + if (zend_hash_index_find(ht, index, (void **) &value) == SUCCESS) { + isset = 1; + } + break; + case IS_STRING: + if (zend_symtable_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 (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 || !i_zend_is_true(*value)) { + result = 0; + } else { + result = 1; + } + break; + } + } else if ((*container)->type == IS_OBJECT) { + if (prop_dim) { + result = Z_OBJ_HT_P(*container)->has_property(*container, offset, (opline->extended_value == ZEND_ISEMPTY) TSRMLS_CC); + } else { + result = Z_OBJ_HT_P(*container)->has_dimension(*container, offset, (opline->extended_value == ZEND_ISEMPTY) TSRMLS_CC); + } + } else if ((*container)->type == IS_STRING) { /* string offsets */ + switch (opline->extended_value) { + case ZEND_ISSET: + if (offset->value.lval < Z_STRLEN_PP(container)) { + result = 1; + } + break; + case ZEND_ISEMPTY: + if (offset->value.lval < Z_STRLEN_PP(container) && Z_STRVAL_PP(container)[offset->value.lval] != '0') { + result = 1; + } + break; + } + } + } + + EX_T(opline->result.u.var).tmp_var.type = IS_BOOL; + + switch (opline->extended_value) { + case ZEND_ISSET: + EX_T(opline->result.u.var).tmp_var.value.lval = result; + break; + case ZEND_ISEMPTY: + EX_T(opline->result.u.var).tmp_var.value.lval = !result; + break; + } + + FREE_OP2(); + FREE_OP1_VAR_PTR(); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(115, ZEND_ISSET_ISEMPTY_DIM_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, prop_dim, 0); +} + +ZEND_VM_HANDLER(148, ZEND_ISSET_ISEMPTY_PROP_OBJ, VAR|UNUSED|CV, CONST|TMP|VAR|CV) +{ + ZEND_VM_DISPATCH_TO_HELPER_EX(zend_isset_isempty_dim_prop_obj_handler, prop_dim, 1); +} + +ZEND_VM_HANDLER(79, ZEND_EXIT, CONST|TMP|VAR|UNUSED|CV, ANY) +{ + zend_op *opline = EX(opline); + + if (OP1_TYPE != IS_UNUSED) { + zval *ptr; + zend_free_op free_op1; + + ptr = GET_OP1_ZVAL_PTR(BP_VAR_R); + if (Z_TYPE_P(ptr) == IS_LONG) { + EG(exit_status) = Z_LVAL_P(ptr); + } else { + zend_print_variable(ptr); + } + FREE_OP1(); + } + zend_bailout(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(57, ZEND_BEGIN_SILENCE, ANY, ANY) +{ + zend_op *opline = EX(opline); + + EX_T(opline->result.u.var).tmp_var.value.lval = EG(error_reporting); + EX_T(opline->result.u.var).tmp_var.type = IS_LONG; /* shouldn't be necessary */ + zend_alter_ini_entry("error_reporting", sizeof("error_reporting"), "0", 1, ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(142, ZEND_RAISE_ABSTRACT_ERROR, ANY, ANY) +{ + zend_error_noreturn(E_ERROR, "Cannot call abstract method %s::%s()", EG(scope)->name, EX(op_array)->function_name); + ZEND_VM_NEXT_OPCODE(); /* Never reached */ +} + +ZEND_VM_HANDLER(58, ZEND_END_SILENCE, TMP, ANY) +{ + zend_op *opline = EX(opline); + zval restored_error_reporting; + + if (!EG(error_reporting)) { + restored_error_reporting.type = IS_LONG; + restored_error_reporting.value.lval = EX_T(opline->op1.u.var).tmp_var.value.lval; + convert_to_string(&restored_error_reporting); + zend_alter_ini_entry("error_reporting", sizeof("error_reporting"), Z_STRVAL(restored_error_reporting), Z_STRLEN(restored_error_reporting), ZEND_INI_USER, ZEND_INI_STAGE_RUNTIME); + zendi_zval_dtor(restored_error_reporting); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(22, ZEND_QM_ASSIGN, CONST|TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *value = GET_OP1_ZVAL_PTR(BP_VAR_R); + + EX_T(opline->result.u.var).tmp_var = *value; + if (!IS_OP1_TMP_FREE()) { + zval_copy_ctor(&EX_T(opline->result.u.var).tmp_var); + } + FREE_OP1_IF_VAR(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(101, ZEND_EXT_STMT, ANY, ANY) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_statement_handler, EX(op_array) TSRMLS_CC); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(102, ZEND_EXT_FCALL_BEGIN, ANY, ANY) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_begin_handler, EX(op_array) TSRMLS_CC); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(103, ZEND_EXT_FCALL_END, ANY, ANY) +{ + if (!EG(no_extensions)) { + zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_fcall_end_handler, EX(op_array) TSRMLS_CC); + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(139, ZEND_DECLARE_CLASS, ANY, ANY) +{ + zend_op *opline = EX(opline); + + EX_T(opline->result.u.var).class_entry = do_bind_class(opline, EG(class_table), 0 TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(140, ZEND_DECLARE_INHERITED_CLASS, ANY, ANY) +{ + zend_op *opline = EX(opline); + + EX_T(opline->result.u.var).class_entry = do_bind_inherited_class(opline, EG(class_table), EX_T(opline->extended_value).class_entry, 0 TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(141, ZEND_DECLARE_FUNCTION, ANY, ANY) +{ + do_bind_function(EX(opline), EG(function_table), 0); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(105, ZEND_TICKS, CONST, ANY) +{ + zend_op *opline = EX(opline); + + if (++EG(ticks_count)>=opline->op1.u.constant.value.lval) { + EG(ticks_count)=0; + if (zend_ticks_function) { + zend_ticks_function(opline->op1.u.constant.value.lval); + } + } + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(138, ZEND_INSTANCEOF, TMP|VAR|CV, ANY) +{ + zend_op *opline = EX(opline); + zend_free_op free_op1; + zval *expr = GET_OP1_ZVAL_PTR(BP_VAR_R); + zend_bool result; + + if (Z_TYPE_P(expr) == IS_OBJECT) { + result = instanceof_function(Z_OBJCE_P(expr), EX_T(opline->op2.u.var).class_entry TSRMLS_CC); + } else { + result = 0; + } + ZVAL_BOOL(&EX_T(opline->result.u.var).tmp_var, result); + FREE_OP1(); + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(104, ZEND_EXT_NOP, ANY, ANY) +{ + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(0, ZEND_NOP, ANY, ANY) +{ + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(144, ZEND_ADD_INTERFACE, ANY, ANY) +{ + zend_op *opline = EX(opline); + zend_class_entry *ce = EX_T(opline->op1.u.var).class_entry; + zend_class_entry *iface = EX_T(opline->op2.u.var).class_entry; + + if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) { + zend_error_noreturn(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name); + } + + ce->interfaces[opline->extended_value] = iface; + + zend_do_implement_interface(ce, iface TSRMLS_CC); + + ZEND_VM_NEXT_OPCODE(); +} + +ZEND_VM_HANDLER(149, ZEND_HANDLE_EXCEPTION, ANY, ANY) +{ + zend_uint op_num = EG(opline_before_exception)-EG(active_op_array)->opcodes; + int i; + int encapsulating_block=-1; + zval **stack_zval_pp; + + stack_zval_pp = (zval **) EG(argument_stack).top_element - 1; + while (*stack_zval_pp != NULL) { + zval_ptr_dtor(stack_zval_pp); + EG(argument_stack).top_element--; + stack_zval_pp--; + } + + for (i=0; ilast_try_catch; i++) { + if (EG(active_op_array)->try_catch_array[i].try_op > op_num) { + /* further blocks will not be relevant... */ + break; + } + if (op_num >= EG(active_op_array)->try_catch_array[i].try_op + && op_num < EG(active_op_array)->try_catch_array[i].catch_op) { + encapsulating_block = i; + } + } + + if (encapsulating_block == -1) { + ZEND_VM_RETURN_FROM_EXECUTE_LOOP(); + } else { + ZEND_VM_SET_OPCODE(&EX(op_array)->opcodes[EG(active_op_array)->try_catch_array[encapsulating_block].catch_op]); + ZEND_VM_CONTINUE(); + } +} + +ZEND_VM_HANDLER(146, ZEND_VERIFY_ABSTRACT_CLASS, ANY, ANY) +{ + zend_verify_abstract_class(EX_T(EX(opline)->op1.u.var).class_entry TSRMLS_CC); + ZEND_VM_NEXT_OPCODE(); +} + diff --git a/Zend/zend_vm_execute.skl b/Zend/zend_vm_execute.skl new file mode 100644 index 0000000000..23f75ab1c0 --- /dev/null +++ b/Zend/zend_vm_execute.skl @@ -0,0 +1,72 @@ +{%DEFINES%} + +ZEND_API void {%EXECUTOR_NAME%}(zend_op_array *op_array TSRMLS_DC) +{ + zend_execute_data execute_data; + {%HELPER_VARS%} + + {%INTERANL_LABELS%} + + /* Initialize execute_data */ + EX(fbc) = NULL; + EX(object) = NULL; + if (op_array->T < TEMP_VAR_STACK_LIMIT) { + EX(Ts) = (temp_variable *) do_alloca(sizeof(temp_variable) * op_array->T); + } else { + EX(Ts) = (temp_variable *) safe_emalloc(sizeof(temp_variable), op_array->T, 0); + } + EX(CVs) = (zval***)do_alloca(sizeof(zval**) * op_array->last_var); + memset(EX(CVs), 0, sizeof(zval**) * op_array->last_var); + EX(op_array) = op_array; + EX(original_in_execution) = EG(in_execution); + EX(symbol_table) = EG(active_symbol_table); + EX(prev_execute_data) = EG(current_execute_data); + EG(current_execute_data) = &execute_data; + + EG(in_execution) = 1; + if (op_array->start_op) { + ZEND_VM_SET_OPCODE(op_array->start_op); + } else { + ZEND_VM_SET_OPCODE(op_array->opcodes); + } + + if (op_array->uses_this && EG(This)) { + EG(This)->refcount++; /* For $this pointer */ + if (zend_hash_add(EG(active_symbol_table), "this", sizeof("this"), &EG(This), sizeof(zval *), NULL)==FAILURE) { + EG(This)->refcount--; + } + } + + EG(opline_ptr) = &EX(opline); + + EX(function_state).function = (zend_function *) op_array; + EG(function_state_ptr) = &EX(function_state); +#if ZEND_DEBUG + /* function_state.function_symbol_table is saved as-is to a stack, + * which is an intentional UMR. Shut it up if we're in DEBUG. + */ + EX(function_state).function_symbol_table = NULL; +#endif + + while (1) { + {%ZEND_VM_CONTINUE_LABEL%} +#ifdef ZEND_WIN32 + if (EG(timed_out)) { + zend_timeout(0); + } +#endif + + {%ZEND_VM_DISPATCH%} { + {%INTERNAL_EXECUTOR%} + } + + } + zend_error_noreturn(E_ERROR, "Arrived at end of main loop which shouldn't happen"); +} + +{%EXTERNAL_EXECUTOR%} + +void {%INITIALIZER_NAME%}() +{ + {%EXTERNAL_LABELS%} +} diff --git a/Zend/zend_vm_gen.php b/Zend/zend_vm_gen.php new file mode 100644 index 0000000000..079dd4279d --- /dev/null +++ b/Zend/zend_vm_gen.php @@ -0,0 +1,1001 @@ + "", + "TMP" => "_TMP", + "VAR" => "_VAR", + "CONST" => "_CONST", + "UNUSED" => "_UNUSED", + "CV" => "_CV", +); + +$typecode = array( + "ANY" => 0, + "TMP" => 1, + "VAR" => 2, + "CONST" => 0, + "UNUSED" => 3, + "CV" => 4, +); + +$op1_type = array( + "ANY" => "opline->op1.op_type", + "TMP" => "IS_TMP_VAR", + "VAR" => "IS_VAR", + "CONST" => "IS_CONST", + "UNUSED" => "IS_UNUSED", + "CV" => "IS_CV", +); + +$op2_type = array( + "ANY" => "opline->op2.op_type", + "TMP" => "IS_TMP_VAR", + "VAR" => "IS_VAR", + "CONST" => "IS_CONST", + "UNUSED" => "IS_UNUSED", + "CV" => "IS_CV", +); + +$op1_get_zval_ptr = array( + "ANY" => "get_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)", + "TMP" => "_get_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "VAR" => "_get_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CONST" => "_get_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "UNUSED" => "_get_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)", +); + +$op2_get_zval_ptr = array( + "ANY" => "get_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)", + "TMP" => "_get_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "VAR" => "_get_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CONST" => "_get_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "UNUSED" => "_get_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CV" => "_get_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)", +); + +$op1_get_zval_ptr_ptr = array( + "ANY" => "get_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)", + "TMP" => "_get_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "VAR" => "_get_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CONST" => "_get_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CV" => "_get_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)", +); + +$op2_get_zval_ptr_ptr = array( + "ANY" => "get_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)", + "TMP" => "_get_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "VAR" => "_get_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CONST" => "_get_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "UNUSED" => "_get_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CV" => "_get_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)", +); + +$op1_get_obj_zval_ptr = array( + "ANY" => "get_obj_zval_ptr(&opline->op1, EX(Ts), &free_op1, \\1)", + "TMP" => "_get_obj_zval_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "VAR" => "_get_obj_zval_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CONST" => "_get_obj_zval_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CV" => "_get_obj_zval_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)", +); + +$op2_get_obj_zval_ptr = array( + "ANY" => "get_obj_zval_ptr(&opline->op2, EX(Ts), &free_op2, \\1)", + "TMP" => "_get_obj_zval_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "VAR" => "_get_obj_zval_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CONST" => "_get_obj_zval_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "UNUSED" => "_get_obj_zval_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CV" => "_get_obj_zval_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)", +); + +$op1_get_obj_zval_ptr_ptr = array( + "ANY" => "get_obj_zval_ptr_ptr(&opline->op1, EX(Ts), &free_op1, \\1)", + "TMP" => "_get_obj_zval_ptr_ptr_tmp(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "VAR" => "_get_obj_zval_ptr_ptr_var(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CONST" => "_get_obj_zval_ptr_ptr_const(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op1, EX(Ts), &free_op1 TSRMLS_CC)", + "CV" => "_get_obj_zval_ptr_ptr_cv(&opline->op1, EX(Ts), &free_op1, \\1 TSRMLS_CC)", +); + +$op2_get_obj_zval_ptr_ptr = array( + "ANY" => "get_obj_zval_ptr_ptr(&opline->op2, EX(Ts), &free_op2, \\1)", + "TMP" => "_get_obj_zval_ptr_ptr_tmp(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "VAR" => "_get_obj_zval_ptr_ptr_var(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CONST" => "_get_obj_zval_ptr_ptr_const(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "UNUSED" => "_get_obj_zval_ptr_ptr_unused(&opline->op2, EX(Ts), &free_op2 TSRMLS_CC)", + "CV" => "_get_obj_zval_ptr_ptr_cv(&opline->op2, EX(Ts), &free_op2, \\1 TSRMLS_CC)", +); + +$op1_is_tmp_free = array( + "ANY" => "IS_TMP_FREE(free_op1)", + "TMP" => "1", + "VAR" => "0", + "CONST" => "0", + "UNUSED" => "0", + "CV" => "0", +); + +$op2_is_tmp_free = array( + "ANY" => "IS_TMP_FREE(free_op2)", + "TMP" => "1", + "VAR" => "0", + "CONST" => "0", + "UNUSED" => "0", + "CV" => "0", +); + +$op1_free_op = array( + "ANY" => "FREE_OP(free_op1)", + "TMP" => "zval_dtor(free_op1.var)", + "VAR" => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$op2_free_op = array( + "ANY" => "FREE_OP(free_op2)", + "TMP" => "zval_dtor(free_op2.var)", + "VAR" => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$op1_free_op_if_var = array( + "ANY" => "FREE_OP_IF_VAR(free_op1)", + "TMP" => "", + "VAR" => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$op2_free_op_if_var = array( + "ANY" => "FREE_OP_IF_VAR(free_op2)", + "TMP" => "", + "VAR" => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$op1_free_op_var_ptr = array( + "ANY" => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}", + "TMP" => "", + "VAR" => "if (free_op1.var) {zval_ptr_dtor(&free_op1.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$op2_free_op_var_ptr = array( + "ANY" => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}", + "TMP" => "", + "VAR" => "if (free_op2.var) {zval_ptr_dtor(&free_op2.var);}", + "CONST" => "", + "UNUSED" => "", + "CV" => "", +); + +$list = array(); // list of opcode handlers and helpers in original order +$opcodes = array(); // opcode handlers by code +$helpers = array(); // opcode helpers by name +$params = array(); // parameters of helpers +$opnames = array(); // opcode name to code mapping +$line_no = 1; + +// Writes $s into resulting executor +function out($f, $s) { + global $line_no; + fputs($f,$s); + $line_no += substr_count($s, "\n"); +} + +// Resets #line directives in resulting executor +function out_line($f) { + global $line_no, $executor_file; + fputs($f,"#line ".($line_no+1)." \"".$executor_file."\"\n"); + ++$line_no; +} + +// Returns name of specialized helper +function helper_name($name, $spec, $op1, $op2) { + global $prefix, $helpers; + + if (isset($helpers[$name])) { + // If we haven't helper with specified spicialized operands then + // using unspecialized helper + if (!isset($helpers[$name]["op1"][$op1]) && + isset($helpers[$name]["op1"]["ANY"])) { + $op1 = "ANY"; + } + if (!isset($helpers[$name]["op2"][$op2]) && + isset($helpers[$name]["op2"]["ANY"])) { + $op2 = "ANY"; + } + } + return $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]; +} + +// Generates code for opcode handler or helper +function gen_code($f, $spec, $kind, $code, $op1, $op2) { + global $op1_type, $op2_type, $op1_get_zval_ptr, $op2_get_zval_ptr, + $op1_get_zval_ptr_ptr, $op2_get_zval_ptr_ptr, + $op1_get_obj_zval_ptr, $op2_get_obj_zval_ptr, + $op1_get_obj_zval_ptr_ptr, $op2_get_obj_zval_ptr_ptr, + $op1_is_tmp_free, $op2_is_tmp_free, + $op1_free_op, $op2_free_op, $op1_free_op_if_var, $op2_free_op_if_var, + $op1_free_op_var_ptr, $op2_free_op_var_ptr, $prefix; + + // Specializing + $code = preg_replace( + array( + "/OP1_TYPE/", + "/OP2_TYPE/", + "/GET_OP1_ZVAL_PTR\(([^)]*)\)/", + "/GET_OP2_ZVAL_PTR\(([^)]*)\)/", + "/GET_OP1_ZVAL_PTR_PTR\(([^)]*)\)/", + "/GET_OP2_ZVAL_PTR_PTR\(([^)]*)\)/", + "/GET_OP1_OBJ_ZVAL_PTR\(([^)]*)\)/", + "/GET_OP2_OBJ_ZVAL_PTR\(([^)]*)\)/", + "/GET_OP1_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/", + "/GET_OP2_OBJ_ZVAL_PTR_PTR\(([^)]*)\)/", + "/IS_OP1_TMP_FREE\(\)/", + "/IS_OP2_TMP_FREE\(\)/", + "/FREE_OP1\(\)/", + "/FREE_OP2\(\)/", + "/FREE_OP1_IF_VAR\(\)/", + "/FREE_OP2_IF_VAR\(\)/", + "/FREE_OP1_VAR_PTR\(\)/", + "/FREE_OP2_VAR_PTR\(\)/", + "/^#ifdef\s+ZEND_VM_SPEC\s*\n/m", + "/^#ifndef\s+ZEND_VM_SPEC\s*\n/m", + "/ZEND_VM_C_LABEL\(\s*([A-Za-z_]*)\s*\)/m", + "/ZEND_VM_C_GOTO\(\s*([A-Za-z_]*)\s*\)/m", + ), + array( + $op1_type[$op1], + $op2_type[$op2], + $op1_get_zval_ptr[$op1], + $op2_get_zval_ptr[$op2], + $op1_get_zval_ptr_ptr[$op1], + $op2_get_zval_ptr_ptr[$op2], + $op1_get_obj_zval_ptr[$op1], + $op2_get_obj_zval_ptr[$op2], + $op1_get_obj_zval_ptr_ptr[$op1], + $op2_get_obj_zval_ptr_ptr[$op2], + $op1_is_tmp_free[$op1], + $op2_is_tmp_free[$op2], + $op1_free_op[$op1], + $op2_free_op[$op2], + $op1_free_op_if_var[$op1], + $op2_free_op_if_var[$op2], + $op1_free_op_var_ptr[$op1], + $op2_free_op_var_ptr[$op2], + ($op1!="ANY"||$op2!="ANY")?"#if 1\n":"#if 0\n", + ($op1!="ANY"||$op2!="ANY")?"#if 0\n":"#if 1\n", + "\\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""), + "goto \\1".(($spec && $kind != ZEND_VM_KIND_CALL)?("_SPEC".$prefix[$op1].$prefix[$op2]):""), + ), + $code); + + // Updating code according to selected threading model + switch($kind) { + case ZEND_VM_KIND_CALL: + $code = preg_replace( + array( + "/EXECUTE_DATA/m", + "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", + "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me", + "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*[A-Za-z_]*\s*,\s*(.*)\s*\);/me", + ), + array( + "execute_data", + "return \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)", + "'return '.helper_name('\\1',$spec,'$op1','$op2').'(ZEND_OPCODE_HANDLER_ARGS_PASSTHRU)'", + "'return '.helper_name('\\1',$spec,'$op1','$op2').'(\\2, ZEND_OPCODE_HANDLER_ARGS_PASSTHRU);'", + ), + $code); + break; + case ZEND_VM_KIND_SWITCH: + $code = preg_replace( + array( + "/EXECUTE_DATA/m", + "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", + "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me", + "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me", + ), + array( + "&execute_data", + "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL", + "'goto '.helper_name('\\1',$spec,'$op1','$op2')", + "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'", + ), + $code); + break; + case ZEND_VM_KIND_GOTO: + $code = preg_replace( + array( + "/EXECUTE_DATA/m", + "/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", + "/ZEND_VM_DISPATCH_TO_HELPER\(\s*([A-Za-z_]*)\s*\)/me", + "/ZEND_VM_DISPATCH_TO_HELPER_EX\(\s*([A-Za-z_]*)\s*,\s*([A-Za-z_]*)\s*,\s*(.*)\s*\);/me", + ), + array( + "&execute_data", + "goto \\1".($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER", + "'goto '.helper_name('\\1',$spec,'$op1','$op2')", + "'\\2 = \\3; goto '.helper_name('\\1',$spec,'$op1','$op2').';'", + ), + $code); + break; + } + + out($f, $code); +} + +// Generates opcode handler +function gen_handler($f, $spec, $kind, $name, $op1, $op2, $use, $code, $lineno) { + global $definition_file, $prefix, $typecode, $opnames; + + if (ZEND_VM_LINES) { + out($f, "#line $lineno \"$definition_file\"\n"); + } + + // Generate opcode handler's entry point according to selected threading model + switch($kind) { + case ZEND_VM_KIND_CALL: + out($f,"static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n"); + break; + case ZEND_VM_KIND_SWITCH: + if ($spec) { + out($f,"case ".((string)($opnames[$name]*25+($typecode[$op1]*5)+$typecode[$op2])).": /*".$name."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER*/"); + } else { + out($f,"case ".$name.":"); + } + if ($use) { + // This handler is used by other handlers. We will add label to call it. + out($f," ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_LABEL:\n"); + } else { + out($f,"\n"); + } + break; + case ZEND_VM_KIND_GOTO: + out($f,$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."_HANDLER:\n"); + break; + } + + // Generate opcode handler's code + gen_code($f, $spec, $kind, $code, $op1, $op2); +} + +// Generates helper +function gen_helper($f, $spec, $kind, $name, $op1, $op2, $param, $code, $lineno) { + global $definition_file, $prefix; + + if (ZEND_VM_LINES) { + out($f, "#line $lineno \"$definition_file\"\n"); + } + + // Generate helper's entry point according to selected threading model + switch($kind) { + case ZEND_VM_KIND_CALL: + if ($param == null) { + out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(ZEND_OPCODE_HANDLER_ARGS)\n"); + } else { + out($f, "static int ".$name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2]."(".$param.", ZEND_OPCODE_HANDLER_ARGS)\n"); + } + break; + case ZEND_VM_KIND_SWITCH: + out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f, $name.($spec?"_SPEC":"").$prefix[$op1].$prefix[$op2].":\n"); + break; + } + + // Generate helper's code + gen_code($f, $spec, $kind, $code, $op1, $op2); +} + +// Generates array of opcode handlers (specialized or unspecialized) +function gen_labels($f, $spec, $kind, $prolog) { + global $opcodes, $op_types, $prefix, $typecode; + + $next = 0; + if ($spec) { + foreach($opcodes as $num => $dsc) { + while ($next != $num) { + $op1t = $op_types; + foreach($op1t as $op1) { + if ($op1 != "ANY") { + $op2t = $op_types; + foreach($op2t as $op2) { + if ($op2 != "ANY") { + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog."ZEND_NULL_HANDLER,\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)-1,\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n"); + break; + } + } + } + } + } + $next++; + } + $next = $num + 1; + $op1t = $op_types; + foreach($op1t as $op1) { + if ($op1 != "ANY") { + if (!isset($dsc["op1"][$op1])) { + $op1 = "ANY"; + } + $op2t = $op_types; + foreach($op2t as $op2) { + if ($op2 != "ANY") { + if (!isset($dsc["op2"][$op2])) { + $op2 = "ANY"; + } + if (isset($dsc["op1"][$op1]) && + isset($dsc["op2"][$op2])) { + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog.$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)".((string)($num*25+$typecode[$op1]*5+$typecode[$op2])).",\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_SPEC".$prefix[$op1].$prefix[$op2]."_HANDLER,\n"); + break; + } + } else { + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog."ZEND_NULL_HANDLER,\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)-1,\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n"); + break; + } + } + } + } + } + } + } + } else { + foreach($opcodes as $num => $dsc) { + while ($next != $num) { + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog."ZEND_NULL_HANDLER,\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)-1,\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER,\n"); + break; + } + $next++; + } + $next = $num+1; + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog.$dsc["op"]."_HANDLER,\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)".((string)$num).",\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&".$dsc["op"]."_HANDLER,\n"); + break; + } + } + } + + // Last handler + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,$prolog."ZEND_NULL_HANDLER\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,$prolog."(opcode_handler_t)-1\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,$prolog."(opcode_handler_t)&&ZEND_NULL_HANDLER\n"); + break; + } +} + +// Generates handler for undefined opcodes (CALL threading model) +function gen_null_handler($f) { + static $done = 0; + + if (!$done) { + $done = 1; + out($f,"static int ZEND_NULL_HANDLER(ZEND_OPCODE_HANDLER_ARGS)\n"); + out($f,"{\n"); + out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n"); + out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n"); + out($f,"}\n\n"); + } +} + +// Generates all opcode handlers and helpers (specialized or unspecilaized) +function gen_executor_code($f, $spec, $kind, $prolog) { + global $list, $opcodes, $helpers, $op_types; + + if ($spec) { + $op1t = $op_types; + foreach($op1t as $op1) { + $op2t = $op_types; + foreach($op2t as $op2) { + foreach ($list as $lineno => $dsc) { + if (isset($dsc["handler"])) { + $num = $dsc["handler"]; + if (isset($opcodes[$num]["op1"][$op1]) && + isset($opcodes[$num]["op2"][$op2])) { + gen_handler($f, 1, $kind, $opcodes[$num]["op"], $op1, $op2, isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno); + } + } else if (isset($dsc["helper"])) { + $num = $dsc["helper"]; + if (isset($helpers[$num]["op1"][$op1]) && + isset($helpers[$num]["op2"][$op2])) { + gen_helper($f, 1, $kind, $num, $op1, $op2, $helpers[$num]["param"], $helpers[$num]["code"], $lineno); + } + } else { + var_dump($dsc); + die("??? $kind:$num\n"); + } + } + } + } + } else { + foreach ($list as $lineno => $dsc) { + if (isset($dsc["handler"])) { + $num = $dsc["handler"]; + gen_handler($f, 0, $kind, $opcodes[$num]["op"], "ANY", "ANY", isset($opcodes[$num]["use"]), $opcodes[$num]["code"], $lineno); + } else if (isset($dsc["helper"])) { + $num = $dsc["helper"]; + gen_helper($f, 0, $kind, $num, "ANY", "ANY", $helpers[$num]["param"], $helpers[$num]["code"], $lineno); + } else { + var_dump($dsc); + die("??? $kind:$num\n"); + } + } + } + if (ZEND_VM_LINES) { + out_line($f); + } + + // Generate handler for undefined opcodes + switch ($kind) { + case ZEND_VM_KIND_CALL: + gen_null_handler($f); + break; + case ZEND_VM_KIND_SWITCH: + out($f,"default:\n"); + out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n"); + out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,"ZEND_NULL_HANDLER:\n"); + out($f,"\tzend_error_noreturn(E_ERROR, \"Invalid opcode %d/%d/%d.\", EX(opline)->opcode, EX(opline)->op1.op_type, EX(opline)->op2.op_type);\n"); + out($f,"\tZEND_VM_RETURN_FROM_EXECUTE_LOOP();\n"); + break; + } +} + +function skip_blanks($f, $prolog, $epilog) { + if (trim($prolog) != "" || trim($epilog) != "") { + out($f, $prolog.$epilog); + } +} + +// Generates executor from skeleton file and definition (specialized or unspecialized) +function gen_executor($f, $skl, $spec, $kind, $executor_name, $initializer_name, $old) { + global $params, $skeleton_file, $line_no; + + $lineno = 0; +// $old_line_no = -1; + foreach ($skl as $line) { +// if (ZEND_VM_LINES) { +// ++$lineno; +// if ($old_line_no+1 != $line_no) { +// out($f,"#line $lineno \"$skeleton_file\" /* $old_line_no, $line_no*/\n"); +// } +// $old_line_no = $line_no; +// } + if (preg_match("/(.*)[{][%]([A-Z_]*)[%][}](.*)/", $line, $m)) { + switch ($m[2]) { + case "DEFINES": + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f,"\n"); + out($f,"#define ZEND_VM_CONTINUE() return 0\n"); + out($f,"#define ZEND_VM_RETURN() return 1\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f,"\n"); + out($f,"#define ZEND_VM_CONTINUE() goto zend_vm_continue\n"); + out($f,"#define ZEND_VM_RETURN() return\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f,"\n"); + out($f,"#define ZEND_VM_CONTINUE() goto *(void**)(EX(opline)->handler)\n"); + out($f,"#define ZEND_VM_RETURN() return\n"); + break; + } + break; + case "EXECUTOR_NAME": + out($f, $m[1].$executor_name.$m[3]."\n"); + break; + case "HELPER_VARS": + if ($kind != ZEND_VM_KIND_CALL) { + foreach ($params as $param => $x) { + out($f,$m[1].$param.";\n"); + } + } else { + skip_blanks($f, $m[1], $m[3]."\n"); + } + break; + case "INTERANL_LABELS": + if ($kind == ZEND_VM_KIND_GOTO) { + $prolog = $m[1]; + out($f,$prolog."if (op_array == NULL) {\n"); + out($f,$prolog."\tstatic const opcode_handler_t labels[] = {\n"); + gen_labels($f, $spec, $kind, $prolog."\t\t"); + out($f,$prolog."\t};\n"); + out($f,$prolog."\tzend_opcode_handlers = (opcode_handler_t*)labels;\n"); + out($f,$prolog."\treturn;\n"); + out($f,$prolog."}\n"); + } else { + skip_blanks($f, $m[1], $m[3]); + } + break; + case "ZEND_VM_CONTINUE_LABEL": + if ($kind == ZEND_VM_KIND_SWITCH) { + out($f,$m[1]."zend_vm_continue:".$m[3]."\n"); + } else { + skip_blanks($f, $m[1], $m[3]); + } + break; + case "ZEND_VM_DISPATCH": + switch ($kind) { + case ZEND_VM_KIND_CALL: + out($f, $m[1]."if (EX(opline)->handler(&execute_data TSRMLS_CC) > 0)".$m[3]."\n"); + break; + case ZEND_VM_KIND_SWITCH: + out($f, $m[1]."switch ((int)EX(opline)->handler)".$m[3]."\n"); + break; + case ZEND_VM_KIND_GOTO: + out($f, $m[1]."goto *(void**)(EX(opline)->handler);".$m[3]."\n"); + break; + } + break; + case "INTERNAL_EXECUTOR": + if ($kind == ZEND_VM_KIND_CALL) { + out($f, $m[1]."return;".$m[3]."\n"); + } else { + gen_executor_code($f, $spec, $kind, $m[1]); + } + break; + case "EXTERNAL_EXECUTOR": + if ($kind == ZEND_VM_KIND_CALL) { + if (!$old || ZEND_VM_SPEC || (ZEND_VM_KIND != ZEND_VM_KIND_CALL)) { + out($f,"#undef EX\n"); + out($f,"#define EX(element) execute_data->element\n\n"); + gen_executor_code($f, $spec, $kind, $m[1]); + } + } + break; + case "INITIALIZER_NAME": + out($f, $m[1].$initializer_name.$m[3]."\n"); + break; + case "EXTERNAL_LABELS": + $prolog = $m[1]; + if ($kind == ZEND_VM_KIND_GOTO) { + out($f,$prolog."TSRMLS_FETCH();\n"); + out($f,$prolog."zend_execute(NULL TSRMLS_CC);\n"); + } else { + if ($old) { + out($f,$prolog."static opcode_handler_t labels[512] = {\n"); + } else { + out($f,$prolog."static const opcode_handler_t labels[] = {\n"); + } + gen_labels($f, $spec, $kind, $prolog."\t"); + out($f,$prolog."};\n"); + out($f,$prolog."zend_opcode_handlers = (opcode_handler_t*)labels;\n"); + if ($old) { + out($f,$prolog."zend_vm_old_executor = 1;\n"); + out($f,$prolog."zend_execute = old_execute;\n"); + } + } + break; + default: + die("ERROR: Unknown keyword ".$m[2]." in skeleton file.\n"); + } + } else { + out($f, $line); + } + } +} + +function gen_vm($def, $skel) { + global $definition_file, $skeleton_file, $executor_file, + $op_types, $list, $opcodes, $helpers, $params, $opnames; + + // Load definition file + $in = @file($def); + if (!$in) { + die("ERROR: Can not open definition file '$def'\n"); + } + $definition_file = realpath($def); + + // Load skeleton file + $skl = @file($skel); + if (!$skl) { + die("ERROR: Can not open skeleton file '$skel'\n"); + } + $skeleton_file = realpath($skel); + + // Parse definition file into tree + $lineno = 0; + $handler = null; + $helper = null; + $max_opcode_len = 0; + $max_opcode = 0; + foreach ($in as $line) { + ++$lineno; + if (strpos($line,"ZEND_VM_HANDLER(") === 0) { + if (preg_match( + "/^ZEND_VM_HANDLER\(\s*([0-9]+)\s*,\s*([A-Z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/", + $line, + $m) == 0) { + die("ERROR ($def:$lineno): Invalid ZEND_VM_HANDLER definition.\n"); + } + $code = (int)$m[1]; + $op = $m[2]; + $len = strlen($op); + $op1 = array_flip(explode("|",$m[3])); + $op2 = array_flip(explode("|",$m[4])); + + if ($len > $max_opcode_len) { + $max_opcode_len = $len; + } + if ($code > $max_opcode) { + $max_opcode = $code; + } + if (isset($opcodes[$code])) { + die("ERROR ($def:$lineno): Opcode with code '$code' is already defined.\n"); + } + if (isset($opnames[$op])) { + die("ERROR ($def:$lineno): Opcode with name '$op' is already defined.\n"); + } + $opcodes[$code] = array("op"=>$op,"op1"=>$op1,"op2"=>$op2,"code"=>""); + $opnames[$op] = $code; + $handler = $code; + $helper = null; + $list[$lineno] = array("handler"=>$handler); + } else if (strpos($line,"ZEND_VM_HELPER(") === 0) { + if (preg_match( + "/^ZEND_VM_HELPER\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*\)/", + $line, + $m) == 0) { + die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n"); + } + $helper = $m[1]; + $op1 = array_flip(explode("|",$m[2])); + $op2 = array_flip(explode("|",$m[3])); + if (isset($helpers[$helper])) { + die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n"); + } + $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>null,"code"=>""); + $handler = null; + $list[$lineno] = array("helper"=>$helper); + } else if (strpos($line,"ZEND_VM_HELPER_EX(") === 0) { + if (preg_match( + "/^ZEND_VM_HELPER_EX\(\s*([A-Za-z_]+)\s*,\s*([A-Z|]+)\s*,\s*([A-Z|]+)\s*,\s*(.*)\s*\)/", + $line, + $m) == 0) { + die("ERROR ($def:$lineno): Invalid ZEND_VM_HELPER definition.\n"); + } + $helper = $m[1]; + $op1 = array_flip(explode("|",$m[2])); + $op2 = array_flip(explode("|",$m[3])); + $param = $m[4]; + if (isset($helpers[$helper])) { + die("ERROR ($def:$lineno): Helper with name '$helper' is already defined.\n"); + } + $params[$param] = 1; + + $helpers[$helper] = array("op1"=>$op1,"op2"=>$op2,"param"=>$param,"code"=>""); + $handler = null; + $list[$lineno] = array("helper"=>$helper); + } else if ($handler !== null) { + $opcodes[$handler]["code"] .= $line; + } else if ($helper !== null) { + $helpers[$helper]["code"] .= $line; + } + } + + ksort($opcodes); + + // Search for opcode handlers those are used by other opcode handlers + foreach ($opcodes as $dsc) { + if (preg_match("/ZEND_VM_DISPATCH_TO_HANDLER\(\s*([A-Z_]*)\s*\)/m", $dsc["code"], $m)) { + $op = $m[1]; + if (!isset($opnames[$op])) { + die("ERROR ($def:$lineno): Opcode with name '$op' is not defined.\n"); + } + $code = $opnames[$op]; + $opcodes[$code]['use'] = 1; + } + } + + // Generate opcode #defines (zend_vm_opcodes.h) + $code_len = strlen((string)$max_opcode); + $f = fopen("zend_vm_opcodes.h", "w+") or die("ERROR: Cannot create zend_vm_opcodes.h\n"); + ksort($opcodes); + foreach ($opcodes as $code => $dsc) { + $code = str_pad((string)$code,$code_len," ",STR_PAD_LEFT); + $op = str_pad($dsc["op"],$max_opcode_len); + fputs($f,"#define $op $code\n"); + } + fclose($f); + echo "zend_vm_opcodes.h generated succesfull.\n"; + + // Generate zend_vm_execute.h + $f = fopen("zend_vm_execute.h", "w+") or die("ERROR: Cannot create zend_vm_execute.h\n"); + $executor_file = realpath("zend_vm_execute.h"); + + // Generate specialized executor + gen_executor($f, $skl, ZEND_VM_SPEC, ZEND_VM_KIND, "execute", "zend_init_opcodes_handlers", 0); + + // Generate un-specialized executor + if (ZEND_VM_OLD_EXECUTOR) { + out($f,"\n/* Old executor */\n\n"); + out($f,"#undef EX\n"); + out($f,"#define EX(element) execute_data.element\n\n"); + out($f,"#undef ZEND_VM_CONTINUE\n\n"); + out($f,"#undef ZEND_VM_RETURN\n\n"); + gen_executor($f, $skl, 0, ZEND_VM_KIND_CALL, "old_execute", "zend_vm_use_old_executor", 1); + } + + // Generate zend_vm_set_opcode_handler() function + out($f, "void zend_vm_set_opcode_handler(zend_op* op)\n"); + out($f, "{\n"); + if (!ZEND_VM_SPEC) { + out($f, "\top->handler = zend_opcode_handlers[op->opcode];\n"); + } else { + if (ZEND_VM_OLD_EXECUTOR) { + out($f, "\tif (zend_vm_old_executor) {\n"); + out($f, "\t\top->handler = zend_opcode_handlers[op->opcode];\n"); + out($f, "\t} else {\n"); + } + out($f, "\t\tstatic const int zend_vm_decode[] = {\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 0 */\n"); + out($f, "\t\t\t_CONST_CODE, /* 1 = IS_CONST */\n"); + out($f, "\t\t\t_TMP_CODE, /* 2 = IS_TMP_VAR */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 3 */\n"); + out($f, "\t\t\t_VAR_CODE, /* 4 = IS_VAR */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 5 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 6 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 7 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 8 = IS_UNUSED */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 9 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 10 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 11 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 12 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 13 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 14 */\n"); + out($f, "\t\t\t_UNUSED_CODE, /* 15 */\n"); + out($f, "\t\t\t_CV_CODE /* 16 = IS_CV */\n"); + out($f, "\t\t};\n"); + out($f, "\t\top->handler = zend_opcode_handlers[op->opcode * 25 + zend_vm_decode[op->op1.op_type] * 5 + zend_vm_decode[op->op2.op_type]];\n"); + if (ZEND_VM_OLD_EXECUTOR) { + out($f, "\t}\n"); + } + } + out($f, "}\n\n"); + + fclose($f); + echo "zend_vm_execute.h generated succesfull.\n"; +} + +function usage() { + echo("\nUsage: php zend_vm_gen.php [options]\n". + "\nOptions:". + "\n --with-vm-kind=CALL|SWITCH|GOTO - select threading model (default is CALL)". + "\n --without-specializer - disable executor specialization". + "\n --without-old-executor - disable old executor". + "\n --without-lines - disable #line directives". + "\n\n"); + +} + +// Parse arguments +for ($i = 1; $i < $argc; $i++) { + if (strpos($argv[$i],"--with-vm-kind=") === 0) { + $kind = substr($argv[$i], strlen("--with-vm-kind=")); + switch ($kind) { + case "CALL": + define("ZEND_VM_KIND", ZEND_VM_KIND_CALL); + break; + case "SWITCH": + define("ZEND_VM_KIND", ZEND_VM_KIND_SWITCH); + break; + case "GOTO": + define("ZEND_VM_KIND", ZEND_VM_KIND_GOTO); + break; + default: + echo("ERROR: Invalid vm kind '$kind'\n"); + usage(); + die(); + } + } else if ($argv[$i] == "--without-specializer") { + define("ZEND_VM_SPEC", 0); + } else if ($argv[$i] == "--without-old-executor") { + define("ZEND_VM_OLD_EXECUTOR", 0); + } else if ($argv[$i] == "--without-lines") { + define("ZEND_VM_LINES", 0); + } else if ($argv[$i] == "--help") { + usage(); + exit(); + } else { + echo("ERROR: Invalid option '".$argv[$i]."'\n"); + usage(); + die(); + } +} + +// Using defaults +if (!defined("ZEND_VM_KIND")) { + define("ZEND_VM_KIND", ZEND_VM_KIND_CALL); +} +if (!defined("ZEND_VM_SPEC")) { + define("ZEND_VM_SPEC", 1); +} +if (!defined("ZEND_VM_OLD_EXECUTOR")) { + define("ZEND_VM_OLD_EXECUTOR", 1); +} +if (!defined("ZEND_VM_LINES")) { + define("ZEND_VM_LINES", 1); +} + +gen_vm("zend_vm_def.h", "zend_vm_execute.skl"); + +?>