X-Git-Url: https://git.m6w6.name/?a=blobdiff_plain;f=src%2Ftypes%2Fdecl_struct.c;h=ffd0efc5d5df52bfb9de279cf111be668bf30d50;hb=ad2c22df5e451fffecc7b7ebdc9c5a4bb36e543e;hp=ab0d9a1a9fe2545d6bcbea572e1f81e952fe7d94;hpb=b09850fb2c28c23547fed5ac83faf0fa2d3e6b8b;p=m6w6%2Fext-psi

diff --git a/src/types/decl_struct.c b/src/types/decl_struct.c
index ab0d9a1..ffd0efc 100644
--- a/src/types/decl_struct.c
+++ b/src/types/decl_struct.c
@@ -78,21 +78,32 @@ struct psi_decl_arg *psi_decl_struct_get_arg(struct psi_decl_struct *s,
 	return NULL;
 }
 
-bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
+bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s,
+		struct psi_validate_stack *type_stack)
 {
 	size_t i, pos, len, size, align;
 	struct psi_decl_arg *darg, *prev_arg;
 
+	if (!s) {
+		return false;
+	}
+	if (psi_validate_stack_has_struct(type_stack, s->name)) {
+		return true;
+	}
+
 	if (!s->size && !psi_plist_count(s->args)) {
 		data->error(data, s->token, PSI_WARNING,
 				"Cannot compute size of empty struct '%s'", s->name);
 		return false;
 	}
 
+	psi_validate_stack_add_struct(type_stack, s->name, s);
+
 	for (i = 0; psi_plist_get(s->args, i, &darg); ++i) {
 		darg->var->arg = darg;
 
-		if (!psi_decl_arg_validate(data, darg)) {
+		if (!psi_decl_arg_validate(data, darg, type_stack)) {
+			psi_validate_stack_del_struct(type_stack, s->name);
 			return false;
 		}
 
@@ -100,6 +111,14 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 			pos = darg->layout->pos;
 			align = psi_decl_arg_align(darg, &pos, &len);
 
+			if (!align) {
+				data->error(data, darg->token, PSI_WARNING,
+						"Computed zero alignment of %s.%s of type '%s'",
+						len, s->name, darg->var->name, darg->type->name);
+				psi_validate_stack_del_struct(type_stack, s->name);
+				return false;
+			}
+
 			if (darg->layout->len != len) {
 				data->error(data, darg->token, PSI_WARNING,
 						"Computed size %zu of %s.%s does not match"
@@ -115,7 +134,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 			}
 		} else {
 			if (i) {
-				if (prev_arg->layout->bfw && darg->layout->bfw) {
+				if (prev_arg->layout && prev_arg->layout->bfw && darg->layout && darg->layout->bfw) {
 					struct psi_decl_type *real = NULL;
 					size_t max_bfw = 8 * psi_decl_type_get_size(prev_arg->type, &real);
 
@@ -132,6 +151,7 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 					default:
 						data->error(data, darg->token, PSI_WARNING,
 								"Unsupported type for bit field: %s", real->name);
+						psi_validate_stack_del_struct(type_stack, s->name);
 						return false;
 					}
 					darg->layout->bfw->pos = prev_arg->layout->bfw->pos + prev_arg->layout->bfw->len;
@@ -180,11 +200,16 @@ bool psi_decl_struct_validate(struct psi_data *data, struct psi_decl_struct *s)
 		}
 	}
 
+	assert(s->size);
+
 	return true;
 }
 
 size_t psi_decl_struct_get_align(struct psi_decl_struct *s)
 {
+	if (!s) {
+		return 0;
+	}
 	if (!s->align) {
 		s->align = psi_decl_type_get_args_align(s->args);
 	}