d0p1/tcc-stupidos
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix more bitfield corner cases

Browse source 
Our code generation assumes that it can load/store with the
bit-fields base type, so bit_pos/bit_size must be in range for this.
We could change the fields type or adjust offset/bit_pos; we do the
latter.
This commit is contained in:
Michael Matz 2017-05-01 06:18:48 +02:00
parent 4ce73354fc
commit 8d9dd3c008
2 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
tccgen.c
View file

@ -3391,6 +3391,9 @@ static void struct_layout(CType *type, AttributeDef *ad)
(ofs2 / (typealign * 8)) > (size/typealign))) {
c = (c + ((bit_pos + 7) >> 3) + typealign - 1) & -typealign;
bit_pos = 0;
} else while (bit_pos + bit_size > size * 8) {
c += size;
bit_pos -= size * 8;
}
offset = c;
/* In PCC layout named bit-fields influence the alignment

6
tests/tcctest.c
View file

@ -2082,6 +2082,12 @@ void bitfield_test(void)
char c;
} st5 = { 1, 2, 3, 4, -3, 6 };
printf("st5 = %d %d %d %d %d %d\n", st5.a, st5.b, st5.x, st5.y, st5.z, st5.c);
struct sbf6 {
short x : 12;
unsigned char y : 2;
} st6;
st6.y = 1;
printf("st6.y == %d\n", st6.y);
}
#ifdef __x86_64__