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

VLA fix [2/3]: removed VT_ARRAY from VT_VLA types

Browse source 
A VLA is not really an array, it's a pointer-to-an-array.
Making this explicit allows us to back out a few parts
of the original VLA patch and paves the way for the next
part of the fix, where a VLA will be stored on the runtime
stack as a pointer-to-an-array, rather than on the compile-
time stack as a Sym*.
This commit is contained in:
Joe Soroka 2011-04-08 01:09:39 -07:00
parent cb2fa5eab9
commit 7c7ca3c6aa
1 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
tccgen.c
View file

@ -1602,7 +1602,7 @@ ST_FUNC void gen_op(int op)
swap(&t1, &t2); swap(&t1, &t2);
} }
type1 = vtop[-1].type; type1 = vtop[-1].type;
type1.t &= ~(VT_ARRAY|VT_VLA); type1.t &= ~VT_ARRAY;
if (vtop[-1].type.t & VT_VLA) if (vtop[-1].type.t & VT_VLA)
vla_runtime_pointed_size(&vtop[-1].type); vla_runtime_pointed_size(&vtop[-1].type);
else { else {
@ -1984,10 +1984,7 @@ ST_FUNC int type_size(CType *type, int *a)
*a = s->r; *a = s->r;
return s->c; return s->c;
} else if (bt == VT_PTR) { } else if (bt == VT_PTR) {
if (type->t & VT_VLA) { if (type->t & VT_ARRAY) {
*a = 1;
return 0;
} else if (type->t & VT_ARRAY) {
int ts; int ts;
s = type->ref; s = type->ref;
@ -3209,7 +3206,7 @@ static void post_type(CType *type, AttributeDef *ad)
if (n >= 0) if (n >= 0)
vpop(); vpop();
} }
type->t = t1 | VT_ARRAY | VT_PTR; type->t = (t1 ? VT_VLA : VT_ARRAY) | VT_PTR;
type->ref = s; type->ref = s;
} }
} }
@ -3327,7 +3324,7 @@ ST_FUNC void indir(void)
gv(RC_INT); gv(RC_INT);
vtop->type = *pointed_type(&vtop->type); vtop->type = *pointed_type(&vtop->type);
/* Arrays and functions are never lvalues */ /* Arrays and functions are never lvalues */
if (!(vtop->type.t & VT_ARRAY) if (!(vtop->type.t & VT_ARRAY) && !(vtop->type.t & VT_VLA)
&& (vtop->type.t & VT_BTYPE) != VT_FUNC) { && (vtop->type.t & VT_BTYPE) != VT_FUNC) {
vtop->r |= lvalue_type(vtop->type.t); vtop->r |= lvalue_type(vtop->type.t);
/* if bound checking, the referenced pointer must be checked */ /* if bound checking, the referenced pointer must be checked */
@ -3577,17 +3574,14 @@ ST_FUNC void unary(void)
next(); next();
in_sizeof++; in_sizeof++;
unary_type(&type); // Perform a in_sizeof = 0; unary_type(&type); // Perform a in_sizeof = 0;
if ((t == TOK_SIZEOF) && (type.t & VT_VLA)) { size = type_size(&type, &align);
vla_runtime_type_size(&type, &align);
size = 0;
} else {
size = type_size(&type, &align);
}
if (t == TOK_SIZEOF) { if (t == TOK_SIZEOF) {
if (!(type.t & VT_VLA)) { if (!(type.t & VT_VLA)) {
if (size < 0) if (size < 0)
error("sizeof applied to an incomplete type"); error("sizeof applied to an incomplete type");
vpushi(size); vpushi(size);
} else {
vla_runtime_type_size(&type, &align);
} }
} else { } else {
vpushi(align); vpushi(align);
@ -5218,8 +5212,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
sec = NULL; sec = NULL;
#ifdef CONFIG_TCC_BCHECK #ifdef CONFIG_TCC_BCHECK
if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) { if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) {
if (!(type->t & VT_VLA)) loc--;
loc--;
} }
#endif #endif
loc = (loc - size) & -align; loc = (loc - size) & -align;
@ -5228,8 +5221,7 @@ static void decl_initializer_alloc(CType *type, AttributeDef *ad, int r,
/* handles bounds */ /* handles bounds */
/* XXX: currently, since we do only one pass, we cannot track /* XXX: currently, since we do only one pass, we cannot track
'&' operators, so we add only arrays */ '&' operators, so we add only arrays */
if (tcc_state->do_bounds_check && (type->t & VT_ARRAY) && if (tcc_state->do_bounds_check && (type->t & VT_ARRAY)) {
!(type->t & VT_VLA)) {
unsigned long *bounds_ptr; unsigned long *bounds_ptr;
/* add padding between regions */ /* add padding between regions */
loc--; loc--;
@ -5713,9 +5705,8 @@ static int decl0(int l, int is_for_loop_init)
if (has_init && (type.t & VT_VLA)) if (has_init && (type.t & VT_VLA))
error("Variable length array cannot be initialized"); error("Variable length array cannot be initialized");
if ((btype.t & VT_EXTERN) || ((type.t & VT_BTYPE) == VT_FUNC) || if ((btype.t & VT_EXTERN) || ((type.t & VT_BTYPE) == VT_FUNC) ||
((type.t & VT_ARRAY) && (!(type.t & VT_VLA)) && ((type.t & VT_ARRAY) && (type.t & VT_STATIC) &&
(type.t & VT_STATIC) && !has_init && l == VT_CONST && !has_init && l == VT_CONST && type.ref->c < 0)) {
type.ref->c < 0)) {
/* external variable or function */ /* external variable or function */
/* NOTE: as GCC, uninitialized global static /* NOTE: as GCC, uninitialized global static
arrays of null size are considered as arrays of null size are considered as