UNLOZE/sourcemod
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

disabled stack recursion detection for now - found a case where it breaks :(

Browse Source 
--HG--
extra : convert_revision : svn%3A39bc706e-5318-0410-9160-8a85361fbb7c/trunk%401170
This commit is contained in:
David Anderson 2007-07-25 02:48:52 +00:00
parent 1027d151e5
commit 9ce839e331
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
sourcepawn/compiler/sc1.c
View File

@ -456,8 +456,10 @@ cleanup:
#if !defined SC_LIGHT #if !defined SC_LIGHT
if (errnum==0 && strlen(errfname)==0) { if (errnum==0 && strlen(errfname)==0) {
#if 0 //bug in compiler -- someone's script caused this function to infrecurs
int recursion; int recursion;
long stacksize=max_stacksize(&glbtab,&recursion); long stacksize=max_stacksize(&glbtab,&recursion);
#endif
int flag_exceed=0; int flag_exceed=0;
if (pc_amxlimit>0) { if (pc_amxlimit>0) {
long totalsize=hdrsize+code_idx; long totalsize=hdrsize+code_idx;
@ -468,11 +470,12 @@ cleanup:
} /* if */ } /* if */
if (pc_amxram>0 && (glb_declared+pc_stksize)*sizeof(cell)>=(unsigned long)pc_amxram) if (pc_amxram>0 && (glb_declared+pc_stksize)*sizeof(cell)>=(unsigned long)pc_amxram)
flag_exceed=1; flag_exceed=1;
if (!norun && (sc_debug & sSYMBOLIC)!=0 || verbosity>=2 || stacksize+32>=(long)pc_stksize || flag_exceed) { if (!norun && (sc_debug & sSYMBOLIC)!=0 || verbosity>=2 || flag_exceed) {
pc_printf("Header size: %8ld bytes\n", (long)hdrsize); pc_printf("Header size: %8ld bytes\n", (long)hdrsize);
pc_printf("Code size: %8ld bytes\n", (long)code_idx); pc_printf("Code size: %8ld bytes\n", (long)code_idx);
pc_printf("Data size: %8ld bytes\n", (long)glb_declared*sizeof(cell)); pc_printf("Data size: %8ld bytes\n", (long)glb_declared*sizeof(cell));
pc_printf("Stack/heap size: %8ld bytes; ", (long)pc_stksize*sizeof(cell)); pc_printf("Stack/heap size: %8ld bytes; ", (long)pc_stksize*sizeof(cell));
#if 0
pc_printf("estimated max. usage"); pc_printf("estimated max. usage");
if (recursion) if (recursion)
pc_printf(": unknown, due to recursion\n"); pc_printf(": unknown, due to recursion\n");
@ -480,6 +483,7 @@ cleanup:
pc_printf(": unknown, due to the \"sleep\" instruction\n"); pc_printf(": unknown, due to the \"sleep\" instruction\n");
else else
pc_printf("=%ld cells (%ld bytes)\n",stacksize,stacksize*sizeof(cell)); pc_printf("=%ld cells (%ld bytes)\n",stacksize,stacksize*sizeof(cell));
#endif
pc_printf("Total requirements:%8ld bytes\n", (long)hdrsize+(long)code_idx+(long)glb_declared*sizeof(cell)+(long)pc_stksize*sizeof(cell)); pc_printf("Total requirements:%8ld bytes\n", (long)hdrsize+(long)code_idx+(long)glb_declared*sizeof(cell)+(long)pc_stksize*sizeof(cell));
} /* if */ } /* if */
if (flag_exceed) if (flag_exceed)
@ -5029,6 +5033,8 @@ static long max_stacksize_recurse(symbol *sourcesym,symbol *sym,long basesize,in
return maxsize+basesize; return maxsize+basesize;
} }
static symbol *save_symbol;
static long max_stacksize(symbol *root,int *recursion) static long max_stacksize(symbol *root,int *recursion)
{ {
/* Loop over all non-native functions. For each function, loop /* Loop over all non-native functions. For each function, loop
@ -5061,6 +5067,7 @@ static long max_stacksize(symbol *root,int *recursion)
if (sym->ident!=iFUNCTN || (sym->usage & uNATIVE)!=0) if (sym->ident!=iFUNCTN || (sym->usage & uNATIVE)!=0)
continue; continue;
/* accumulate stack size for this symbol */ /* accumulate stack size for this symbol */
save_symbol = sym;
size=max_stacksize_recurse(sym,sym,0L,&maxparams,recursion); size=max_stacksize_recurse(sym,sym,0L,&maxparams,recursion);
assert(size>=0); assert(size>=0);
if (maxsize<size) if (maxsize<size)