X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Fcontext_dump.c;h=8e11eca41763589155de8a03fed85780aa463a01;hb=6eb5f114bb934c85515da1f38547728d80008961;hp=708b36f1e950ab581121ac768c82b15dece6934f;hpb=9bd48d16d68944f3a1e9366fe8c6f3c6d985bf56;p=m6w6%2Fext-psi

diff --git a/src/context_dump.c b/src/context_dump.c
index 708b36f..8e11eca 100644
--- a/src/context_dump.c
+++ b/src/context_dump.c
@@ -4,15 +4,46 @@
 #include "libjit.h"
 #include "libffi.h"
 
+static inline void dump_decl_arg(int fd, decl_arg *darg);
+
 static inline void dump_decl_type(int fd, decl_type *t) {
 	const char *pre;
+	size_t j;
 
 	switch (t->type) {
+	case PSI_T_POINTER:
+		dprintf(fd, "%s *", t->name);
+		return;
+
+	case PSI_T_FUNCTION:
+		dump_decl_arg(fd, t->func->func);
+		dprintf(fd, "(");
+		if (t->func->args) {
+			for (j = 0; j < t->func->args->count; ++j) {
+				if (j) {
+					dprintf(fd, ", ");
+				}
+				dump_decl_arg(fd, t->func->args->args[j]);
+			}
+			if (t->func->args->varargs) {
+				dprintf(fd, ", ...");
+			}
+		}
+		dprintf(fd, ")");
+		return;
+
 	case PSI_T_STRUCT:
 		pre = "struct ";
 		break;
+	case PSI_T_ENUM:
+		pre = "enum ";
+		break;
+	case PSI_T_UNION:
+		pre = "union ";
+		break;
 	default:
 		pre = "";
+		break;
 	}
 	dprintf(fd, "%s%s", pre, t->name);
 }
@@ -96,10 +127,10 @@ static inline void dump_impl_set_value(int fd, set_value *set, unsigned level, i
 		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);
@@ -114,6 +145,7 @@ static inline void dump_impl_set_value(int fd, set_value *set, unsigned level, i
 static inline void dump_typedef(int fd, decl_arg *tdef) {
 	dprintf(fd, "typedef ");
 	dump_decl_arg(fd, tdef);
+	dprintf(fd, ";");
 	/*
 	dump_decl_type(fd, tdef->type);
 	dprintf(fd, " %s%s;", tdef->type->type == PSI_T_POINTER ? "*":"",
@@ -135,7 +167,7 @@ static inline void dump_typedefs(int fd, decl_typedefs *defs) {
 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) {
@@ -162,6 +194,31 @@ static inline void dump_structs(int fd, decl_structs *structs) {
 	}
 }
 
+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;
 
@@ -407,7 +464,10 @@ void PSI_ContextDump(PSI_Context *C, int fd)
 		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");