bitfields: one more hack and a "-Wgcc-compat" switch

bit_pos + bit_size > type_size * 8 must NEVER happen because the code generator can read/write only the basic integral types. Warn if tcc has to break GCC compatibility for that reason and if -Wgcc-compat is given. Example: struct __attribute__((packed)) _s { unsigned int x : 12; unsigned char y : 7; unsigned int z : 28; }; Expected (GCC) layout (sizeof struct = 6) .xxxxxxxx.xxxxyyyy.yyyzzzzz.zzzzzzzz.zzzzzzzz.zzzzzzz0. But we cannot read/write 'char y'from 2 bytes in memory. So we have to adjust: .xxxxxxxx.xxxx0000.yyyyyyyz.zzzzzzzz.zzzzzzzz.zzzzzzzz.zzz00000 Now 'int z' cannot be accessed from 5 bytes. So we arrive at this (sizeof struct = 7): .xxxxxxxx.xxxx0000.yyyyyyy0.zzzzzzzz.zzzzzzzz.zzzzzzzz.zzzz0000 Otherwise the bitfield load/store generator needs to be changed to allow byte-wise accesses. Also we may touch memory past the struct in some cases currently. The patch adds a warning for that too. 0: 55 push %ebp 1: 89 e5 mov %esp,%ebp 3: 81 ec 04 00 00 00 sub $0x4,%esp 9: 90 nop struct __attribute__((packed)) { unsigned x : 5; } b = {0} ; a: 8b 45 ff mov -0x1(%ebp),%eax d: 83 e0 e0 and $0xffffffe0,%eax 10: 89 45 ff mov %eax,-0x1(%ebp) This touches -0x1 ... +0x3(%ebp), hence 3 bytes beyond stack space. Since the data is not changed, nothing else happens here.

grischka committed 9 years ago

Commit d2427061 parent 3f5fd303 files · +21 −6Browse files

Unified · Split

3 files

libtcc.c +1 −0
tcc.h +1 −0
tccgen.c +19 −6

libtcc.c+1−0

@@ -1578,6 +1578,7 @@ static const FlagDef options_W[] = { · 1577 unmodified lines
1578	{ offsetof(TCCState, warn_unsupported), 0, "unsupported" },	1578	{ offsetof(TCCState, warn_unsupported), 0, "unsupported" },
1579	{ offsetof(TCCState, warn_write_strings), 0, "write-strings" },	1579	{ offsetof(TCCState, warn_write_strings), 0, "write-strings" },
1580	{ offsetof(TCCState, warn_error), 0, "error" },	1580	{ offsetof(TCCState, warn_error), 0, "error" },
		1581	{ offsetof(TCCState, warn_gcc_compat), 0, "gcc-compat" },
1581	{ offsetof(TCCState, warn_implicit_function_declaration), WD_ALL,	1582	{ offsetof(TCCState, warn_implicit_function_declaration), WD_ALL,
1582	"implicit-function-declaration" },	1583	"implicit-function-declaration" },
1583	{ 0, 0, NULL }	1584	{ 0, 0, NULL }

tcc.h+1−0

@@ -660,6 +660,7 @@ struct TCCState { · 659 unmodified lines
660	int warn_error;	660	int warn_error;
661	int warn_none;	661	int warn_none;
662	int warn_implicit_function_declaration;	662	int warn_implicit_function_declaration;
		663	int warn_gcc_compat;
663		664
664	/* compile with debug symbol (and use them if error during execution) */	665	/* compile with debug symbol (and use them if error during execution) */
665	int do_debug;	666	int do_debug;

tccgen.c+19−6

 {
     int align, maxalign, offset, c, bit_pos, bt, prevbt, prev_bit_size;
     int pcc = !tcc_state->ms_bitfields;
+    int packwarn = tcc_state->warn_gcc_compat;
+    int typealign, bit_size, size;
     Sym *f;
     if (ad->a.aligned)
       maxalign = 1 << (ad->a.aligned - 1);
     bit_pos = 0;
     prevbt = VT_STRUCT; /* make it never match */
     prev_bit_size = 0;
+    size = 0;
     for (f = type->ref->next; f; f = f->next) {
-	int typealign, bit_size;
+	size = type_size(&f->type, &typealign);
-	int size = type_size(&f->type, &typealign);
 	if (f->type.t & VT_BITFIELD)
 	  bit_size = (f->type.t >> (VT_STRUCT_SHIFT + 6)) & 0x3f;
 	else
 		int ofs = (c * 8 + bit_pos) % (typealign * 8);
 		int ofs2 = ofs + bit_size + (typealign * 8) - 1;
 		if (bit_size == 0 ||
-		    ((typealign != 1 || size == 1) &&
+		    (typealign != 1 &&
 		     (ofs2 / (typealign * 8)) > (size/typealign))) {
 		    c = (c + ((bit_pos + 7) >> 3) + typealign - 1) & -typealign;
 		    bit_pos = 0;
 		} else if (bit_pos + bit_size > size * 8) {
 		    c += bit_pos >> 3;
 		    bit_pos &= 7;
+                    if (bit_pos + bit_size > size * 8) {
+                        c += 1, bit_pos = 0;
+                        if ((ad->a.packed || f->r) && packwarn) {
+                            tcc_warning("struct layout not compatible with GCC (internal limitation)");
+                            packwarn = 0;
+                        }
+                    }
 		}
 		offset = c;
 		/* In PCC layout named bit-fields influence the alignment
 	if (align > maxalign)
 	  maxalign = align;
 #if 0
-	printf("set field %s offset=%d c=%d",
+	printf("set field %s offset=%d",
-	       get_tok_str(f->v & ~SYM_FIELD, NULL), offset, c);
+	       get_tok_str(f->v & ~SYM_FIELD, NULL), offset);
 	if (f->type.t & VT_BITFIELD) {
 	    printf(" pos=%d size=%d",
 		   (f->type.t >> VT_STRUCT_SHIFT) & 0x3f,
     type->ref->c = (c + (pcc ? (bit_pos + 7) >> 3 : 0)
 		    + maxalign - 1) & -maxalign;
     type->ref->r = maxalign;
+    if (offset + size > type->ref->c)
+        tcc_warning("will touch memory past end of the struct (internal limitation)");
 }
 /* enum/struct/union declaration. u is either VT_ENUM or VT_STRUCT */
                     } else if (ad1.a.packed || ad->a.packed) {
                         alignoverride = 1;
                     } else if (*tcc_state->pack_stack_ptr) {
-                        if (align > *tcc_state->pack_stack_ptr)
+                        if (align >= *tcc_state->pack_stack_ptr)
                             alignoverride = *tcc_state->pack_stack_ptr;
                     }
                     if (bit_size >= 0) {

bitfields: one more hack and a "-Wgcc-compat" switch

Keyboard shortcuts

General

Issues and pull requests

Issues, pull requests and Inbox

Repository code