static inline void dump_decl_arg(int fd, decl_arg *a) {
dump_decl_type(fd, a->type);
- dprintf(fd, " ");
- dump_decl_var(fd, a->var);
+ if (a->type->type != PSI_T_FUNCTION) {
+ dprintf(fd, " ");
+ dump_decl_var(fd, a->var);
+ }
}
static inline void dump_level(int fd, unsigned level) {
dprintf(fd, ", ");
dump_num_exp(fd, set->num);
}
- if (set->inner && set->func->type != PSI_T_ELLIPSIS) {
+ if (set->inner && set->inner->vals && 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, i == (set->count - 1));
+ for (i = 0; i < set->inner->count; ++i) {
+ dump_impl_set_value(fd, set->inner->vals[i], level+1, i == (set->inner->count - 1));
}
/* only if inner stmts, i.e. with new lines, were dumped */
dump_level(fd, level);
static inline void dump_struct(int fd, decl_struct *strct) {
size_t j;
- dprintf(fd, "struct %s::(%zu)", strct->name, strct->size);
+ dprintf(fd, "struct %s::(%zu, %zu)", strct->name, strct->align, strct->size);
if (strct->args && strct->args->count) {
dprintf(fd, " {\n");
for (j = 0; j < strct->args->count; ++j) {
for (i = 0; i < structs->count; ++i) {
decl_struct *strct = structs->list[i];
-
dump_struct(fd, strct);
dprintf(fd, "\n");
}
}
+static inline void dump_union(int fd, decl_union *unn) {
+ size_t j;
+
+ dprintf(fd, "union %s::(%zu, %zu) {\n", unn->name, unn->align, unn->size);
+ for (j = 0; j < unn->args->count; ++j) {
+ decl_arg *uarg = unn->args->args[j];
+
+ dprintf(fd, "\t");
+ dump_decl_arg(fd, uarg);
+ dprintf(fd, "::(%zu, %zu);\n", uarg->layout->pos, uarg->layout->len);
+ }
+ dprintf(fd, "}");
+}
+
+static inline void dump_unions(int fd, decl_unions *unions) {
+ size_t i;
+
+ for (i = 0; i < unions->count; ++i) {
+ decl_union *unn = unions->list[i];
+
+ dump_union(fd, unn);
+ dprintf(fd, "\n");
+ }
+}
+
static inline void dump_enum(int fd, decl_enum *e) {
size_t j;
for (j = 0; j < func->args->count; ++j) {
impl_arg *iarg = func->args->args[j];
- dprintf(fd, "%s%s %s$%s",
+ dprintf(fd, "%s%s %s%s",
j ? ", " : "",
iarg->type->name,
iarg->var->reference ? "&" : "",
if (func->args->vararg.name) {
impl_arg *vararg = func->args->vararg.name;
- dprintf(fd, ", %s %s...$%s",
+ dprintf(fd, ", %s %s...%s",
vararg->type->name,
vararg->var->reference ? "&" : "",
vararg->var->name);
dump_num_exp(fd, let->val->data.alloc->size);
dprintf(fd, ")");
break;
+ case PSI_LET_CALLBACK:
+ dprintf(fd, "callback %s(%s(", let->val->data.callback->func->name,
+ let->val->data.callback->func->var->name);
+ if (let->val->data.callback->args) {
+ size_t i, c = let->val->data.callback->args->count;
+
+ dprintf(fd, "\n");
+ for (i = 0; i < c; ++i) {
+ set_value *set = let->val->data.callback->args->vals[i];
+ dump_impl_set_value(fd, set, 2, i + 1 == c);
+ }
+ dprintf(fd, "\t");
+ }
+ dprintf(fd, "));");
+ break;
case PSI_LET_FUNC:
- dprintf(fd, "%s($%s)", let->val->data.func->name,
+ dprintf(fd, "%s(%s)", let->val->data.func->name,
let->val->data.func->var->name);
break;
case PSI_LET_NUMEXP:
}
static inline void dump_impl_set_stmt(int fd, set_stmt *set) {
- dprintf(fd, "\tset $%s = ", set->var->name);
+ dprintf(fd, "\tset %s = ", set->var->name);
dump_impl_set_value(fd, set->val, 1, 0);
}
dump_typedefs(fd, C->defs);
dprintf(fd, "\n");
}
-
+ if (C->unions) {
+ dump_unions(fd, C->unions);
+ dprintf(fd, "\n");
+ }
if (C->structs) {
dump_structs(fd, C->structs);
dprintf(fd, "\n");