size_t psi_t_alignment(token_t t)
{
size_t align;
-# define PSI_TAS_D(T) struct TAS_ ##T { \
+#define PSI_TAS_D(T) struct PSI_TAS_ ##T { \
char c; \
- ##T x; \
+ T x; \
}
-# define PSI_TAS_C(T) align = offsetof(struct TAS_ ##T, x)
-# define PSI_TAS_CASE(T) { \
+#define PSI_TAS_P(T) struct PSI_TAS_ ## T ## _pointer { \
+ char c; \
+ T *x; \
+}
+#define PSI_TAS_C(T) align = offsetof(struct PSI_TAS_ ##T, x)
+#define PSI_TAS_CASE(T) { \
PSI_TAS_D(T); \
PSI_TAS_C(T); \
}
case PSI_T_DOUBLE:
PSI_TAS_CASE(double);
break;
+ case PSI_T_SIZE_T:
+ PSI_TAS_CASE(size_t);
+ break;
+ case PSI_T_POINTER:
+ {
+ PSI_TAS_P(char);
+ PSI_TAS_C(char_pointer);
+ }
+ break;
EMPTY_SWITCH_DEFAULT_CASE();
}
+
+ return align;
}
size_t psi_t_size(token_t t)
case PSI_T_DOUBLE:
size = sizeof(double);
break;
+ case PSI_T_SIZE_T:
+ size = sizeof(size_t);
+ break;
+ case PSI_T_POINTER:
+ size = sizeof(char *);
+ break;
EMPTY_SWITCH_DEFAULT_CASE();
}
return size;
zval ele;
unsigned i;
impl_val tmp;
- token_t t = real_decl_type(func->type)->type;
+ decl_type *type = real_decl_type(func->type);
+ token_t t = type->type;
+ printf("%d:%s real=%p,strct=%p\n", t, type->name, type->real, type->strct);
array_init(return_value);
+
+ if (t == PSI_T_STRUCT) {
+ decl_struct *s = type->strct;
+ ret_val = deref_impl_val(func->var->pointer_level, ret_val, func);
+
+ 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;
+ zval ztmp;
+ char *ptr = (char *) ret_val->ptr + layout.pos;
+
+ memset(&tmp, 0, sizeof(tmp));
+ memcpy(&tmp, ptr, layout.len);
+ switch (real_decl_type(darg->type)->type) {
+ case PSI_T_INT:
+ case PSI_T_LONG:
+ psi_to_int(&tmp, darg, &ztmp);
+ break;
+ case PSI_T_CHAR:
+ psi_to_string(&tmp, darg, &ztmp);
+ break;
+ EMPTY_SWITCH_DEFAULT_CASE();
+ }
+ add_assoc_zval(return_value, darg->var->name, &ztmp);
+ }
+ return;
+ }
ret_val = deref_impl_val(0, ret_val, func);
for (i = 0; i < func->var->array_size; ++i) {
impl_val *ptr = iterate(ret_val, t, i, &tmp);
case PSI_T_TO_INT:
psi_to_int(ret_val, impl->decl->func, return_value);
break;
+ case PSI_T_TO_ARRAY:
+ psi_to_array(ret_val, impl->decl->func, return_value);
+ break;
EMPTY_SWITCH_DEFAULT_CASE();
}
}