void *psi_array_to_struct(decl_struct *s, HashTable *arr)
{
- size_t i, j = 0, size = decl_struct_size(s);
- char *mem = ecalloc(1, size + s->args->count * sizeof(void *));
+ size_t i, j = 0;
+ char *mem = ecalloc(1, s->size + s->args->count * sizeof(void *));
if (arr) for (i = 0; i < s->args->count; ++i) {
- decl_struct_layout *layout = &s->layout[i];
decl_arg *darg = s->args->args[i];
zval *entry = zend_hash_str_find_ind(arr, darg->var->name, strlen(darg->var->name));
memset(&tmp, 0, sizeof(tmp));
psi_from_zval(&val, darg, entry, &tmp);
- memcpy(mem + layout->pos, &val, layout->len);
+ memcpy(mem + darg->layout->pos, &val, darg->layout->len);
if (tmp) {
- ((void **)(mem + size))[j++] = tmp;
+ ((void **)(mem + s->size))[j++] = tmp;
}
}
}
ZEND_ASSERT(s);
for (i = 0; i < s->args->count; ++i) {
decl_arg *darg = s->args->args[i];
- decl_struct_layout layout = s->layout[i];
- impl_val tmp;
+ impl_val tmp, tmp_ptr;
zval ztmp;
- char *ptr = (char *) ret_val->ptr + layout.pos;
+ char *ptr = (char *) ret_val->ptr + darg->layout->pos;
+ tmp_ptr.ptr = &tmp;
memset(&tmp, 0, sizeof(tmp));
- memcpy(&tmp, ptr, layout.len);
+ memcpy(&tmp, ptr, darg->layout->len);
switch (real_decl_type(darg->type)->type) {
case PSI_T_FLOAT:
case PSI_T_DOUBLE:
case PSI_T_UINT64:
psi_to_int(&ztmp, real_decl_type(darg->type)->type, &tmp, darg->var);
break;
+ case PSI_T_STRUCT:
+ psi_to_array(&ztmp, real_decl_type(darg->type)->type, &tmp_ptr, darg->var);
+ break;
default:
printf("t=%d\n", real_decl_type(darg->type)->type);
abort();
size_t size;
if (type->type == PSI_T_STRUCT) {
- /* psi_do_clean expects a NULL pointer after the struct */
- size = decl_struct_size(type->strct) + sizeof(void *);
+ /* psi_do_clean expects at least one NULL pointer after the struct */
+ size = type->strct->size + sizeof(void *);
} else {
size = psi_t_size(type->type);
}
decl_type *type = real_decl_type(darg->type);
if (type->type == PSI_T_STRUCT) {
- size_t eos = decl_struct_size(type->strct);
- void **ptr = (void **) ((char *) darg->let->mem + eos);
+ void **ptr = (void **) ((char *) darg->let->mem + type->strct->size);
while (*ptr) {
efree(*ptr++);