revert complicated & broken flexible array member handling

Joe Soroka committed 15 years ago

Commit 06a7c411 parent 4062d782 files · +5 −21Browse files

Unified · Split

2 files

tcc.h +1 −3
tccgen.c +4 −18

       func_args     : 5,
       mode          : 4,
       weak          : 1,
-      resize	    : 1,
+      fill          : 11;
-      fill          : 10;
     struct Section *section;
     int alias_target;    /* token */
 } AttributeDef;
 #define FUNC_ARGS(r) (((AttributeDef*)&(r))->func_args)
 #define FUNC_ALIGN(r) (((AttributeDef*)&(r))->aligned)
 #define FUNC_PACKED(r) (((AttributeDef*)&(r))->packed)
-#define ARRAY_RESIZE(r) (((AttributeDef*)&(r))->resize)
 #define ATTR_MODE(r)  (((AttributeDef*)&(r))->mode)
 #define INT_ATTR(ad) (*(int*)(ad))

tccgen.c+4−18

     if (bt == VT_STRUCT) {
         /* struct/union */
         s = type->ref;
-        *a = s->r & 0xffffff;
+        *a = s->r;
         return s->c;
     } else if (bt == VT_PTR) {
         if (type->t & VT_ARRAY) {
 static void struct_decl(CType *type, int u)
 {
     int a, v, size, align, maxalign, c, offset;
-    int bit_size, bit_pos, bsize, bt, lbit_pos, prevbt, resize;
+    int bit_size, bit_pos, bsize, bt, lbit_pos, prevbt;
     Sym *s, *ss, *ass, **ps;
     AttributeDef ad;
     CType type1, btype;
             }
             skip('}');
         } else {
-	    resize = 0;
             maxalign = 1;
             ps = &s->next;
             prevbt = VT_INT;
                                 offset = c;
                                 if (size > 0)
                                     c += size;
-				if (size < 0)
-				    resize = 1;
                             } else {
                                 offset = 0;
                                 if (size > c)
             skip('}');
             /* store size and alignment */
             s->c = (c + maxalign - 1) & -maxalign;
-            s->r = maxalign | (resize ? (1 << 31) : 0);
+            s->r = maxalign;
         }
     }
 }
         /* we push a anonymous symbol which will contain the array
            element type */
         s = sym_push(SYM_FIELD, type, 0, n);
-	if (n < 0)
-		ARRAY_RESIZE(s->r) = 1;
         type->t = t1 | VT_ARRAY | VT_PTR;
         type->ref = s;
     }
             }
         } else {
             index = 0;
-	    if (ARRAY_RESIZE(s->r))
-		n = -1;
             while (tok != '}') {
                 decl_designator(type, sec, c, &index, NULL, size_only);
                 if (n >= 0 && index >= n)
         array_length = 0;
         index = 0;
         n = s->c;
-	if (s->r & (1<<31))
-	    n = -1;
         while (tok != '}') {
             decl_designator(type, sec, c, NULL, &f, size_only);
             index = f->c;
             skip(',');
         }
         /* put zeros at the end */
-        if (!size_only && n >= 0 && array_length < n) {
+        if (!size_only && array_length < n) {
             init_putz(type, sec, c + array_length,
                       n - array_length);
         }
             skip(')');
             par_count--;
         }
-	if (n < 0)
-	    s->c = array_length;
     } else if (tok == '{') {
         next();
         decl_initializer(type, sec, c, first, size_only);
     TokenString init_str;
     Section *sec;
-    /* resize the struct */
-    if ((type->t & VT_BTYPE) == VT_STRUCT && (type->ref->r & (1<<31)) != 0)
-	type->ref->c = -1;
     size = type_size(type, &align);
     /* If unknown size, we must evaluate it before
        evaluating initializers because

revert complicated & broken flexible array member handling

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code