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

implicit cast in global init - added bound check define - fixed division by zero in constant eval

Browse source
This commit is contained in:
bellard 2002-01-05 19:55:43 +00:00
parent 872eed648c
commit 8d19107149
1 changed files with 28 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
tcc.c
View file

@ -514,8 +514,6 @@ void *dlsym(void *handle, char *symbol)
/* XXX: we suppose that the host compiler handles 'long long'. It /* XXX: we suppose that the host compiler handles 'long long'. It
would not be difficult to suppress this assumption */ would not be difficult to suppress this assumption */
/* XXX: these functions are defined in libgcc. Should provide a
portable code too. */
long long __divll(long long a, long long b) long long __divll(long long a, long long b)
{ {
return a / b; return a / b;
@ -2646,7 +2644,7 @@ void gen_opl(int op)
gen_op('+'); gen_op('+');
gen_op('+'); gen_op('+');
} else if (op == '+' || op == '-') { } else if (op == '+' || op == '-') {
/* XXX: add non carry method too (for MIPS ?) */ /* XXX: add non carry method too (for MIPS or alpha) */
if (op == '+') if (op == '+')
op1 = TOK_ADDC1; op1 = TOK_ADDC1;
else else
@ -2802,11 +2800,25 @@ void gen_opc(int op)
case '^': v1->c.i ^= fc; break; case '^': v1->c.i ^= fc; break;
case '|': v1->c.i |= fc; break; case '|': v1->c.i |= fc; break;
case '*': v1->c.i *= fc; break; case '*': v1->c.i *= fc; break;
case TOK_PDIV: case TOK_PDIV:
case '/': v1->c.i /= fc; break; /* XXX: zero case ? */ case '/':
case '%': v1->c.i %= fc; break; /* XXX: zero case ? */ case '%':
case TOK_UDIV: v1->c.i = (unsigned)v1->c.i / fc; break; /* XXX: zero case ? */ case TOK_UDIV:
case TOK_UMOD: v1->c.i = (unsigned)v1->c.i % fc; break; /* XXX: zero case ? */ case TOK_UMOD:
/* if division by zero, generate explicit division */
if (fc == 0) {
if (const_wanted)
error("division by zero in constant");
goto general_case;
}
switch(op) {
default: v1->c.i /= fc; break;
case '%': v1->c.i %= fc; break;
case TOK_UDIV: v1->c.i = (unsigned)v1->c.i / fc; break;
case TOK_UMOD: v1->c.i = (unsigned)v1->c.i % fc; break;
}
break;
case TOK_SHL: v1->c.i <<= fc; break; case TOK_SHL: v1->c.i <<= fc; break;
case TOK_SHR: v1->c.i = (unsigned)v1->c.i >> fc; break; case TOK_SHR: v1->c.i = (unsigned)v1->c.i >> fc; break;
case TOK_SAR: v1->c.i >>= fc; break; case TOK_SAR: v1->c.i >>= fc; break;
@ -2866,7 +2878,6 @@ void gen_opc(int op)
} else { } else {
general_case: general_case:
/* call low level op generator */ /* call low level op generator */
/* XXX: remove explicit registers */
gen_opi(op); gen_opi(op);
} }
} }
@ -4994,9 +5005,9 @@ void init_putv(int t, int r, int c,
} }
if ((r & VT_VALMASK) == VT_CONST) { if ((r & VT_VALMASK) == VT_CONST) {
/* XXX: do casting */
/* XXX: not portable */ /* XXX: not portable */
bt = vtop->t & VT_BTYPE; gen_assign_cast(t);
bt = t & VT_BTYPE;
switch(bt) { switch(bt) {
case VT_BYTE: case VT_BYTE:
*(char *)c = vtop->c.i; *(char *)c = vtop->c.i;
@ -5010,16 +5021,14 @@ void init_putv(int t, int r, int c,
case VT_LDOUBLE: case VT_LDOUBLE:
*(long double *)c = vtop->c.ld; *(long double *)c = vtop->c.ld;
break; break;
#if 0
case VT_LLONG: case VT_LLONG:
*(long long *)c = vtop->c.ll; *(long long *)c = vtop->c.ll;
break; break;
#endif
default: default:
*(int *)c = vtop->c.i; *(int *)c = vtop->c.i;
break; break;
} }
vpop(); vtop--;
} else { } else {
vset(t, r, c); vset(t, r, c);
vswap(); vswap();
@ -5034,7 +5043,7 @@ void init_putz(int t, int r, int c, int size)
GFuncContext gf; GFuncContext gf;
if ((r & VT_VALMASK) == VT_CONST) { if ((r & VT_VALMASK) == VT_CONST) {
/* nothing to do because global are already set to zero */ /* nothing to do because globals are already set to zero */
} else { } else {
gfunc_start(&gf); gfunc_start(&gf);
vpushi(size); vpushi(size);
@ -5417,6 +5426,7 @@ void decl(int l)
} }
funcname = ""; /* for safety */ funcname = ""; /* for safety */
func_vt = VT_VOID; /* for safety */ func_vt = VT_VOID; /* for safety */
ind = 0; /* for safety */
break; break;
} else { } else {
if (b & VT_TYPEDEF) { if (b & VT_TYPEDEF) {
@ -5745,10 +5755,10 @@ static void put_stabd(int type, int other, int desc)
} }
/* output an ELF file (currently, only for testing) */ /* output an ELF file (currently, only for testing) */
/* XXX: better program header generation */
/* XXX: handle realloc'ed sections (instead of mmaping them) */
/* XXX: generate dynamic reloc info + DLL tables */ /* XXX: generate dynamic reloc info + DLL tables */
/* XXX: generate startup code */ /* XXX: generate startup code */
/* XXX: better program header generation */
/* XXX: handle realloc'ed sections (instead of mmaping them) */
void build_exe(char *filename) void build_exe(char *filename)
{ {
Elf32_Ehdr ehdr; Elf32_Ehdr ehdr;
@ -6144,6 +6154,8 @@ int main(int argc, char **argv)
} else if (r[1] == 'b') { } else if (r[1] == 'b') {
if (!do_bounds_check) { if (!do_bounds_check) {
do_bounds_check = 1; do_bounds_check = 1;
/* define symbol */
define_symbol("__BOUNDS_CHECKING_ON");
/* create bounds sections */ /* create bounds sections */
bounds_section = new_section(".bounds", bounds_section = new_section(".bounds",
SHT_PROGBITS, SHF_ALLOC); SHT_PROGBITS, SHF_ALLOC);