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

tccgen: skip ')' in front of ',' for initializer

Browse source
This commit is contained in:
yuanbin 2010-06-13 14:50:53 +08:00
parent 952e83e0ca
commit d351384fdc
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
tccgen.c
View file

@ -4824,7 +4824,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
/* patch type size if needed */ /* patch type size if needed */
if (n < 0) if (n < 0)
s->c = array_length; s->c = array_length;
} else if ((type->t & VT_BTYPE) == VT_STRUCT && type->ref->c && /* Coo: ignore empty */ } else if ((type->t & VT_BTYPE) == VT_STRUCT &&
(sec || !first || tok == '{')) { (sec || !first || tok == '{')) {
int par_count; int par_count;
@ -4837,6 +4837,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
to do it correctly (ideally, the expression parser should to do it correctly (ideally, the expression parser should
be used in all cases) */ be used in all cases) */
par_count = 0; par_count = 0;
/* Coo: I think we must not deal '(' */
if (tok == '(') { if (tok == '(') {
AttributeDef ad1; AttributeDef ad1;
CType type1; CType type1;
@ -4861,6 +4862,9 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
} }
s = type->ref; s = type->ref;
f = s->next; f = s->next;
/* Coo: skip empty struct */
while (f->next && (f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c)
f=f->next;
array_length = 0; array_length = 0;
index = 0; index = 0;
n = s->c; n = s->c;
@ -4877,19 +4881,24 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
array_length = index; array_length = index;
/* Coo: skip fields from same union */ /* Coo: skip fields from same union */
if ((f->type.t&VT_BITFIELD)==0) if (!(f->type.t&VT_BITFIELD))
bit_pos=index*8; bit_pos=index*8;
else else
bit_pos=f->c*8+((f->type.t>>VT_STRUCT_SHIFT)&0x3f)+((f->type.t>>(VT_STRUCT_SHIFT+6))&0x3f); bit_pos=f->c*8+((f->type.t>>VT_STRUCT_SHIFT)&0x3f)+((f->type.t>>(VT_STRUCT_SHIFT+6))&0x3f);
while (f->next && f->next->c<index && do
((f->next->type.t&VT_BITFIELD)==0 || f->next->c*8+((f->next->type.t>>VT_STRUCT_SHIFT)&0x3f)<bit_pos))
f=f->next; f=f->next;
while (f && (((f->type.t&VT_BTYPE)==VT_STRUCT && !f->type.ref->c) ||
f->c*8+((f->type.t&VT_BITFIELD)?((f->type.t>>VT_STRUCT_SHIFT)&0x3f):0)<bit_pos));
f = f->next;
if (no_oblock && f == NULL) if (no_oblock && f == NULL)
break; break;
if (tok == '}') if (tok == '}')
break; break;
/* Coo: skip ')' in front of ',' for initializer */
while (tok==')' && par_count) {
next();
par_count--;
}
skip(','); skip(',');
} }
/* put zeros at the end */ /* put zeros at the end */