bitfield support

[m6w6/ext-psi] / src / types / decl_union.c

diff --git a/src/types/decl_union.c b/src/types/decl_union.c
index f3299976d53eaf9c3e393a5fbf512ac7769622d6..71e70eb378b2bf5b7bfd7141037f1d4f94b7038a 100644 (file)
--- a/src/types/decl_union.c
+++ b/src/types/decl_union.c
@@ -92,7 +92,7 @@ bool psi_decl_union_validate(struct psi_data *data, struct psi_decl_union *u)
                        return false;
                }
 
                        return false;
                }
 

-               if (darg->layout) {
+               if (darg->layout && darg->layout->len) {

                        pos = darg->layout->pos;
 
                        align = psi_decl_arg_align(darg, &pos, &len);
                        pos = darg->layout->pos;
 
                        align = psi_decl_arg_align(darg, &pos, &len);


@@ -114,7 +114,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);
                        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;
                }
                if (len > size) {
                        size = len;