cvs: ZendEngine2 / zend.h zend_execute.c zend_execute.h
| From: | Zeev Suraski | Date: | Sun, 14 Dec 2003 12:32:02 +0000 |
| Subject: | cvs: ZendEngine2 / zend.h zend_execute.c zend_execute.h | ||
| Groups: | php.zend-engine.cvs | ||
| Request: | Send a blank email to php-zend-engine-cvs+get-2112@lists.php.net to get a copy of this message | ||
zeev Sun Dec 14 07:32:02 2003 EDT
Modified files:
/ZendEngine2 zend.h zend_execute.c zend_execute.h
Log:
Some cleanup
Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.230 ZendEngine2/zend.h:1.231 --- ZendEngine2/zend.h:1.230 Thu Dec 11 18:50:13 2003 +++ ZendEngine2/zend.h Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.230 2003/12/11 23:50:13 iliaa Exp $ */ +/* $Id: zend.h,v 1.231 2003/12/14 12:32:02 zeev Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -287,18 +287,6 @@ zend_uchar is_ref; }; -typedef struct _zend_property_reference { - int type; /* read, write or r/w */ - zval *object; - zend_llist *elements_list; -} zend_property_reference; - - - -typedef struct _zend_overloaded_element { - int type; /* array offset or object proprety */ - zval element; -} zend_overloaded_element; /* excpt.h on Digital Unix 4.0 defines function_table */ #undef function_table @@ -348,13 +336,6 @@ zend_uint line_end; char *doc_comment; zend_uint doc_comment_len; - - /* old handlers */ -#if 0 - void (*handle_function_call)(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); - zval (*handle_property_get)(zend_property_reference *property_reference); - int (*handle_property_set)(zend_property_reference *property_reference, zval *value); -#endif }; #include "zend_stream.h" Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.563 ZendEngine2/zend_execute.c:1.564 --- ZendEngine2/zend_execute.c:1.563 Thu Dec 11 05:21:16 2003 +++ ZendEngine2/zend_execute.c Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.563 2003/12/11 10:21:16 andi Exp $ */ +/* $Id: zend_execute.c,v 1.564 2003/12/14 12:32:02 zeev Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -98,33 +98,29 @@ *should_free = 0; return T(node->u.var).var.ptr; } else { + temp_variable *T = &T(node->u.var); + zval *str = T->var.str_offset.str; + + /* string offset */ *should_free = &T(node->u.var).tmp_var; - switch (T(node->u.var).EA.type) { - case IS_STRING_OFFSET: { - temp_variable *T = &T(node->u.var); - zval *str = T->EA.data.str_offset.str; - - if (T->EA.data.str_offset.str->type != IS_STRING - || ((int)T->EA.data.str_offset.offset<0) - || (T->EA.data.str_offset.str->value.str.len <= T->EA.data.str_offset.offset)) { - zend_error(E_NOTICE, "Uninitialized string offset: %d", T->EA.data.str_offset.offset); - T->tmp_var.value.str.val = empty_string; - T->tmp_var.value.str.len = 0; - } else { - char c = str->value.str.val[T->EA.data.str_offset.offset]; - - T->tmp_var.value.str.val = estrndup(&c, 1); - T->tmp_var.value.str.len = 1; - } - PZVAL_UNLOCK(str); - T->tmp_var.refcount=1; - T->tmp_var.is_ref=1; - T->tmp_var.type = IS_STRING; - return &T->tmp_var; - } - break; + if (T->var.str_offset.str->type != IS_STRING + || ((int)T->var.str_offset.offset<0) + || (T->var.str_offset.str->value.str.len <= T->var.str_offset.offset)) { + zend_error(E_NOTICE, "Uninitialized string offset: %d", T->var.str_offset.offset); + T->tmp_var.value.str.val = empty_string; + T->tmp_var.value.str.len = 0; + } else { + char c = str->value.str.val[T->var.str_offset.offset]; + + T->tmp_var.value.str.val = estrndup(&c, 1); + T->tmp_var.value.str.len = 1; } + PZVAL_UNLOCK(str); + T->tmp_var.refcount=1; + T->tmp_var.is_ref=1; + T->tmp_var.type = IS_STRING; + return &T->tmp_var; } break; case IS_UNUSED: @@ -141,8 +137,9 @@ if (node->op_type==IS_VAR) { if (T(node->u.var).var.ptr_ptr) { PZVAL_UNLOCK(*T(node->u.var).var.ptr_ptr); - } else if (T(node->u.var).EA.type==IS_STRING_OFFSET) { - PZVAL_UNLOCK(T(node->u.var).EA.data.str_offset.str); + } else { + /* string offset */ + PZVAL_UNLOCK(T(node->u.var).var.str_offset.str); } return T(node->u.var).var.ptr_ptr; } else { @@ -198,7 +195,7 @@ /* perform the equivalent of equivalent of a * quick & silent get_zval_ptr, and FREE_OP */ - PZVAL_UNLOCK(T->EA.data.str_offset.str); + PZVAL_UNLOCK(T->var.str_offset.str); } else { zval_ptr_dtor(&T(opline->op1.u.var).var.ptr); if (opline->extended_value) { /* foreach() free */ @@ -437,82 +434,77 @@ zval *variable_ptr; if (!variable_ptr_ptr) { - switch (T(op1->u.var).EA.type) { - case IS_STRING_OFFSET: { - temp_variable *T = &T(op1->u.var); + temp_variable *T = &T(op1->u.var); - if (T->EA.data.str_offset.str->type == IS_STRING) do { - zval tmp; - zval *final_value = value; + if (T->var.str_offset.str->type == IS_STRING) do { + zval tmp; + zval *final_value = value; - if (((int)T->EA.data.str_offset.offset < 0)) { - zend_error(E_WARNING, "Illegal string offset: %d", T->EA.data.str_offset.offset); - break; - } - if (T->EA.data.str_offset.offset >= T->EA.data.str_offset.str->value.str.len) { - zend_uint i; + if (((int)T->var.str_offset.offset < 0)) { + zend_error(E_WARNING, "Illegal string offset: %d", T->var.str_offset.offset); + break; + } + if (T->var.str_offset.offset >= T->var.str_offset.str->value.str.len) { + zend_uint i; - if (T->EA.data.str_offset.str->value.str.len==0) { - STR_FREE(T->EA.data.str_offset.str->value.str.val); - T->EA.data.str_offset.str->value.str.val = (char *) emalloc(T->EA.data.str_offset.offset+1+1); - } else { - T->EA.data.str_offset.str->value.str.val = (char *) erealloc(T->EA.data.str_offset.str->value.str.val, T->EA.data.str_offset.offset+1+1); - } - for (i=T->EA.data.str_offset.str->value.str.len; i<T->EA.data.str_offset.offset; i++) { - T->EA.data.str_offset.str->value.str.val[i] = ' '; - } - T->EA.data.str_offset.str->value.str.val[T->EA.data.str_offset.offset+1] = 0; - T->EA.data.str_offset.str->value.str.len = T->EA.data.str_offset.offset+1; - } + if (T->var.str_offset.str->value.str.len==0) { + STR_FREE(T->var.str_offset.str->value.str.val); + T->var.str_offset.str->value.str.val = (char *) emalloc(T->var.str_offset.offset+1+1); + } else { + T->var.str_offset.str->value.str.val = (char *) erealloc(T->var.str_offset.str->value.str.val, T->var.str_offset.offset+1+1); + } + for (i=T->var.str_offset.str->value.str.len; i<T->var.str_offset.offset; i++) { + T->var.str_offset.str->value.str.val[i] = ' '; + } + T->var.str_offset.str->value.str.val[T->var.str_offset.offset+1] = 0; + T->var.str_offset.str->value.str.len = T->var.str_offset.offset+1; + } - if (value->type!=IS_STRING) { - tmp = *value; - if (op2 && op2->op_type == IS_VAR) { - zval_copy_ctor(&tmp); - } - convert_to_string(&tmp); - final_value = &tmp; - } + if (value->type!=IS_STRING) { + tmp = *value; + if (op2 && op2->op_type == IS_VAR) { + zval_copy_ctor(&tmp); + } + convert_to_string(&tmp); + final_value = &tmp; + } - T->EA.data.str_offset.str->value.str.val[T->EA.data.str_offset.offset] = final_value->value.str.val[0]; - - if (op2) { - if (op2->op_type == IS_VAR) { - if (value == &T(op2->u.var).tmp_var) { - if (result->u.EA.type & EXT_TYPE_UNUSED) { - /* We are not going to use return value, drop it */ - STR_FREE(value->value.str.val); - } else { - /* We are going to use return value, make it real zval */ - ALLOC_ZVAL(value); - *value = T(op2->u.var).tmp_var; - value->is_ref = 0; - value->refcount = 0; /* LOCK will increase it */ - } - } - } else { - if (final_value == &T(op2->u.var).tmp_var) { - /* we can safely free final_value here - * because separation is done only - * in case op2->op_type == IS_VAR */ - STR_FREE(final_value->value.str.val); - } - } - } - if (final_value == &tmp) { - zval_dtor(final_value); + T->var.str_offset.str->value.str.val[T->var.str_offset.offset] = final_value->value.str.val[0]; + + if (op2) { + if (op2->op_type == IS_VAR) { + if (value == &T(op2->u.var).tmp_var) { + if (result->u.EA.type & EXT_TYPE_UNUSED) { + /* We are not going to use return value, drop it */ + STR_FREE(value->value.str.val); + } else { + /* We are going to use return value, make it real zval */ + ALLOC_ZVAL(value); + *value = T(op2->u.var).tmp_var; + value->is_ref = 0; + value->refcount = 0; /* LOCK will increase it */ } - /* - * the value of an assignment to a string offset is undefined - T(result->u.var).var = &T->EA.data.str_offset.str; - */ - } while (0); - /* zval_ptr_dtor(&T->EA.data.str_offset.str); Nuke this line if it doesn't cause a leak */ - T->tmp_var.type = IS_STRING; + } + } else { + if (final_value == &T(op2->u.var).tmp_var) { + /* we can safely free final_value here + * because separation is done only + * in case op2->op_type == IS_VAR */ + STR_FREE(final_value->value.str.val); + } } - break; - EMPTY_SWITCH_DEFAULT_CASE() - } + } + if (final_value == &tmp) { + zval_dtor(final_value); + } + /* + * the value of an assignment to a string offset is undefined + T(result->u.var).var = &T->var.str_offset.str; + */ + } while (0); + /* zval_ptr_dtor(&T->var.str_offset.str); Nuke this line if it doesn't cause a leak */ + T->tmp_var.type = IS_STRING; + /* T(result->u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); */ T(result->u.var).var.ptr_ptr = &value; SELECTIVE_PZVAL_LOCK(*T(result->u.var).var.ptr_ptr, result); @@ -689,7 +681,7 @@ if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { target_symbol_table = NULL; - retval = zend_std_get_static_property(T(opline->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC); + retval = zend_std_get_static_property(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++; @@ -830,15 +822,7 @@ zval ***retval = &T(result->u.var).var.ptr_ptr; if (!container_ptr) { - if (T(op1->u.var).EA.type == IS_STRING_OFFSET) { - zend_error(E_ERROR, "Cannot use string offset as an array"); - - get_zval_ptr(op2, Ts, &EG(free_op2), BP_VAR_R); - FREE_OP(Ts, op2, EG(free_op2)); - } - *retval = &EG(error_zval_ptr); - SELECTIVE_PZVAL_LOCK(**retval, result); - return; + zend_error(E_ERROR, "Cannot use string offset as an array"); } container = *container_ptr; @@ -914,10 +898,9 @@ SEPARATE_ZVAL_IF_NOT_REF(container_ptr); } container = *container_ptr; - T(result->u.var).EA.data.str_offset.str = container; + T(result->u.var).var.str_offset.str = container; PZVAL_LOCK(container); - T(result->u.var).EA.data.str_offset.offset = offset->value.lval; - T(result->u.var).EA.type = IS_STRING_OFFSET; + T(result->u.var).var.str_offset.offset = offset->value.lval; FREE_OP(Ts, op2, EG(free_op2)); *retval = NULL; return; @@ -2290,7 +2273,7 @@ if (EX(opline)->op2.op_type == IS_UNUSED) { - EX_T(EX(opline)->result.u.var).EA.class_entry = zend_fetch_class(NULL, 0, EX(opline)->extended_value TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = zend_fetch_class(NULL, 0, EX(opline)->extended_value TSRMLS_CC); NEXT_OPCODE(); } @@ -2298,10 +2281,10 @@ switch (class_name->type) { case IS_OBJECT: - EX_T(EX(opline)->result.u.var).EA.class_entry = Z_OBJCE_P(class_name); + EX_T(EX(opline)->result.u.var).class_entry = Z_OBJCE_P(class_name); break; case IS_STRING: - EX_T(EX(opline)->result.u.var).EA.class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC); + EX_T(EX(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(E_ERROR, "Class name must be a valid object or a string"); @@ -2412,7 +2395,7 @@ zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + ce = EX_T(EX(opline)->op1.u.var).class_entry; if(EX(opline)->op2.op_type != IS_UNUSED) { char *function_name_strval; int function_name_strlen; @@ -2786,9 +2769,9 @@ return 0; /* CHECK_ME */ } ce = Z_OBJCE_P(EG(exception)); - if (ce != EX_T(EX(opline)->op1.u.var).EA.class_entry) { + if (ce != EX_T(EX(opline)->op1.u.var).class_entry) { while (ce->parent) { - if (ce->parent == EX_T(EX(opline)->op1.u.var).EA.class_entry) { + if (ce->parent == EX_T(EX(opline)->op1.u.var).class_entry) { goto exception_should_be_taken; } ce = ce->parent; @@ -3048,12 +3031,11 @@ int switch_expr_is_overloaded=0; if (EX(opline)->op1.op_type==IS_VAR) { - if (EX_T(EX(opline)->op1.u.var).var.ptr_ptr - || (EX_T(EX(opline)->op1.u.var).var.ptr && EX_T(EX(opline)->op1.u.var).EA.type!=IS_STRING_OFFSET)) { + if (EX_T(EX(opline)->op1.u.var).var.ptr_ptr) { PZVAL_LOCK(EX_T(EX(opline)->op1.u.var).var.ptr); } else { switch_expr_is_overloaded = 1; - EX_T(EX(opline)->op1.u.var).EA.data.str_offset.str->refcount++; + EX_T(EX(opline)->op1.u.var).var.str_offset.str->refcount++; } } is_equal_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -3084,19 +3066,19 @@ int zend_new_handler(ZEND_OPCODE_HANDLER_ARGS) { - if (EX_T(EX(opline)->op1.u.var).EA.class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_ABSTRACT_CLASS)) { + if (EX_T(EX(opline)->op1.u.var).class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_ABSTRACT_CLASS)) { char *class_type; - if (EX_T(EX(opline)->op1.u.var).EA.class_entry->ce_flags & ZEND_ACC_INTERFACE) { + if (EX_T(EX(opline)->op1.u.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) { class_type = "interface"; } else { class_type = "abstract class"; } - zend_error(E_ERROR, "Cannot instantiate %s %s", class_type, EX_T(EX(opline)->op1.u.var).EA.class_entry->name); + zend_error(E_ERROR, "Cannot instantiate %s %s", class_type, EX_T(EX(opline)->op1.u.var).class_entry->name); } EX_T(EX(opline)->result.u.var).var.ptr_ptr = &EX_T(EX(opline)->result.u.var).var.ptr; ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr); - object_init_ex(EX_T(EX(opline)->result.u.var).var.ptr, EX_T(EX(opline)->op1.u.var).EA.class_entry); + object_init_ex(EX_T(EX(opline)->result.u.var).var.ptr, EX_T(EX(opline)->op1.u.var).class_entry); EX_T(EX(opline)->result.u.var).var.ptr->refcount=1; EX_T(EX(opline)->result.u.var).var.ptr->is_ref=1; @@ -3188,7 +3170,7 @@ NEXT_OPCODE(); } - ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + ce = EX_T(EX(opline)->op1.u.var).class_entry; if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { zval_update_constant(value, (void *) 1 TSRMLS_CC); @@ -3451,7 +3433,7 @@ } if (EX(opline)->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { - zend_std_unset_static_property(EX_T(EX(opline)->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname) TSRMLS_CC); + zend_std_unset_static_property(EX_T(EX(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(EX(opline), EX(Ts), BP_VAR_IS, varname TSRMLS_CC); zend_hash_del(target_symbol_table, varname->value.str.val, varname->value.str.len+1); @@ -3731,7 +3713,7 @@ } if (EX(opline)->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { - value = zend_std_get_static_property(EX_T(EX(opline)->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC); + value = zend_std_get_static_property(EX_T(EX(opline)->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC); if (!value) { isset = 0; } @@ -3970,14 +3952,14 @@ int zend_declare_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - EX_T(EX(opline)->result.u.var).EA.class_entry = do_bind_class(EX(opline), EG(function_table), EG(class_table) TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = do_bind_class(EX(opline), EG(function_table), EG(class_table) TSRMLS_CC); NEXT_OPCODE(); } int zend_declare_inherited_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - EX_T(EX(opline)->result.u.var).EA.class_entry = do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX_T(EX(opline)->extended_value).EA.class_entry TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX_T(EX(opline)->extended_value).class_entry TSRMLS_CC); NEXT_OPCODE(); } @@ -4007,7 +3989,7 @@ zend_bool result; if (Z_TYPE_P(expr) == IS_OBJECT) { - result = instanceof_function(Z_OBJCE_P(expr), EX_T(EX(opline)->op2.u.var).EA.class_entry TSRMLS_CC); + result = instanceof_function(Z_OBJCE_P(expr), EX_T(EX(opline)->op2.u.var).class_entry TSRMLS_CC); } else { result = 0; } @@ -4030,8 +4012,8 @@ int zend_add_interface_handler(ZEND_OPCODE_HANDLER_ARGS) { - zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; - zend_class_entry *iface = EX_T(EX(opline)->op2.u.var).EA.class_entry; + zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).class_entry; + zend_class_entry *iface = EX_T(EX(opline)->op2.u.var).class_entry; if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) { zend_error(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name); @@ -4072,7 +4054,7 @@ int zend_verify_abstract_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).class_entry; zend_abstract_info ai; if ((ce->ce_flags & ZEND_ACC_ABSTRACT) && !(ce->ce_flags & ZEND_ACC_ABSTRACT_CLASS)) { Index: ZendEngine2/zend_execute.h diff -u ZendEngine2/zend_execute.h:1.58 ZendEngine2/zend_execute.h:1.59 --- ZendEngine2/zend_execute.h:1.58 Sun Aug 24 09:10:02 2003 +++ ZendEngine2/zend_execute.h Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.h,v 1.58 2003/08/24 13:10:02 helly Exp $ */ +/* $Id: zend_execute.h,v 1.59 2003/12/14 12:32:02 zeev Exp $ */ #ifndef ZEND_EXECUTE_H #define ZEND_EXECUTE_H @@ -32,21 +32,12 @@ struct { zval **ptr_ptr; zval *ptr; + struct { + zval *str; + zend_uint offset; + } str_offset; } var; - struct { - zval tmp_var; /* a dummy */ - - union { - struct { - zval *str; - zend_uint offset; - } str_offset; - zend_property_reference overloaded_element; - } data; - - unsigned char type; - zend_class_entry *class_entry; - } EA; + zend_class_entry *class_entry; } temp_variable; @@ -164,7 +155,6 @@ void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts TSRMLS_DC); -#define IS_OVERLOADED_OBJECT 1 #define IS_STRING_OFFSET 2 /* The following tries to resolve the classname of a zval of type object.
Index: ZendEngine2/zend.h diff -u ZendEngine2/zend.h:1.230 ZendEngine2/zend.h:1.231 --- ZendEngine2/zend.h:1.230 Thu Dec 11 18:50:13 2003 +++ ZendEngine2/zend.h Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend.h,v 1.230 2003/12/11 23:50:13 iliaa Exp $ */ +/* $Id: zend.h,v 1.231 2003/12/14 12:32:02 zeev Exp $ */ #ifndef ZEND_H #define ZEND_H @@ -287,18 +287,6 @@ zend_uchar is_ref; }; -typedef struct _zend_property_reference { - int type; /* read, write or r/w */ - zval *object; - zend_llist *elements_list; -} zend_property_reference; - - - -typedef struct _zend_overloaded_element { - int type; /* array offset or object proprety */ - zval element; -} zend_overloaded_element; /* excpt.h on Digital Unix 4.0 defines function_table */ #undef function_table @@ -348,13 +336,6 @@ zend_uint line_end; char *doc_comment; zend_uint doc_comment_len; - - /* old handlers */ -#if 0 - void (*handle_function_call)(INTERNAL_FUNCTION_PARAMETERS, zend_property_reference *property_reference); - zval (*handle_property_get)(zend_property_reference *property_reference); - int (*handle_property_set)(zend_property_reference *property_reference, zval *value); -#endif }; #include "zend_stream.h" Index: ZendEngine2/zend_execute.c diff -u ZendEngine2/zend_execute.c:1.563 ZendEngine2/zend_execute.c:1.564 --- ZendEngine2/zend_execute.c:1.563 Thu Dec 11 05:21:16 2003 +++ ZendEngine2/zend_execute.c Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.c,v 1.563 2003/12/11 10:21:16 andi Exp $ */ +/* $Id: zend_execute.c,v 1.564 2003/12/14 12:32:02 zeev Exp $ */ #define ZEND_INTENSIVE_DEBUGGING 0 @@ -98,33 +98,29 @@ *should_free = 0; return T(node->u.var).var.ptr; } else { + temp_variable *T = &T(node->u.var); + zval *str = T->var.str_offset.str; + + /* string offset */ *should_free = &T(node->u.var).tmp_var; - switch (T(node->u.var).EA.type) { - case IS_STRING_OFFSET: { - temp_variable *T = &T(node->u.var); - zval *str = T->EA.data.str_offset.str; - - if (T->EA.data.str_offset.str->type != IS_STRING - || ((int)T->EA.data.str_offset.offset<0) - || (T->EA.data.str_offset.str->value.str.len <= T->EA.data.str_offset.offset)) { - zend_error(E_NOTICE, "Uninitialized string offset: %d", T->EA.data.str_offset.offset); - T->tmp_var.value.str.val = empty_string; - T->tmp_var.value.str.len = 0; - } else { - char c = str->value.str.val[T->EA.data.str_offset.offset]; - - T->tmp_var.value.str.val = estrndup(&c, 1); - T->tmp_var.value.str.len = 1; - } - PZVAL_UNLOCK(str); - T->tmp_var.refcount=1; - T->tmp_var.is_ref=1; - T->tmp_var.type = IS_STRING; - return &T->tmp_var; - } - break; + if (T->var.str_offset.str->type != IS_STRING + || ((int)T->var.str_offset.offset<0) + || (T->var.str_offset.str->value.str.len <= T->var.str_offset.offset)) { + zend_error(E_NOTICE, "Uninitialized string offset: %d", T->var.str_offset.offset); + T->tmp_var.value.str.val = empty_string; + T->tmp_var.value.str.len = 0; + } else { + char c = str->value.str.val[T->var.str_offset.offset]; + + T->tmp_var.value.str.val = estrndup(&c, 1); + T->tmp_var.value.str.len = 1; } + PZVAL_UNLOCK(str); + T->tmp_var.refcount=1; + T->tmp_var.is_ref=1; + T->tmp_var.type = IS_STRING; + return &T->tmp_var; } break; case IS_UNUSED: @@ -141,8 +137,9 @@ if (node->op_type==IS_VAR) { if (T(node->u.var).var.ptr_ptr) { PZVAL_UNLOCK(*T(node->u.var).var.ptr_ptr); - } else if (T(node->u.var).EA.type==IS_STRING_OFFSET) { - PZVAL_UNLOCK(T(node->u.var).EA.data.str_offset.str); + } else { + /* string offset */ + PZVAL_UNLOCK(T(node->u.var).var.str_offset.str); } return T(node->u.var).var.ptr_ptr; } else { @@ -198,7 +195,7 @@ /* perform the equivalent of equivalent of a * quick & silent get_zval_ptr, and FREE_OP */ - PZVAL_UNLOCK(T->EA.data.str_offset.str); + PZVAL_UNLOCK(T->var.str_offset.str); } else { zval_ptr_dtor(&T(opline->op1.u.var).var.ptr); if (opline->extended_value) { /* foreach() free */ @@ -437,82 +434,77 @@ zval *variable_ptr; if (!variable_ptr_ptr) { - switch (T(op1->u.var).EA.type) { - case IS_STRING_OFFSET: { - temp_variable *T = &T(op1->u.var); + temp_variable *T = &T(op1->u.var); - if (T->EA.data.str_offset.str->type == IS_STRING) do { - zval tmp; - zval *final_value = value; + if (T->var.str_offset.str->type == IS_STRING) do { + zval tmp; + zval *final_value = value; - if (((int)T->EA.data.str_offset.offset < 0)) { - zend_error(E_WARNING, "Illegal string offset: %d", T->EA.data.str_offset.offset); - break; - } - if (T->EA.data.str_offset.offset >= T->EA.data.str_offset.str->value.str.len) { - zend_uint i; + if (((int)T->var.str_offset.offset < 0)) { + zend_error(E_WARNING, "Illegal string offset: %d", T->var.str_offset.offset); + break; + } + if (T->var.str_offset.offset >= T->var.str_offset.str->value.str.len) { + zend_uint i; - if (T->EA.data.str_offset.str->value.str.len==0) { - STR_FREE(T->EA.data.str_offset.str->value.str.val); - T->EA.data.str_offset.str->value.str.val = (char *) emalloc(T->EA.data.str_offset.offset+1+1); - } else { - T->EA.data.str_offset.str->value.str.val = (char *) erealloc(T->EA.data.str_offset.str->value.str.val, T->EA.data.str_offset.offset+1+1); - } - for (i=T->EA.data.str_offset.str->value.str.len; i<T->EA.data.str_offset.offset; i++) { - T->EA.data.str_offset.str->value.str.val[i] = ' '; - } - T->EA.data.str_offset.str->value.str.val[T->EA.data.str_offset.offset+1] = 0; - T->EA.data.str_offset.str->value.str.len = T->EA.data.str_offset.offset+1; - } + if (T->var.str_offset.str->value.str.len==0) { + STR_FREE(T->var.str_offset.str->value.str.val); + T->var.str_offset.str->value.str.val = (char *) emalloc(T->var.str_offset.offset+1+1); + } else { + T->var.str_offset.str->value.str.val = (char *) erealloc(T->var.str_offset.str->value.str.val, T->var.str_offset.offset+1+1); + } + for (i=T->var.str_offset.str->value.str.len; i<T->var.str_offset.offset; i++) { + T->var.str_offset.str->value.str.val[i] = ' '; + } + T->var.str_offset.str->value.str.val[T->var.str_offset.offset+1] = 0; + T->var.str_offset.str->value.str.len = T->var.str_offset.offset+1; + } - if (value->type!=IS_STRING) { - tmp = *value; - if (op2 && op2->op_type == IS_VAR) { - zval_copy_ctor(&tmp); - } - convert_to_string(&tmp); - final_value = &tmp; - } + if (value->type!=IS_STRING) { + tmp = *value; + if (op2 && op2->op_type == IS_VAR) { + zval_copy_ctor(&tmp); + } + convert_to_string(&tmp); + final_value = &tmp; + } - T->EA.data.str_offset.str->value.str.val[T->EA.data.str_offset.offset] = final_value->value.str.val[0]; - - if (op2) { - if (op2->op_type == IS_VAR) { - if (value == &T(op2->u.var).tmp_var) { - if (result->u.EA.type & EXT_TYPE_UNUSED) { - /* We are not going to use return value, drop it */ - STR_FREE(value->value.str.val); - } else { - /* We are going to use return value, make it real zval */ - ALLOC_ZVAL(value); - *value = T(op2->u.var).tmp_var; - value->is_ref = 0; - value->refcount = 0; /* LOCK will increase it */ - } - } - } else { - if (final_value == &T(op2->u.var).tmp_var) { - /* we can safely free final_value here - * because separation is done only - * in case op2->op_type == IS_VAR */ - STR_FREE(final_value->value.str.val); - } - } - } - if (final_value == &tmp) { - zval_dtor(final_value); + T->var.str_offset.str->value.str.val[T->var.str_offset.offset] = final_value->value.str.val[0]; + + if (op2) { + if (op2->op_type == IS_VAR) { + if (value == &T(op2->u.var).tmp_var) { + if (result->u.EA.type & EXT_TYPE_UNUSED) { + /* We are not going to use return value, drop it */ + STR_FREE(value->value.str.val); + } else { + /* We are going to use return value, make it real zval */ + ALLOC_ZVAL(value); + *value = T(op2->u.var).tmp_var; + value->is_ref = 0; + value->refcount = 0; /* LOCK will increase it */ } - /* - * the value of an assignment to a string offset is undefined - T(result->u.var).var = &T->EA.data.str_offset.str; - */ - } while (0); - /* zval_ptr_dtor(&T->EA.data.str_offset.str); Nuke this line if it doesn't cause a leak */ - T->tmp_var.type = IS_STRING; + } + } else { + if (final_value == &T(op2->u.var).tmp_var) { + /* we can safely free final_value here + * because separation is done only + * in case op2->op_type == IS_VAR */ + STR_FREE(final_value->value.str.val); + } } - break; - EMPTY_SWITCH_DEFAULT_CASE() - } + } + if (final_value == &tmp) { + zval_dtor(final_value); + } + /* + * the value of an assignment to a string offset is undefined + T(result->u.var).var = &T->var.str_offset.str; + */ + } while (0); + /* zval_ptr_dtor(&T->var.str_offset.str); Nuke this line if it doesn't cause a leak */ + T->tmp_var.type = IS_STRING; + /* T(result->u.var).var.ptr_ptr = &EG(uninitialized_zval_ptr); */ T(result->u.var).var.ptr_ptr = &value; SELECTIVE_PZVAL_LOCK(*T(result->u.var).var.ptr_ptr, result); @@ -689,7 +681,7 @@ if (opline->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { target_symbol_table = NULL; - retval = zend_std_get_static_property(T(opline->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 0 TSRMLS_CC); + retval = zend_std_get_static_property(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++; @@ -830,15 +822,7 @@ zval ***retval = &T(result->u.var).var.ptr_ptr; if (!container_ptr) { - if (T(op1->u.var).EA.type == IS_STRING_OFFSET) { - zend_error(E_ERROR, "Cannot use string offset as an array"); - - get_zval_ptr(op2, Ts, &EG(free_op2), BP_VAR_R); - FREE_OP(Ts, op2, EG(free_op2)); - } - *retval = &EG(error_zval_ptr); - SELECTIVE_PZVAL_LOCK(**retval, result); - return; + zend_error(E_ERROR, "Cannot use string offset as an array"); } container = *container_ptr; @@ -914,10 +898,9 @@ SEPARATE_ZVAL_IF_NOT_REF(container_ptr); } container = *container_ptr; - T(result->u.var).EA.data.str_offset.str = container; + T(result->u.var).var.str_offset.str = container; PZVAL_LOCK(container); - T(result->u.var).EA.data.str_offset.offset = offset->value.lval; - T(result->u.var).EA.type = IS_STRING_OFFSET; + T(result->u.var).var.str_offset.offset = offset->value.lval; FREE_OP(Ts, op2, EG(free_op2)); *retval = NULL; return; @@ -2290,7 +2273,7 @@ if (EX(opline)->op2.op_type == IS_UNUSED) { - EX_T(EX(opline)->result.u.var).EA.class_entry = zend_fetch_class(NULL, 0, EX(opline)->extended_value TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = zend_fetch_class(NULL, 0, EX(opline)->extended_value TSRMLS_CC); NEXT_OPCODE(); } @@ -2298,10 +2281,10 @@ switch (class_name->type) { case IS_OBJECT: - EX_T(EX(opline)->result.u.var).EA.class_entry = Z_OBJCE_P(class_name); + EX_T(EX(opline)->result.u.var).class_entry = Z_OBJCE_P(class_name); break; case IS_STRING: - EX_T(EX(opline)->result.u.var).EA.class_entry = zend_fetch_class(Z_STRVAL_P(class_name), Z_STRLEN_P(class_name), ZEND_FETCH_CLASS_DEFAULT TSRMLS_CC); + EX_T(EX(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(E_ERROR, "Class name must be a valid object or a string"); @@ -2412,7 +2395,7 @@ zend_ptr_stack_n_push(&EG(arg_types_stack), 3, EX(fbc), EX(object), EX(calling_scope)); - ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + ce = EX_T(EX(opline)->op1.u.var).class_entry; if(EX(opline)->op2.op_type != IS_UNUSED) { char *function_name_strval; int function_name_strlen; @@ -2786,9 +2769,9 @@ return 0; /* CHECK_ME */ } ce = Z_OBJCE_P(EG(exception)); - if (ce != EX_T(EX(opline)->op1.u.var).EA.class_entry) { + if (ce != EX_T(EX(opline)->op1.u.var).class_entry) { while (ce->parent) { - if (ce->parent == EX_T(EX(opline)->op1.u.var).EA.class_entry) { + if (ce->parent == EX_T(EX(opline)->op1.u.var).class_entry) { goto exception_should_be_taken; } ce = ce->parent; @@ -3048,12 +3031,11 @@ int switch_expr_is_overloaded=0; if (EX(opline)->op1.op_type==IS_VAR) { - if (EX_T(EX(opline)->op1.u.var).var.ptr_ptr - || (EX_T(EX(opline)->op1.u.var).var.ptr && EX_T(EX(opline)->op1.u.var).EA.type!=IS_STRING_OFFSET)) { + if (EX_T(EX(opline)->op1.u.var).var.ptr_ptr) { PZVAL_LOCK(EX_T(EX(opline)->op1.u.var).var.ptr); } else { switch_expr_is_overloaded = 1; - EX_T(EX(opline)->op1.u.var).EA.data.str_offset.str->refcount++; + EX_T(EX(opline)->op1.u.var).var.str_offset.str->refcount++; } } is_equal_function(&EX_T(EX(opline)->result.u.var).tmp_var, @@ -3084,19 +3066,19 @@ int zend_new_handler(ZEND_OPCODE_HANDLER_ARGS) { - if (EX_T(EX(opline)->op1.u.var).EA.class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_ABSTRACT_CLASS)) { + if (EX_T(EX(opline)->op1.u.var).class_entry->ce_flags & (ZEND_ACC_INTERFACE|ZEND_ACC_ABSTRACT_CLASS)) { char *class_type; - if (EX_T(EX(opline)->op1.u.var).EA.class_entry->ce_flags & ZEND_ACC_INTERFACE) { + if (EX_T(EX(opline)->op1.u.var).class_entry->ce_flags & ZEND_ACC_INTERFACE) { class_type = "interface"; } else { class_type = "abstract class"; } - zend_error(E_ERROR, "Cannot instantiate %s %s", class_type, EX_T(EX(opline)->op1.u.var).EA.class_entry->name); + zend_error(E_ERROR, "Cannot instantiate %s %s", class_type, EX_T(EX(opline)->op1.u.var).class_entry->name); } EX_T(EX(opline)->result.u.var).var.ptr_ptr = &EX_T(EX(opline)->result.u.var).var.ptr; ALLOC_ZVAL(EX_T(EX(opline)->result.u.var).var.ptr); - object_init_ex(EX_T(EX(opline)->result.u.var).var.ptr, EX_T(EX(opline)->op1.u.var).EA.class_entry); + object_init_ex(EX_T(EX(opline)->result.u.var).var.ptr, EX_T(EX(opline)->op1.u.var).class_entry); EX_T(EX(opline)->result.u.var).var.ptr->refcount=1; EX_T(EX(opline)->result.u.var).var.ptr->is_ref=1; @@ -3188,7 +3170,7 @@ NEXT_OPCODE(); } - ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + ce = EX_T(EX(opline)->op1.u.var).class_entry; if (zend_hash_find(&ce->constants_table, EX(opline)->op2.u.constant.value.str.val, EX(opline)->op2.u.constant.value.str.len+1, (void **) &value) == SUCCESS) { zval_update_constant(value, (void *) 1 TSRMLS_CC); @@ -3451,7 +3433,7 @@ } if (EX(opline)->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { - zend_std_unset_static_property(EX_T(EX(opline)->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname) TSRMLS_CC); + zend_std_unset_static_property(EX_T(EX(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(EX(opline), EX(Ts), BP_VAR_IS, varname TSRMLS_CC); zend_hash_del(target_symbol_table, varname->value.str.val, varname->value.str.len+1); @@ -3731,7 +3713,7 @@ } if (EX(opline)->op2.u.EA.type == ZEND_FETCH_STATIC_MEMBER) { - value = zend_std_get_static_property(EX_T(EX(opline)->op2.u.var).EA.class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC); + value = zend_std_get_static_property(EX_T(EX(opline)->op2.u.var).class_entry, Z_STRVAL_P(varname), Z_STRLEN_P(varname), 1 TSRMLS_CC); if (!value) { isset = 0; } @@ -3970,14 +3952,14 @@ int zend_declare_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - EX_T(EX(opline)->result.u.var).EA.class_entry = do_bind_class(EX(opline), EG(function_table), EG(class_table) TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = do_bind_class(EX(opline), EG(function_table), EG(class_table) TSRMLS_CC); NEXT_OPCODE(); } int zend_declare_inherited_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - EX_T(EX(opline)->result.u.var).EA.class_entry = do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX_T(EX(opline)->extended_value).EA.class_entry TSRMLS_CC); + EX_T(EX(opline)->result.u.var).class_entry = do_bind_inherited_class(EX(opline), EG(function_table), EG(class_table), EX_T(EX(opline)->extended_value).class_entry TSRMLS_CC); NEXT_OPCODE(); } @@ -4007,7 +3989,7 @@ zend_bool result; if (Z_TYPE_P(expr) == IS_OBJECT) { - result = instanceof_function(Z_OBJCE_P(expr), EX_T(EX(opline)->op2.u.var).EA.class_entry TSRMLS_CC); + result = instanceof_function(Z_OBJCE_P(expr), EX_T(EX(opline)->op2.u.var).class_entry TSRMLS_CC); } else { result = 0; } @@ -4030,8 +4012,8 @@ int zend_add_interface_handler(ZEND_OPCODE_HANDLER_ARGS) { - zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; - zend_class_entry *iface = EX_T(EX(opline)->op2.u.var).EA.class_entry; + zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).class_entry; + zend_class_entry *iface = EX_T(EX(opline)->op2.u.var).class_entry; if (!(iface->ce_flags & ZEND_ACC_INTERFACE)) { zend_error(E_ERROR, "%s cannot implement %s - it is not an interface", ce->name, iface->name); @@ -4072,7 +4054,7 @@ int zend_verify_abstract_class_handler(ZEND_OPCODE_HANDLER_ARGS) { - zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).EA.class_entry; + zend_class_entry *ce = EX_T(EX(opline)->op1.u.var).class_entry; zend_abstract_info ai; if ((ce->ce_flags & ZEND_ACC_ABSTRACT) && !(ce->ce_flags & ZEND_ACC_ABSTRACT_CLASS)) { Index: ZendEngine2/zend_execute.h diff -u ZendEngine2/zend_execute.h:1.58 ZendEngine2/zend_execute.h:1.59 --- ZendEngine2/zend_execute.h:1.58 Sun Aug 24 09:10:02 2003 +++ ZendEngine2/zend_execute.h Sun Dec 14 07:32:02 2003 @@ -17,7 +17,7 @@ +----------------------------------------------------------------------+ */ -/* $Id: zend_execute.h,v 1.58 2003/08/24 13:10:02 helly Exp $ */ +/* $Id: zend_execute.h,v 1.59 2003/12/14 12:32:02 zeev Exp $ */ #ifndef ZEND_EXECUTE_H #define ZEND_EXECUTE_H @@ -32,21 +32,12 @@ struct { zval **ptr_ptr; zval *ptr; + struct { + zval *str; + zend_uint offset; + } str_offset; } var; - struct { - zval tmp_var; /* a dummy */ - - union { - struct { - zval *str; - zend_uint offset; - } str_offset; - zend_property_reference overloaded_element; - } data; - - unsigned char type; - zend_class_entry *class_entry; - } EA; + zend_class_entry *class_entry; } temp_variable; @@ -164,7 +155,6 @@ void zend_assign_to_variable_reference(znode *result, zval **variable_ptr_ptr, zval **value_ptr_ptr, temp_variable *Ts TSRMLS_DC); -#define IS_OVERLOADED_OBJECT 1 #define IS_STRING_OFFSET 2 /* The following tries to resolve the classname of a zval of type object.