struct-init: Support range inits for local vars

Implement missing support for range init for local variables.

Michael Matz committed 10 years ago

Commit 4e46c221 parent 4cb70473 files · +33 −17Browse files

Unified · Split

3 files

tccgen.c +28 −17
tests/tests2/86-struct-init.c +4 −0
tests/tests2/86-struct-init.expect +1 −0

 /* t is the array or struct type. c is the array or struct
    address. cur_field is the pointer to the current
-   value, for arrays the 'c' member contains the current index.
+   value, for arrays the 'c' member contains the current start
+   index and the 'r' contains the end index (in case of range init).
    'size_only' is true if only size info is needed (only used
    in arrays) */
 static void decl_designator(CType *type, Section *sec, unsigned long c,
                 index_last = index;
             }
             skip(']');
-            if (!notfirst)
+            if (!notfirst) {
-		(*cur_field)->c = index_last;
+		(*cur_field)->c = index;
+		(*cur_field)->r = index_last;
+	    }
             type = pointed_type(type);
             elem_size = type_size(type, &align);
             c += index * elem_size;
         uint8_t *src, *dst;
         int i;
-        if (!sec)
+        if (!sec) {
-            tcc_error("range init not supported yet for dynamic storage");
+	    vset(type, VT_LOCAL|VT_LVAL, c);
-        c_end = c + nb_elems * elem_size;
+	    for (i = 1; i < nb_elems; i++) {
-        if (c_end > sec->data_allocated)
+		vset(type, VT_LOCAL|VT_LVAL, c + elem_size * i);
-            section_realloc(sec, c_end);
+		vswap();
-        src = sec->data + c;
+		vstore();
-        dst = src;
+	    }
-        for(i = 1; i < nb_elems; i++) {
+	    vpop();
-            dst += elem_size;
+	} else {
-            memcpy(dst, src, elem_size);
+	    c_end = c + nb_elems * elem_size;
-        }
+	    if (c_end > sec->data_allocated)
+	        section_realloc(sec, c_end);
+	    src = sec->data + c;
+	    dst = src;
+	    for(i = 1; i < nb_elems; i++) {
+		dst += elem_size;
+		memcpy(dst, src, elem_size);
+	    }
+	}
     }
 }
 	!(type->t & VT_ARRAY) &&
 	/* Use i_c_parameter_t, to strip toplevel qualifiers.
 	   The source type might have VT_CONSTANT set, which is
-	   of course assignable to a non-const elements.  */
+	   of course assignable to non-const elements.  */
 	is_compatible_parameter_types(type, &vtop->type)) {
         init_putv(type, sec, c);
     } else if (type->t & VT_ARRAY) {
             }
         } else {
 	    indexsym.c = 0;
+	    indexsym.r = 0;
 	    f = &indexsym;
           do_init_list:
 			      (index - array_length) * size1);
 		}
 		if (type->t & VT_ARRAY) {
-		    index++;
+		    index = indexsym.c = ++indexsym.r;
-		    indexsym.c++;
 		} else {
 		    index = index + type_size(&f->type, &align1);
 		    if (s->type.t == TOK_UNION)

tests/tests2/86-struct-init.c+4−0

   struct V lv3 = {((struct S){7,8,{9,10}}), ((const struct W *)w)->t.t, 50};
   const struct pkthdr *phdr = phdr_;
   struct flowi6 flow = { .daddr = phdr->daddr, .saddr = phdr->saddr };
+  int elt = 0x42;
+  /* Range init, overlapping */
+  struct T lt2 = { { [1 ... 5] = 9, [6 ... 10] = elt, [4 ... 7] = elt+1 }, 1 };
   print(ls);
   print(ls2);
   print(lt);
   print(lv);
   print(lv2);
   print(lv3);
+  print(lt2);
   print(flow);
 }
 #endif

tests/tests2/86-struct-init.expect+1−0

@@ -33,4 +33,5 @@ ls3: 1 2 3 4 · 32 unmodified lines
33	lv: 3 4 5 6 68 61 68 61 0 0 0 0 0 0 0 0 0 0 0 0 2d 2e	33	lv: 3 4 5 6 68 61 68 61 0 0 0 0 0 0 0 0 0 0 0 0 2d 2e
34	lv2: 1 2 3 4 68 69 68 69 0 0 0 0 0 0 0 0 0 0 0 0 2f 30	34	lv2: 1 2 3 4 68 69 68 69 0 0 0 0 0 0 0 0 0 0 0 0 2f 30
35	lv3: 7 8 9 a 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32	35	lv3: 7 8 9 a 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 32
		36	lt2: 0 9 9 9 43 43 43 43 42 42 42 0 0 0 0 0 1
36	flow: 9 8 7 6 0 0 0 0 0 0 0 0 0 0 0 0 6 5 4 3 0 0 0 0 0 0 0 0 0 0 0 0	37	flow: 9 8 7 6 0 0 0 0 0 0 0 0 0 0 0 0 6 5 4 3 0 0 0 0 0 0 0 0 0 0 0 0