} psi_std_types[] = {
{PSI_T_FLOAT, "float"},
{PSI_T_DOUBLE, "double"},
+#ifdef HAVE_LONG_DOUBLE
+ {PSI_T_LONG_DOUBLE, "long double"},
+#endif
{PSI_T_INT8, "int8_t"},
{PSI_T_INT16, "int16_t"},
{PSI_T_INT32, "int32_t"},
static inline int validate_decl_type(PSI_Data *data, decl_type *type) {
switch (type->type) {
+ case PSI_T_CHAR:
+ case PSI_T_SHORT:
+ case PSI_T_INT:
+ case PSI_T_LONG:
case PSI_T_NAME:
if (!data->defs || !locate_decl_type_alias(data->defs, type)) {
return 0;
return 1;
}
+static int psi_sort_struct_arg_cmp(const void *_a, const void *_b) {
+ decl_arg *a = *(decl_arg **)_a, *b = *(decl_arg **)_b;
+
+ if (a->layout->pos == b->layout->pos) {
+ if (a->layout->len == b->layout->len) {
+ return 0;
+ } else if (a->layout->len > b->layout->len) {
+ return -1;
+ } else {
+ return 1;
+ }
+ } else if (a->layout->pos > b->layout->pos) {
+ return 1;
+ } else {
+ return -1;
+ }
+}
+static void psi_sort_struct_arg_swp(void *a, void *b) {
+ decl_arg **_a = a, **_b = b, *_c;
+
+ _c = *_b;
+ *_b = *_a;
+ *_a = _c;
+}
+static inline void psi_sort_struct_args(decl_struct *s) {
+ zend_insert_sort(s->args->args, s->args->count, sizeof(*s->args->args),
+ psi_sort_struct_arg_cmp, psi_sort_struct_arg_swp);
+}
+
static inline int validate_decl_struct(PSI_Data *data, decl_struct *s) {
size_t i;
ZEND_ASSERT(!darg->var->arg || darg->var->arg == darg);
darg->var->arg = darg;
- if (!darg->layout) {
+ if (darg->layout) {
+ size_t size;
+
+ if (darg->var->array_size) {
+ size = psi_t_size(real_decl_type(darg->type)->type) * darg->var->array_size;
+ } else if (darg->var->pointer_level) {
+ size = psi_t_size(PSI_T_POINTER);
+ } else {
+ decl_type *real = real_decl_type(darg->type);
+
+ if (real->type == PSI_T_STRUCT) {
+ size = real->strct->size;
+ } else {
+ size = psi_t_size(real->type);
+ }
+ }
+ if (darg->layout->len != size) {
+ data->error(darg->token, PSI_WARNING,
+ "Computed length %zu of %s.%s does not match"
+ " pre-defined length %zu of type '%s'",
+ darg->layout->len, s->name, darg->var->name, size,
+ darg->type->name);
+ return 0;
+ }
+ } else {
token_t t;
if (darg->var->pointer_level && (!darg->var->array_size || darg->var->pointer_level == 1)) {
s->size = darg->layout->pos + darg->layout->len;
}
}
+
+ psi_sort_struct_args(s);
+
return 1;
}
dprintf(fd, ", ");
dump_num_exp(fd, set->num);
}
- if (set->inner) {
+ if (set->inner && set->func->type != PSI_T_ELLIPSIS) {
dprintf(fd, ",\n");
for (i = 0; i < set->count; ++i) {
dump_impl_set_value(fd, set->inner[i], level+1);
dprintf(fd, "typedef ");
dump_decl_type(fd, tdef->type);
- dprintf(fd, " %s;\n", tdef->alias);
+ dprintf(fd, " %s%s;\n", tdef->type->type == PSI_T_POINTER ? "*":"",
+ tdef->alias);
}
dprintf(fd, "\n");
}
dprintf(fd, "%s($%s)", let->val->data.func->name,
let->val->data.func->var->name);
break;
+ case PSI_LET_NUMEXP:
+ dump_num_exp(fd, let->val->data.num);
+ break;
EMPTY_SWITCH_DEFAULT_CASE();
}