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

tccgen: initial last member of union

Browse source
This commit is contained in:
yuanbin 2010-06-11 20:28:31 +08:00 committed by yuanbin
parent dc265feb63
commit 6709933d78
1 changed files with 28 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tccgen.c
View file

@ -4824,7 +4824,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
/* patch type size if needed */
if (n < 0)
s->c = array_length;
} else if ((type->t & VT_BTYPE) == VT_STRUCT &&
} else if ((type->t & VT_BTYPE) == VT_STRUCT && type->ref->c && /* Coo: ignore empty */
(sec || !first || tok == '{')) {
int par_count;
@ -4861,6 +4861,13 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
}
s = type->ref;
f = s->next;
/* Coo: initial last member of union */
while (f->next && f->next->c==f->c) {
if ((f->type.t&VT_BITFIELD) && (f->next->type.t&VT_BITFIELD)
&& ((f->type.t>>VT_STRUCT_SHIFT)&0x3f)==((f->next->type.t>>VT_STRUCT_SHIFT)&0x3f))
break;
f = f->next;
}
array_length = 0;
index = 0;
n = s->c;
@ -4875,6 +4882,9 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
if (index > array_length)
array_length = index;
f = f->next;
/* Coo: initial last member of union */
if (f)
/* gr: skip fields from same union - ugly. */
while (f->next) {
///printf("index: %2d %08x -- %2d %08x\n", f->c, f->type.t, f->next->c, f->next->type.t);
@ -4891,9 +4901,7 @@ static void decl_initializer(CType *type, Section *sec, unsigned long c,
}
f = f->next;
}
f = f->next;
if (no_oblock && f == NULL)
else if (no_oblock)
break;
if (tok == '}')
break;