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_stack *type_stack)
{
size_t i, pos, len, size = 0, align;
struct psi_decl_arg *darg;
+ if (psi_validate_stack_has_union(type_stack, u->name)) {
+ return true;
+ }
+ psi_validate_stack_add_union(type_stack, u->name, u);
+
if (!u->size && !psi_plist_count(u->args)) {
data->error(data, u->token, PSI_WARNING,
"Cannot compute size of empty union %s", u->name);
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, type_stack)) {
return false;
}
- if (darg->layout) {
+ if (darg->layout && darg->layout->len) {
pos = darg->layout->pos;
align = psi_decl_arg_align(darg, &pos, &len);
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;