X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_union.c;h=5d0f1631a8f77788221a6f77e72d283abc854ced;hb=a88d91ed2154bdb6d2198e44c6f3868a5b398287;hp=f3299976d53eaf9c3e393a5fbf512ac7769622d6;hpb=9bcb1df0786a8193d65949c857baaba2f4296e84;p=m6w6%2Fext-psi

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f329997..5d0f163 100644
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -74,25 +74,33 @@ struct psi_decl_arg *psi_decl_union_get_arg(struct psi_decl_union *u,
 	return NULL;
 }
 
-bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
+bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u,
+		struct psi_validate_scope *scope)
 {
 	size_t i, pos, len, size = 0, align;
 	struct psi_decl_arg *darg;
 
+	if (psi_validate_scope_has_union(scope, u->name)) {
+		return true;
+	}
+
 	if (!u->size && !psi_plist_count(u->args)) {
 		data->error(data, u->token, PSI_WARNING,
 				"Cannot compute size of empty union %s", u->name);
 		return false;
 	}
 
+	psi_validate_scope_add_union(scope, u->name, u);
+
 	for (i = 0; psi_plist_get(u->args, i, &darg); ++i) {
 		darg->var->arg = darg;
 
-		if (!psi_decl_arg_validate(data, darg)) {
+		if (!psi_decl_arg_validate(data, darg, scope)) {
+			psi_validate_scope_del_union(scope, u->name);
 			return false;
 		}
 
-		if (darg->layout) {
+		if (darg->layout && darg->layout->len) {
 			pos = darg->layout->pos;
 
 			align = psi_decl_arg_align(darg, &pos, &len);
@@ -114,7 +122,18 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
 			pos = 0;
 
 			align = psi_decl_arg_align(darg, &pos, &len);
-			darg->layout = psi_layout_init(pos, len);
+
+			if (darg->layout) {
+				if (darg->layout->pos != 0) {
+					data->error(data, darg->token, PSI_WARNING,
+							"Offset of %s.%s should be 0", u->name,
+							darg->var->name);
+					darg->layout->pos = 0;
+				}
+				darg->layout->len = len;
+			} else {
+				darg->layout = psi_layout_init(pos, len, NULL);
+			}
 		}
 		if (len > size) {
 			size = len;
@@ -130,6 +149,8 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
 		u->size = psi_align(size, u->align);
 	}
 
+	assert(u->size);
+
 	return true;
 }