From b6bd2ed29f4d7a554c02c22d8de2637525215845 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Sun, 2 Jul 2017 21:21:50 -0700 Subject: [PATCH] Create storage.h to declare functions defined in storage.c Update files that depend on storage functions to include storage.h Declare as static all functions in storage.c that are not needed externally. Add dependencies to makefile-tail. modified: makefile-tail new file: ../inc/storage.h modified: ../src/allocmds.c modified: ../src/gchtfind.c modified: ../src/llstk.c modified: ../src/main.c modified: ../src/storage.c modified: ../src/subr.c --- bin/makefile-tail | 12 ++++++------ inc/storage.h | 4 ++++ src/allocmds.c | 1 + src/gchtfind.c | 1 + src/llstk.c | 1 + src/main.c | 1 + src/storage.c | 13 +++++++------ src/subr.c | 1 + 8 files changed, 22 insertions(+), 12 deletions(-) create mode 100644 inc/storage.h diff --git a/bin/makefile-tail b/bin/makefile-tail index ea32eb8..92f3e96 100755 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -235,7 +235,7 @@ $(OBJECTDIR)main.o : $(SRCDIR)main.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)emlglob.h $(INCDIR)address.h $(INCDIR)lsptypes.h \ $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ $(INCDIR)lispmap.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ - $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h $(INCDIR)dir.h + $(INCDIR)return.h $(INCDIR)debug.h $(INCDIR)profile.h $(INCDIR)unixfork.h $(INCDIR)dir.h $(INCDIR)storage.h $(CC) $(RFLAGS) $(SRCDIR)main.c $(INLINE) -o $(OBJECTDIR)main$(OEXT) $(OBJECTDIR)dbgtool.o : $(SRCDIR)dbgtool.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -264,7 +264,7 @@ $(OBJECTDIR)testtool.o : $(SRCDIR)testtool.c $(REQUIRED-INCS) $(INCDIR)lispemu $(OBJECTDIR)allocmds.o : $(SRCDIR)allocmds.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)address.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)cell.h $(INCDIR)lispmap.h \ - $(INCDIR)initatms.h $(INCDIR)sysatms.h $(INCDIR)lspglob.h + $(INCDIR)initatms.h $(INCDIR)sysatms.h $(INCDIR)lspglob.h $(INCDIR)storage.h $(CC) $(RFLAGS) $(SRCDIR)allocmds.c $(INLINE) -o $(OBJECTDIR)allocmds$(OEXT) $(OBJECTDIR)arith2.o : $(SRCDIR)arith2.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -536,7 +536,7 @@ $(OBJECTDIR)gcoflow.o : $(SRCDIR)gcoflow.c $(REQUIRED-INCS) $(INCDIR)lispemul. $(OBJECTDIR)gchtfind.o : $(SRCDIR)gchtfind.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)lsptypes.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)lspglob.h $(INCDIR)gc.h \ - $(INCDIR)lispmap.h $(INCDIR)cell.h + $(INCDIR)lispmap.h $(INCDIR)cell.h $(INCDIR)storage.h $(CC) $(RFLAGS) $(SRCDIR)gchtfind.c $(INLINE) -o $(OBJECTDIR)gchtfind$(OEXT) $(OBJECTDIR)gcmain3.o : $(SRCDIR)gcmain3.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ @@ -577,7 +577,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)llstk.h $(INCDIR)return.h \ - $(INCDIR)emlglob.h + $(INCDIR)emlglob.h $(INCDIR)storage.h $(CC) $(RFLAGS) $(SRCDIR)hardrtn.c $(INLINE) -o $(OBJECTDIR)hardrtn$(OEXT) $(OBJECTDIR)inet.o : $(SRCDIR)inet.c $(REQUIRED-INCS) $(INCDIR)lispemul.h $(INCDIR)arith.h \ @@ -706,7 +706,7 @@ $(OBJECTDIR)shift.o : $(SRCDIR)shift.c $(REQUIRED-INCS) $(INCDIR)lispemul.h \ $(INCDIR)arith.h $(INCDIR)fp.h $(CC) $(RFLAGS) $(SRCDIR)shift.c $(INLINE) -o $(OBJECTDIR)shift$(OEXT) -$(OBJECTDIR)storage.o : $(SRCDIR)storage.c $(REQUIRED-INCS) $(INCDIR)hdw_conf.h \ +$(OBJECTDIR)storage.o : $(SRCDIR)storage.c $(INCDIR)storage.h $(REQUIRED-INCS) $(INCDIR)hdw_conf.h \ $(INCDIR)lispemul.h $(INCDIR)address.h \ $(INCDIR)adr68k.h $(INCDIR)lispmap.h $(INCDIR)stack.h \ $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)lsptypes.h \ @@ -719,7 +719,7 @@ $(OBJECTDIR)subr.o : $(SRCDIR)subr.c $(REQUIRED-INCS) \ $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)emlglob.h \ $(INCDIR)lspglob.h $(INCDIR)cell.h $(INCDIR)stack.h \ $(INCDIR)arith.h $(INCDIR)profile.h $(INCDIR)dsk.h $(INCDIR)dir.h $(INCDIR)ufs.h \ - $(INCDIR)chardev.h $(INCDIR)dspsubrs.h + $(INCDIR)chardev.h $(INCDIR)dspsubrs.h $(INCDIR)storage.h $(CC) $(RFLAGS) $(SRCDIR)subr.c $(INLINE) -o $(OBJECTDIR)subr$(OEXT) $(OBJECTDIR)miscn.o : $(SRCDIR)miscn.c $(REQUIRED-INCS) \ diff --git a/inc/storage.h b/inc/storage.h new file mode 100644 index 0000000..6a9992b --- /dev/null +++ b/inc/storage.h @@ -0,0 +1,4 @@ +void checkfor_storagefull(register unsigned int npages); +LispPTR dremove(LispPTR x, LispPTR l); +LispPTR newpage(LispPTR base); +void init_storage(void); diff --git a/src/allocmds.c b/src/allocmds.c index 19eec46..dee9724 100644 --- a/src/allocmds.c +++ b/src/allocmds.c @@ -40,6 +40,7 @@ static char *id = "$Id: allocmds.c,v 1.4 1999/05/31 23:35:20 sybalsky Exp $ Copy #include "initatms.h" #include "sysatms.h" #include "lspglob.h" +#include "storage.h" /************************************************************************/ /* */ diff --git a/src/gchtfind.c b/src/gchtfind.c index ba6c780..2a4efec 100644 --- a/src/gchtfind.c +++ b/src/gchtfind.c @@ -24,6 +24,7 @@ static char *id = "$Id: gchtfind.c,v 1.3 1999/05/31 23:35:31 sybalsky Exp $ Copy #include "gc.h" #include "lispmap.h" #include "cell.h" +#include "storage.h" #define Evenp(num, prim) ((num % prim) == 0) #ifdef BIGVM diff --git a/src/llstk.c b/src/llstk.c index 193ece3..e8d6fb5 100644 --- a/src/llstk.c +++ b/src/llstk.c @@ -38,6 +38,7 @@ static char *id = "$Id: llstk.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyrig #include "stack.h" #include "llstk.h" #include "return.h" +#include "storage.h" extern int extended_frame; diff --git a/src/main.c b/src/main.c index ea9d5de..b7bb412 100644 --- a/src/main.c +++ b/src/main.c @@ -96,6 +96,7 @@ static char *id = "$Id: main.c,v 1.4 2001/12/26 22:17:03 sybalsky Exp $ Copyrigh #include "profile.h" #include "timeout.h" +#include "storage.h" DLword *Lisp_world; /* lispworld */ diff --git a/src/storage.c b/src/storage.c index 3e86d16..b1833fb 100644 --- a/src/storage.c +++ b/src/storage.c @@ -36,13 +36,15 @@ static const char *id = #include "lsptypes.h" #include "ifpage.h" #include "gc.h" +#include "storage.h" #define MINARRAYBLOCKSIZE 4 #define GUARDVMEMFULL 500 #define IFPVALID_KEY 5603 -void advance_array_seg(register unsigned int nxtpage); -void set_storage_state(void); +static void advance_array_seg(register unsigned int nxtpage); +static void advance_storagestate(DLword flg); +static void set_storage_state(void); /*****************************************************************/ /* @@ -58,7 +60,6 @@ void set_storage_state(void); void checkfor_storagefull(register unsigned int npages) { register int pagesleft; register INTSTAT *int_state; - void advance_storagestate(DLword flg); #ifdef BIGVM pagesleft = (*Next_MDSpage_word) - (*Next_Array_word) - PAGESPER_MDSUNIT; @@ -150,7 +151,7 @@ void checkfor_storagefull(register unsigned int npages) { */ /*****************************************************************/ -void advance_array_seg(register unsigned int nxtpage) +static void advance_array_seg(register unsigned int nxtpage) /* rare page num */ { unsigned int ncellsleft; @@ -203,7 +204,7 @@ void advance_array_seg(register unsigned int nxtpage) /*****************************************************************/ /* DLword */ -void advance_storagestate(DLword flg) { +static void advance_storagestate(DLword flg) { LispPTR dremove(LispPTR x, LispPTR l); #ifdef DEBUG printf("STORAGEFULLSTATE is now set to %d \n", flg); @@ -223,7 +224,7 @@ void advance_storagestate(DLword flg) { */ /*****************************************************************/ -void set_storage_state(void) { +static void set_storage_state(void) { LispPTR cons(LispPTR cons_car, LispPTR cons_cdr); if ((*MACHINETYPE_word & 0xffff) == KATANA) { diff --git a/src/subr.c b/src/subr.c index b95736c..5a4bb6f 100644 --- a/src/subr.c +++ b/src/subr.c @@ -52,6 +52,7 @@ static char *id = "$Id: subr.c,v 1.3 1999/05/31 23:35:42 sybalsky Exp $ Copyrigh #include "dir.h" #include "chardev.h" #include "dspsubrs.h" +#include "storage.h" extern LispPTR *PENDINGINTERRUPT68k;