X-Git-Url: https://git.m6w6.name/?p=m6w6%2Fext-psi;a=blobdiff_plain;f=src%2Ftypes.h;h=e0c4b07106901079abd372701e4dfa634b8899b5;hp=60fde1190b82a1b5595bc9cc95ecb401ba3ca7e4;hb=216e7ac3b97aed5a5d65c511dc061c78be90e79d;hpb=b029005e56a8913fbb3d17ab497b4a37a00a211c diff --git a/src/types.h b/src/types.h index 60fde11..e0c4b07 100644 --- a/src/types.h +++ b/src/types.h @@ -39,7 +39,6 @@ #include "types/impl_type.h" #include "types/impl_var.h" #include "types/impl_def_val.h" -#include "types/const_type.h" #include "types/const.h" #include "types/impl_arg.h" #include "types/impl_func.h" @@ -74,7 +73,7 @@ static inline impl_val *deref_impl_val(impl_val *ret_val, struct psi_decl_var *v ZEND_ASSERT(!var->arg || var->arg->var != var); #if 0 fprintf(stderr, "deref: %s pl=%u:%u as=%u:%u %p\n", - var->name, var->pointer_level, var->arg->var->pointer_level, + var->name->val, var->pointer_level, var->arg->var->pointer_level, var->array_size, var->arg->var->array_size, ret_val); #endif for (i = 0; i < var->pointer_level; ++i) { @@ -86,39 +85,4 @@ static inline impl_val *deref_impl_val(impl_val *ret_val, struct psi_decl_var *v return ret_val; } -static inline impl_val *enref_impl_val(void *ptr, struct psi_decl_var *var) { - impl_val *val, *val_ptr; - unsigned i; - - ZEND_ASSERT(var->arg->var == var); -#if 0 - fprintf(stderr, "enref: %s pl=%u:%u as=%u:%u\n", - var->name, var->pointer_level, var->arg->var->pointer_level, - var->array_size, var->arg->var->array_size); -#endif - if (!var->pointer_level ){//&& real_decl_type(var->arg->type)->type != PSI_T_STRUCT) { - return ptr; - } - - val = calloc(var->pointer_level + 1, sizeof(void *)); - val_ptr = val; - for (i = !var->arg->var->array_size; i < var->pointer_level; ++i) { -#if 0 - fprintf(stderr, "++\n"); -#endif - val_ptr->ptr = (void **) val_ptr + 1; - val_ptr = val_ptr->ptr; - } - val_ptr->ptr = ptr; - return val; -} - -static inline impl_val *struct_member_ref(struct psi_decl_arg *set_arg, impl_val *struct_ptr, impl_val **to_free) { - void *ptr = (char *) struct_ptr + set_arg->layout->pos; -#if 0 - fprintf(stderr, "struct member %s: %p\n", set_arg->var->name, ptr); -#endif - return ptr; -} - #endif