Fix bitfields init : tiny solution

tccgen.c: Check struct/union size for bitfield. tests/tcctest.c: Add test code.

herman ten brugge committed 6 years ago

Commit 8fd7a381 parent 89ea6242 files · +9 −3Browse files

Unified · Split

2 files

    'al' contains the already initialized length of the
    current container (starting at c).  This returns the new length of that.  */
 static int decl_designator(CType *type, Section *sec, unsigned long c,
-                           Sym **cur_field, int flags, int al)
+                           Sym **cur_field, int flags, int al, int size)
 {
     Sym *s, *f;
     int index, index_last, align, l, nb_elems, elem_size;
        ensures that it even works with designators) */
     if (!(flags & DIF_SIZE_ONLY)) {
         int zlen = c - (corig + al);
-        if (type->t & VT_BITFIELD) /* must include current field too */
+        if (type->t & VT_BITFIELD) { /* must include current field too */
             zlen += type_size(type, &align);
+            if (al + zlen > size)
+                zlen = size - al;
+        }
         if (zlen > 0)
 	    init_putz(sec, corig + al, zlen);
     }
           do_init_list:
 	    len = 0;
 	    while (tok != '}' || (flags & DIF_HAVE_ELEM)) {
-		len = decl_designator(type, sec, c, &f, flags, len);
+		len = decl_designator(type, sec, c, &f, flags, len, n*size1);
 		flags &= ~DIF_HAVE_ELEM;
 		if (type->t & VT_ARRAY) {
 		    ++indexsym.c;

 struct bfa_SS bfa_init = { .c[1].bit = 1 };
 struct bf_SS bfaa_init[3] = { [1].bit = 1 };
 struct bf_SS bfaa_vinit[] = { [2].bit = 1 };
+struct b2_SS {long long int field : 52; long long int pad : 12; };
+struct b2_SS bf_init2 = {0xFFF000FFF000FLL, 0x123};
 extern int external_inited = 42;
     struct bfa_SS bfa_finit = { .c[1].bit = 1 };
     struct bf_SS bfaa_finit[3] = { [1].bit = 1 };
     struct bf_SS bfaa_fvinit[] = { [2].bit = 1 };
+    struct b2_SS bf_finit2 = {0xFFF000FFF000FLL, 0x123};
     printf("sinit1=%d\n", sinit1);
     printf("sinit2=%d\n", sinit2);

Keyboard shortcuts