diff --git a/bin/makefile-darwin.386-x b/bin/makefile-darwin.386-x index bd960d3..3568eb8 100755 --- a/bin/makefile-darwin.386-x +++ b/bin/makefile-darwin.386-x @@ -48,5 +48,5 @@ $(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h \ $(INCDIR)initatms.h $(INCDIR)gc.h \ $(INCDIR)arith.h $(INCDIR)stream.h \ $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h + $(INCDIR)tosfns.h $(INCDIR)inlineC.h $(INCDIR)car-cdr.h $(INCDIR)conspage.h $(INCDIR)llstk.h $(CC) $(DISPRFLAGS) -UOPDISP $(SRCDIR)xc.c -I$(INCDIR) -o $(OBJECTDIR)xc.o diff --git a/bin/makefile-tail b/bin/makefile-tail index ee06f2f..2305d23 100755 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -521,7 +521,7 @@ $(OBJECTDIR)gcarray.o : $(SRCDIR)gcarray.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(OBJECTDIR)gcfinal.o : $(SRCDIR)gcfinal.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h \ - $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h \ + $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)stack.h $(INCDIR)llstk.h\ $(INCDIR)cell.h $(INCDIR)ifpage.h $(INCDIR)gc.h \ $(INCDIR)array.h $(CC) $(RFLAGS) $(SRCDIR)gcfinal.c $(INLINE) -o $(OBJECTDIR)gcfinal$(OEXT) @@ -574,7 +574,7 @@ $(OBJECTDIR)gvar2.o : $(SRCDIR)gvar2.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(OBJECTDIR)hardrtn.o : $(SRCDIR)hardrtn.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lspglob.h $(INCDIR)adr68k.h \ - $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)return.h \ + $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)llstk.h $(INCDIR)return.h \ $(INCDIR)emlglob.h $(CC) $(RFLAGS) $(SRCDIR)hardrtn.c $(INLINE) -o $(OBJECTDIR)hardrtn$(OEXT) @@ -628,7 +628,7 @@ $(OBJECTDIR)lsthandl.o : $(SRCDIR)lsthandl.c $(REQUIRED-INCS) $(INCDIR)lispemu $(INCDIR)cell.h $(INCDIR)car-cdr.h $(CC) $(RFLAGS) $(SRCDIR)lsthandl.c $(INLINE) -o $(OBJECTDIR)lsthandl$(OEXT) -$(OBJECTDIR)llstk.o : $(SRCDIR)llstk.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ +$(OBJECTDIR)llstk.o : $(SRCDIR)llstk.c $(INCDIR)llstk.h $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)adr68k.h \ $(INCDIR)address.h $(INCDIR)lsptypes.h $(INCDIR)initatms.h \ $(INCDIR)lspglob.h $(INCDIR)emlglob.h $(INCDIR)cell.h \ @@ -764,7 +764,7 @@ $(OBJECTDIR)unixcomm.o : $(SRCDIR)unixcomm.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)uraid.o : $(SRCDIR)uraid.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \ - $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \ + $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h $(INCDIR)llstk.h \ $(INCDIR)debug.h $(INCDIR)uraid.h $(CC) $(RFLAGS) $(SRCDIR)uraid.c $(INLINE) -o $(OBJECTDIR)uraid$(OEXT) diff --git a/inc/llstk.h b/inc/llstk.h new file mode 100644 index 0000000..6e44f87 --- /dev/null +++ b/inc/llstk.h @@ -0,0 +1,11 @@ +DLword *freestackblock(DLword n, StackWord *start68k, int align); +int do_stackoverflow(int incallp); +void decusecount68k(register FX *frame68k); +void flip_cursorbar(int n); +void blt(register DLword *dest68k, register DLword *source68k, int nw); +void stack_check(StackWord *start68k); +void walk_stack(StackWord *start68k); +void quick_stack_check(void); +void check_FX(FX *fx68k); +void check_BF(Bframe *bf68k); +int check_stack_rooms(FX *fx68k); diff --git a/src/gcfinal.c b/src/gcfinal.c index 3ea1565..3286b72 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -54,6 +54,7 @@ static char *id = "$Id: gcfinal.c,v 1.3 1999/05/31 23:35:31 sybalsky Exp $ Copyr #include "adr68k.h" #include "lspglob.h" #include "stack.h" +#include "llstk.h" #include "cell.h" #include "ifpage.h" #include "gc.h" diff --git a/src/hardrtn.c b/src/hardrtn.c index 5eade81..4cfa812 100644 --- a/src/hardrtn.c +++ b/src/hardrtn.c @@ -37,6 +37,7 @@ static char *id = "$Id: hardrtn.c,v 1.4 2001/12/24 01:09:02 sybalsky Exp $ Copyr #include "emlglob.h" #include "cell.h" #include "stack.h" +#include "llstk.h" #include "return.h" #define MAKE_FXCOPY(fx68k) \ diff --git a/src/llstk.c b/src/llstk.c index 8c402f5..193ece3 100644 --- a/src/llstk.c +++ b/src/llstk.c @@ -36,11 +36,12 @@ static char *id = "$Id: llstk.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyrig #include "emlglob.h" #include "cell.h" #include "stack.h" +#include "llstk.h" #include "return.h" extern int extended_frame; -void blt(register DLword *dest68k, register DLword *source68k, int nw); +static DLword *extendstack(void); /******************************************************************/ /* @@ -49,12 +50,10 @@ void blt(register DLword *dest68k, register DLword *source68k, int nw); Edited by : Take(March 14, 1988) */ /******************************************************************/ -LispPTR moveframe(register FX *oldfx68k) { +static LispPTR moveframe(register FX *oldfx68k) { register int size; register DLword *next68k; register DLword *new68k; - DLword *freestackblock(DLword n, StackWord * start68k, int align); - DLword *extendstack(void); int nametbl_on_stk = NIL; int at_eos = NIL; @@ -252,7 +251,7 @@ int do_stackoverflow(int incallp) { */ /******************************************************************/ -DLword *extendstack(void) { +static DLword *extendstack(void) { register LispPTR easp; register LispPTR scanptr; diff --git a/src/uraid.c b/src/uraid.c index 06479e7..eca9763 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -82,6 +82,7 @@ extern int Win_security_p; #include "emlglob.h" #include "cell.h" #include "stack.h" +#include "llstk.h" #include "ifpage.h" #include "debug.h" #include "devconf.h" diff --git a/src/xc.c b/src/xc.c index e5bb114..157655e 100644 --- a/src/xc.c +++ b/src/xc.c @@ -45,6 +45,7 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright #include "address.h" #include "adr68k.h" #include "stack.h" +#include "llstk.h" #include "dbprint.h" #include "lspglob.h" diff --git a/src/xc.c.orig b/src/xc.c.orig index d145d80..aa85845 100644 --- a/src/xc.c.orig +++ b/src/xc.c.orig @@ -50,6 +50,7 @@ static char *id = "$Id: xc.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyright #include "address.h" #include "adr68k.h" #include "stack.h" +#include "llstk.h" #include "dbprint.h" #include "lspglob.h"