1berry/pawn-compiler
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Slightly simplify max_stacksize_recurse()

Browse Source
This commit is contained in:
Zeex 2013-09-17 21:12:35 +07:00
parent eb8280a711
commit a2a2f0e382
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/compiler/sc1.c
View File

@ -4431,7 +4431,7 @@ static void reduce_referrers(symbol *root)
} }
#if !defined SC_LIGHT #if !defined SC_LIGHT
static long max_stacksize_recurse(symbol **sourcesym,symbol **rsourcesym,int stkidx,symbol *sym,long basesize,int *pubfuncparams,int *recursion) static long max_stacksize_recurse(symbol **sourcesym,symbol *sym,symbol **rsourcesym,long basesize,int *pubfuncparams,int *recursion)
{ {
long size,maxsize; long size,maxsize;
int i,stkpos; int i,stkpos;
@ -4447,10 +4447,10 @@ static long max_stacksize_recurse(symbol **sourcesym,symbol **rsourcesym,int stk
if (sym->refer[i]!=NULL) { if (sym->refer[i]!=NULL) {
assert(sym->refer[i]->ident==iFUNCTN); assert(sym->refer[i]->ident==iFUNCTN);
assert((sym->refer[i]->usage & uNATIVE)==0); /* a native function cannot refer to a user-function */ assert((sym->refer[i]->usage & uNATIVE)==0); /* a native function cannot refer to a user-function */
*(rsourcesym)=sym;
*(rsourcesym+1)=NULL;
for (stkpos=0; sourcesym[stkpos]!=NULL; stkpos++) { for (stkpos=0; sourcesym[stkpos]!=NULL; stkpos++) {
if (sym->refer[i]==sourcesym[stkpos]) { /* recursion detection */ if (sym->refer[i]==sourcesym[stkpos]) { /* recursion detection */
rsourcesym[stkidx]=sym;
rsourcesym[stkidx+1]=NULL;
*recursion=1; *recursion=1;
goto break_recursion; /* recursion was detected, quit loop */ goto break_recursion; /* recursion was detected, quit loop */
} /* if */ } /* if */
@ -4458,10 +4458,8 @@ static long max_stacksize_recurse(symbol **sourcesym,symbol **rsourcesym,int stk
/* add this symbol to the stack */ /* add this symbol to the stack */
sourcesym[stkpos]=sym; sourcesym[stkpos]=sym;
sourcesym[stkpos+1]=NULL; sourcesym[stkpos+1]=NULL;
rsourcesym[stkidx]=sym;
rsourcesym[stkidx+1]=NULL;
/* check size of callee */ /* check size of callee */
size=max_stacksize_recurse(sourcesym,rsourcesym,stkidx+1,sym->refer[i],sym->x.stacksize,pubfuncparams,recursion); size=max_stacksize_recurse(sourcesym,sym->refer[i],rsourcesym+1,sym->x.stacksize,pubfuncparams,recursion);
if (maxsize<size) if (maxsize<size)
maxsize=size; maxsize=size;
/* remove this symbol from the stack */ /* remove this symbol from the stack */
@ -4537,7 +4535,7 @@ static long max_stacksize(symbol *root,int *recursion)
symstack[0]=sym; symstack[0]=sym;
assert(symstack[1]==NULL); assert(symstack[1]==NULL);
recursion_detected=0; recursion_detected=0;
size=max_stacksize_recurse(symstack,rsymstack,0,sym,0L,&maxparams,&recursion_detected); size=max_stacksize_recurse(symstack,sym,rsymstack,0L,&maxparams,&recursion_detected);
if (recursion_detected) { if (recursion_detected) {
if (rsymstack[1]==NULL) { if (rsymstack[1]==NULL) {
pc_printf("recursion detected: function %s directly calls itself\n", sym->name); pc_printf("recursion detected: function %s directly calls itself\n", sym->name);