From 0ad69fc6fecaf28e3ea830e520f4993f44f698d8 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Fri, 4 Sep 2020 18:21:44 -0700 Subject: [PATCH] Create a new inc/xxxdefs.h for each src/xxx.c containing appropriate function prototypes. This also involves removing unnecessary forward declarations, inserting includes for all cross-file function references, making some definitions static if they are not otherwise used, correcting errors that were exposed by having correct prototypes. new file: inc/allocmdsdefs.h new file: inc/arith2defs.h new file: inc/arith3defs.h new file: inc/arith4defs.h new file: inc/array2defs.h new file: inc/array3defs.h new file: inc/array4defs.h new file: inc/array5defs.h new file: inc/array6defs.h new file: inc/arraydefs.h new file: inc/bbtsubdefs.h new file: inc/bindefs.h new file: inc/bindsdefs.h new file: inc/bitbltdefs.h new file: inc/bltdefs.h new file: inc/byteswapdefs.h new file: inc/car-cdrdefs.h new file: inc/chardevdefs.h new file: inc/commondefs.h new file: inc/conspagedefs.h new file: inc/dbgtooldefs.h new file: inc/dirdefs.h new file: inc/drawdefs.h new file: inc/dskdefs.h new file: inc/dspifdefs.h new file: inc/dspsubrsdefs.h new file: inc/eqfdefs.h new file: inc/etherdefs.h new file: inc/findkeydefs.h new file: inc/fpdefs.h new file: inc/fvardefs.h new file: inc/gc2defs.h new file: inc/gcarraydefs.h new file: inc/gccodedefs.h new file: inc/gcdefs.h new file: inc/gcfinaldefs.h new file: inc/gchtfinddefs.h new file: inc/gcmain3defs.h new file: inc/gcoflowdefs.h new file: inc/gcrcelldefs.h new file: inc/gcrdefs.h new file: inc/gcscandefs.h new file: inc/gvar2defs.h new file: inc/hacksdefs.h new file: inc/hardrtndefs.h new file: inc/inetdefs.h new file: inc/initdspdefs.h new file: inc/initkbddefs.h new file: inc/initsoutdefs.h modified: inc/inlineC.h new file: inc/intcalldefs.h new file: inc/kbdsubrsdefs.h new file: inc/keyeventdefs.h new file: inc/keylibdefs.h new file: inc/kprintdefs.h new file: inc/ldsoutdefs.h new file: inc/lineblt8defs.h new file: inc/lisp2cdefs.h modified: inc/lispemul.h new file: inc/llcolordefs.h new file: inc/llstkdefs.h modified: inc/lnk-inlineC.h new file: inc/loopsopsdefs.h new file: inc/lowlev1defs.h new file: inc/lowlev2defs.h new file: inc/lsthandldefs.h new file: inc/maindefs.h new file: inc/misc7defs.h new file: inc/miscndefs.h new file: inc/mkatomdefs.h new file: inc/mkcelldefs.h new file: inc/mvsdefs.h new file: inc/osmsgdefs.h new file: inc/perrnodefs.h new file: inc/returndefs.h new file: inc/rpcdefs.h new file: inc/rplconsdefs.h new file: inc/shiftdefs.h new file: inc/storagedefs.h new file: inc/subr0374defs.h new file: inc/subrdefs.h new file: inc/sxhashdefs.h new file: inc/testtooldefs.h new file: inc/timerdefs.h new file: inc/typeofdefs.h new file: inc/ubf1defs.h new file: inc/ubf2defs.h new file: inc/ubf3defs.h new file: inc/ufsdefs.h new file: inc/unixcommdefs.h new file: inc/unwinddefs.h new file: inc/uraiddefs.h new file: inc/usrsubrdefs.h new file: inc/uutilsdefs.h new file: inc/vars3defs.h new file: inc/vmemsavedefs.h new file: inc/xbbtdefs.h new file: inc/xcdefs.h new file: inc/xcursordefs.h new file: inc/xinitdefs.h new file: inc/xlspwindefs.h new file: inc/xmkicondefs.h new file: inc/xrdoptdefs.h new file: inc/xscrolldefs.h new file: inc/xwinmandefs.h new file: inc/z2defs.h modified: src/allocmds.c modified: src/arith2.c modified: src/arith3.c modified: src/arith4.c modified: src/array.c modified: src/array2.c modified: src/array3.c modified: src/array4.c modified: src/array5.c modified: src/array6.c modified: src/bbtsub.c modified: src/bin.c modified: src/binds.c modified: src/bitblt.c modified: src/blt.c modified: src/byteswap.c modified: src/car-cdr.c modified: src/chardev.c modified: src/common.c modified: src/conspage.c modified: src/dbgtool.c modified: src/dir.c modified: src/draw.c modified: src/dsk.c modified: src/dspif.c modified: src/dspsubrs.c modified: src/eqf.c modified: src/ether.c modified: src/findkey.c modified: src/foreign.c modified: src/fp.c modified: src/fvar.c modified: src/gc.c modified: src/gc2.c modified: src/gcarray.c modified: src/gccode.c modified: src/gcfinal.c modified: src/gchtfind.c modified: src/gcmain3.c modified: src/gcoflow.c modified: src/gcr.c modified: src/gcrcell.c modified: src/gcscan.c modified: src/gvar2.c modified: src/hacks.c modified: src/hardrtn.c modified: src/inet.c modified: src/initdsp.c modified: src/initkbd.c modified: src/initsout.c modified: src/intcall.c modified: src/kbdsubrs.c modified: src/keyevent.c modified: src/keylib.c modified: src/kprint.c modified: src/ldsout.c modified: src/lineblt8.c modified: src/lisp2c.c modified: src/llcolor.c modified: src/llstk.c modified: src/loopsops.c modified: src/lowlev1.c modified: src/lowlev2.c modified: src/lsthandl.c modified: src/main.c modified: src/misc7.c modified: src/miscn.c modified: src/mkatom.c modified: src/mkcell.c modified: src/mvs.c modified: src/osmsg.c modified: src/perrno.c modified: src/return.c modified: src/rpc.c modified: src/rplcons.c modified: src/setsout.c modified: src/shift.c modified: src/storage.c modified: src/subr.c modified: src/subr0374.c modified: src/sxhash.c modified: src/testtool.c modified: src/timer.c modified: src/truecolor.c modified: src/tstsout.c modified: src/typeof.c modified: src/ubf1.c modified: src/ubf2.c modified: src/ubf3.c modified: src/ufn.c modified: src/ufs.c modified: src/unixcomm.c modified: src/unwind.c modified: src/uraid.c modified: src/usrsubr.c modified: src/uutils.c modified: src/vars3.c modified: src/vmemsave.c modified: src/xbbt.c modified: src/xc.c modified: src/xcursor.c modified: src/xinit.c modified: src/xlspwin.c modified: src/xmkicon.c modified: src/xrdopt.c modified: src/xscroll.c modified: src/xwinman.c modified: src/z2.c --- inc/allocmdsdefs.h | 5 ++ inc/arith2defs.h | 14 ++++ inc/arith3defs.h | 6 ++ inc/arith4defs.h | 8 ++ inc/array2defs.h | 5 ++ inc/array3defs.h | 4 + inc/array4defs.h | 4 + inc/array5defs.h | 4 + inc/array6defs.h | 4 + inc/arraydefs.h | 4 + inc/bbtsubdefs.h | 16 ++++ inc/bindefs.h | 4 + inc/bindsdefs.h | 6 ++ inc/bitbltdefs.h | 6 ++ inc/bltdefs.h | 5 ++ inc/byteswapdefs.h | 11 +++ inc/car-cdrdefs.h | 13 ++++ inc/chardevdefs.h | 10 +++ inc/commondefs.h | 8 ++ inc/conspagedefs.h | 7 ++ inc/dbgtooldefs.h | 17 +++++ inc/dirdefs.h | 13 ++++ inc/drawdefs.h | 4 + inc/dskdefs.h | 24 ++++++ inc/dspifdefs.h | 8 ++ inc/dspsubrsdefs.h | 11 +++ inc/eqfdefs.h | 7 ++ inc/etherdefs.h | 16 ++++ inc/findkeydefs.h | 4 + inc/fpdefs.h | 8 ++ inc/fvardefs.h | 9 +++ inc/gc2defs.h | 5 ++ inc/gcarraydefs.h | 7 ++ inc/gccodedefs.h | 7 ++ inc/gcdefs.h | 4 + inc/gcfinaldefs.h | 18 +++++ inc/gchtfinddefs.h | 6 ++ inc/gcmain3defs.h | 7 ++ inc/gcoflowdefs.h | 5 ++ inc/gcrcelldefs.h | 6 ++ inc/gcrdefs.h | 7 ++ inc/gcscandefs.h | 5 ++ inc/gvar2defs.h | 5 ++ inc/hacksdefs.h | 7 ++ inc/hardrtndefs.h | 5 ++ inc/inetdefs.h | 4 + inc/initdspdefs.h | 13 ++++ inc/initkbddefs.h | 9 +++ inc/initsoutdefs.h | 10 +++ inc/inlineC.h | 1 - inc/intcalldefs.h | 4 + inc/kbdsubrsdefs.h | 7 ++ inc/keyeventdefs.h | 8 ++ inc/keylibdefs.h | 12 +++ inc/kprintdefs.h | 9 +++ inc/ldsoutdefs.h | 4 + inc/lineblt8defs.h | 5 ++ inc/lisp2cdefs.h | 8 ++ inc/lispemul.h | 7 +- inc/llcolordefs.h | 6 ++ inc/llstkdefs.h | 15 ++++ inc/lnk-inlineC.h | 1 - inc/loopsopsdefs.h | 11 +++ inc/lowlev1defs.h | 7 ++ inc/lowlev2defs.h | 6 ++ inc/lsthandldefs.h | 6 ++ inc/maindefs.h | 6 ++ inc/misc7defs.h | 4 + inc/miscndefs.h | 4 + inc/mkatomdefs.h | 11 +++ inc/mkcelldefs.h | 6 ++ inc/mvsdefs.h | 8 ++ inc/osmsgdefs.h | 8 ++ inc/perrnodefs.h | 5 ++ inc/returndefs.h | 5 ++ inc/rpcdefs.h | 4 + inc/rplconsdefs.h | 4 + inc/shiftdefs.h | 8 ++ inc/storagedefs.h | 7 ++ inc/subr0374defs.h | 4 + inc/subrdefs.h | 5 ++ inc/sxhashdefs.h | 7 ++ inc/testtooldefs.h | 39 ++++++++++ inc/timerdefs.h | 18 +++++ inc/typeofdefs.h | 5 ++ inc/ubf1defs.h | 4 + inc/ubf2defs.h | 4 + inc/ubf3defs.h | 4 + inc/ufsdefs.h | 16 ++++ inc/unixcommdefs.h | 12 +++ inc/unwinddefs.h | 4 + inc/uraiddefs.h | 9 +++ inc/usrsubrdefs.h | 4 + inc/uutilsdefs.h | 11 +++ inc/vars3defs.h | 6 ++ inc/vmemsavedefs.h | 9 +++ inc/xbbtdefs.h | 4 + inc/xcdefs.h | 6 ++ inc/xcursordefs.h | 9 +++ inc/xinitdefs.h | 9 +++ inc/xlspwindefs.h | 8 ++ inc/xmkicondefs.h | 4 + inc/xrdoptdefs.h | 6 ++ inc/xscrolldefs.h | 10 +++ inc/xwinmandefs.h | 11 +++ inc/z2defs.h | 6 ++ src/allocmds.c | 8 +- src/arith2.c | 6 +- src/arith3.c | 3 + src/arith4.c | 4 + src/array.c | 7 +- src/array2.c | 4 + src/array3.c | 6 +- src/array4.c | 4 + src/array5.c | 3 + src/array6.c | 4 + src/bbtsub.c | 11 ++- src/bin.c | 2 + src/binds.c | 2 + src/bitblt.c | 3 + src/blt.c | 2 + src/byteswap.c | 6 +- src/car-cdr.c | 6 +- src/chardev.c | 12 ++- src/common.c | 5 +- src/conspage.c | 7 +- src/dbgtool.c | 4 + src/dir.c | 19 +++-- src/draw.c | 3 + src/dsk.c | 19 ++--- src/dspif.c | 3 + src/dspsubrs.c | 8 ++ src/eqf.c | 3 + src/ether.c | 33 +++++---- src/findkey.c | 2 + src/foreign.c | 2 + src/fp.c | 5 +- src/fvar.c | 5 ++ src/gc.c | 3 + src/gc2.c | 3 + src/gcarray.c | 8 +- src/gccode.c | 6 +- src/gcfinal.c | 9 ++- src/gchtfind.c | 6 +- src/gcmain3.c | 6 ++ src/gcoflow.c | 4 + src/gcr.c | 7 +- src/gcrcell.c | 8 +- src/gcscan.c | 2 + src/gvar2.c | 3 + src/hacks.c | 2 + src/hardrtn.c | 179 +++++++++++++++++++++++---------------------- src/inet.c | 23 +++--- src/initdsp.c | 13 +++- src/initkbd.c | 8 +- src/initsout.c | 10 ++- src/intcall.c | 6 +- src/kbdsubrs.c | 6 ++ src/keyevent.c | 6 +- src/keylib.c | 1 + src/kprint.c | 11 +-- src/ldsout.c | 12 ++- src/lineblt8.c | 2 + src/lisp2c.c | 4 + src/llcolor.c | 2 + src/llstk.c | 77 +++++++++---------- src/loopsops.c | 7 +- src/lowlev1.c | 4 +- src/lowlev2.c | 2 + src/lsthandl.c | 5 +- src/main.c | 23 ++++-- src/misc7.c | 4 + src/miscn.c | 7 ++ src/mkatom.c | 8 +- src/mkcell.c | 5 ++ src/mvs.c | 7 +- src/osmsg.c | 4 + src/perrno.c | 4 + src/return.c | 3 + src/rpc.c | 4 + src/rplcons.c | 6 +- src/setsout.c | 4 +- src/shift.c | 5 +- src/storage.c | 10 ++- src/subr.c | 36 +++++++-- src/subr0374.c | 2 + src/sxhash.c | 39 +++++----- src/testtool.c | 22 +++--- src/timer.c | 71 +++++++++--------- src/truecolor.c | 1 - src/tstsout.c | 3 +- src/typeof.c | 2 + src/ubf1.c | 5 +- src/ubf2.c | 2 + src/ubf3.c | 2 + src/ufn.c | 2 +- src/ufs.c | 7 +- src/unixcomm.c | 13 +++- src/unwind.c | 3 +- src/uraid.c | 50 ++++++++++--- src/usrsubr.c | 4 +- src/uutils.c | 8 +- src/vars3.c | 4 +- src/vmemsave.c | 20 +++-- src/xbbt.c | 1 + src/xc.c | 55 ++++++++++++-- src/xcursor.c | 3 +- src/xinit.c | 9 ++- src/xlspwin.c | 25 ++++--- src/xmkicon.c | 2 + src/xrdopt.c | 5 +- src/xscroll.c | 3 + src/xwinman.c | 6 +- src/z2.c | 8 +- 214 files changed, 1608 insertions(+), 381 deletions(-) create mode 100644 inc/allocmdsdefs.h create mode 100644 inc/arith2defs.h create mode 100644 inc/arith3defs.h create mode 100644 inc/arith4defs.h create mode 100644 inc/array2defs.h create mode 100644 inc/array3defs.h create mode 100644 inc/array4defs.h create mode 100644 inc/array5defs.h create mode 100644 inc/array6defs.h create mode 100644 inc/arraydefs.h create mode 100644 inc/bbtsubdefs.h create mode 100644 inc/bindefs.h create mode 100644 inc/bindsdefs.h create mode 100644 inc/bitbltdefs.h create mode 100644 inc/bltdefs.h create mode 100644 inc/byteswapdefs.h create mode 100644 inc/car-cdrdefs.h create mode 100644 inc/chardevdefs.h create mode 100644 inc/commondefs.h create mode 100644 inc/conspagedefs.h create mode 100644 inc/dbgtooldefs.h create mode 100644 inc/dirdefs.h create mode 100644 inc/drawdefs.h create mode 100644 inc/dskdefs.h create mode 100644 inc/dspifdefs.h create mode 100644 inc/dspsubrsdefs.h create mode 100644 inc/eqfdefs.h create mode 100644 inc/etherdefs.h create mode 100644 inc/findkeydefs.h create mode 100644 inc/fpdefs.h create mode 100644 inc/fvardefs.h create mode 100644 inc/gc2defs.h create mode 100644 inc/gcarraydefs.h create mode 100644 inc/gccodedefs.h create mode 100644 inc/gcdefs.h create mode 100644 inc/gcfinaldefs.h create mode 100644 inc/gchtfinddefs.h create mode 100644 inc/gcmain3defs.h create mode 100644 inc/gcoflowdefs.h create mode 100644 inc/gcrcelldefs.h create mode 100644 inc/gcrdefs.h create mode 100644 inc/gcscandefs.h create mode 100644 inc/gvar2defs.h create mode 100644 inc/hacksdefs.h create mode 100644 inc/hardrtndefs.h create mode 100644 inc/inetdefs.h create mode 100644 inc/initdspdefs.h create mode 100644 inc/initkbddefs.h create mode 100644 inc/initsoutdefs.h create mode 100644 inc/intcalldefs.h create mode 100644 inc/kbdsubrsdefs.h create mode 100644 inc/keyeventdefs.h create mode 100644 inc/keylibdefs.h create mode 100644 inc/kprintdefs.h create mode 100644 inc/ldsoutdefs.h create mode 100644 inc/lineblt8defs.h create mode 100644 inc/lisp2cdefs.h create mode 100644 inc/llcolordefs.h create mode 100644 inc/llstkdefs.h create mode 100644 inc/loopsopsdefs.h create mode 100644 inc/lowlev1defs.h create mode 100644 inc/lowlev2defs.h create mode 100644 inc/lsthandldefs.h create mode 100644 inc/maindefs.h create mode 100644 inc/misc7defs.h create mode 100644 inc/miscndefs.h create mode 100644 inc/mkatomdefs.h create mode 100644 inc/mkcelldefs.h create mode 100644 inc/mvsdefs.h create mode 100644 inc/osmsgdefs.h create mode 100644 inc/perrnodefs.h create mode 100644 inc/returndefs.h create mode 100644 inc/rpcdefs.h create mode 100644 inc/rplconsdefs.h create mode 100644 inc/shiftdefs.h create mode 100644 inc/storagedefs.h create mode 100644 inc/subr0374defs.h create mode 100644 inc/subrdefs.h create mode 100644 inc/sxhashdefs.h create mode 100644 inc/testtooldefs.h create mode 100644 inc/timerdefs.h create mode 100644 inc/typeofdefs.h create mode 100644 inc/ubf1defs.h create mode 100644 inc/ubf2defs.h create mode 100644 inc/ubf3defs.h create mode 100644 inc/ufsdefs.h create mode 100644 inc/unixcommdefs.h create mode 100644 inc/unwinddefs.h create mode 100644 inc/uraiddefs.h create mode 100644 inc/usrsubrdefs.h create mode 100644 inc/uutilsdefs.h create mode 100644 inc/vars3defs.h create mode 100644 inc/vmemsavedefs.h create mode 100644 inc/xbbtdefs.h create mode 100644 inc/xcdefs.h create mode 100644 inc/xcursordefs.h create mode 100644 inc/xinitdefs.h create mode 100644 inc/xlspwindefs.h create mode 100644 inc/xmkicondefs.h create mode 100644 inc/xrdoptdefs.h create mode 100644 inc/xscrolldefs.h create mode 100644 inc/xwinmandefs.h create mode 100644 inc/z2defs.h diff --git a/inc/allocmdsdefs.h b/inc/allocmdsdefs.h new file mode 100644 index 0000000..3919b3b --- /dev/null +++ b/inc/allocmdsdefs.h @@ -0,0 +1,5 @@ +#ifndef ALLOCMDSDEFS_H +#define ALLOCMDSDEFS_H 1 +LispPTR initmdspage(register LispPTR *base, register DLword size, register LispPTR prev); +LispPTR *alloc_mdspage(register short int type); +#endif diff --git a/inc/arith2defs.h b/inc/arith2defs.h new file mode 100644 index 0000000..6b39273 --- /dev/null +++ b/inc/arith2defs.h @@ -0,0 +1,14 @@ +#ifndef ARITH2DEFS_H +#define ARITH2DEFS_H 1 +LispPTR N_OP_plus2(int tosm1, int tos); +LispPTR N_OP_iplus2(int tosm1, int tos); +LispPTR N_OP_difference(int tosm1, int tos); +LispPTR N_OP_idifference(int tosm1, int tos); +LispPTR N_OP_logxor(int tosm1, int tos); +LispPTR N_OP_logand(int tosm1, int tos); +LispPTR N_OP_logor(int tosm1, int tos); +LispPTR N_OP_greaterp(int tosm1, int tos); +LispPTR N_OP_igreaterp(int tosm1, int tos); +LispPTR N_OP_iplusn(int tos, int n); +LispPTR N_OP_idifferencen(int tos, int n); +#endif diff --git a/inc/arith3defs.h b/inc/arith3defs.h new file mode 100644 index 0000000..97a3399 --- /dev/null +++ b/inc/arith3defs.h @@ -0,0 +1,6 @@ +#ifndef ARITH3DEFS_H +#define ARITH3DEFS_H 1 +LispPTR N_OP_makenumber(int tosm1, int tos); +LispPTR N_OP_boxiplus(register int a, int tos); +LispPTR N_OP_boxidiff(register int a, int tos); +#endif diff --git a/inc/arith4defs.h b/inc/arith4defs.h new file mode 100644 index 0000000..61fe20d --- /dev/null +++ b/inc/arith4defs.h @@ -0,0 +1,8 @@ +#ifndef ARITH4DEFS_H +#define ARITH4DEFS_H 1 +int N_OP_times2(int tosm1, int tos); +int N_OP_itimes2(int tosm1, int tos); +int N_OP_quot(int tosm1, int tos); +int N_OP_iquot(int tosm1, int tos); +int N_OP_iremainder(int tosm1, int tos); +#endif diff --git a/inc/array2defs.h b/inc/array2defs.h new file mode 100644 index 0000000..6ce9c0e --- /dev/null +++ b/inc/array2defs.h @@ -0,0 +1,5 @@ +#ifndef ARRAY2DEFS_H +#define ARRAY2DEFS_H 1 +LispPTR N_OP_misc4(register LispPTR data, register LispPTR base, register LispPTR typenumber, + register LispPTR inx, int alpha); +#endif diff --git a/inc/array3defs.h b/inc/array3defs.h new file mode 100644 index 0000000..692287b --- /dev/null +++ b/inc/array3defs.h @@ -0,0 +1,4 @@ +#ifndef ARRAY3DEFS_H +#define ARRAY3DEFS_H 1 +LispPTR N_OP_aref1(register LispPTR arrayarg, register LispPTR inx); +#endif diff --git a/inc/array4defs.h b/inc/array4defs.h new file mode 100644 index 0000000..a65eec3 --- /dev/null +++ b/inc/array4defs.h @@ -0,0 +1,4 @@ +#ifndef ARRAY4DEFS_H +#define ARRAY4DEFS_H 1 +LispPTR N_OP_aset1(register LispPTR data, LispPTR arrayarg, register int inx); +#endif diff --git a/inc/array5defs.h b/inc/array5defs.h new file mode 100644 index 0000000..ef74bde --- /dev/null +++ b/inc/array5defs.h @@ -0,0 +1,4 @@ +#ifndef ARRAY5DEFS_H +#define ARRAY5DEFS_H 1 +LispPTR N_OP_aref2(LispPTR arrayarg, LispPTR inx0, LispPTR inx1); +#endif diff --git a/inc/array6defs.h b/inc/array6defs.h new file mode 100644 index 0000000..299a325 --- /dev/null +++ b/inc/array6defs.h @@ -0,0 +1,4 @@ +#ifndef ARRAY6DEFS_H +#define ARRAY6DEFS_H 1 +LispPTR N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1); +#endif diff --git a/inc/arraydefs.h b/inc/arraydefs.h new file mode 100644 index 0000000..ebe07a5 --- /dev/null +++ b/inc/arraydefs.h @@ -0,0 +1,4 @@ +#ifndef ARRAYDEFS_H +#define ARRAYDEFS_H 1 +LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha); +#endif diff --git a/inc/bbtsubdefs.h b/inc/bbtsubdefs.h new file mode 100644 index 0000000..07a9df0 --- /dev/null +++ b/inc/bbtsubdefs.h @@ -0,0 +1,16 @@ +#ifndef BBTSUBDEFS_H +#define BBTSUBDEFS_H 1 +void bitbltsub(LispPTR *argv); +LispPTR n_new_cursorin(DLword *baseaddr, int dx, int dy, int w, int h); +LispPTR bitblt_bitmap(LispPTR *args); +LispPTR bitshade_bitmap(LispPTR *args); +#ifndef prropstyle +void bltchar(LispPTR *args); +void newbltchar(LispPTR *args); +#else +LispPTR bltchar(LispPTR *args); +LispPTR newbltchar(LispPTR *args); +#endif +void ccfuncall(register unsigned int atom_index, register int argnum, register int bytenum); +void tedit_bltchar(LispPTR *args); +#endif diff --git a/inc/bindefs.h b/inc/bindefs.h new file mode 100644 index 0000000..2ee2059 --- /dev/null +++ b/inc/bindefs.h @@ -0,0 +1,4 @@ +#ifndef BINDEFS_H +#define BINDEFS_H 1 +LispPTR N_OP_bin(register int tos); +#endif diff --git a/inc/bindsdefs.h b/inc/bindsdefs.h new file mode 100644 index 0000000..1eb97c2 --- /dev/null +++ b/inc/bindsdefs.h @@ -0,0 +1,6 @@ +#ifndef BINDSDEFS_H +#define BINDSDEFS_H 1 +LispPTR *N_OP_bind(register LispPTR *stack_pointer, register LispPTR tos, int byte1, int byte2); +LispPTR *N_OP_unbind(register LispPTR *stack_pointer); +LispPTR *N_OP_dunbind(register LispPTR *stack_pointer, register LispPTR tos); +#endif diff --git a/inc/bitbltdefs.h b/inc/bitbltdefs.h new file mode 100644 index 0000000..b7a63c0 --- /dev/null +++ b/inc/bitbltdefs.h @@ -0,0 +1,6 @@ +#ifndef BITBLTDEFS_H +#define BITBLTDEFS_H 1 +LispPTR N_OP_pilotbitblt(LispPTR pilot_bt_tbl,int tos); +int cursorin(DLword addrhi, DLword addrlo, int w, int h, int backward); +#endif + diff --git a/inc/bltdefs.h b/inc/bltdefs.h new file mode 100644 index 0000000..a5fbdd4 --- /dev/null +++ b/inc/bltdefs.h @@ -0,0 +1,5 @@ +#ifndef BLTDEFS_H +#define BLTDEFS_H 1 +LispPTR N_OP_blt(LispPTR destptr, LispPTR sourceptr, register LispPTR wordcount); +#endif + diff --git a/inc/byteswapdefs.h b/inc/byteswapdefs.h new file mode 100644 index 0000000..924e1f2 --- /dev/null +++ b/inc/byteswapdefs.h @@ -0,0 +1,11 @@ +#ifndef BYTESWAPDEFS_H +#define BYTESWAPDEFS_H 1 +unsigned int swapx(unsigned int word); +unsigned short byte_swap_word(unsigned short word); +void byte_swap_page(unsigned short *page, int wordcount); +void word_swap_page(unsigned short *page, int longwordcount); +void bit_reverse_region(unsigned short *top, int width, int height, int rasterwidth); +#ifdef RESWAPPEDDCODESTREAM +unsigned int byte_swap_code_block(unsigned int *base); +#endif +#endif diff --git a/inc/car-cdrdefs.h b/inc/car-cdrdefs.h new file mode 100644 index 0000000..679f8e6 --- /dev/null +++ b/inc/car-cdrdefs.h @@ -0,0 +1,13 @@ +#ifndef CAR_CDRDEFS_H +#define CAR_CDRDEFS_H 1 +#include "cell.h" +LispPTR car(register LispPTR datum); +LispPTR cdr(register LispPTR datum); +LispPTR rplaca(register LispPTR x, register LispPTR y); +LispPTR rplacd(LispPTR x, register LispPTR y); +LispPTR N_OP_car(register LispPTR tos); +LispPTR N_OP_cdr(register LispPTR tos); +LispPTR N_OP_rplaca(register LispPTR tosm1, register LispPTR tos); +LispPTR N_OP_rplacd(register LispPTR tosm1, register LispPTR tos); +ConsCell *find_close_prior_cell(struct conspage *page, LispPTR oldcell); +#endif diff --git a/inc/chardevdefs.h b/inc/chardevdefs.h new file mode 100644 index 0000000..5a93fa1 --- /dev/null +++ b/inc/chardevdefs.h @@ -0,0 +1,10 @@ +#ifndef CHARDEVDEFS_H +#define CHARDEVDEFS_H 1 +LispPTR CHAR_openfile(LispPTR *args); +LispPTR CHAR_closefile(LispPTR *args); +LispPTR CHAR_ioctl(LispPTR *args); +LispPTR CHAR_bin(int id, LispPTR errn); +LispPTR CHAR_bout(int id, LispPTR ch, LispPTR errn); +LispPTR CHAR_bins(LispPTR *args); +LispPTR CHAR_bouts(LispPTR *args); +#endif diff --git a/inc/commondefs.h b/inc/commondefs.h new file mode 100644 index 0000000..f5ae025 --- /dev/null +++ b/inc/commondefs.h @@ -0,0 +1,8 @@ +#ifndef COMMONDEFS_H +#define COMMONDEFS_H 1 +void stab(); +void warn(char *s); +int error(char *s); +int stackcheck(); +void stackoverflow(); +#endif diff --git a/inc/conspagedefs.h b/inc/conspagedefs.h new file mode 100644 index 0000000..c7b58e7 --- /dev/null +++ b/inc/conspagedefs.h @@ -0,0 +1,7 @@ +#ifndef CONSPAGEDEFS_H +#define CONSPAGEDEFS_H 1 +#include "cell.h" +struct conspage *next_conspage(void); +LispPTR N_OP_cons(register int cons_car, register int cons_cdr); +LispPTR cons(LispPTR cons_car, LispPTR cons_cdr); +#endif diff --git a/inc/dbgtooldefs.h b/inc/dbgtooldefs.h new file mode 100644 index 0000000..c8a39e6 --- /dev/null +++ b/inc/dbgtooldefs.h @@ -0,0 +1,17 @@ +#ifndef DBGTOOLDEFS_H +#define DBGTOOLDEFS_H 1 +#include "stack.h" +LispPTR get_ivar_name(struct frameex1 *fx_addr68k, DLword offset, int *localivar); +LispPTR get_pvar_name(struct frameex1 *fx_addr68k, DLword offset); +LispPTR get_fn_fvar_name(struct fnhead *fnobj, DLword offset); +LispPTR get_fvar_name(struct frameex1 *fx_addr68k, DLword offset); +void bt(void); +void bt1(FX *startFX); +void btvv(void); +int sf(struct frameex1 *fx_addr68k); +void sff(LispPTR laddr); +void nt(LispPTR index); +void nt1(LispPTR *start, int size, char *str); +void ntheader(struct fnhead *fnobj); +void nts(struct frameex1 *fxp); +#endif diff --git a/inc/dirdefs.h b/inc/dirdefs.h new file mode 100644 index 0000000..7d541ba --- /dev/null +++ b/inc/dirdefs.h @@ -0,0 +1,13 @@ +#ifndef DIRDEFS_H +#define DIRDEFS_H 1 +#ifdef DOS +int make_old_version(char *old, char *file); +#endif +#ifdef FSDEBUG +void print_finfo(FINFO *fp); +#endif +int init_finfo(); +LispPTR COM_gen_files(register LispPTR *args); +LispPTR COM_next_file(register LispPTR *args); +LispPTR COM_finish_finfo(register LispPTR *args); +#endif diff --git a/inc/drawdefs.h b/inc/drawdefs.h new file mode 100644 index 0000000..c30a344 --- /dev/null +++ b/inc/drawdefs.h @@ -0,0 +1,4 @@ +#ifndef DRAWDEFS_H +#define DRAWDEFS_H 1 +int N_OP_drawline(LispPTR ptr, int curbit, int xsize, int width, int ysize, int op, int delta, int numx, int numy); +#endif diff --git a/inc/dskdefs.h b/inc/dskdefs.h new file mode 100644 index 0000000..c3c84eb --- /dev/null +++ b/inc/dskdefs.h @@ -0,0 +1,24 @@ +#ifndef DSKDEFS_H +#define DSKDEFS_H 1 +#ifdef DOS +void separate_host(char *lfname, char *host, char *drive); +#else +void separate_host(char *lfname, char *host); +#endif +LispPTR COM_openfile(register LispPTR *args); +LispPTR COM_closefile(register LispPTR *args); +LispPTR DSK_getfilename(register LispPTR *args); +LispPTR DSK_deletefile(register LispPTR *args); +LispPTR DSK_renamefile(register LispPTR *args); +LispPTR DSK_directorynamep(register LispPTR *args); +LispPTR COM_getfileinfo(register LispPTR *args); +LispPTR COM_setfileinfo(register LispPTR *args); +LispPTR COM_readpage(register LispPTR *args); +LispPTR COM_writepage(register LispPTR *args); +LispPTR COM_truncatefile(register LispPTR *args); +LispPTR COM_changedir(register LispPTR *args); +LispPTR COM_getfreeblock(register LispPTR *args); +void separate_version(char *name, char *ver, int checkp); +int unpack_filename(char *file, char *dir, char *name, char *ver, int checkp); +int true_name(register char *path); +#endif diff --git a/inc/dspifdefs.h b/inc/dspifdefs.h new file mode 100644 index 0000000..91f171c --- /dev/null +++ b/inc/dspifdefs.h @@ -0,0 +1,8 @@ +#ifndef DSPIFDEFS_H +#define DSPIFDEFS_H 1 +#include "devif.h" +void make_dsp_instance(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint); +unsigned long GenericReturnT(void); +void GenericPanic(DspInterface dsp); +LispPTR SwitchDisplay(LispPTR display); +#endif diff --git a/inc/dspsubrsdefs.h b/inc/dspsubrsdefs.h new file mode 100644 index 0000000..0d2a357 --- /dev/null +++ b/inc/dspsubrsdefs.h @@ -0,0 +1,11 @@ +#ifndef DSPSUBRSDEFS_H +#define DSPSUBRSDEFS_H 1 +void DSP_dspbout(LispPTR *args); +void DSP_showdisplay(LispPTR *args); +LispPTR DSP_VideoColor(LispPTR *args); +void DSP_Cursor(LispPTR *args, int argnum); +void DSP_SetMousePos(register LispPTR *args); +LispPTR DSP_ScreenWidth(LispPTR *args); +LispPTR DSP_ScreenHight(LispPTR *args); +void flip_cursor(); +#endif diff --git a/inc/eqfdefs.h b/inc/eqfdefs.h new file mode 100644 index 0000000..0969b96 --- /dev/null +++ b/inc/eqfdefs.h @@ -0,0 +1,7 @@ +#ifndef EQFDEFS_H +#define EQFDEFS_H 1 +LispPTR N_OP_clequal(register int arg1, register int arg2); +LispPTR N_OP_eqlop(register int arg1, register int arg2); +LispPTR N_OP_equal(register int arg1, register int arg2); +LispPTR N_OP_eqq(register int arg1, register int arg2); +#endif diff --git a/inc/etherdefs.h b/inc/etherdefs.h new file mode 100644 index 0000000..0ceb173 --- /dev/null +++ b/inc/etherdefs.h @@ -0,0 +1,16 @@ +#ifndef ETHERDEFS_H +#define ETHERDEFS_H 1 +LispPTR ether_suspend(LispPTR args[]); +LispPTR ether_resume(LispPTR args[]); +LispPTR ether_ctrlr(LispPTR args[]); +LispPTR ether_reset(LispPTR args[]); +LispPTR get_packet(); +LispPTR ether_get(LispPTR args[]); +LispPTR ether_send(LispPTR args[]); +LispPTR ether_setfilter(LispPTR args[]); +int *ether_debug(); +LispPTR check_ether(); +void init_ifpage_ether(); +void init_ether(); +LispPTR check_sum(register LispPTR *args); +#endif diff --git a/inc/findkeydefs.h b/inc/findkeydefs.h new file mode 100644 index 0000000..d305335 --- /dev/null +++ b/inc/findkeydefs.h @@ -0,0 +1,4 @@ +#ifndef FINDKEYDEFS_H +#define FINDKEYDEFS_H 1 +LispPTR N_OP_findkey(register LispPTR tos, register int byte); +#endif diff --git a/inc/fpdefs.h b/inc/fpdefs.h new file mode 100644 index 0000000..bbd172f --- /dev/null +++ b/inc/fpdefs.h @@ -0,0 +1,8 @@ +#ifndef FPDEFS_H +#define FPDEFS_H 1 +LispPTR N_OP_fplus2(LispPTR parg1, LispPTR parg2); +LispPTR N_OP_fdifference(LispPTR parg1, LispPTR parg2); +LispPTR N_OP_ftimes2(LispPTR parg1, LispPTR parg2); +LispPTR N_OP_fquotient(LispPTR parg1, LispPTR parg2); +LispPTR N_OP_fgreaterp(LispPTR parg1, LispPTR parg2); +#endif diff --git a/inc/fvardefs.h b/inc/fvardefs.h new file mode 100644 index 0000000..c949747 --- /dev/null +++ b/inc/fvardefs.h @@ -0,0 +1,9 @@ +#ifndef FVARDEFS_H +#define FVARDEFS_H 1 +LispPTR N_OP_fvarn(register int n); +LispPTR N_OP_stkscan(LispPTR tos); +LispPTR N_OP_fvar_(register LispPTR tos, register int n); +void nnewframe(register struct frameex1 *newpfra2, register DLword *achain, register int name); +void nfvlookup(struct frameex1 *apframe1, register DLword *achain, register struct fnhead *apfnhead1); +LispPTR native_newframe(int slot); +#endif diff --git a/inc/gc2defs.h b/inc/gc2defs.h new file mode 100644 index 0000000..4c220f3 --- /dev/null +++ b/inc/gc2defs.h @@ -0,0 +1,5 @@ +#ifndef GC2DEFS_H +#define GC2DEFS_H 1 +void OP_gcscan1(void); +void OP_gcscan2(void); +#endif diff --git a/inc/gcarraydefs.h b/inc/gcarraydefs.h new file mode 100644 index 0000000..46f616e --- /dev/null +++ b/inc/gcarraydefs.h @@ -0,0 +1,7 @@ +#ifndef GCARRAYDEFS_H +#define GCARRAYDEFS_H 1 +LispPTR aref1(LispPTR array, int index); +LispPTR find_symbol(char *char_base, DLword offset, DLword length, LispPTR hashtbl, DLword fatp, DLword lispp); +LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword packlen, int externalp); +LispPTR with_symbol(LispPTR char_base, LispPTR offset, LispPTR charlen, LispPTR fatp, LispPTR hashtbl, LispPTR result); +#endif diff --git a/inc/gccodedefs.h b/inc/gccodedefs.h new file mode 100644 index 0000000..c26d6d7 --- /dev/null +++ b/inc/gccodedefs.h @@ -0,0 +1,7 @@ +#ifndef GCCODEDEFS_H +#define GCCODEDEFS_H 1 +LispPTR map_code_pointers(LispPTR codeblock, short int casep); +LispPTR remimplicitkeyhash(LispPTR item, LispPTR ik_hash_table); +LispPTR reclaimcodeblock(LispPTR codebase); +int code_block_size(long unsigned int codeblock68k); +#endif diff --git a/inc/gcdefs.h b/inc/gcdefs.h new file mode 100644 index 0000000..8ebaabd --- /dev/null +++ b/inc/gcdefs.h @@ -0,0 +1,4 @@ +#ifndef GCDEFS_H +#define GCDEFS_H 1 +void OP_gcref(void); +#endif diff --git a/inc/gcfinaldefs.h b/inc/gcfinaldefs.h new file mode 100644 index 0000000..20dea3b --- /dev/null +++ b/inc/gcfinaldefs.h @@ -0,0 +1,18 @@ +#ifndef GCFINALDEFS_H +#define GCFINALDEFS_H 1 +void printarrayblock(LispPTR base); +int integerlength(unsigned int n); +LispPTR findptrsbuffer(LispPTR ptr); +LispPTR releasingvmempage(LispPTR ptr); +LispPTR checkarrayblock(LispPTR base, LispPTR free, LispPTR onfreelist); +LispPTR deleteblock(LispPTR base); +LispPTR linkblock(LispPTR base); +LispPTR makefreearrayblock(LispPTR block, DLword length); +LispPTR arrayblockmerger(LispPTR base, LispPTR nbase); +LispPTR mergebackward(LispPTR base); +LispPTR mergeforward(LispPTR base); +LispPTR reclaimarrayblock(LispPTR ptr); +LispPTR reclaimstackp(LispPTR ptr); +#endif + + diff --git a/inc/gchtfinddefs.h b/inc/gchtfinddefs.h new file mode 100644 index 0000000..655c065 --- /dev/null +++ b/inc/gchtfinddefs.h @@ -0,0 +1,6 @@ +#ifndef GCHTFINDDEFS_H +#define GCHTFINDDEFS_H 1 +void enter_big_reference_count(LispPTR ptr); +void modify_big_reference_count(LispPTR *entry, DLword casep, LispPTR ptr); +LispPTR htfind(LispPTR ptr, int casep); +#endif diff --git a/inc/gcmain3defs.h b/inc/gcmain3defs.h new file mode 100644 index 0000000..66495c1 --- /dev/null +++ b/inc/gcmain3defs.h @@ -0,0 +1,7 @@ +#ifndef GCMAIN3DEFS_H +#define GCMAIN3DEFS_H 1 +LispPTR gcmapscan(); +LispPTR gcmapscan(void); +LispPTR gcmapunscan(void); +LispPTR gcscanstack(void); +#endif diff --git a/inc/gcoflowdefs.h b/inc/gcoflowdefs.h new file mode 100644 index 0000000..0026ead --- /dev/null +++ b/inc/gcoflowdefs.h @@ -0,0 +1,5 @@ +#ifndef GCOFLOWDEFS_H +#define GCOFLOWDEFS_H 1 +DLword gc_handleoverflow(DLword arg); +DLword gcmaptable(DLword arg); +#endif diff --git a/inc/gcrcelldefs.h b/inc/gcrcelldefs.h new file mode 100644 index 0000000..ee3a174 --- /dev/null +++ b/inc/gcrcelldefs.h @@ -0,0 +1,6 @@ +#ifndef GCRCELLDEFS_H +#define GCRCELLDEFS_H 1 +void freelistcell(LispPTR cell); +LispPTR gcreccell(LispPTR cell); +void freelistcell(LispPTR cell); +#endif diff --git a/inc/gcrdefs.h b/inc/gcrdefs.h new file mode 100644 index 0000000..8b6a014 --- /dev/null +++ b/inc/gcrdefs.h @@ -0,0 +1,7 @@ +#ifndef GCRDEFS_H +#define GCRDEFS_H 1 +void gcarrangementstack(void); +void dogc01(void); +void doreclaim(void); +void disablegc1(int noerror); +#endif diff --git a/inc/gcscandefs.h b/inc/gcscandefs.h new file mode 100644 index 0000000..d354c29 --- /dev/null +++ b/inc/gcscandefs.h @@ -0,0 +1,5 @@ +#ifndef GCSCANDEFS_H +#define GCSCANDEFS_H 1 +DLword gcscan1(register int probe); +DLword gcscan2(register int probe); +#endif diff --git a/inc/gvar2defs.h b/inc/gvar2defs.h new file mode 100644 index 0000000..5fcada8 --- /dev/null +++ b/inc/gvar2defs.h @@ -0,0 +1,5 @@ +#ifndef GVAR2DEFS_H +#define GVAR2DEFS_H 1 +LispPTR N_OP_gvar_(register LispPTR tos, unsigned int atom_index); +LispPTR N_OP_rplptr(register LispPTR tos_m_1, register LispPTR tos, unsigned int alpha); +#endif diff --git a/inc/hacksdefs.h b/inc/hacksdefs.h new file mode 100644 index 0000000..d67c991 --- /dev/null +++ b/inc/hacksdefs.h @@ -0,0 +1,7 @@ +#ifndef HACKSDEFS_H +#define HACKSDEFS_H 1 +int pickapart1(int i1, int i2, int i3, int i4); +int pickapart2(int i1, int i2, int i3, int i4); +int pickapart3(int i1, int i2, int i3, int i4); +int pickapart4(int i1, int i2, int i3, int i4); +#endif diff --git a/inc/hardrtndefs.h b/inc/hardrtndefs.h new file mode 100644 index 0000000..2fa3202 --- /dev/null +++ b/inc/hardrtndefs.h @@ -0,0 +1,5 @@ +#ifndef HARDRTNDEFS_H +#define HARDRTNDEFS_H 1 +int slowreturn(void); +void incusecount68k(FX *fx68k); +#endif diff --git a/inc/inetdefs.h b/inc/inetdefs.h new file mode 100644 index 0000000..c0fcecd --- /dev/null +++ b/inc/inetdefs.h @@ -0,0 +1,4 @@ +#ifndef INETDEFS_H +#define INETDEFS_H 1 +LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, LispPTR bufaddr, LispPTR maxlen); +#endif diff --git a/inc/initdspdefs.h b/inc/initdspdefs.h new file mode 100644 index 0000000..f5caa2b --- /dev/null +++ b/inc/initdspdefs.h @@ -0,0 +1,13 @@ +#ifndef INITDSPDEFS_H +#define INITDSPDEFS_H 1 +void init_cursor(); +void set_cursor(); +void clear_display(); +void init_display2(DLword *display_addr, int display_max); +void display_before_exit(); +void flush_display_buffer(); +void flush_display_region(int x, int y, int w, int h); +void byte_swapped_displayregion(int x, int y, int w, int h); +void flush_display_lineregion(UNSIGNED x, DLword *ybase, UNSIGNED w, UNSIGNED h); +void flush_display_ptrregion(DLword *ybase, UNSIGNED bitoffset, UNSIGNED w, UNSIGNED h); +#endif diff --git a/inc/initkbddefs.h b/inc/initkbddefs.h new file mode 100644 index 0000000..8859886 --- /dev/null +++ b/inc/initkbddefs.h @@ -0,0 +1,9 @@ +#ifndef INITKBDDEFS_H +#define INITKBDDEFS_H 1 +void set_kbd_iopointers(); +void keyboardtype(int fd); +void init_keyboard(int flg); +void device_before_exit(); +void set_kbd_iopointers(); +void keyboardtype(int fd); +#endif diff --git a/inc/initsoutdefs.h b/inc/initsoutdefs.h new file mode 100644 index 0000000..8dc45ee --- /dev/null +++ b/inc/initsoutdefs.h @@ -0,0 +1,10 @@ +#ifndef INITSOUTDEFS_H +#define INITSOUTDEFS_H 1 +LispPTR *fixp_value(LispPTR *ptr); +void init_ifpage(int sysout_size); +void init_iopage(void); +void build_lisp_map(void); +void init_for_keyhandle(void); +void init_for_bltchar(void); +void init_for_bitblt(void); +#endif diff --git a/inc/inlineC.h b/inc/inlineC.h index 839dffb..9319e5b 100755 --- a/inc/inlineC.h +++ b/inc/inlineC.h @@ -585,7 +585,6 @@ LispPTR arrayarg; \ register LispPTR baseL; \ register int index; \ register OneDArray *arrayblk; \ -DLword *createcell68k(); \ SV; arrayarg = POP_TOS_1; \ if (GetTypeNumber(arrayarg) != TYPE_ONED_ARRAY) goto aref_ufn; \ arrayblk = (OneDArray *)Addr68k_from_LADDR(arrayarg); \ diff --git a/inc/intcalldefs.h b/inc/intcalldefs.h new file mode 100644 index 0000000..65e5064 --- /dev/null +++ b/inc/intcalldefs.h @@ -0,0 +1,4 @@ +#ifndef INTCALLDEFS_H +#define INTCALLDEFS_H 1 +void cause_interruptcall(register unsigned int atom_index); +#endif diff --git a/inc/kbdsubrsdefs.h b/inc/kbdsubrsdefs.h new file mode 100644 index 0000000..6f28624 --- /dev/null +++ b/inc/kbdsubrsdefs.h @@ -0,0 +1,7 @@ +#ifndef KBDSUBRSDEFS_H +#define KBDSUBRSDEFS_H 1 +void KB_enable(LispPTR *args); +void KB_beep(LispPTR *args); +void KB_setmp(LispPTR *args); +void KB_setled(LispPTR *args); +#endif diff --git a/inc/keyeventdefs.h b/inc/keyeventdefs.h new file mode 100644 index 0000000..5d1a86e --- /dev/null +++ b/inc/keyeventdefs.h @@ -0,0 +1,8 @@ +#ifndef KEYEVENTDEFS_H +#define KEYEVENTDEFS_H 1 +void getsignaldata(int sig, int code, void *scp); +void kb_trans(u_short keycode, u_short upflg); +void taking_mouse_down(); +void copy_cursor(int newx, int newy); +void cursor_hidden_bitmap(int x, int y); +#endif diff --git a/inc/keylibdefs.h b/inc/keylibdefs.h new file mode 100644 index 0000000..aa09a2f --- /dev/null +++ b/inc/keylibdefs.h @@ -0,0 +1,12 @@ +#ifndef KEYLIBDEFS_H +#define KEYLIBDEFS_H 1 +unsigned long make_verification(unsigned long x, unsigned long y); +unsigned long date_integer16(const char *date); +unsigned long idate(const char *str); +unsigned long modify(unsigned long hostid); +int imod64bit(unsigned long x1, unsigned long x0, unsigned long y); +unsigned long make_verification(long unsigned int x, long unsigned int y); +unsigned long date_integer16(const char *date); +unsigned long idate(const char *str); +unsigned long modify(unsigned long hostid); +#endif diff --git a/inc/kprintdefs.h b/inc/kprintdefs.h new file mode 100644 index 0000000..7916584 --- /dev/null +++ b/inc/kprintdefs.h @@ -0,0 +1,9 @@ +#ifndef KPRINTDEFS_H +#define KPRINTDEFS_H 1 +void prindatum(LispPTR x); +LispPTR print(LispPTR x); +void print_NEWstring(LispPTR x); +void print_fixp(LispPTR x); +void print_floatp(LispPTR x); +void print_string(LispPTR x); +#endif diff --git a/inc/ldsoutdefs.h b/inc/ldsoutdefs.h new file mode 100644 index 0000000..e97fbba --- /dev/null +++ b/inc/ldsoutdefs.h @@ -0,0 +1,4 @@ +#ifndef LDSOUTDEFS_H +#define LDSOUTDEFS_H 1 +int sysout_loader(char * sysout_file_name, int sys_size); +#endif diff --git a/inc/lineblt8defs.h b/inc/lineblt8defs.h new file mode 100644 index 0000000..feb801b --- /dev/null +++ b/inc/lineblt8defs.h @@ -0,0 +1,5 @@ +#ifndef LINEBLT8DEFS_H +#define LINEBLT8DEFS_H 1 +void lineBlt8(DLword *srcbase, register int offset, register u_char *destl, register int width, + u_char color0, u_char color1, LispPTR sourcetype, LispPTR operation); +#endif diff --git a/inc/lisp2cdefs.h b/inc/lisp2cdefs.h new file mode 100644 index 0000000..06eb075 --- /dev/null +++ b/inc/lisp2cdefs.h @@ -0,0 +1,8 @@ +#ifndef LISP2CDEFS_H +#define LISP2CDEFS_H 1 +int LispStringP(LispPTR object); +int LispStringLength(LispPTR lispstring); +void LispStringToCStr(LispPTR lispstring, char *cstring); +int LispIntToCInt(LispPTR lispint); +LispPTR CIntToLispInt(int cint); +#endif diff --git a/inc/lispemul.h b/inc/lispemul.h index 0d0017e..6b593fd 100755 --- a/inc/lispemul.h +++ b/inc/lispemul.h @@ -463,14 +463,9 @@ DOSTACKOVERFLOW(argnum,bytenum) if it needs hardreturn-cleanup /* bytes--but the default fn decl is int, a 4-byte return. */ /* */ /************************************************************************/ +/* All external functions defined in xxx.c now declared in xxxdefs.h */ #include -extern DLword *createcell68k(unsigned int type); -extern LispPTR *alloc_mdspage(register short int type); -extern UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep); -extern int error(char *); - - /************************************************************************/ /* */ diff --git a/inc/llcolordefs.h b/inc/llcolordefs.h new file mode 100644 index 0000000..123f804 --- /dev/null +++ b/inc/llcolordefs.h @@ -0,0 +1,6 @@ +#ifndef LLCOLORDEFS_H +#define LLCOLORDEFS_H 1 +LispPTR cgfour_init_color_display(LispPTR color_bitmapbase); +LispPTR cgfour_change_screen_mode(LispPTR which_screen); +LispPTR cgfour_set_colormap(LispPTR args[]); +#endif diff --git a/inc/llstkdefs.h b/inc/llstkdefs.h new file mode 100644 index 0000000..1f9abd7 --- /dev/null +++ b/inc/llstkdefs.h @@ -0,0 +1,15 @@ +#ifndef LLSTKDEFS_H +#define LLSTKDEFS_H 1 +#include "stack.h" +int do_stackoverflow(int incallp); +DLword *freestackblock(DLword n, StackWord *start68k, int align); +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); +#endif diff --git a/inc/lnk-inlineC.h b/inc/lnk-inlineC.h index dff6f93..d8f9b20 100755 --- a/inc/lnk-inlineC.h +++ b/inc/lnk-inlineC.h @@ -577,7 +577,6 @@ LispPTR arrayarg; \ register LispPTR baseL; \ register int index; \ register OneDArray *arrayblk; \ -DLword *createcell68k(); \ SV; arrayarg = POP_TOS_1; \ if (GetTypeNumber(arrayarg) != TYPE_ONED_ARRAY) goto aref_ufn; \ arrayblk = (OneDArray *)Addr68k_from_LADDR(arrayarg); \ diff --git a/inc/loopsopsdefs.h b/inc/loopsopsdefs.h new file mode 100644 index 0000000..ee5c2e7 --- /dev/null +++ b/inc/loopsopsdefs.h @@ -0,0 +1,11 @@ +#ifndef LOOPSOPSDEFS_H +#define LOOPSOPSDEFS_H 1 +LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum); +LispPTR LCinit(void); +LispPTR LCFetchMethod(register LispPTR class, register LispPTR selector); +LispPTR LCFetchMethodOrHelp(register LispPTR object, register LispPTR selector); +LispPTR LCFindVarIndex(register LispPTR iv, register LispPTR object); +LispPTR LCGetIVValue(register LispPTR object, register LispPTR iv); +LispPTR LCPutIVValue(register LispPTR object, register LispPTR iv, register LispPTR val); +LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum); +#endif diff --git a/inc/lowlev1defs.h b/inc/lowlev1defs.h new file mode 100644 index 0000000..9ef8bb2 --- /dev/null +++ b/inc/lowlev1defs.h @@ -0,0 +1,7 @@ +#ifndef LOWLEV1DEFS_H +#define LOWLEV1DEFS_H 1 +LispPTR N_OP_putbitsnfd(register LispPTR base, register LispPTR data, int word_offset, register int beta); +LispPTR N_OP_getbitsnfd(int base_addr, register int word_offset, int beta); +LispPTR N_OP_putbasen(register LispPTR base, register LispPTR tos, int n); +LispPTR N_OP_putbaseptrn(register LispPTR base, register LispPTR tos, int n); +#endif diff --git a/inc/lowlev2defs.h b/inc/lowlev2defs.h new file mode 100644 index 0000000..80009da --- /dev/null +++ b/inc/lowlev2defs.h @@ -0,0 +1,6 @@ +#ifndef LOWLEV2DEFS_H +#define LOWLEV2DEFS_H 1 +LispPTR N_OP_addbase(register int base, register int offset); +LispPTR N_OP_getbasebyte(register LispPTR base_addr, register int byteoffset); +LispPTR N_OP_putbasebyte(register LispPTR base_addr, register int byteoffset, register int tos); +#endif diff --git a/inc/lsthandldefs.h b/inc/lsthandldefs.h new file mode 100644 index 0000000..b8beb02 --- /dev/null +++ b/inc/lsthandldefs.h @@ -0,0 +1,6 @@ +#ifndef LSTHANDLDEFS_H +#define LSTHANDLDEFS_H 1 +LispPTR N_OP_fmemb(register LispPTR item, register LispPTR tos); +LispPTR fmemb(register LispPTR item, register LispPTR list); +LispPTR N_OP_listget(register LispPTR plist, register LispPTR tos); +#endif diff --git a/inc/maindefs.h b/inc/maindefs.h new file mode 100644 index 0000000..7a44a03 --- /dev/null +++ b/inc/maindefs.h @@ -0,0 +1,6 @@ +#ifndef MAINDEFS_H +#define MAINDEFS_H 1 +int makepathname(char *src, char *dst); +void start_lisp(); +void print_info_lines(); +#endif diff --git a/inc/misc7defs.h b/inc/misc7defs.h new file mode 100644 index 0000000..3cbdfa3 --- /dev/null +++ b/inc/misc7defs.h @@ -0,0 +1,4 @@ +#ifndef MISC7DEFS_H +#define MISC7DEFS_H 1 +LispPTR N_OP_misc7(LispPTR arg1, LispPTR arg2, LispPTR arg3, LispPTR arg4, LispPTR arg5, LispPTR arg6, LispPTR arg7, int alpha); +#endif diff --git a/inc/miscndefs.h b/inc/miscndefs.h new file mode 100644 index 0000000..a2c72cf --- /dev/null +++ b/inc/miscndefs.h @@ -0,0 +1,4 @@ +#ifndef MISCNDEFS_H +#define MISCNDEFS_H 1 +int OP_miscn(int misc_index, int arg_count); +#endif diff --git a/inc/mkatomdefs.h b/inc/mkatomdefs.h new file mode 100644 index 0000000..e57ffe6 --- /dev/null +++ b/inc/mkatomdefs.h @@ -0,0 +1,11 @@ +#ifndef MKATOMDEFS_H +#define MKATOMDEFS_H 1 +DLword compute_hash(char *char_base, DLword offset, DLword length); +DLword compute_lisp_hash(char *char_base, DLword offset, DLword length, DLword fatp); +LispPTR compare_chars(register char *char1, register char *char2, register DLword length); +int bytecmp(char *char1, char *char2, int len); +LispPTR compare_lisp_chars(register char *char1, register char *char2, register DLword length, DLword fat1, DLword fat2); +int lispcmp(DLword *char1, unsigned char *char2, int len); +LispPTR make_atom(char *char_base, DLword offset, DLword length, short int non_numericp); +LispPTR parse_number(char *char_base, short int length); +#endif diff --git a/inc/mkcelldefs.h b/inc/mkcelldefs.h new file mode 100644 index 0000000..256f3f9 --- /dev/null +++ b/inc/mkcelldefs.h @@ -0,0 +1,6 @@ +#ifndef MKCELLDEFS_H +#define MKCELLDEFS_H 1 +LispPTR N_OP_createcell(register LispPTR tos); +DLword *createcell68k(unsigned int type); +LispPTR Create_n_Set_Cell(unsigned int type, LispPTR value); +#endif diff --git a/inc/mvsdefs.h b/inc/mvsdefs.h new file mode 100644 index 0000000..1e5c116 --- /dev/null +++ b/inc/mvsdefs.h @@ -0,0 +1,8 @@ +#ifndef MVSDEFS_H +#define MVSDEFS_H 1 +#include "stack.h" +LispPTR make_value_list(int argcount, LispPTR *argarray); +void simulate_unbind(FX2 *frame, int unbind_count, FX2 *returner); +LispPTR values(int arg_count, register LispPTR *args); +LispPTR values_list(int arg_count, register LispPTR *args); +#endif diff --git a/inc/osmsgdefs.h b/inc/osmsgdefs.h new file mode 100644 index 0000000..6801a29 --- /dev/null +++ b/inc/osmsgdefs.h @@ -0,0 +1,8 @@ +#ifndef OSMSGDEFS_H +#define OSMSGDEFS_H 1 +void mess_init(); +void mess_reset(); +LispPTR mess_read(LispPTR *args); +LispPTR mess_readp(); +LispPTR flush_pty(); +#endif diff --git a/inc/perrnodefs.h b/inc/perrnodefs.h new file mode 100644 index 0000000..6c66450 --- /dev/null +++ b/inc/perrnodefs.h @@ -0,0 +1,5 @@ +#ifndef PERRNODEFS_H +#define PERRNODEFS_H 1 +void perrorn(char *s, int n); +void err_mess(char *from, int no); +#endif diff --git a/inc/returndefs.h b/inc/returndefs.h new file mode 100644 index 0000000..59f61d6 --- /dev/null +++ b/inc/returndefs.h @@ -0,0 +1,5 @@ +#ifndef RETURNDEFS_H +#define RETURNDEFS_H 1 +void OP_contextsw(void); +void contextsw(register DLword fxnum, register DLword bytenum, register DLword flags); +#endif diff --git a/inc/rpcdefs.h b/inc/rpcdefs.h new file mode 100644 index 0000000..338966e --- /dev/null +++ b/inc/rpcdefs.h @@ -0,0 +1,4 @@ +#ifndef RPCDEFS_H +#define RPCDEFS_H 1 +LispPTR rpc(LispPTR *args); +#endif diff --git a/inc/rplconsdefs.h b/inc/rplconsdefs.h new file mode 100644 index 0000000..1e27919 --- /dev/null +++ b/inc/rplconsdefs.h @@ -0,0 +1,4 @@ +#ifndef RPLCONSDEFS_H +#define RPLCONSDEFS_H 1 +LispPTR N_OP_rplcons(register LispPTR list, register LispPTR item); +#endif diff --git a/inc/shiftdefs.h b/inc/shiftdefs.h new file mode 100644 index 0000000..5319f5b --- /dev/null +++ b/inc/shiftdefs.h @@ -0,0 +1,8 @@ +#ifndef SHIFTDEFS_H +#define SHIFTDEFS_H 1 +LispPTR N_OP_llsh1(int a); +LispPTR N_OP_llsh8(int a); +LispPTR N_OP_lrsh1(int a); +LispPTR N_OP_lrsh8(int a); +LispPTR N_OP_lsh(int a, int b); +#endif diff --git a/inc/storagedefs.h b/inc/storagedefs.h new file mode 100644 index 0000000..85e3120 --- /dev/null +++ b/inc/storagedefs.h @@ -0,0 +1,7 @@ +#ifndef STORAGEDEFS_H +#define STORAGEDEFS_H 1 +void checkfor_storagefull(register unsigned int npages); +LispPTR dremove(LispPTR x, LispPTR l); +LispPTR newpage(LispPTR base); +void init_storage(void); +#endif diff --git a/inc/subr0374defs.h b/inc/subr0374defs.h new file mode 100644 index 0000000..bfed141 --- /dev/null +++ b/inc/subr0374defs.h @@ -0,0 +1,4 @@ +#ifndef SUBR0374DEFS_H +#define SUBR0374DEFS_H 1 +LispPTR subr_k_trace(LispPTR *args); +#endif diff --git a/inc/subrdefs.h b/inc/subrdefs.h new file mode 100644 index 0000000..ace9a20 --- /dev/null +++ b/inc/subrdefs.h @@ -0,0 +1,5 @@ +#ifndef SUBRDEFS_H +#define SUBRDEFS_H 1 +char *atom_to_str(LispPTR atom_index); +void OP_subrcall(int subr_no, int argnum); +#endif diff --git a/inc/sxhashdefs.h b/inc/sxhashdefs.h new file mode 100644 index 0000000..4cf5b77 --- /dev/null +++ b/inc/sxhashdefs.h @@ -0,0 +1,7 @@ +#ifndef SXHASHDEFS_H +#define SXHASHDEFS_H 1 +typedef struct { LispPTR object; } SXHASHARG; +LispPTR SX_hash(register SXHASHARG *args); +LispPTR STRING_EQUAL_HASHBITS(SXHASHARG *args); +LispPTR STRING_HASHBITS(SXHASHARG *args); +#endif diff --git a/inc/testtooldefs.h b/inc/testtooldefs.h new file mode 100644 index 0000000..bb48af2 --- /dev/null +++ b/inc/testtooldefs.h @@ -0,0 +1,39 @@ +#ifndef TESTTOOLDEFS_H +#define TESTTOOLDEFS_H 1 +#include "stack.h" +#include "cell.h" +void print_package_name(int index); +void print_atomname(LispPTR index); +int find_package_from_name(char *packname, int len); +void print_package_name(int index); +void dump_dtd(void); +void check_type_68k(int type, LispPTR *ptr); +int type_num(LispPTR lispptr); +void dump_conspage(struct conspage *base, int linking); +void trace_listpDTD(void); +void a68k(LispPTR lispptr); +void laddr(DLword *addr68k); +void dump_fnbody(LispPTR fnblockaddr); +void dump_fnobj(LispPTR index); +int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj); +void doko(void); +void dumpl(LispPTR laddr); +void dumps(LispPTR laddr); +void printPC(void); +int countchar(char *string); +void dump_bf(Bframe *bf); +void dump_fx(struct frameex1 *fx_addr68k); +void dump_stackframe(struct frameex1 *fx_addr68k); +void dump_CSTK(int before); +void btv(void); +int get_framename(struct frameex1 *fx_addr68k); +FX *get_nextFX(FX *fx); +int MAKEATOM(char *string); +LispPTR *MakeAtom68k(char *string); +void GETTOPVAL(char *string); +void S_TOPVAL(char *string); +void all_stack_dump(DLword start, DLword end, DLword silent); +void dtd_chain(DLword type); +void Trace_FNCall(int numargs, int atomindex, int arg1, LispPTR *tos); +void Trace_APPLY(int atomindex); +#endif diff --git a/inc/timerdefs.h b/inc/timerdefs.h new file mode 100644 index 0000000..2cb22ae --- /dev/null +++ b/inc/timerdefs.h @@ -0,0 +1,18 @@ +#ifndef TIMERDEFS_H +#define TIMERDEFS_H 1 +void update_miscstats(); +void init_miscstats(); +LispPTR subr_gettime(LispPTR args[]); +void subr_settime(LispPTR args[]); +void subr_copytimestats(LispPTR args[]); +LispPTR N_OP_rclk(LispPTR tos); +void update_timer(); +void int_io_open(int fd); +void int_io_close(int fd); +void int_block(); +void int_unblock(); +void int_timer_off(); +void int_timer_on(); +void panicuraid(int sig, int code, void *scp, void *addr); +void int_init(); +#endif diff --git a/inc/typeofdefs.h b/inc/typeofdefs.h new file mode 100644 index 0000000..23296bf --- /dev/null +++ b/inc/typeofdefs.h @@ -0,0 +1,5 @@ +#ifndef TYPEOFDEFS_H +#define TYPEOFDEFS_H 1 +LispPTR N_OP_dtest(register LispPTR tos, register int atom_index); +LispPTR N_OP_instancep(register LispPTR tos, register int atom_index); +#endif diff --git a/inc/ubf1defs.h b/inc/ubf1defs.h new file mode 100644 index 0000000..8666de8 --- /dev/null +++ b/inc/ubf1defs.h @@ -0,0 +1,4 @@ +#ifndef UBF1DEFS_H +#define UBF1DEFS_H 1 +LispPTR N_OP_ubfloat1(int arg, int alpha); +#endif diff --git a/inc/ubf2defs.h b/inc/ubf2defs.h new file mode 100644 index 0000000..cd55ca7 --- /dev/null +++ b/inc/ubf2defs.h @@ -0,0 +1,4 @@ +#ifndef UBF2DEFS_H +#define UBF2DEFS_H 1 +LispPTR N_OP_ubfloat2(int a2, int a1, int alpha); +#endif diff --git a/inc/ubf3defs.h b/inc/ubf3defs.h new file mode 100644 index 0000000..4690197 --- /dev/null +++ b/inc/ubf3defs.h @@ -0,0 +1,4 @@ +#ifndef UBF3DEFS_H +#define UBF3DEFS_H 1 +LispPTR N_OP_ubfloat3(int arg3, LispPTR arg2, LispPTR arg1, int alpha); +#endif diff --git a/inc/ufsdefs.h b/inc/ufsdefs.h new file mode 100644 index 0000000..85d6363 --- /dev/null +++ b/inc/ufsdefs.h @@ -0,0 +1,16 @@ +#ifndef UFSDEFS_H +#define UFSDEFS_H 1 +LispPTR UFS_getfilename(LispPTR *args); +LispPTR UFS_deletefile(LispPTR *args); +LispPTR UFS_renamefile(LispPTR *args); +LispPTR UFS_directorynamep(LispPTR *args); +#ifdef DOS +int unixpathname(char *src, char *dst, int versionp, int genp, char *drive, int *extlenptr, char *rawname); +#else +int unixpathname(char *src, char *dst, int versionp, int genp); +#endif +int lisppathname(char *fullname, char *lispname, int dirp, int versionp); +int quote_fname(char *file); +int quote_fname_ufs(char *file); +int quote_dname(char *dir); +#endif diff --git a/inc/unixcommdefs.h b/inc/unixcommdefs.h new file mode 100644 index 0000000..f83ae21 --- /dev/null +++ b/inc/unixcommdefs.h @@ -0,0 +1,12 @@ +#ifndef UNIXCOMMDEFS_H +#define UNIXCOMMDEFS_H 1 +int find_process_slot(register int pid); +void wait_for_comm_processes(void); +char *build_socket_pathname(int desc); +void close_unix_descriptors(void); +int FindUnixPipes(void); +int FindAvailablePty(char *Master, char *Slave); +void WriteLispStringToPipe(LispPTR lispstr); +LispPTR Unix_handlecomm(LispPTR *args); +void WriteLispStringToPipe(LispPTR lispstr); +#endif diff --git a/inc/unwinddefs.h b/inc/unwinddefs.h new file mode 100644 index 0000000..07789aa --- /dev/null +++ b/inc/unwinddefs.h @@ -0,0 +1,4 @@ +#ifndef UNWINDDEFS_H +#define UNWINDDEFS_H 1 +UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep); +#endif diff --git a/inc/uraiddefs.h b/inc/uraiddefs.h new file mode 100644 index 0000000..9a5879c --- /dev/null +++ b/inc/uraiddefs.h @@ -0,0 +1,9 @@ +#ifndef URAIDDEFS_H +#define URAIDDEFS_H 1 +LispPTR parse_atomstring(char *string); +void uraid_commclear(); +void copy_region(DLword *src, DLword *dst, int width, int h); +LispPTR uraid_commands(); +int device_before_raid(); +int device_after_raid(); +#endif diff --git a/inc/usrsubrdefs.h b/inc/usrsubrdefs.h new file mode 100644 index 0000000..b439bc3 --- /dev/null +++ b/inc/usrsubrdefs.h @@ -0,0 +1,4 @@ +#ifndef USRSUBRDEFS_H +#define USRSUBRDEFS_H 1 +int UserSubr(int user_subr_index, int num_args, unsigned *args); +#endif diff --git a/inc/uutilsdefs.h b/inc/uutilsdefs.h new file mode 100644 index 0000000..2100328 --- /dev/null +++ b/inc/uutilsdefs.h @@ -0,0 +1,11 @@ +#ifndef UUTILSDEFS_H +#define UUTILSDEFS_H 1 +int lisp_string_to_c_string(LispPTR Lisp, char *C, int length); +int c_string_to_lisp_string(char *C, LispPTR Lisp); +LispPTR check_unix_password(LispPTR *args); +LispPTR unix_username(LispPTR *args); +LispPTR unix_getparm(LispPTR *args); +LispPTR unix_getenv(LispPTR *args); +LispPTR unix_fullname(LispPTR *args); +LispPTR suspend_lisp(LispPTR *args); +#endif diff --git a/inc/vars3defs.h b/inc/vars3defs.h new file mode 100644 index 0000000..c370c5b --- /dev/null +++ b/inc/vars3defs.h @@ -0,0 +1,6 @@ +#ifndef VARS3DEFS_H +#define VARS3DEFS_H 1 +struct cadr_cell cadr(LispPTR cell_adr); +LispPTR N_OP_arg0(register LispPTR tos); +LispPTR N_OP_assoc(register LispPTR key, register LispPTR list); +#endif diff --git a/inc/vmemsavedefs.h b/inc/vmemsavedefs.h new file mode 100644 index 0000000..fc8106c --- /dev/null +++ b/inc/vmemsavedefs.h @@ -0,0 +1,9 @@ +#ifndef VMEMSAVEDEFS_H +#define VMEMSAVEDEFS_H 1 +int lispstringP(LispPTR Lisp); +LispPTR vmem_save(char *sysout_file_name); +LispPTR vmem_save0(LispPTR *args); +int twowords(const void *i, const void *j); +void sort_fptovp(DLword *fptovp, int size); +void lisp_finish(); +#endif diff --git a/inc/xbbtdefs.h b/inc/xbbtdefs.h new file mode 100644 index 0000000..ffb2929 --- /dev/null +++ b/inc/xbbtdefs.h @@ -0,0 +1,4 @@ +#ifndef XBBTDEFS_H +#define XBBTDEFS_H 1 +unsigned long clipping_Xbitblt(DspInterface dsp, int dummy, int x, int y, int w, int h); +#endif diff --git a/inc/xcdefs.h b/inc/xcdefs.h new file mode 100644 index 0000000..e6636de --- /dev/null +++ b/inc/xcdefs.h @@ -0,0 +1,6 @@ +#ifndef XCDEFS_H +#define XCDEFS_H 1 +void dispatch(void); +int retfun(void); +void do_brk(void); +#endif diff --git a/inc/xcursordefs.h b/inc/xcursordefs.h new file mode 100644 index 0000000..01db230 --- /dev/null +++ b/inc/xcursordefs.h @@ -0,0 +1,9 @@ +#ifndef XCURSORDEFS_H +#define XCURSORDEFS_H 1 +#include +#include "devif.h" +void Init_XCursor(); +void Set_XCursor(int x, int y); +void init_Xcursor(Display *display, int window); +void set_Xcursor(DspInterface dsp, unsigned char *bitmap, int hotspot_x, int hotspot_y, Cursor *return_cursor, int from_lisp); +#endif diff --git a/inc/xinitdefs.h b/inc/xinitdefs.h new file mode 100644 index 0000000..1cf7a04 --- /dev/null +++ b/inc/xinitdefs.h @@ -0,0 +1,9 @@ +#ifndef XINITDEFS_H +#define XINITDEFS_H 1 +void init_Xevent(DspInterface dsp); +void lisp_Xexit(DspInterface dsp); +void Xevent_before_raid(DspInterface dsp); +void Xevent_after_raid(DspInterface dsp); +void Open_Display(DspInterface dsp); +DspInterface X_init(DspInterface dsp, char *lispbitmap, int width_hint, int height_hint, int depth_hint); +#endif diff --git a/inc/xlspwindefs.h b/inc/xlspwindefs.h new file mode 100644 index 0000000..1836c1a --- /dev/null +++ b/inc/xlspwindefs.h @@ -0,0 +1,8 @@ +#ifndef XLSPWINDEFS_H +#define XLSPWINDEFS_H 1 +#include "devif.h" +void Create_LispWindow(DspInterface dsp); +void lisp_Xvideocolor(int flag); +void set_Xmouseposition(int x, int y); +void DoRing(); +#endif diff --git a/inc/xmkicondefs.h b/inc/xmkicondefs.h new file mode 100644 index 0000000..4db912c --- /dev/null +++ b/inc/xmkicondefs.h @@ -0,0 +1,4 @@ +#ifndef XMKICONDEFS_H +#define XMKICONDEFS_H 1 +Pixmap make_Xicon(DspInterface dsp); +#endif diff --git a/inc/xrdoptdefs.h b/inc/xrdoptdefs.h new file mode 100644 index 0000000..c513541 --- /dev/null +++ b/inc/xrdoptdefs.h @@ -0,0 +1,6 @@ +#ifndef XRDOPTDEFS_H +#define XRDOPTDEFS_H 1 +void print_Xusage(char *prog); +void print_lispusage(char *prog); +void read_Xoption(int *argc, char *argv[]); +#endif diff --git a/inc/xscrolldefs.h b/inc/xscrolldefs.h new file mode 100644 index 0000000..dd9df67 --- /dev/null +++ b/inc/xscrolldefs.h @@ -0,0 +1,10 @@ +#ifndef XSCROLLDEFS_H +#define XSCROLLDEFS_H 1 +void Scroll(DspInterface dsp, int newX, int newY); +void JumpScrollVer(DspInterface dsp, int y); +void JumpScrollHor(DspInterface dsp, int x); +void ScrollLeft(DspInterface dsp); +void ScrollRight(DspInterface dsp); +void ScrollUp(DspInterface dsp); +void ScrollDown(DspInterface dsp); +#endif diff --git a/inc/xwinmandefs.h b/inc/xwinmandefs.h new file mode 100644 index 0000000..93a47af --- /dev/null +++ b/inc/xwinmandefs.h @@ -0,0 +1,11 @@ +#ifndef XWINMANDEFS_H +#define XWINMANDEFS_H 1 +#include +#include "devif.h" +int bound(int a, int b, int c); +void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int grav); +void enable_Xkeyboard(DspInterface dsp); +void disable_Xkeyboard(DspInterface dsp); +void beep_Xkeyboard(DspInterface dsp); +void getXsignaldata(DspInterface dsp); +#endif diff --git a/inc/z2defs.h b/inc/z2defs.h new file mode 100644 index 0000000..4460a76 --- /dev/null +++ b/inc/z2defs.h @@ -0,0 +1,6 @@ +#ifndef Z2DEFS_H +#define Z2DEFS_H 1 +LispPTR N_OP_classoc(LispPTR key, LispPTR list); +LispPTR N_OP_clfmemb(register LispPTR item, register LispPTR list); +LispPTR N_OP_restlist(register LispPTR tail, register int last, register int skip); +#endif diff --git a/src/allocmds.c b/src/allocmds.c index 79cf5d8..0b0a800 100644 --- a/src/allocmds.c +++ b/src/allocmds.c @@ -35,7 +35,13 @@ 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" + +#include "allocmdsdefs.h" +#include "commondefs.h" +#include "gcrdefs.h" +#include "perrnodefs.h" +#include "storagedefs.h" +#include "timerdefs.h" /************************************************************************/ /* */ diff --git a/src/arith2.c b/src/arith2.c index 4c8b599..d91d924 100644 --- a/src/arith2.c +++ b/src/arith2.c @@ -20,10 +20,8 @@ static char *id = "$Id: arith2.c,v 1.4 2001/12/24 01:08:58 sybalsky Exp $ Copyri #include "medleyfp.h" #include "arith.h" -DLword *createcell68k(unsigned int type); -LispPTR N_OP_flpus2(); -LispPTR N_OP_fdifference(LispPTR parg1, LispPTR parg2); -LispPTR N_OP_fgreaterp(LispPTR parg1, LispPTR parg2); +#include "fpdefs.h" +#include "mkcelldefs.h" /************************************************************ N_OP_plus2 diff --git a/src/arith3.c b/src/arith3.c index c4e6f52..2838c1a 100644 --- a/src/arith3.c +++ b/src/arith3.c @@ -31,6 +31,9 @@ static char *id = "$Id: arith3.c,v 1.3 1999/05/31 23:35:21 sybalsky Exp $ Copyri #include "cell.h" #include "arith.h" +#include "arith3defs.h" +#include "mkcelldefs.h" + /************************************************************************/ /* */ /* N _ O P _ m a k e n u m b e r */ diff --git a/src/arith4.c b/src/arith4.c index a99665e..1408a45 100644 --- a/src/arith4.c +++ b/src/arith4.c @@ -33,6 +33,10 @@ static char *id = "$Id: arith4.c,v 1.3 1999/05/31 23:35:21 sybalsky Exp $ Copyri #include "medleyfp.h" #include "arith.h" +#include "arith4defs.h" +#include "fpdefs.h" +#include "mkcelldefs.h" + /**********************************************************************/ /* diff --git a/src/array.c b/src/array.c index b979056..0eb8c4c 100644 --- a/src/array.c +++ b/src/array.c @@ -17,9 +17,13 @@ static char *id = "@(#) array.c 2.8 12/23/88 (envos & Fuji Xerox)"; #include "lispmap.h" #include "lsptypes.h" #include "emlglob.h" + +#include "arraydefs.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" + /************************************************************ OP_claref -- op 372/9 (base typenumber index) @@ -42,9 +46,6 @@ type size typenumber LispPTR N_OP_misc3(LispPTR baseL, LispPTR typenumber, LispPTR inx, int alpha) { register int index, type; - /* for CREATECELL */ - DLword *createcell68k(unsigned int type); - if (alpha != 9) ERROR_EXIT(inx); /* test and setup index */ N_GetPos(inx, index, inx); diff --git a/src/array2.c b/src/array2.c index 15edf44..5a0ab3a 100644 --- a/src/array2.c +++ b/src/array2.c @@ -26,9 +26,13 @@ static char *id = "@(#) array2.c 2.9 10/12/88"; #include "lsptypes.h" #include "emlglob.h" #include "gc.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" +#include "array2defs.h" +#include "gchtfinddefs.h" + /************************************************************************/ /* */ /* N _ O P _ m i s c 4 */ diff --git a/src/array3.c b/src/array3.c index 2e1f548..2cde5db 100644 --- a/src/array3.c +++ b/src/array3.c @@ -25,6 +25,9 @@ static char *id = "@(#) array3.c 2.9 10/12/88"; #include "lispmap.h" #include "lsptypes.h" #include "emlglob.h" + +#include "array3defs.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" @@ -34,9 +37,6 @@ LispPTR N_OP_aref1(register LispPTR arrayarg, register LispPTR inx) { register int type, index; register OneDArray *arrayblk; - /* for CREATECELL */ - DLword *createcell68k(unsigned int type); - /* verify array */ if (GetTypeNumber(arrayarg) != TYPE_ONED_ARRAY) ERROR_EXIT(inx); arrayblk = (OneDArray *)Addr68k_from_LADDR(arrayarg); diff --git a/src/array4.c b/src/array4.c index 1b86f2b..48155c9 100644 --- a/src/array4.c +++ b/src/array4.c @@ -24,10 +24,14 @@ static char *id = "@(#) array4.c 2.7 10/12/88"; #include "adr68k.h" #include "lispmap.h" #include "lsptypes.h" +#include "mkcelldefs.h" #include "arith.h" #include "gc.h" #include "my.h" +#include "array4defs.h" +#include "gchtfinddefs.h" + /*** N_OP_aset1 -- op 267 (new-value array index) ***/ /************************************************************************/ diff --git a/src/array5.c b/src/array5.c index a4fe30f..aaf3313 100644 --- a/src/array5.c +++ b/src/array5.c @@ -25,6 +25,9 @@ static char *id = "@(#) array5.c 2.7 10/12/88"; #include "lispmap.h" #include "lsptypes.h" #include "emlglob.h" + +#include "array5defs.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" diff --git a/src/array6.c b/src/array6.c index ac812c8..595d85c 100644 --- a/src/array6.c +++ b/src/array6.c @@ -18,9 +18,13 @@ static char *id = "@(#) array6.c 2.10 4/21/92"; #include "lsptypes.h" #include "emlglob.h" #include "gc.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" +#include "array6defs.h" +#include "gchtfinddefs.h" + /*** N_OP_aset2 -- op 357 (new-value array index0 index1) ***/ LispPTR N_OP_aset2(register LispPTR data, LispPTR arrayarg, LispPTR inx0, LispPTR inx1) { register int type; diff --git a/src/bbtsub.c b/src/bbtsub.c index 8be0715..7d0cc88 100644 --- a/src/bbtsub.c +++ b/src/bbtsub.c @@ -66,12 +66,19 @@ static char *id = "$Id: bbtsub.c,v 1.3 2001/12/24 01:08:59 sybalsky Exp $ Copyri #include "address.h" #include "arith.h" #include "stack.h" -#include "llstk.h" #include "return.h" #include "cell.h" -#include "car-cdr.h" #include "gc.h" #include "iopage.h" + +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "gcarraydefs.h" +#include "initdspdefs.h" +#include "kprintdefs.h" +#include "llstkdefs.h" +#include "returndefs.h" + extern IOPAGE *IOPage68K; #ifdef AIX diff --git a/src/bin.c b/src/bin.c index faf4ab7..4771234 100644 --- a/src/bin.c +++ b/src/bin.c @@ -36,6 +36,8 @@ static char *id = "$Id: bin.c,v 1.3 1999/05/31 23:35:24 sybalsky Exp $ Copyright #include "cell.h" #include "stream.h" +#include "bindefs.h" + LispPTR N_OP_bin(register int tos) { register Stream *stream68k; /* stream instance on TOS */ register char *buff68k; /* pointer to BUFF */ diff --git a/src/binds.c b/src/binds.c index 668812d..bb92ec4 100644 --- a/src/binds.c +++ b/src/binds.c @@ -15,6 +15,8 @@ static char *id = "$Id: binds.c,v 1.3 1999/05/31 23:35:24 sybalsky Exp $ Copyrig #include "lspglob.h" #include "emlglob.h" +#include "bindsdefs.h" + /************************************************** N_OP_bind(stack_pointer, tos, n1, n2) diff --git a/src/bitblt.c b/src/bitblt.c index 9493e84..663e5b5 100644 --- a/src/bitblt.c +++ b/src/bitblt.c @@ -41,6 +41,9 @@ static char *id = "$Id: bitblt.c,v 1.2 1999/01/03 02:06:47 sybalsky Exp $ Copyri #include "bitblt.h" #include "bb.h" +#include "bitbltdefs.h" +#include "initdspdefs.h" + #ifdef DOS #include "devif.h" #include "iopage.h" diff --git a/src/blt.c b/src/blt.c index 452cbfc..a10ca1c 100644 --- a/src/blt.c +++ b/src/blt.c @@ -34,6 +34,8 @@ static char *id = "$Id: blt.c,v 1.3 1999/05/31 23:35:24 sybalsky Exp $ Copyright #include "lspglob.h" #include "cell.h" +#include "bltdefs.h" + /* N_OP_blt takes 3 arguments. STK-1 has destination's pointer. diff --git a/src/byteswap.c b/src/byteswap.c index 9fe23ca..50f244d 100644 --- a/src/byteswap.c +++ b/src/byteswap.c @@ -26,6 +26,8 @@ static char *id = "$Id: byteswap.c,v 1.5 2002/01/02 08:15:16 sybalsky Exp $ Copy #include "lsptypes.h" #include "stack.h" +#include "byteswapdefs.h" + #if defined(ISC) #include "inlnPS2.h" #else @@ -82,7 +84,7 @@ void byte_swap_page(unsigned short *page, int wordcount) { /* Byte- & word-swap a region wordcount long-words long */ /* */ /****************************************************************/ -void word_swap_page(short unsigned int *page, int longwordcount) { +void word_swap_page(unsigned short *page, int longwordcount) { register int i; register unsigned int *longpage; longpage = (unsigned int *)page; @@ -142,7 +144,7 @@ unsigned char reversedbits[256] = { ******/ #define reverse_bits(word) ((reversedbits[((word) >> 8) & 0xFF] << 8) | reversedbits[(word)&0xff]) -void bit_reverse_region(register short unsigned int *top, int width, int height, int rasterwidth) { +void bit_reverse_region(unsigned short *top, int width, int height, int rasterwidth) { register int i, j, wordwid = ((width + 31) >> 5) << 1; register unsigned short *word; diff --git a/src/car-cdr.c b/src/car-cdr.c index 0de0484..c883ec9 100644 --- a/src/car-cdr.c +++ b/src/car-cdr.c @@ -39,7 +39,11 @@ static char *id = "$Id: car-cdr.c,v 1.3 1999/05/31 23:35:25 sybalsky Exp $ Copyr #include "adr68k.h" #include "gc.h" #include "cell.h" -#include "car-cdr.h" + +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "conspagedefs.h" +#include "gchtfinddefs.h" /************************************************************************/ /* */ diff --git a/src/chardev.c b/src/chardev.c index 7508b41..2728072 100644 --- a/src/chardev.c +++ b/src/chardev.c @@ -56,7 +56,11 @@ static char *id = "$Id: chardev.c,v 1.2 1999/01/03 02:06:50 sybalsky Exp $ Copyr #include "locfile.h" #include "osmsg.h" #include "dbprint.h" -#include "chardev.h" + +#include "chardevdefs.h" +#include "byteswapdefs.h" +#include "commondefs.h" +#include "perrnodefs.h" #if defined(ISC) || defined(FREEBSD) #include @@ -328,7 +332,7 @@ LispPTR CHAR_bins(LispPTR *args) } #ifdef BYTESWAP - word_swap_page(buffer, (nbytes + 3) >> 2); + word_swap_page((unsigned short *)buffer, (nbytes + 3) >> 2); #endif /* BYTESWAP */ return (GetSmallp(rval)); @@ -369,12 +373,12 @@ LispPTR CHAR_bouts(LispPTR *args) nbytes = LispNumToCInt(args[3]); /* Write PAGE_SIZE bytes file contents from filepointer. */ #ifdef BYTESWAP - word_swap_page(buffer, (nbytes + 3) >> 2); + word_swap_page((unsigned short *)buffer, (nbytes + 3) >> 2); #endif /* BYTESWAP */ TIMEOUT(rval = write(id, buffer, nbytes)); #ifdef BYTESWAP - word_swap_page(buffer, (nbytes + 3) >> 2); + word_swap_page((unsigned short *)buffer, (nbytes + 3) >> 2); #endif /* BYTESWAP */ if (rval == -1) { diff --git a/src/common.c b/src/common.c index dceb6fb..bf725a7 100644 --- a/src/common.c +++ b/src/common.c @@ -23,7 +23,10 @@ static char *id = "$Id: common.c,v 1.2 1999/01/03 02:06:52 sybalsky Exp $ Copyri #include "emlglob.h" #include "stack.h" #include "dbprint.h" -#include "uraid.h" + +#include "commondefs.h" +#include "kprintdefs.h" +#include "uraiddefs.h" #ifndef NOPIXRECT #include diff --git a/src/conspage.c b/src/conspage.c index 2edca5a..60ceb92 100644 --- a/src/conspage.c +++ b/src/conspage.c @@ -24,7 +24,12 @@ static char *id = "$Id: conspage.c,v 1.3 1999/05/31 23:35:27 sybalsky Exp $ Copy #include "lispmap.h" #include "lspglob.h" #include "gc.h" -#include "conspage.h" + +#include "conspagedefs.h" +#include "allocmdsdefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "gchtfinddefs.h" /************************************************************************/ /* */ diff --git a/src/dbgtool.c b/src/dbgtool.c index 1dc649a..b519765 100644 --- a/src/dbgtool.c +++ b/src/dbgtool.c @@ -37,6 +37,10 @@ static char *id = "$Id: dbgtool.c,v 1.4 2001/12/24 01:09:00 sybalsky Exp $ Copyr #include "cell.h" #include "stack.h" +#include "dbgtooldefs.h" +#include "kprintdefs.h" +#include "testtooldefs.h" + #define LOCAL_PVAR 0xFFFF #ifdef BIGATOMS #define VTY_IVAR 0x00000000 diff --git a/src/dir.c b/src/dir.c index c6151ca..5d362c3 100644 --- a/src/dir.c +++ b/src/dir.c @@ -63,7 +63,7 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright #define alarm(x) 1 #endif /* DOS */ -#ifdef SYSVONLY +#if defined(SYSVONLY) || defined(MACOSX) || defined(FREEBSD) || defined(LINUX) #include #endif /* SYSVONLY */ @@ -82,9 +82,6 @@ static char *id = "$Id: dir.c,v 1.4 2001/12/26 22:17:01 sybalsky Exp $ Copyright #include "lspglob.h" #include "timeout.h" #include "locfile.h" -#include "dsk.h" -#include "ufs.h" -#include "dir.h" extern int *Lisp_errno; extern int Dummy_errno; @@ -358,6 +355,12 @@ unsigned MAXFINFO; FreeFinfoList = fp; \ } +/* XXX: the datatypes need to go into dirdefs.h so that one could include it elsewhere */ +#include "dirdefs.h" +#include "commondefs.h" +#include "dskdefs.h" +#include "ufsdefs.h" + /* * For debug aid. */ @@ -1843,7 +1846,7 @@ static int trim_finfo_version(FINFO **fp, int rver) * Caller have to free the area after sorting done. */ -FINFO **prepare_sort_buf(register FINFO *fp, register int n) +static FINFO **prepare_sort_buf(register FINFO *fp, register int n) { register FINFO **bp; register FINFO **bufp; @@ -1876,7 +1879,7 @@ FINFO **prepare_sort_buf(register FINFO *fp, register int n) * Note that the result is in the reversed order. */ -int dsk_filecmp(FINFO **fp1, FINFO **fp2) +static int dsk_filecmp(FINFO **fp1, FINFO **fp2) { register int res, v1, v2; @@ -1907,7 +1910,7 @@ int dsk_filecmp(FINFO **fp1, FINFO **fp2) * Note that the result is in the reversed order. */ -int unix_filecmp(register FINFO **f1, register FINFO **f2) +static int unix_filecmp(register FINFO **f1, register FINFO **f2) { return (strcmp((*f1)->lname, (*f2)->lname)); } /* @@ -1929,7 +1932,7 @@ int unix_filecmp(register FINFO **f1, register FINFO **f2) * used for {DSK} and {UNIX} device respectively as a sort function. */ -int file_sort(register FINFO **fpp, register int n, register int (*sortfn)()) +static int file_sort(register FINFO **fpp, register int n, register int (*sortfn)()) { register FINFO **fp; register FINFO **sort_bufp; diff --git a/src/draw.c b/src/draw.c index 43fdbb5..e82873d 100644 --- a/src/draw.c +++ b/src/draw.c @@ -36,6 +36,9 @@ static char *id = "$Id: draw.c,v 1.2 1999/01/03 02:06:56 sybalsky Exp $ Copyrigh #include "bbtsub.h" #include "display.h" +#include "drawdefs.h" +#include "initdspdefs.h" + #ifdef DISPLAYBUFFER extern struct pixrect *ColorDisplayPixrect, *DisplayRegionPixrect; #endif diff --git a/src/dsk.c b/src/dsk.c index 5254d61..1fe3978 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -108,11 +108,12 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright #include "locfile.h" #include "osmsg.h" #include "dbprint.h" -#include "conspage.h" -#include "car-cdr.h" -#include "dsk.h" -#include "ufs.h" -#include "dir.h" + +#include "dskdefs.h" +#include "byteswapdefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "ufsdefs.h" #if defined(ULTRIX) || defined(MACOSX) || defined(FREEBSD) #include @@ -2065,7 +2066,7 @@ rdlp: for (bp = &bufp[count], rval = count; rval < FDEV_PAGE_SIZE; ++rval) *bp++ = 0; #ifdef BYTESWAP - word_swap_page(bufp, FDEV_PAGE_SIZE / 4); + word_swap_page((DLword *)bufp, FDEV_PAGE_SIZE / 4); #endif /* BYTESWAP */ return (GetSmallp(count)); @@ -2131,7 +2132,7 @@ sklp2: /* OK to write the page. */ #ifdef BYTESWAP - word_swap_page(bufp, (count + 3) >> 2); + word_swap_page((DLword *)bufp, (count + 3) >> 2); #endif /* BYTESWAP */ wlp: @@ -2140,13 +2141,13 @@ wlp: if (errno == EINTR) goto wlp; /* interrupted; retry */ *Lisp_errno = errno; #ifdef BYTESWAP - word_swap_page(bufp, (count + 3) >> 2); + word_swap_page((DLword *)bufp, (count + 3) >> 2); #endif /* BYTESWAP */ return (NIL); } #ifdef BYTESWAP - word_swap_page(bufp, (count + 3) >> 2); + word_swap_page((DLword *)bufp, (count + 3) >> 2); #endif /* BYTESWAP */ #endif /* DEMO */ diff --git a/src/dspif.c b/src/dspif.c index 9891541..197f823 100644 --- a/src/dspif.c +++ b/src/dspif.c @@ -18,6 +18,9 @@ static char *id = "$Id: dspif.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyrig #include "dbprint.h" #include "devif.h" +#include "dspifdefs.h" +#include "xinitdefs.h" + DspInterfaceRec _curdsp, _coldsp; DspInterface currentdsp = &_curdsp; diff --git a/src/dspsubrs.c b/src/dspsubrs.c index 0f4c678..dc89632 100644 --- a/src/dspsubrs.c +++ b/src/dspsubrs.c @@ -23,6 +23,14 @@ static char *id = "$Id: dspsubrs.c,v 1.3 2001/12/26 22:17:02 sybalsky Exp $ Copy #include "lispmap.h" #include "display.h" #include "arith.h" + +#include "dspsubrsdefs.h" +#include "commondefs.h" +#ifdef XWINDOW +#include "xcursordefs.h" +#include "xlspwindefs.h" +#endif + extern int DebugDSP; extern int displaywidth, displayheight; diff --git a/src/eqf.c b/src/eqf.c index b4d7250..252d203 100644 --- a/src/eqf.c +++ b/src/eqf.c @@ -25,9 +25,12 @@ static char *id = "$Id: eqf.c,v 1.3 1999/05/31 23:35:28 sybalsky Exp $ Copyright #include "lispmap.h" #include "lsptypes.h" #include "medleyfp.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" +#include "eqfdefs.h" + /************************************************************ op 072 N_OP_eqlop EQL op 0314 N_OP_clequal CL:EQUAL diff --git a/src/ether.c b/src/ether.c index 19da00e..b3ea9e8 100644 --- a/src/ether.c +++ b/src/ether.c @@ -19,6 +19,7 @@ static char *id = "$Id: ether.c,v 1.4 2001/12/24 01:09:02 sybalsky Exp $ Copyrig #endif #include +#include #include #ifndef DOS #include @@ -696,13 +697,27 @@ LispPTR get_packet() { return (NIL); } /* end get_packet */ +/********************************************************************** + * ether_addr_equal(add1, add2) + * checks ethernet addresses equality + * Also believed obsolete + **********************************************************************/ + +static int ether_addr_equal(u_char add1[], u_char add2[]) +{ + register int i; + for (i = 0; i < 6; i++) + if (add1[i] != add2[i]) return (0); + return (1); +} + /********************************************************************** * check_filter(buffer) * see if this packet passes the current filter setting * This is believed obsolete with packet filtering enabled **********************************************************************/ -int check_filter(u_char *buffer) +static int check_filter(u_char *buffer) { /* broadcast packets */ if (ether_addr_equal(buffer, broadcast)) switch (((short *)buffer)[6]) { @@ -719,25 +734,11 @@ int check_filter(u_char *buffer) return (0); } -/********************************************************************** - * ether_addr_equal(add1, add2) - * checks ethernet addresses equality - * Also believed obsolete - **********************************************************************/ - -int ether_addr_equal(u_char add1[], u_char add2[]) -{ - register int i; - for (i = 0; i < 6; i++) - if (add1[i] != add2[i]) return (0); - return (1); -} - /********************************************************************** * init_uid() * sets effective user-id to real user-id **********************************************************************/ -void init_uid() { +static void init_uid() { #ifndef NOETHER int rid; rid = getuid(); diff --git a/src/findkey.c b/src/findkey.c index a81e19b..c537ab9 100644 --- a/src/findkey.c +++ b/src/findkey.c @@ -18,6 +18,8 @@ static char *id = "$Id: findkey.c,v 1.3 1999/05/31 23:35:28 sybalsky Exp $ Copyr #include "lspglob.h" #include "adr68k.h" +#include "findkeydefs.h" + /***********************************************************************/ /* File Name : findkey.c diff --git a/src/foreign.c b/src/foreign.c index ac7267d..f540f24 100644 --- a/src/foreign.c +++ b/src/foreign.c @@ -25,6 +25,8 @@ static char *id = "$Id: foreign.c,v 1.3 1999/05/31 23:35:28 sybalsky Exp $ Copyr #include "arith.h" #include "stack.h" +#include "foreigndefs.h" + /***********************************************************/ /* L S t r i n g T o C S t r i n g */ /* */ diff --git a/src/fp.c b/src/fp.c index 52b7fb3..9593e51 100644 --- a/src/fp.c +++ b/src/fp.c @@ -24,10 +24,13 @@ static char *id = "$Id: fp.c,v 1.3 1999/05/31 23:35:29 sybalsky Exp $ Copyright #include "lispmap.h" #include "lsptypes.h" #include "emlglob.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" #include "medleyfp.h" +#include "fpdefs.h" + /************************************************************ N_OP_fplus2 -- op 350 N_OP_fdifference -- op 351 @@ -36,8 +39,6 @@ static char *id = "$Id: fp.c,v 1.3 1999/05/31 23:35:29 sybalsky Exp $ Copyright N_OP_fgreaterp -- op 362 ***********************************************************/ -DLword *createcell68k(unsigned int type); - /************************************************************************/ /* */ /* N _ O P _ f p l u s 2 */ diff --git a/src/fvar.c b/src/fvar.c index 35c0fa9..89fca9b 100644 --- a/src/fvar.c +++ b/src/fvar.c @@ -20,6 +20,11 @@ static char *id = "$Id: fvar.c,v 1.3 1999/05/31 23:35:29 sybalsky Exp $ Copyrigh #include "lsptypes.h" #include "gc.h" +#include "fvardefs.h" +#include "byteswapdefs.h" +#include "commondefs.h" +#include "gchtfinddefs.h" + #ifdef GCC386 #include "inlnPS2.h" #endif diff --git a/src/gc.c b/src/gc.c index 63368a1..f3c2d32 100644 --- a/src/gc.c +++ b/src/gc.c @@ -17,6 +17,9 @@ static char *id = "$Id: gc.c,v 1.3 1999/05/31 23:35:29 sybalsky Exp $ Copyright #include "emlglob.h" #include "gc.h" +#include "gcdefs.h" +#include "gchtfinddefs.h" + /************************************************************ entry OP_gcref OPCODE[025] diff --git a/src/gc2.c b/src/gc2.c index 83e86d9..ce93832 100644 --- a/src/gc2.c +++ b/src/gc2.c @@ -31,6 +31,9 @@ static char *id = "$Id: gc2.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyright #include "address.h" #include "adr68k.h" +#include "gc2defs.h" +#include "gcscandefs.h" + #ifdef GCC386 #include "inlnPS2.h" #endif /* GCC386 */ diff --git a/src/gcarray.c b/src/gcarray.c index f7662e7..98bacd1 100644 --- a/src/gcarray.c +++ b/src/gcarray.c @@ -50,7 +50,6 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr #include "lspglob.h" #include "stack.h" #include "cell.h" -#include "car-cdr.h" #include "ifpage.h" #include "gc.h" #include "array.h" @@ -61,6 +60,12 @@ static char *id = "$Id: gcarray.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyr #include #endif +#include "gcarraydefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "mkatomdefs.h" +#include "testtooldefs.h" + /*** not currently used -FS #define min(a,b) ((a > b)?b:a) #define Trailer(ldatum,datum68) (ldatum+2*(datum68->arlen - ARRAYBLOCKTRAILERCELLS)) @@ -265,7 +270,6 @@ LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword PACKAGE *packaddr; LispPTR hashtbladdr; LispPTR index; - extern LispPTR find_package_from_name(char *packname, int len); /* For convenience, recognize the common package nicknames: */ diff --git a/src/gccode.c b/src/gccode.c index b54d4b4..651e7ab 100644 --- a/src/gccode.c +++ b/src/gccode.c @@ -30,6 +30,7 @@ static char *id = "$Id: gccode.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyri /* \Tomtom */ /************************************************************************/ +#include #include "lispemul.h" #include "lsptypes.h" #include "address.h" @@ -41,7 +42,10 @@ static char *id = "$Id: gccode.c,v 1.3 1999/05/31 23:35:30 sybalsky Exp $ Copyri #include "ifpage.h" #include "gc.h" #include "array.h" -#include + +#include "gccodedefs.h" +#include "commondefs.h" +#include "gchtfinddefs.h" #define min(a, b) ((a > b) ? b : a) diff --git a/src/gcfinal.c b/src/gcfinal.c index a7bf730..2c895be 100644 --- a/src/gcfinal.c +++ b/src/gcfinal.c @@ -43,18 +43,23 @@ static char *id = "$Id: gcfinal.c,v 1.3 1999/05/31 23:35:31 sybalsky Exp $ Copyr /* \Tomtom */ /*************************************************************************/ +#include #include "lispemul.h" #include "lsptypes.h" #include "address.h" #include "adr68k.h" #include "lspglob.h" #include "stack.h" -#include "llstk.h" #include "cell.h" #include "ifpage.h" #include "gc.h" #include "array.h" -#include + +#include "gcfinaldefs.h" +#include "commondefs.h" +#include "gccodedefs.h" +#include "gchtfinddefs.h" +#include "llstkdefs.h" #ifdef NEVER #define GetSegnuminColl(entry1) ((entry1 & 0x01fe) >> 1) /* segnum field */ diff --git a/src/gchtfind.c b/src/gchtfind.c index dbcfeb5..dd846ae 100644 --- a/src/gchtfind.c +++ b/src/gchtfind.c @@ -19,7 +19,11 @@ 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" + +#include "gchtfinddefs.h" +#include "commondefs.h" +#include "gcrdefs.h" +#include "storagedefs.h" #define Evenp(num, prim) ((num % prim) == 0) #ifdef BIGVM diff --git a/src/gcmain3.c b/src/gcmain3.c index 5c1cf3f..622b6f8 100644 --- a/src/gcmain3.c +++ b/src/gcmain3.c @@ -47,6 +47,12 @@ static char *id = "$Id: gcmain3.c,v 1.4 1999/05/31 23:35:31 sybalsky Exp $ Copyr #include "ifpage.h" #include "gc.h" +#include "gcmain3defs.h" +#include "commondefs.h" +#include "gchtfinddefs.h" +#include "gcrcelldefs.h" +#include "gcscandefs.h" + #ifdef GCC386 #include "inlnPS2.h" #endif diff --git a/src/gcoflow.c b/src/gcoflow.c index 061db4d..d04dc0b 100644 --- a/src/gcoflow.c +++ b/src/gcoflow.c @@ -37,6 +37,10 @@ static char *id = "$Id: gcoflow.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyr #include "lspglob.h" #include "gc.h" +#include "gcoflowdefs.h" +#include "gchtfinddefs.h" +#include "gcrdefs.h" + #define MAXSMALLP 65535 #define HTBIGENTRYSIZE 4 #define WORDSPERPAGE 256 diff --git a/src/gcr.c b/src/gcr.c index d71b124..fc5ffcc 100644 --- a/src/gcr.c +++ b/src/gcr.c @@ -61,9 +61,14 @@ static char *id = "$Id: gcr.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyright #include "adr68k.h" #include "lspglob.h" #include "stack.h" -#include "dspsubrs.h" #include "gc.h" +#include "gcrdefs.h" +#include "commondefs.h" +#include "dspsubrsdefs.h" +#include "gcmain3defs.h" +#include "timerdefs.h" + #define MAXSMALLP 65535 #define HTBIGENTRYSIZE 4 #define WORDSPERPAGE 256 diff --git a/src/gcrcell.c b/src/gcrcell.c index 76ae9fc..05e5da1 100644 --- a/src/gcrcell.c +++ b/src/gcrcell.c @@ -72,11 +72,17 @@ static char *id = "$Id: gcrcell.c,v 1.3 1999/05/31 23:35:32 sybalsky Exp $ Copyr #include "lspglob.h" #include "stack.h" #include "cell.h" -#include "car-cdr.h" #include "ifpage.h" #include "gc.h" #include "dbprint.h" +#include "gcrcelldefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "gccodedefs.h" +#include "gcfinaldefs.h" +#include "gchtfinddefs.h" + #ifdef NEWCDRCODING #undef CONSPAGE_LAST #define CONSPAGE_LAST 0x0ffffffff diff --git a/src/gcscan.c b/src/gcscan.c index b20f797..7ca1b19 100644 --- a/src/gcscan.c +++ b/src/gcscan.c @@ -52,6 +52,8 @@ static char *id = "$Id: gcscan.c,v 1.3 1999/05/31 23:35:33 sybalsky Exp $ Copyri #include "gc.h" #include "lsptypes.h" +#include "gcscandefs.h" + #ifdef BIGVM #define HTSTKBIT 0x10000 /* = 512 */ #define HTENDS ((struct hashentry *)htlptr) diff --git a/src/gvar2.c b/src/gvar2.c index 9d8a97a..3756344 100644 --- a/src/gvar2.c +++ b/src/gvar2.c @@ -20,6 +20,9 @@ static char *id = "$Id: gvar2.c,v 1.3 1999/05/31 23:35:33 sybalsky Exp $ Copyrig #include "cell.h" #include "dbprint.h" +#include "gvar2defs.h" +#include "gchtfinddefs.h" + /************************************************************************/ /* */ /* N _ O P _ g v a r _ */ diff --git a/src/hacks.c b/src/hacks.c index 4dadc3f..0eb0985 100644 --- a/src/hacks.c +++ b/src/hacks.c @@ -10,6 +10,8 @@ static char *id = "$Id: hacks.c,v 1.3 1999/05/31 23:35:33 sybalsky Exp $ Copyrig #include "version.h" +#include "hacksdefs.h" + /* These functions are created so that you can split a float into */ /* four integers. The general idea behind these functions is to */ /* act as a caster between different entitys on the stack */ diff --git a/src/hardrtn.c b/src/hardrtn.c index 3cccf6c..32c2386 100644 --- a/src/hardrtn.c +++ b/src/hardrtn.c @@ -33,9 +33,12 @@ 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" +#include "hardrtndefs.h" +#include "commondefs.h" +#include "llstkdefs.h" + #define MAKE_FXCOPY(fx68k) \ { \ BEFORE_CONTEXTSW; \ @@ -43,7 +46,92 @@ static char *id = "$Id: hardrtn.c,v 1.4 2001/12/24 01:09:02 sybalsky Exp $ Copyr AFTER_CONTEXTSW; \ CHECK_FX(fx68k); \ } -void incusecount68k(FX *fx68k), decusecount68k(register FX *frame68k); +static FX *make_FXcopy(register FX *fx68k) { + register int size; + int nametbl_on_stk = NIL; + register DLword *new68k; + register Bframe *retbf68k; + extern DLword *freestackblock(DLword n, StackWord * start68k, int align); + +#ifdef FLIPCURSOR + flip_cursorbar(5); +#endif + + CHECK_FX(fx68k); + size = FX_size(fx68k) + DLWORDSPER_CELL; +#ifdef BIGVM + if (fx68k->validnametable && ((fx68k->nametable >> 16) == STK_HI)) +#else + if (fx68k->validnametable && (fx68k->hi2nametable == STK_HI)) +#endif /* BIGVM */ + { +/* frame contains a name table, so we care that the alignment + of the new block be same as old */ +#ifdef STACKCHECK + { + DLword n; +#ifdef BIGVM + n = fx68k->nametable & 0xFFFF; +#else + n = fx68k->lonametable; +#endif /* BIGVM */ + if ((n <= StkOffset_from_68K(fx68k)) && (n >= fx68k->nextblock)) + error("hardreturn:nametable check"); + } +#endif + nametbl_on_stk = T; + /* Find a free stack block */ + new68k = freestackblock(size, (StackWord *)CURRENTFX, + (StkOffset_from_68K(fx68k) - DLWORDSPER_CELL) % DLWORDSPER_QUAD); + } /*if end */ + else + new68k = freestackblock(size, (StackWord *)CURRENTFX, -1); /* No align */ + + if (new68k == 0) return (0); /* No more space for STACK */ + + /* blt(dest,source,size) */ + blt(new68k, (((DLword *)fx68k) - DLWORDSPER_CELL), size); + + ((Bframe *)new68k)->residual = T; + new68k = new68k + DLWORDSPER_CELL; /* now NEW points to the FX */ + ((FX *)new68k)->nextblock = (StkOffset_from_68K(new68k) + size) - DLWORDSPER_CELL; + retbf68k = (Bframe *)Addr68k_from_StkOffset(GETBLINK(fx68k)); + /* Set true BFptr,not the residual */ + SETBLINK(new68k, GETBLINK(fx68k)); + ((FX *)new68k)->usecount = 0; + CHECK_BF(retbf68k); + +#ifdef BIGVM + if (nametbl_on_stk) ((FX *)new68k)->nametable += (((UNSIGNED)new68k - (UNSIGNED)fx68k) >> 1); +#else + if (nametbl_on_stk) ((FX *)new68k)->lonametable += (((UNSIGNED)new68k - (UNSIGNED)fx68k) >> 1); +#endif + /* increment use count of basic frame of returnee because + we made another FX which points to it */ + retbf68k->usecnt++; + SET_FASTP_NIL(fx68k); + /* increment use count of CLINK of returnee + because we made a copy of returnee */ + incusecount68k((FX *)Addr68k_from_StkOffset(GETCLINK(fx68k))); + + if (GETCLINK(fx68k) != GETALINK(fx68k)) { + incusecount68k((FX *)Addr68k_from_StkOffset(GETALINK(fx68k))); + } + + decusecount68k(fx68k); /* if usecon==0 -> FSB */ + SETACLINK(CURRENTFX, StkOffset_from_68K(new68k)); + CHECK_FX((FX *)new68k); + CHECK_FX(CURRENTFX); +#ifdef STACKCHECK + stack_check(0); +#endif +#ifdef FLIPCURSOR + flip_cursorbar(5); +#endif + + return ((FX *)new68k); +} /* make_FXcopy end */ + /********************************************************************/ /* Func Name : slowreturn() @@ -62,7 +150,6 @@ int slowreturn(void) { register DLword *freeptr; register Bframe *currentBF; register FX *returnFX; - extern FX *make_FXcopy(register FX * fx68k); S_CHECK(SLOWP(CURRENTFX), "CURRENTFX not SLOWP"); @@ -168,92 +255,6 @@ retry: /* this is retry entry after MAKE_FXCOPY etc */ } /* slowreturn end */ -FX *make_FXcopy(register FX *fx68k) { - register int size; - int nametbl_on_stk = NIL; - register DLword *new68k; - register Bframe *retbf68k; - extern DLword *freestackblock(DLword n, StackWord * start68k, int align); - -#ifdef FLIPCURSOR - flip_cursorbar(5); -#endif - - CHECK_FX(fx68k); - size = FX_size(fx68k) + DLWORDSPER_CELL; -#ifdef BIGVM - if (fx68k->validnametable && ((fx68k->nametable >> 16) == STK_HI)) -#else - if (fx68k->validnametable && (fx68k->hi2nametable == STK_HI)) -#endif /* BIGVM */ - { -/* frame contains a name table, so we care that the alignment - of the new block be same as old */ -#ifdef STACKCHECK - { - DLword n; -#ifdef BIGVM - n = fx68k->nametable & 0xFFFF; -#else - n = fx68k->lonametable; -#endif /* BIGVM */ - if ((n <= StkOffset_from_68K(fx68k)) && (n >= fx68k->nextblock)) - error("hardreturn:nametable check"); - } -#endif - nametbl_on_stk = T; - /* Find a free stack block */ - new68k = freestackblock(size, (StackWord *)CURRENTFX, - (StkOffset_from_68K(fx68k) - DLWORDSPER_CELL) % DLWORDSPER_QUAD); - } /*if end */ - else - new68k = freestackblock(size, (StackWord *)CURRENTFX, -1); /* No align */ - - if (new68k == 0) return (0); /* No more space for STACK */ - - /* blt(dest,source,size) */ - blt(new68k, (((DLword *)fx68k) - DLWORDSPER_CELL), size); - - ((Bframe *)new68k)->residual = T; - new68k = new68k + DLWORDSPER_CELL; /* now NEW points to the FX */ - ((FX *)new68k)->nextblock = (StkOffset_from_68K(new68k) + size) - DLWORDSPER_CELL; - retbf68k = (Bframe *)Addr68k_from_StkOffset(GETBLINK(fx68k)); - /* Set true BFptr,not the residual */ - SETBLINK(new68k, GETBLINK(fx68k)); - ((FX *)new68k)->usecount = 0; - CHECK_BF(retbf68k); - -#ifdef BIGVM - if (nametbl_on_stk) ((FX *)new68k)->nametable += (((UNSIGNED)new68k - (UNSIGNED)fx68k) >> 1); -#else - if (nametbl_on_stk) ((FX *)new68k)->lonametable += (((UNSIGNED)new68k - (UNSIGNED)fx68k) >> 1); -#endif - /* increment use count of basic frame of returnee because - we made another FX which points to it */ - retbf68k->usecnt++; - SET_FASTP_NIL(fx68k); - /* increment use count of CLINK of returnee - because we made a copy of returnee */ - incusecount68k((FX *)Addr68k_from_StkOffset(GETCLINK(fx68k))); - - if (GETCLINK(fx68k) != GETALINK(fx68k)) { - incusecount68k((FX *)Addr68k_from_StkOffset(GETALINK(fx68k))); - } - - decusecount68k(fx68k); /* if usecon==0 -> FSB */ - SETACLINK(CURRENTFX, StkOffset_from_68K(new68k)); - CHECK_FX((FX *)new68k); - CHECK_FX(CURRENTFX); -#ifdef STACKCHECK - stack_check(0); -#endif -#ifdef FLIPCURSOR - flip_cursorbar(5); -#endif - - return ((FX *)new68k); -} /* make_FXcopy end */ - #define MAXSAFEUSECOUNT 200 void incusecount68k(FX *fx68k) { diff --git a/src/inet.c b/src/inet.c index f694332..8f43f04 100644 --- a/src/inet.c +++ b/src/inet.c @@ -45,6 +45,11 @@ static char *id = "$Id: inet.c,v 1.3 2001/12/24 01:09:03 sybalsky Exp $ Copyrigh #include "dbprint.h" #include "locfile.h" +#include "inetdefs.h" +#include "byteswapdefs.h" +#include "commondefs.h" +#include "mkcelldefs.h" + #ifdef HPUX #define FASYNC O_NONBLOCK #endif /* NPUX */ @@ -98,7 +103,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li struct servent *service; struct sockaddr_in farend; int addr_class, protocol; - char *buffer; + DLword *buffer; int result; #ifdef RS6000 static int one = 1; /* Used in TCPconnect */ @@ -187,7 +192,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li case TCPsend: /* args: conn, buffer, len */ sock = LispNumToCInt(nameConn); - buffer = (char *)Addr68k_from_LADDR(proto); + buffer = Addr68k_from_LADDR(proto); len = LispNumToCInt(length); DBPRINT(("sock: %d, len %d.\n", sock, len)); @@ -210,7 +215,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li case TCPrecv: /* args: conn, buffer, maxlen */ sock = LispNumToCInt(nameConn); - buffer = (char *)Addr68k_from_LADDR(proto); + buffer = Addr68k_from_LADDR(proto); len = LispNumToCInt(length); result = read(sock, buffer, len); if (result < 0) { @@ -319,22 +324,22 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li case INETpeername: /* socket#, buffer for name string */ sock = LispNumToCInt(nameConn); - buffer = (char *)Addr68k_from_LADDR(proto); + buffer = Addr68k_from_LADDR(proto); ures = sizeof(addr); getpeername(sock, (struct sockaddr *)&addr, &ures); host = gethostbyaddr((const char *)&addr, ures, AF_INET); - strcpy(buffer, host->h_name); + strcpy((char *)buffer, host->h_name); return (GetSmallp(strlen(host->h_name))); break; case INETgetname: /* host addr, buffer for name string */ sock = LispNumToCInt(nameConn); - buffer = (char *)Addr68k_from_LADDR(proto); + buffer = Addr68k_from_LADDR(proto); ures = sizeof(addr); addr.sin_addr.s_addr = htonl(sock); host = gethostbyaddr((const char *)&addr, ures, 0); if (!host) return (GetSmallp(0)); - strcpy(buffer, host->h_name); + strcpy((char *)buffer, host->h_name); return (GetSmallp(strlen(host->h_name))); break; @@ -376,7 +381,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li farend.sin_family = AF_INET; farend.sin_port = htons(LispNumToCInt(length)); farend.sin_addr.s_addr = htonl(LispNumToCInt(proto)); - buffer = (char *)Addr68k_from_LADDR(bufaddr); + buffer = Addr68k_from_LADDR(bufaddr); buflen = LispNumToCInt(maxlen); DBPRINT(("UDP send: socket = %d, remote-port = %d.\n", sock, farend.sin_port)); @@ -399,7 +404,7 @@ LispPTR subr_TCP_ops(int op, LispPTR nameConn, LispPTR proto, LispPTR length, Li case UDPRecvfrom: /* fd-socket# buffer len addr-cell port-cell*/ sock = LispNumToCInt(nameConn); - buffer = (char *)Addr68k_from_LADDR(proto); + buffer = Addr68k_from_LADDR(proto); buflen = LispNumToCInt(length); ures = sizeof farend; if ((result = recvfrom(sock, buffer, buflen, 0, (struct sockaddr *)&farend, &ures)) < 0) { diff --git a/src/initdsp.c b/src/initdsp.c index dd6b90b..d403ef4 100644 --- a/src/initdsp.c +++ b/src/initdsp.c @@ -17,6 +17,7 @@ static char *id = "$Id: initdsp.c,v 1.2 1999/01/03 02:07:08 sybalsky Exp $ Copyr */ #include +#include #ifndef NOPIXRECT #ifndef DOS @@ -67,6 +68,14 @@ static char *id = "$Id: initdsp.c,v 1.2 1999/01/03 02:07:08 sybalsky Exp $ Copyr #include "pilotbbt.h" #include "dbprint.h" +#include "initdspdefs.h" +#ifdef BYTESWAP +#include "byteswapdefs.h" +#endif +#ifdef XWINDOW +#include "xcursordefs.h" +#endif + #ifdef ISC #define getpagesize() 512 #endif /* ISC */ @@ -274,7 +283,7 @@ void clear_display() { /* ================================================================ */ /* Now takes 68k address, function renamed for safety */ -void init_display2(INT display_addr, INT display_max) +void init_display2(DLword *display_addr, int display_max) { int mmapstat; int fbgattr_result; @@ -729,7 +738,7 @@ void byte_swapped_displayregion(int x, int y, int w, int h) ((x + 7) >> 3)) & 0xfffffffc); - bit_reverse_region(longptr, w, h, DLWORD_PERLINE); + bit_reverse_region((unsigned short *)longptr, w, h, DLWORD_PERLINE); return; diff --git a/src/initkbd.c b/src/initkbd.c index 490b08a..d323d1f 100644 --- a/src/initkbd.c +++ b/src/initkbd.c @@ -108,8 +108,12 @@ extern int KBDEventFlg; #include "ifpage.h" #include "keyboard.h" +#include "initkbddefs.h" +#include "initdspdefs.h" + #ifdef XWINDOW #include "devif.h" +#include "xinitdefs.h" extern DspInterface currentdsp; #endif /* XWINDOW */ @@ -531,7 +535,7 @@ char *getenv(); /* ---- external entry points --------*/ * */ -int find_unused_key(KeySym *map, int minkey, int codecount, int symspercode, int sym, u_char *table) +static int find_unused_key(KeySym *map, int minkey, int codecount, int symspercode, int sym, u_char *table) { int i; @@ -556,7 +560,7 @@ int find_unused_key(KeySym *map, int minkey, int codecount, int symspercode, int /* */ /************************************************************************/ -u_char *make_X_keymap() { +static u_char *make_X_keymap() { u_char *table = (u_char *)malloc(256); /* the final result table */ int lisp_codes_used[256]; /* Keep track of the Lisk key #s we've used */ int last_KEYSYM = -1; diff --git a/src/initsout.c b/src/initsout.c index 2aa427c..919f0b6 100644 --- a/src/initsout.c +++ b/src/initsout.c @@ -19,6 +19,7 @@ static char *id = "$Id: initsout.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copy #include "version.h" #include +#include #include #if defined(MACOSX) || defined(FREEBSD) #include @@ -44,6 +45,13 @@ static char *id = "$Id: initsout.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copy #include "lldsp.h" #include "gc.h" /* for ADDREF & GCLOOKUP */ +#include "initsoutdefs.h" +#include "byteswapdefs.h" +#include "gcarraydefs.h" +#include "gchtfinddefs.h" +#include "mkcelldefs.h" +#include "testtooldefs.h" + /********** definitions for bitblt. add by osamu **********/ DLword TEXTURE_atom; DLword MERGE_atom; @@ -223,8 +231,6 @@ void init_iopage(void) { extern int for_makeinit; -extern LispPTR *MakeAtom68k(char *string); - void build_lisp_map(void) { DLword index; diff --git a/src/intcall.c b/src/intcall.c index 07e8e46..545c218 100644 --- a/src/intcall.c +++ b/src/intcall.c @@ -17,7 +17,6 @@ static char *id = "$Id: intcall.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copyr #include "lsptypes.h" #include "lispmap.h" #include "stack.h" -#include "llstk.h" #include "return.h" #include "emlglob.h" #include "lspglob.h" @@ -25,6 +24,11 @@ static char *id = "$Id: intcall.c,v 1.3 1999/05/31 23:35:34 sybalsky Exp $ Copyr #include "cell.h" #include "tosfns.h" +#include "intcalldefs.h" +#include "commondefs.h" +#include "llstkdefs.h" +#include "returndefs.h" + void cause_interruptcall(register unsigned int atom_index) /* Atomindex for Function you want to invoke */ { diff --git a/src/kbdsubrs.c b/src/kbdsubrs.c index d24f928..71c34b0 100644 --- a/src/kbdsubrs.c +++ b/src/kbdsubrs.c @@ -29,6 +29,12 @@ static char *id = "$Id: kbdsubrs.c,v 1.2 1999/01/03 02:07:10 sybalsky Exp $ Copy #include "lispemul.h" +#include "kbdsubrsdefs.h" +#include "commondefs.h" +#ifdef XWINDOW +#include "xwinmandefs.h" +#endif + #ifdef DOS #define PORT_A 0x60 #define KBD_COMMAND_PORT 0x64 diff --git a/src/keyevent.c b/src/keyevent.c index 8c80f8b..2e48d50 100644 --- a/src/keyevent.c +++ b/src/keyevent.c @@ -68,6 +68,10 @@ void Mouse_hndlr(void); /* Fields mouse events from driver */ #include "bitblt.h" #include "pilotbbt.h" +#include "keyeventdefs.h" +#include "osmsgdefs.h" +#include "xwinmandefs.h" + #include "dbprint.h" #if (defined(DOS) || defined(XWINDOW)) #include "devif.h" @@ -295,7 +299,7 @@ DLword ColorCursor_savebitmap[CURSORWIDTH / COLORPIXELS_IN_DLWORD * CURSORHEIGHT /* */ /************************************************************************/ -void getsignaldata(int sig, int code, struct sigcontext *scp) +void getsignaldata(int sig, int code, void *scp) { #ifndef DOS #ifndef XWINDOW diff --git a/src/keylib.c b/src/keylib.c index faa0f80..09f3e2a 100644 --- a/src/keylib.c +++ b/src/keylib.c @@ -21,6 +21,7 @@ static char *id = "$Id: keylib.c,v 1.4 2001/12/24 01:09:03 sybalsky Exp $ Copyri #include #include #include +#include "keylibdefs.h" #define GOLDEN_RATIO_HACK -478700649 #define ULONG_MAX 4294967295 diff --git a/src/kprint.c b/src/kprint.c index 1cbf63a..6670ff5 100644 --- a/src/kprint.c +++ b/src/kprint.c @@ -19,22 +19,19 @@ static char *id = "$Id: kprint.c,v 1.2 1999/05/31 23:35:36 sybalsky Exp $ Copyri #include "lspglob.h" #include "initatms.h" #include "cell.h" -#include "car-cdr.h" #include "emlglob.h" #include "lispmap.h" #include "adr68k.h" +#include "kprintdefs.h" +#include "car-cdrdefs.h" +#include "testtooldefs.h" + int PrintMaxLevel = 3; int Printdepth = 0; int PrintMaxLen = 10; int PrintLen[20]; -/* forward references */ -void print_string(LispPTR x); -void print_NEWstring(LispPTR x); -void print_fixp(LispPTR x); -void print_floatp(LispPTR x); - /************************************************************************/ /* */ /* P R I N D A T U M */ diff --git a/src/ldsout.c b/src/ldsout.c index b395b7c..943df50 100644 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -38,6 +38,10 @@ static char *id = "$Id: ldsout.c,v 1.4 2001/12/26 22:17:02 sybalsky Exp $ Copyri #include "ifpage.h" #include "dbprint.h" +#include "ldsoutdefs.h" +#include "byteswapdefs.h" +#include "initdspdefs.h" + #ifdef GCC386 #include "inlnPS2.h" #endif /* GCC386 */ @@ -136,7 +140,7 @@ int sysout_loader(char * sysout_file_name, int sys_size) } #ifdef BYTESWAP - word_swap_page((unsigned int *)&ifpage, (3 + sizeof(IFPAGE)) / 4); + word_swap_page((unsigned short *)&ifpage, (3 + sizeof(IFPAGE)) / 4); #endif /* Check the sysout and emulator for compatibility: @@ -277,7 +281,7 @@ int sysout_loader(char * sysout_file_name, int sys_size) } #ifdef BYTESWAP - word_swap_page(fptovp, (sysout_size / 2) + 1); /* So space to swap is twice as big, too. */ + word_swap_page((unsigned short *)fptovp, (sysout_size / 2) + 1); /* So space to swap is twice as big, too. */ #endif /* BYTESWAP */ #else @@ -288,7 +292,7 @@ int sysout_loader(char * sysout_file_name, int sys_size) } #ifdef BYTESWAP - word_swap_page(fptovp, (sysout_size / 4) + 1); + word_swap_page((unsigned short *)fptovp, (sysout_size / 4) + 1); #endif /* BYTESWAP */ #endif /* BIGVM */ @@ -341,7 +345,7 @@ int sysout_loader(char * sysout_file_name, int sys_size) exit(-1); }; #ifdef BYTESWAP - word_swap_page(lispworld_scratch + lispworld_offset, 128); + word_swap_page((DLword *)(lispworld_scratch + lispworld_offset), 128); #endif }; } diff --git a/src/lineblt8.c b/src/lineblt8.c index f66fbc8..853ed29 100644 --- a/src/lineblt8.c +++ b/src/lineblt8.c @@ -13,6 +13,8 @@ static char *id = "$Id: lineblt8.c,v 1.3 1999/05/31 23:35:37 sybalsky Exp $ Copy #include #include "lispemul.h" +#include "lineblt8defs.h" +#include "commondefs.h" #ifdef ISC #include diff --git a/src/lisp2c.c b/src/lisp2c.c index 7922d60..e44fceb 100644 --- a/src/lisp2c.c +++ b/src/lisp2c.c @@ -24,6 +24,10 @@ static char *id = "$Id: lisp2c.c,v 1.3 1999/05/31 23:35:37 sybalsky Exp $ Copyri #include "medleyfp.h" #include "arith.h" +#include "lisp2cdefs.h" +#include "commondefs.h" +#include "mkcelldefs.h" + int LispStringP(LispPTR object) { int type; diff --git a/src/llcolor.c b/src/llcolor.c index ad53b73..5958a7f 100644 --- a/src/llcolor.c +++ b/src/llcolor.c @@ -44,6 +44,8 @@ static char *id = "$Id: llcolor.c,v 1.2 1999/01/03 02:07:15 sybalsky Exp $ Copyr #include "pilotbbt.h" #include "dbprint.h" +#include "llcolordefs.h" + int MonoOrColor = MONO_SCREEN; DLword *ColorDisplayRegion68k; int Dispcolorsize; diff --git a/src/llstk.c b/src/llstk.c index caffc3e..c0eab07 100644 --- a/src/llstk.c +++ b/src/llstk.c @@ -34,13 +34,50 @@ 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" -#include "storage.h" + +#include "llstkdefs.h" +#include "commondefs.h" +#include "dbgtooldefs.h" +#include "testtooldefs.h" +#include "kprintdefs.h" +#include "storagedefs.h" extern int extended_frame; -static DLword *extendstack(void); +/******************************************************************/ +/* + Func Name : extendstack() + Desc. : if LastStackAddr_word is exceeded,then allocate + one new lisppage for STACK area. + + Edited by : Take(March 14, 1988) + +*/ +/******************************************************************/ +static DLword *extendstack(void) { + register LispPTR easp; + register LispPTR scanptr; + + easp = InterfacePage->endofstack; + + if (easp < LOLOC(*LastStackAddr_word)) { + if ((easp > LOLOC(*GuardStackAddr_word)) && ((*STACKOVERFLOW_word) == NIL)) { + extended_frame = 1; + ((INTSTAT *)Addr68k_from_LADDR(*INTERRUPTSTATE_word))->stackoverflow = 1; + *STACKOVERFLOW_word = *PENDINGINTERRUPT_word = ATOM_T; + } + newpage(STK_OFFSET | (scanptr = easp + 2)); + /* I don't concern about DOLOCKPAGES */ + + MAKEFREEBLOCK(Addr68k_from_StkOffset(scanptr), DLWORDSPER_PAGE - 2); + InterfacePage->endofstack = scanptr = easp + DLWORDSPER_PAGE; + SETUPGUARDBLOCK(Addr68k_from_StkOffset(InterfacePage->endofstack), 2); + MAKEFREEBLOCK(Addr68k_from_StkOffset(easp), 2); + return ((DLword *)Addr68k_from_StkOffset(scanptr)); + } else + return (NIL); +} /* end extendstack */ /******************************************************************/ /* @@ -241,40 +278,6 @@ int do_stackoverflow(int incallp) { /* new PVar will set in funcall */ } /* end do_stackoverflow */ -/******************************************************************/ -/* - Func Name : extendstack() - Desc. : if LastStackAddr_word is exceeded,then allocate - one new lisppage for STACK area. - - Edited by : Take(March 14, 1988) - -*/ -/******************************************************************/ -static DLword *extendstack(void) { - register LispPTR easp; - register LispPTR scanptr; - - easp = InterfacePage->endofstack; - - if (easp < LOLOC(*LastStackAddr_word)) { - if ((easp > LOLOC(*GuardStackAddr_word)) && ((*STACKOVERFLOW_word) == NIL)) { - extended_frame = 1; - ((INTSTAT *)Addr68k_from_LADDR(*INTERRUPTSTATE_word))->stackoverflow = 1; - *STACKOVERFLOW_word = *PENDINGINTERRUPT_word = ATOM_T; - } - newpage(STK_OFFSET | (scanptr = easp + 2)); - /* I don't concern about DOLOCKPAGES */ - - MAKEFREEBLOCK(Addr68k_from_StkOffset(scanptr), DLWORDSPER_PAGE - 2); - InterfacePage->endofstack = scanptr = easp + DLWORDSPER_PAGE; - SETUPGUARDBLOCK(Addr68k_from_StkOffset(InterfacePage->endofstack), 2); - MAKEFREEBLOCK(Addr68k_from_StkOffset(easp), 2); - return ((DLword *)Addr68k_from_StkOffset(scanptr)); - } else - return (NIL); -} /* end extendstack */ - /******************************************************************/ /* Func Name : freestackblock(n,sart,align) diff --git a/src/loopsops.c b/src/loopsops.c index 37ffa5a..32167c2 100644 --- a/src/loopsops.c +++ b/src/loopsops.c @@ -23,13 +23,18 @@ static char *id = "$Id: loopsops.c,v 1.3 1999/05/31 23:35:37 sybalsky Exp $ Copy #include "lispemul.h" #include "lsptypes.h" #include "cell.h" -#include "car-cdr.h" #include "lispmap.h" #include "lspglob.h" #include "adr68k.h" #include "stack.h" #include "gc.h" +#include "loopsopsdefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "gcarraydefs.h" +#include "gchtfinddefs.h" + LispPTR lcfuncall(register unsigned int atom_index, register int argnum, register int bytenum); LispPTR get_package_atom(char *char_base, DLword charlen, char *packname, DLword packlen, int externalp); diff --git a/src/lowlev1.c b/src/lowlev1.c index b57766f..22c4b66 100644 --- a/src/lowlev1.c +++ b/src/lowlev1.c @@ -19,7 +19,9 @@ static char *id = "$Id: lowlev1.c,v 1.3 1999/05/31 23:35:38 sybalsky Exp $ Copyr #include "lsptypes.h" #include "emlglob.h" -int mask_array[16] = {1, 3, 7, 0xf, 0x1f, 0x3f, 0x7f, 0xff, +#include "lowlev1defs.h" + +static int mask_array[16] = {1, 3, 7, 0xf, 0x1f, 0x3f, 0x7f, 0xff, 0x1ff, 0x3ff, 0x7ff, 0xfff, 0x1fff, 0x3fff, 0x7fff, 0xffff}; /************************************************************ diff --git a/src/lowlev2.c b/src/lowlev2.c index 93d1a0d..1ed983c 100644 --- a/src/lowlev2.c +++ b/src/lowlev2.c @@ -19,6 +19,8 @@ static char *id = "$Id: lowlev2.c,v 1.3 1999/05/31 23:35:38 sybalsky Exp $ Copyr #include "lsptypes.h" #include "emlglob.h" +#include "lowlev2defs.h" + /*** NOTE: these routines likely not called (see inlinedefsC.h) ***/ /************************************************************ diff --git a/src/lsthandl.c b/src/lsthandl.c index cca09d1..74f89c5 100644 --- a/src/lsthandl.c +++ b/src/lsthandl.c @@ -26,7 +26,10 @@ static char *id = "$Id: lsthandl.c,v 1.4 1999/05/31 23:35:38 sybalsky Exp $ Copy #include "address.h" #include "adr68k.h" #include "cell.h" -#include "car-cdr.h" + +#include "lsthandldefs.h" +#include "car-cdrdefs.h" +#include "vars3defs.h" /***********************************************************************/ /* N_OP_fmemb */ diff --git a/src/main.c b/src/main.c index 918b636..6ac388f 100644 --- a/src/main.c +++ b/src/main.c @@ -18,7 +18,6 @@ static char *id = "$Id: main.c,v 1.4 2001/12/26 22:17:03 sybalsky Exp $ Copyrigh #include "lispemul.h" #include "dbprint.h" #include "unixfork.h" -#include "dir.h" #include #ifndef DOS @@ -95,7 +94,21 @@ 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" + +#include "maindefs.h" +#include "commondefs.h" +#include "dirdefs.h" +#include "dspifdefs.h" +#include "etherdefs.h" +#include "initdspdefs.h" +#include "initkbddefs.h" +#include "initsoutdefs.h" +#include "ldsoutdefs.h" +#include "storagedefs.h" +#include "timerdefs.h" +#include "unixcommdefs.h" +#include "xcdefs.h" +#include "xrdoptdefs.h" DLword *Lisp_world; /* lispworld */ @@ -522,12 +535,6 @@ int main(int argc, char *argv[]) strcpy(keytyped, keystring); - if (keytester(keystring)) { /* keytester destroys keystring */ - fprintf(stderr, "Sorry, invalid or expired access key.\n"); - fprintf(stderr, "Key tried: %s\n", keytyped); - exit(-1); - } - #ifndef NOETHER init_ether(); /* modified by kiuchi Nov. 4 */ #endif /* NOETHER */ diff --git a/src/misc7.c b/src/misc7.c index 96680b0..01dfe4b 100644 --- a/src/misc7.c +++ b/src/misc7.c @@ -29,6 +29,10 @@ static char *id = "$Id: misc7.c,v 1.2 1999/01/03 02:07:22 sybalsky Exp $ Copyrig */ #include "display.h" +#include "misc7defs.h" +#include "bbtsubdefs.h" +#include "initdspdefs.h" + #ifndef NOPIXRECT #include #include diff --git a/src/miscn.c b/src/miscn.c index 4c4e9d7..e362c87 100644 --- a/src/miscn.c +++ b/src/miscn.c @@ -28,6 +28,13 @@ static char *id = "$Id: miscn.c,v 1.3 1999/05/31 23:35:39 sybalsky Exp $ Copyrig #include "subrs.h" #include "profile.h" +#include "miscndefs.h" +#include "commondefs.h" +#include "loopsopsdefs.h" +#include "mvsdefs.h" +#include "sxhashdefs.h" +#include "usrsubrdefs.h" + /***********************************************************/ /* Func Name : OP_miscn diff --git a/src/mkatom.c b/src/mkatom.c index 21ad7b5..ccf4936 100644 --- a/src/mkatom.c +++ b/src/mkatom.c @@ -39,6 +39,10 @@ static char *id = "$Id: mkatom.c,v 1.4 2001/12/24 01:09:05 sybalsky Exp $ Copyri #include "cell.h" #include "dbprint.h" +#include "mkatomdefs.h" +#include "commondefs.h" +#include "mkcelldefs.h" + #define ATOMoffset 2 /* NIL NOBIND */ #define MAX_ATOMINDEX 0xffff /* max number of atoms */ @@ -215,12 +219,12 @@ LispPTR compare_lisp_chars(register char *char1, register char *char2, register #endif /* BYTESWAP */ } else if (fat1) { /* char1 is fat, char2 isn't */ - if (lispcmp(char1, char2, length)) + if (lispcmp((DLword *)char1, char2, length)) return (T); else return (NIL); } else { /* char2 is fat, char1 isn't */ - if (lispcmp(char2, char1, length)) + if (lispcmp((DLword *)char2, char1, length)) return (T); else return (NIL); diff --git a/src/mkcell.c b/src/mkcell.c index 75f915e..8fa8214 100644 --- a/src/mkcell.c +++ b/src/mkcell.c @@ -38,6 +38,11 @@ static char *id = "$Id: mkcell.c,v 1.3 1999/05/31 23:35:39 sybalsky Exp $ Copyri #include "cell.h" #include "gc.h" +#include "mkcelldefs.h" +#include "allocmdsdefs.h" +#include "commondefs.h" +#include "gchtfinddefs.h" + static LispPTR oldoldfree; static LispPTR oldfree; diff --git a/src/mvs.c b/src/mvs.c index 7ac383d..b4fe861 100644 --- a/src/mvs.c +++ b/src/mvs.c @@ -27,11 +27,12 @@ static char *id = "$Id: mvs.c,v 1.3 1999/05/31 23:35:40 sybalsky Exp $ Copyright #include "emlglob.h" #include "adr68k.h" #include "lsptypes.h" -#include "stack.h" #include "opcodes.h" #include "cell.h" -#include "conspage.h" -#include "car-cdr.h" + +#include "mvsdefs.h" +#include "car-cdrdefs.h" +#include "conspagedefs.h" #ifdef AIXPS2 #include "inlnPS2.h" diff --git a/src/osmsg.c b/src/osmsg.c index e787176..4562640 100644 --- a/src/osmsg.c +++ b/src/osmsg.c @@ -24,6 +24,7 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig #include #include +#include #ifdef ISC #include #endif /* ISC */ @@ -61,6 +62,9 @@ static char *id = "$Id: osmsg.c,v 1.2 1999/01/03 02:07:29 sybalsky Exp $ Copyrig #include "locfile.h" #include "osmsg.h" #include "dbprint.h" + +#include "osmsgdefs.h" + #ifdef OS4 #include #endif diff --git a/src/perrno.c b/src/perrno.c index a5c514b..c5aee8c 100644 --- a/src/perrno.c +++ b/src/perrno.c @@ -14,8 +14,12 @@ static char *id = "$Id: perrno.c,v 1.4 2001/12/26 22:17:04 sybalsky Exp $ Copyri #include #include #include +#include "lispemul.h" #include "osmsg.h" +#include "perrnodefs.h" +#include "osmsgdefs.h" + /************************************************************************/ /* */ /* p e r r o r n */ diff --git a/src/return.c b/src/return.c index de83ad6..a18aebf 100644 --- a/src/return.c +++ b/src/return.c @@ -41,6 +41,9 @@ static char *id = "$Id: return.c,v 1.4 2001/12/24 01:09:05 sybalsky Exp $ Copyri #include "cell.h" #include "return.h" +#include "returndefs.h" +#include "commondefs.h" + /***********************************************************************/ /* Func Name : OP_contextsw diff --git a/src/rpc.c b/src/rpc.c index 54eaf90..744d6ef 100644 --- a/src/rpc.c +++ b/src/rpc.c @@ -21,6 +21,7 @@ static char *id = "$Id: rpc.c,v 1.3 2001/12/24 01:09:06 sybalsky Exp $ Copyright #ifndef DOS #include +#include #include #include #include @@ -39,6 +40,9 @@ static char *id = "$Id: rpc.c,v 1.3 2001/12/24 01:09:06 sybalsky Exp $ Copyright #include "arith.h" #include "locfile.h" +#include "rpcdefs.h" +#include "commondefs.h" + #define MAX_HOSTNAME_LENGTH 100 #define UDP_DATA_BLOCK_SIZE 1000 diff --git a/src/rplcons.c b/src/rplcons.c index 5fe0f95..841c0aa 100644 --- a/src/rplcons.c +++ b/src/rplcons.c @@ -31,8 +31,10 @@ static char *id = "$Id: rplcons.c,v 1.3 1999/05/31 23:35:41 sybalsky Exp $ Copyr #include "adr68k.h" #include "gc.h" #include "cell.h" -#include "conspage.h" -#include "car-cdr.h" + +#include "rplconsdefs.h" +#include "car-cdrdefs.h" +#include "conspagedefs.h" /***************************************************/ diff --git a/src/setsout.c b/src/setsout.c index 14590a8..b41cc0f 100644 --- a/src/setsout.c +++ b/src/setsout.c @@ -37,6 +37,8 @@ static char *id = "$Id: setsout.c,v 1.3 1999/05/31 23:35:41 sybalsky Exp $ Copyr #include "ifpage.h" #include "dbprint.h" +#include "byteswapdefs.h" + #define IFPAGE_ADDRESS 512 #define MBYTE 0x100000 /* 1 Mbyte */ extern int errno; @@ -71,7 +73,7 @@ void set_sysout(int version, char *sysout_file_name) { } #ifdef BYTESWAP - word_swap_page(&ifpage, (3 + sizeof(IFPAGE)) / 4); + word_swap_page((unsigned short *)&ifpage, (3 + sizeof(IFPAGE)) / 4); #endif ifpage.lversion = version; diff --git a/src/shift.c b/src/shift.c index 8ea3737..fc5bbca 100644 --- a/src/shift.c +++ b/src/shift.c @@ -19,9 +19,8 @@ static char *id = "$Id: shift.c,v 1.3 1999/05/31 23:35:42 sybalsky Exp $ Copyrig #include "lsptypes.h" #include "arith.h" -#define LSH 0347 - -DLword *createcell68k(unsigned int type); +#include "shiftdefs.h" +#include "mkcelldefs.h" /* * XXX: it feels as though something is not clean here, looks like the diff --git a/src/storage.c b/src/storage.c index 1016b0c..20ef726 100644 --- a/src/storage.c +++ b/src/storage.c @@ -27,11 +27,17 @@ static const char *id = #include "stack.h" #include "lspglob.h" #include "cell.h" -#include "car-cdr.h" #include "lsptypes.h" #include "ifpage.h" #include "gc.h" -#include "storage.h" + +#include "storagedefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "conspagedefs.h" +#include "gcfinaldefs.h" +#include "gchtfinddefs.h" +#include "mkatomdefs.h" #define MINARRAYBLOCKSIZE 4 #define GUARDVMEMFULL 500 diff --git a/src/subr.c b/src/subr.c index 9e2fbdd..07fb312 100644 --- a/src/subr.c +++ b/src/subr.c @@ -42,14 +42,30 @@ static char *id = "$Id: subr.c,v 1.3 1999/05/31 23:35:42 sybalsky Exp $ Copyrigh #include "subrs.h" #include "profile.h" #include "dbprint.h" -#include "dsk.h" -#include "ufs.h" -#include "dir.h" -#include "chardev.h" -#include "dspsubrs.h" -#include "storage.h" #include "bbtsub.h" +#include "subrdefs.h" +#include "bbtsubdefs.h" +#include "chardevdefs.h" +#include "commondefs.h" +#include "dirdefs.h" +#include "dskdefs.h" +#include "dspsubrsdefs.h" +#include "etherdefs.h" +#include "gcarraydefs.h" +#include "gcrdefs.h" +#include "inetdefs.h" +#include "kbdsubrsdefs.h" +#include "mkcelldefs.h" +#include "osmsgdefs.h" +#include "rpcdefs.h" +#include "storagedefs.h" +#include "timerdefs.h" +#include "ufsdefs.h" +#include "unixcommdefs.h" +#include "uutilsdefs.h" +#include "vmemsavedefs.h" + extern LispPTR *PENDINGINTERRUPT68k; /***********************************************************/ @@ -187,7 +203,9 @@ void OP_subrcall(int subr_no, int argnum) { /*************/ case sb_SETUNIXTIME: POP_SUBR_ARGS; - TopOfStack = subr_settime(args); + subr_settime(args); + /* don't know whether it worked or not */ + TopOfStack = NIL; break; case sb_GETUNIXTIME: POP_SUBR_ARGS; @@ -195,7 +213,9 @@ void OP_subrcall(int subr_no, int argnum) { break; case sb_COPYTIMESTATS: POP_SUBR_ARGS; - TopOfStack = subr_copytimestats(args); + subr_copytimestats(args); + /* no result */ + TopOfStack = NIL; break; /*************/ diff --git a/src/subr0374.c b/src/subr0374.c index f774d88..80a4828 100644 --- a/src/subr0374.c +++ b/src/subr0374.c @@ -35,6 +35,8 @@ static char *id = "$Id: subr0374.c,v 1.3 1999/05/31 23:35:43 sybalsky Exp $ Copy #include "adr68k.h" #include "lspglob.h" +#include "subr0374defs.h" + LispPTR subr_k_trace(LispPTR *args) { int len; char *base; diff --git a/src/sxhash.c b/src/sxhash.c index 079fea9..c9900cd 100644 --- a/src/sxhash.c +++ b/src/sxhash.c @@ -22,23 +22,25 @@ static char *id = "$Id: sxhash.c,v 1.4 2001/12/24 01:09:06 sybalsky Exp $ Copyri #include "address.h" #include "stack.h" #include "cell.h" -#include "car-cdr.h" #include "array.h" - #include "arith.h" +#include "sxhashdefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" + /** Follows definition in LLARRAYELT: **/ #define EQHASHINGBITS(item) \ ((((item) >> 16) & 0xFFFF) ^ ((((item)&0x1FFF) << 3) ^ (((item) >> 9) & 0x7f))) -unsigned short sxhash(LispPTR obj); -unsigned short sxhash_rotate(short unsigned int value); -unsigned short sxhash_string(OneDArray *obj); -unsigned short sxhash_bitvec(OneDArray *obj); -unsigned short sxhash_list(LispPTR obj); -unsigned short sxhash_pathname(LispPTR obj); -unsigned short stringequalhash(LispPTR obj); -unsigned short stringhash(LispPTR obj); +static unsigned short sxhash(LispPTR obj); +static unsigned short sxhash_rotate(short unsigned int value); +static unsigned short sxhash_string(OneDArray *obj); +static unsigned short sxhash_bitvec(OneDArray *obj); +static unsigned short sxhash_list(LispPTR obj); +static unsigned short sxhash_pathname(LispPTR obj); +static unsigned short stringequalhash(LispPTR obj); +static unsigned short stringhash(LispPTR obj); /****************************************************************/ /* */ @@ -47,7 +49,6 @@ unsigned short stringhash(LispPTR obj); /* C-coded version of the hashing function SXHASH */ /* */ /****************************************************************/ -typedef struct { LispPTR object; } SXHASHARG; LispPTR SX_hash(register SXHASHARG *args) { return (S_POSITIVE | (0xFFFF & (sxhash(args->object)))); @@ -62,7 +63,7 @@ LispPTR SX_hash(register SXHASHARG *args) { /* Fails to handle ratios, complex's, bitvectors pathnames & odd */ /* cases */ /*****************************************************************/ -unsigned short sxhash(LispPTR obj) { +static unsigned short sxhash(LispPTR obj) { /* unsigned short hashOffset; Not Used */ unsigned int cell; unsigned typen; @@ -113,13 +114,13 @@ unsigned short sxhash(LispPTR obj) { #ifndef SUN3_OS3_OR_OS4_IL /* Rotates the 16-bit work to the left 7 bits (or to the right 9 bits) */ -unsigned short sxhash_rotate(short unsigned int value) { +static unsigned short sxhash_rotate(short unsigned int value) { return ((value << 7) | ((value >> 9) & 0x7f)); } #endif -unsigned short sxhash_string(OneDArray *obj) { +static unsigned short sxhash_string(OneDArray *obj) { unsigned len, offset; register unsigned short hash = 0; len = (unsigned)obj->fillpointer; @@ -143,7 +144,7 @@ unsigned short sxhash_string(OneDArray *obj) { return (hash); } -unsigned short sxhash_bitvec(OneDArray *obj) { +static unsigned short sxhash_bitvec(OneDArray *obj) { unsigned short *base; unsigned len, offset, bitoffset; unsigned short hash = 0; @@ -162,7 +163,7 @@ unsigned short sxhash_bitvec(OneDArray *obj) { return (hash); } -unsigned short sxhash_list(LispPTR obj) { +static unsigned short sxhash_list(LispPTR obj) { unsigned short hash = 0; int counter; for (counter = 0; (counter < 13) && (GetTypeNumber(obj) == TYPE_LISTP); counter++) { @@ -172,7 +173,7 @@ unsigned short sxhash_list(LispPTR obj) { return (hash); } -unsigned short sxhash_pathname(LispPTR obj) { +static unsigned short sxhash_pathname(LispPTR obj) { unsigned short hash = 0; PATHNAME *path; path = (PATHNAME *)(Addr68k_from_LADDR(obj)); @@ -197,7 +198,7 @@ LispPTR STRING_EQUAL_HASHBITS(SXHASHARG *args) { return (S_POSITIVE | (0xFFFF & (stringequalhash(args->object)))); } /* STRING_EQUAL_HASHBITS */ -unsigned short stringequalhash(LispPTR obj) { +static unsigned short stringequalhash(LispPTR obj) { unsigned len, offset, fatp, ind; register unsigned short hash = 0; PNCell *pnptr; @@ -265,7 +266,7 @@ LispPTR STRING_HASHBITS(SXHASHARG *args) { return (S_POSITIVE | (0xFFFF & (stringhash(args->object)))); } /* STRING_HASHBITS */ -unsigned short stringhash(LispPTR obj) { +static unsigned short stringhash(LispPTR obj) { unsigned len, offset, fatp, ind; register unsigned short hash = 0; PNCell *pnptr; diff --git a/src/testtool.c b/src/testtool.c index bd639b8..ce973c3 100644 --- a/src/testtool.c +++ b/src/testtool.c @@ -55,12 +55,17 @@ static char *id = "$Id: testtool.c,v 1.4 2001/12/24 01:09:07 sybalsky Exp $ Copy #include "lspglob.h" #include "emlglob.h" #include "cell.h" -#include "stack.h" #include "ifpage.h" #include "debug.h" #include "dbprint.h" #include "tosfns.h" +#include "testtooldefs.h" +#include "dbgtooldefs.h" +#include "gcarraydefs.h" +#include "kprintdefs.h" +#include "mkatomdefs.h" + #define URMAXFXNUM 100 #define URSCAN_ALINK 0 #define URSCAN_CLINK 1 @@ -814,20 +819,11 @@ int print_opcode(int pc, DLbyte *addr, struct fnhead *fnobj) { /* */ /************************************************************************/ -struct doko { - LispPTR func; - int pc; -}; - -struct doko doko(void) { - struct doko tmp; - +void doko(void) { printf(" At "); print_atomname(FuncObj->framename); putchar('\n'); - printf(" PC cnt = 0%o\n", tmp.pc = ((UNSIGNED)(PC) - (UNSIGNED)FuncObj)); - tmp.func = FuncObj->framename; - return (tmp); + printf(" PC cnt = 0%o\n", ((UNSIGNED)(PC) - (UNSIGNED)FuncObj)); } /**** dump specified area (in 32 bit width) ***/ @@ -1055,7 +1051,7 @@ int MAKEATOM(char *string) { /* */ /************************************************************************/ -DLword *MakeAtom68k(char *string) { +LispPTR *MakeAtom68k(char *string) { int index; index = make_atom(string, 0, countchar(string), 0); #ifdef BIGVM diff --git a/src/timer.c b/src/timer.c index 370edc9..3f33927 100644 --- a/src/timer.c +++ b/src/timer.c @@ -45,6 +45,7 @@ unsigned long tick_count = 0; /* approx 18 ticks per sec */ #include #include #include +#include #ifdef LINUX #include #else @@ -108,6 +109,10 @@ extern int ether_fd; #include "stack.h" #include "dbprint.h" +#include "timerdefs.h" +#include "commondefs.h" +#include "mkcelldefs.h" + #ifdef XWINDOW #include "devif.h" extern DspInterface currentdsp; @@ -147,23 +152,7 @@ int Event_Req = FALSE; #define SIGERRCHK(set, str) \ if (set == SIG_ERR) perror(str) -void update_miscstats(); - -/************************************************************************/ -/* */ -/* i n i t _ m i s c s t a t s */ -/* */ -/* Called at initialization time to set miscstats words. */ -/* ?? and to periodically update them ?? [JDS 11/22/89] */ -/* */ -/* */ -/************************************************************************/ - -void init_miscstats() { - MiscStats->starttime = gettime(0); - MiscStats->gctime = 0; - update_miscstats(); -} +static int gettime(int casep); /************************************************************************/ /* */ @@ -221,6 +210,22 @@ void update_miscstats() { #endif /* DOS */ } +/************************************************************************/ +/* */ +/* i n i t _ m i s c s t a t s */ +/* */ +/* Called at initialization time to set miscstats words. */ +/* ?? and to periodically update them ?? [JDS 11/22/89] */ +/* */ +/* */ +/************************************************************************/ + +void init_miscstats() { + MiscStats->starttime = gettime(0); + MiscStats->gctime = 0; + update_miscstats(); +} + /************************************************************************/ /* */ /* s u b r _ g e t t i m e */ @@ -265,7 +270,7 @@ LispPTR subr_gettime(LispPTR args[]) /* */ /************************************************************************/ -int gettime(int casep) +static int gettime(int casep) { #ifndef USETIMEFN struct timeval timev; @@ -510,9 +515,9 @@ static struct sigvec timerv; #endif /* SYSVSIGNALS */ #if (defined(OS4) || defined(SYSVONLY)) || defined(MACOSX) || defined(FREEBSD) || defined(OS5) -void int_timer_service(int sig, int code, struct sigcontext *scp) +static void int_timer_service(int sig, int code, void *scp) #else -int int_timer_service(int sig, int code, struct sigcontext *scp) +static int int_timer_service(int sig, int code, void *scp) #endif /* OS4 | SYSVONLY | MACOSX | FREEBSD */ { /* this may have to do more in the future, like check for nested interrupts, @@ -553,7 +558,7 @@ int int_timer_service(int sig, int code, struct sigcontext *scp) /* */ /************************************************************************/ -void int_timer_init() +static void int_timer_init() { #ifdef DOS @@ -655,7 +660,7 @@ void int_io_close(int fd) /* */ /************************************************************************/ -void int_io_init() { +static void int_io_init() { #ifndef SYSVSIGNALS static struct sigvec timerv; static struct sigvec poll_timerv; @@ -912,7 +917,7 @@ void int_fp_init() { /* first set up the signal handler */ /************************************************************************/ jmp_buf jmpbuf; -void timeout_error() { +static void timeout_error() { /* * Following printf changes the contents of jmpbuf! * This would lead to horrible segmentation violation. @@ -938,7 +943,7 @@ void timeout_error() { /* */ /************************************************************************/ -void int_file_init() { +static void int_file_init() { #ifndef SYSVSIGNALS static struct sigvec timerv; #endif /* SYSVSIGNALS */ @@ -1008,7 +1013,7 @@ void int_file_init() { struct sigaction * restrict oact); */ -void panicuraid(int sig, int code, struct sigcontext *scp, void *addr) +void panicuraid(int sig, int code, void *scp, void *addr) { static char errormsg[200]; static char *stdmsg = @@ -1021,35 +1026,35 @@ and do a 'v' before trying anything else."; switch (sig) { #ifdef SIGBUS case SIGBUS: - sprintf(errormsg, "BUS error (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "BUS error (code %d) at address %p.\n%s", code, addr, stdmsg); break; #endif /* SIGBUS */ case SIGSEGV: - sprintf(errormsg, "SEGV error (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "SEGV error (code %d) at address %p.\n%s", code, addr, stdmsg); break; case SIGILL: - sprintf(errormsg, "Illegal instruction (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "Illegal instruction (code %d) at address %p.\n%s", code, addr, stdmsg); break; #ifdef SIGPIPE case SIGPIPE: - sprintf(errormsg, "Broken PIPE (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "Broken PIPE (code %d) at address %p.\n%s", code, addr, stdmsg); break; #endif /* SGPIPE */ #ifdef SIGHUP case SIGHUP: - sprintf(errormsg, "HANGUP signalled (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "HANGUP signalled (code %d) at address %p.\n%s", code, addr, stdmsg); /* Assume that a user tried to exit UNIX shell */ #ifdef SYSVONLY kill(0, SIGKILL); exit(0); #else - killpg(getpgrp(0), SIGKILL); + killpg(getpgrp(), SIGKILL); exit(0); #endif /* SYSVONLY */ break; #endif /* SIGHUP */ case SIGFPE: - sprintf(errormsg, "FP error (code %d) at address 0x%x.\n%s", code, addr, stdmsg); + sprintf(errormsg, "FP error (code %d) at address %p.\n%s", code, addr, stdmsg); break; default: sprintf(errormsg, "Uncaught SIGNAL %d (code %d).\n%s", sig, code, stdmsg); } @@ -1067,7 +1072,7 @@ and do a 'v' before trying anything else."; /* uraid and get a clue about why you're dying. */ /* */ /************************************************************************/ -void int_panic_init() { +static void int_panic_init() { #ifdef SYSVSIGNALS #ifdef ISC sigset(SIGHUP, panicuraid); diff --git a/src/truecolor.c b/src/truecolor.c index 1a163f6..10570ec 100644 --- a/src/truecolor.c +++ b/src/truecolor.c @@ -22,7 +22,6 @@ static char *id = "$Id: truecolor.c,v 1.2 1999/01/03 02:07:38 sybalsky Exp $ Cop #include "adr68k.h" #include "arith.h" #include "devconf.h" -#include "uraid.h" #include "picture.h" diff --git a/src/tstsout.c b/src/tstsout.c index 610c4e3..1d39697 100644 --- a/src/tstsout.c +++ b/src/tstsout.c @@ -29,6 +29,7 @@ static char *id = "$Id: tstsout.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyr #include "lspglob.h" #include "ifpage.h" #include "dbprint.h" +#include "byteswapdefs.h" #define IFPAGE_ADDRESS 512 #define MBYTE 0x100000 /* 1 Mbyte */ @@ -66,7 +67,7 @@ void check_sysout(char *sysout_file_name) { } #ifdef BYTESWAP - word_swap_page(&ifpage, (3 + sizeof(IFPAGE)) / 4); + word_swap_page((unsigned short *)&ifpage, (3 + sizeof(IFPAGE)) / 4); #endif close(sysout); printf("%d", ifpage.minbversion); diff --git a/src/typeof.c b/src/typeof.c index e1d5bc3..7d55c16 100644 --- a/src/typeof.c +++ b/src/typeof.c @@ -27,6 +27,8 @@ static char *id = "$Id: typeof.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyri #include "lispmap.h" #include "lspglob.h" +#include "typeofdefs.h" + /************************************************************************/ /* */ /* N _ O P _ d t e s t */ diff --git a/src/ubf1.c b/src/ubf1.c index c548cb2..0830a3a 100644 --- a/src/ubf1.c +++ b/src/ubf1.c @@ -16,9 +16,13 @@ static char *id = "$Id: ubf1.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyrigh #include "lspglob.h" #include "lsptypes.h" #include "lispmap.h" +#include "mkcelldefs.h" #include "arith.h" #include "medleyfp.h" #include "my.h" + +#include "ubf1defs.h" + /************************************************************ OP_ubfloat1 -- op 355 == UBFLOAT1 355/0 BOX @@ -33,7 +37,6 @@ LispPTR N_OP_ubfloat1(int arg, int alpha) { case 0: /* box */ { register DLword *wordp; - DLword *createcell68k(unsigned int type); wordp = createcell68k(TYPE_FLOATP); *((int *)wordp) = arg; return (LADDR_from_68k(wordp)); diff --git a/src/ubf2.c b/src/ubf2.c index 363bb25..a980702 100644 --- a/src/ubf2.c +++ b/src/ubf2.c @@ -17,6 +17,8 @@ static char *id = "$Id: ubf2.c,v 1.3 1999/05/31 23:35:44 sybalsky Exp $ Copyrigh #include "lispemul.h" #include "medleyfp.h" +#include "ubf2defs.h" + /************************************************************ OP_ub2 -- op 354 == UBFLOAT2 354/0 ADD diff --git a/src/ubf3.c b/src/ubf3.c index 6be0a10..342f108 100644 --- a/src/ubf3.c +++ b/src/ubf3.c @@ -19,6 +19,8 @@ static char *id = "$Id: ubf3.c,v 1.3 1999/05/31 23:35:45 sybalsky Exp $ Copyrigh #include "lispmap.h" #include "medleyfp.h" +#include "ubf3defs.h" + /************************************************************ N_OP_ubfloat3 -- op 062 062/0 POLY diff --git a/src/ufn.c b/src/ufn.c index f61ab4e..6048c35 100644 --- a/src/ufn.c +++ b/src/ufn.c @@ -65,7 +65,7 @@ void ufn(DLword bytecode) #ifdef TRACE printPC(); - print_atomname("TRACE : ufn() 0%o ", bytecode); + print_atomname("TRACE : ufn() 0%o ", bytecode); /* XXX: this is WRONG */ #endif PushCStack; diff --git a/src/ufs.c b/src/ufs.c index a57a34a..eff9f19 100644 --- a/src/ufs.c +++ b/src/ufs.c @@ -71,6 +71,7 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #include #include #include +#include #include #include "lispemul.h" #include "lispmap.h" @@ -82,8 +83,10 @@ static char *id = "$Id: ufs.c,v 1.2 1999/01/03 02:07:41 sybalsky Exp $ Copyright #include "timeout.h" #include "locfile.h" #include "dbprint.h" -#include "dsk.h" -#include "ufs.h" + +#include "ufsdefs.h" +#include "commondefs.h" +#include "dskdefs.h" int *Lisp_errno; int Dummy_errno; /* If errno cell is not provided by Lisp, dummy_errno is used. */ diff --git a/src/unixcomm.c b/src/unixcomm.c index 18f8065..f3dfc67 100644 --- a/src/unixcomm.c +++ b/src/unixcomm.c @@ -80,6 +80,11 @@ Unix Interface Communications #include "stack.h" #include "arith.h" #include "dbprint.h" + +#include "unixcommdefs.h" +#include "byteswapdefs.h" +#include "commondefs.h" + #ifdef GCC386 #include "inlinePS2.h" #endif /* GCC386 */ @@ -877,7 +882,7 @@ LispPTR Unix_handlecomm(LispPTR *args) { /**********************************************************/ { - char *bufp; + DLword *bufp; int terno; /* holds errno thru sys calls after I/O fails */ N_GETNUMBER(args[1], slot, bad); /* Get job # */ @@ -888,7 +893,7 @@ LispPTR Unix_handlecomm(LispPTR *args) { else sock = slot; - bufp = (char *)(Addr68k_from_LADDR(args[2])); /* User buffer */ + bufp = (Addr68k_from_LADDR(args[2])); /* User buffer */ DBPRINT(("Read buffer slot %d, type is %d\n", slot, UJ[slot].type)); switch (UJ[slot].type) { @@ -1074,9 +1079,9 @@ LispPTR Unix_handlecomm(LispPTR *args) { case 15: /* Write buffer */ { - char *bufp; + DLword *bufp; N_GETNUMBER(args[1], slot, bad); /* Get job # */ - bufp = (char *)(Addr68k_from_LADDR(args[2])); /* User buffer */ + bufp = (Addr68k_from_LADDR(args[2])); /* User buffer */ N_GETNUMBER(args[3], i, bad); /* # to write */ DBPRINT(("Write buffer, type is %d\n", UJ[slot].type)); diff --git a/src/unwind.c b/src/unwind.c index 39af11e..a4d2bf7 100644 --- a/src/unwind.c +++ b/src/unwind.c @@ -26,7 +26,8 @@ static char *id = "$Id: unwind.c,v 1.3 1999/05/31 23:35:46 sybalsky Exp $ Copyri #include "emlglob.h" #include "stack.h" #include "lspglob.h" -#include "uraid.h" + +#include "unwinddefs.h" UNSIGNED N_OP_unwind(register LispPTR *cstkptr, register LispPTR tos, int n, int keep) { register int num; /* number of UNBOUND slot */ diff --git a/src/uraid.c b/src/uraid.c index afcc406..56904e4 100644 --- a/src/uraid.c +++ b/src/uraid.c @@ -78,15 +78,25 @@ extern int Win_security_p; #include "lspglob.h" #include "emlglob.h" #include "cell.h" -#include "stack.h" -#include "llstk.h" #include "ifpage.h" #include "debug.h" #include "devconf.h" #include "display.h" #include "bitblt.h" -#include "uraid.h" + +#include "uraiddefs.h" +#include "dbgtooldefs.h" +#include "gcarraydefs.h" +#include "initdspdefs.h" +#include "initkbddefs.h" +#include "kprintdefs.h" +#include "llstkdefs.h" +#include "mkatomdefs.h" +#include "returndefs.h" +#include "testtooldefs.h" +#include "timerdefs.h" +#include "vmemsavedefs.h" #ifdef DOS #define vfork() printf("No forking around here.\n") @@ -167,10 +177,10 @@ extern u_int EtherReadFds; LispPTR RadiAtomIndex; LispPTR RaidPackageIndex; -char *HideDisp68k; +DLword *HideDisp68k; #ifdef COLOR -char *HideColorDisp68k; +DLword *HideColorDisp68k; extern int Inited_Color; #endif /* COLOR */ @@ -245,7 +255,6 @@ v filename\t\tSave the virtual memory on the filename(Not Bootable)\n\ printf("Address out of range.\n"); \ return (T); \ } -extern int get_package_atom(); #define URMAXCOMM 512 #define URMAXFXNUM 2000 @@ -280,7 +289,6 @@ extern int PrintMaxLevel; /* for print level */ */ /***********************************************************************/ -LispPTR make_atom(); LispPTR parse_atomstring(char *string) { char *start, *packageptr, *nameptr; @@ -339,7 +347,7 @@ void uraid_commclear() { URaid_argnum = 0; } -void copy_region(short *src, short *dst, int width, int h) +void copy_region(DLword *src, DLword *dst, int width, int h) { register int w; @@ -348,6 +356,14 @@ void copy_region(short *src, short *dst, int width, int h) } } +struct dtd * uGetDTD(unsigned int typenum) { + return (struct dtd *)GetDTD(typenum); +} + +unsigned int uGetTN(unsigned int address) { + return GetTypeNumber(address); +} + /***********************************************************************/ /* func name : uraid_commands() @@ -582,12 +598,22 @@ LispPTR uraid_commands() { printf("{DISPLAY}"); printf("0x%x\n", address); break; - default: - num = GetTypeNumber(address); + default: { + struct dtd *dtd = GetDTD(GetTypeNumber(address)); +#ifdef BIGVM + index = dtd->dtd_name; +#else + index = (dtd->dtd_namehi << 16) + dtd->dtd_namelo; +#endif putchar('{'); - print_atomname((DLword *)GetDTD(num)); - putchar('}'); + if (index != 0) { + print_atomname(index); + } else { + printf("unknown"); + } + printf("}\n"); break; + } } /* switch end */ break; diff --git a/src/usrsubr.c b/src/usrsubr.c index cc4f7ee..4948132 100644 --- a/src/usrsubr.c +++ b/src/usrsubr.c @@ -13,13 +13,15 @@ static char *id = "$Id: usrsubr.c,v 1.3 1999/05/31 23:35:46 sybalsky Exp $ Copyr #include +#include "usrsubrdefs.h" + /** User defined subrs here. Do NOT attempt to use this unless you FULLY understand the dependencies of the LDE architecture. **/ #define DO_UFN \ { return (-1); } -int UserSubr(int user_subr_index, int num_args, int *args) { +int UserSubr(int user_subr_index, int num_args, unsigned *args) { int result = 0; /* *** remove the printf when finished debugging your user subr *** */ diff --git a/src/uutils.c b/src/uutils.c index 00dbb74..ce42e3c 100644 --- a/src/uutils.c +++ b/src/uutils.c @@ -40,13 +40,17 @@ static char *id = "$Id: uutils.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyri #endif #include +#include #include "lispemul.h" #include "adr68k.h" #include "lsptypes.h" #include "lspglob.h" #include "osmsg.h" #include "keyboard.h" -#include "uraid.h" + +#include "uutilsdefs.h" +#include "osmsgdefs.h" +#include "uraiddefs.h" #ifdef OS5 #define gethostid() 0 @@ -382,7 +386,7 @@ LispPTR suspend_lisp(LispPTR *args) { #ifdef SYSVONLY kill(0, SIGTSTP); #else - killpg(getpgrp(0), SIGTSTP); + killpg(getpgrp(), SIGTSTP); #endif /* SYSVONLY */ OSMESSAGE_PRINT(printf("resuming\n")); diff --git a/src/vars3.c b/src/vars3.c index 7bb7d10..baee5b9 100644 --- a/src/vars3.c +++ b/src/vars3.c @@ -17,10 +17,12 @@ static char *id = "$Id: vars3.c,v 1.4 2001/12/24 01:09:07 sybalsky Exp $ Copyrig #include "adr68k.h" #include "emlglob.h" #include "cell.h" -#include "car-cdr.h" #include "lsptypes.h" #include "stack.h" +#include "vars3defs.h" +#include "car-cdrdefs.h" + /* def. of car_cell moved to cell.h */ struct cadr_cell cadr(LispPTR cell_adr); diff --git a/src/vmemsave.c b/src/vmemsave.c index 5c882c7..1666136 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -71,9 +71,14 @@ static char *id = "$Id: vmemsave.c,v 1.2 1999/01/03 02:07:45 sybalsky Exp $ Copy #include "locfile.h" #include "dbprint.h" #include "devif.h" -#include "dsk.h" -#include "ufs.h" -#include "dir.h" + +#include "vmemsavedefs.h" +#include "byteswapdefs.h" +#include "commondefs.h" +#include "dskdefs.h" +#include "initkbddefs.h" +#include "perrnodefs.h" +#include "ufsdefs.h" #ifdef GCC386 #include "inlnPS2.h" @@ -173,7 +178,6 @@ LispPTR vmem_save0(LispPTR *args) #else struct passwd *pwd; #endif /* DOS */ - char *getenv(); Lisp_errno = &Dummy_errno; @@ -460,7 +464,7 @@ LispPTR vmem_save(char *sysout_file_name) DBPRINT(("%4d: writing %d pages from %x\n", i, contig_pages, base_addr - (char *)Lisp_world)); #ifdef BYTESWAP - word_swap_page(base_addr, contig_pages * BYTESPER_PAGE / 4); + word_swap_page((unsigned short *)base_addr, contig_pages * BYTESPER_PAGE / 4); #endif /* BYTESWAP */ if (contig_pages > maxpages) { @@ -485,7 +489,7 @@ LispPTR vmem_save(char *sysout_file_name) TIMEOUT_TIME = oldTT; } #ifdef BYTESWAP - word_swap_page(base_addr, contig_pages * BYTESPER_PAGE / 4); + word_swap_page((unsigned short *)base_addr, contig_pages * BYTESPER_PAGE / 4); #endif /* BYTESWAP */ if (rval == -1) { @@ -502,12 +506,12 @@ LispPTR vmem_save(char *sysout_file_name) return (FILECANNOTSEEK); } #ifdef BYTESWAP - word_swap_page((char *)InterfacePage, BYTESPER_PAGE / 4); + word_swap_page((unsigned short *)InterfacePage, BYTESPER_PAGE / 4); #endif /* BYTESWAP */ TIMEOUT(rval = write(sysout, (char *)InterfacePage, BYTESPER_PAGE)); #ifdef BYTESWAP - word_swap_page((char *)InterfacePage, BYTESPER_PAGE / 4); + word_swap_page((unsigned short *)InterfacePage, BYTESPER_PAGE / 4); #endif /* BYTESWAP */ if (rval == -1) { diff --git a/src/xbbt.c b/src/xbbt.c index d990272..38c108b 100644 --- a/src/xbbt.c +++ b/src/xbbt.c @@ -19,6 +19,7 @@ static char *id = "$Id: xbbt.c,v 1.2 1999/01/03 02:07:46 sybalsky Exp $ Copyrigh #include "lispemul.h" #include "xdefs.h" #include "devif.h" +#include "xbbtdefs.h" extern DspInterface currentdsp; diff --git a/src/xc.c b/src/xc.c index 37992ff..5124e4b 100644 --- a/src/xc.c +++ b/src/xc.c @@ -40,7 +40,6 @@ 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 "return.h" #include "dbprint.h" @@ -48,8 +47,6 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright #include "lsptypes.h" #include "lispmap.h" #include "cell.h" -#include "car-cdr.h" -#include "conspage.h" #include "initatms.h" #include "gc.h" #include "arith.h" @@ -60,6 +57,51 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright #include "tosfns.h" #include "inlineC.h" +#include "xcdefs.h" +#include "arith2defs.h" +#include "arith3defs.h" +#include "arith4defs.h" +#include "arraydefs.h" +#include "array2defs.h" +#include "array3defs.h" +#include "array4defs.h" +#include "array5defs.h" +#include "array6defs.h" +#include "bitbltdefs.h" +#include "bltdefs.h" +#include "car-cdrdefs.h" +#include "commondefs.h" +#include "conspagedefs.h" +#include "drawdefs.h" +#include "eqfdefs.h" +#include "findkeydefs.h" +#include "fpdefs.h" +#include "fvardefs.h" +#include "gchtfinddefs.h" +#include "gcscandefs.h" +#include "gvar2defs.h" +#include "hardrtndefs.h" +#include "intcalldefs.h" +#include "keyeventdefs.h" +#include "llstkdefs.h" +#include "lowlev2defs.h" +#include "lsthandldefs.h" +#include "misc7defs.h" +#include "miscndefs.h" +#include "mkcelldefs.h" +#include "returndefs.h" +#include "rplconsdefs.h" +#include "shiftdefs.h" +#include "subrdefs.h" +#include "timerdefs.h" +#include "typeofdefs.h" +#include "ubf1defs.h" +#include "ubf2defs.h" +#include "ubf3defs.h" +#include "unwinddefs.h" +#include "vars3defs.h" +#include "z2defs.h" + #ifdef DOS #include "iopage.h" extern IOPAGE *IOPage68K; @@ -1303,11 +1345,14 @@ check_interrupt: if ((Irq_Stk_End <= 0) || (Irq_Stk_Check <= 0) || need_irq) { if (StkOffset_from_68K(CSTKPTR) > InterfacePage->stackbase) { /* Interrupts not Disabled */ +/* XXX: what on earth is this code trying to accomplish by calling + getsignaldata -- it used to have no arguments, but that's an error +*/ #ifndef KBINT - getsignaldata(); + getsignaldata(0, 0, NULL); #endif #ifdef OS4 - getsignaldata(); + getsignaldata(0, 0, NULL); #endif EXT; update_timer(); diff --git a/src/xcursor.c b/src/xcursor.c index c3d7636..04e3739 100644 --- a/src/xcursor.c +++ b/src/xcursor.c @@ -29,6 +29,8 @@ static char *id = "$Id: xcursor.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyr #include "dbprint.h" #include "devif.h" +#include "xcursordefs.h" + extern IOPAGE *IOPage; extern XGCValues gcv; @@ -60,7 +62,6 @@ int cursor_sw; int Current_Hot_X = 0, Current_Hot_Y = 0; -void set_Xcursor(DspInterface, unsigned char *, int, int, Cursor *, int); /************************************************************************/ /* */ diff --git a/src/xinit.c b/src/xinit.c index 6355f10..e6d7a9b 100644 --- a/src/xinit.c +++ b/src/xinit.c @@ -12,6 +12,7 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig #include "version.h" #include +#include #include #include #include @@ -25,6 +26,12 @@ static char *id = "$Id: xinit.c,v 1.5 2001/12/26 22:17:06 sybalsky Exp $ Copyrig #include "devif.h" #include "adr68k.h" +#include "xinitdefs.h" +#include "dspifdefs.h" +#include "xbbtdefs.h" +#include "xlspwindefs.h" +#include "xwinmandefs.h" + #ifdef HPUX #define FASYNC O_NONBLOCK @@ -77,8 +84,6 @@ Colormap Colors; int XLocked = 0; /* non-zero while doing X ops, to avoid signals */ extern int LispReadFds; -extern PFUL GenericReturnT(); -extern PFUL clipping_Xbitblt(); /************************************************************************/ /* */ diff --git a/src/xlspwin.c b/src/xlspwin.c index aa7bcf9..e1c45a0 100644 --- a/src/xlspwin.c +++ b/src/xlspwin.c @@ -28,6 +28,11 @@ static char *id = "$Id: xlspwin.c,v 1.4 2001/12/26 22:17:07 sybalsky Exp $ Copyr #include "devif.h" #include "dbprint.h" +#include "xlspwindefs.h" +#include "commondefs.h" +#include "xcursordefs.h" +#include "xmkicondefs.h" + extern DLword *EmKbdAd068K, *EmKbdAd168K, *EmKbdAd268K, *EmKbdAd368K, *EmKbdAd468K, *EmKbdAd568K, *EmRealUtilin68K; extern DLword *CTopKeyevent; @@ -165,25 +170,25 @@ void Create_LispWindow(DspInterface dsp) dsp->display_id, dsp->LispWindow, plain_bits, 16, 16, BlackPixelOfScreen(screen), WhitePixelOfScreen(screen), DefaultDepthOfScreen(screen)); - set_Xcursor(dsp, (char *)default_cursor.cuimage, (int)default_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)default_cursor.cuimage, (int)default_cursor.cuhotspotx, (int)(15 - default_cursor.cuhotspoty), &DefaultCursor, 0); - set_Xcursor(dsp, (char *)wait_cursor.cuimage, (int)wait_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)wait_cursor.cuimage, (int)wait_cursor.cuhotspotx, (int)(15 - wait_cursor.cuhotspoty), &WaitCursor, 0); - set_Xcursor(dsp, (char *)scrolldown_cursor.cuimage, (int)scrolldown_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)scrolldown_cursor.cuimage, (int)scrolldown_cursor.cuhotspotx, (int)(15 - scrolldown_cursor.cuhotspoty), &ScrollDownCursor, 0); - set_Xcursor(dsp, (char *)scrollleft_cursor.cuimage, (int)scrollleft_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)scrollleft_cursor.cuimage, (int)scrollleft_cursor.cuhotspotx, (int)(15 - scrollleft_cursor.cuhotspoty), &ScrollLeftCursor, 0); - set_Xcursor(dsp, (char *)vertscroll_cursor.cuimage, (int)vertscroll_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)vertscroll_cursor.cuimage, (int)vertscroll_cursor.cuhotspotx, (int)(15 - vertscroll_cursor.cuhotspoty), &VertScrollCursor, 0); - set_Xcursor(dsp, (char *)vertthumb_cursor.cuimage, (int)vertthumb_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)vertthumb_cursor.cuimage, (int)vertthumb_cursor.cuhotspotx, (int)(15 - vertthumb_cursor.cuhotspoty), &VertThumbCursor, 0); - set_Xcursor(dsp, (char *)horizscroll_cursor.cuimage, (int)horizscroll_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)horizscroll_cursor.cuimage, (int)horizscroll_cursor.cuhotspotx, (int)(15 - horizscroll_cursor.cuhotspoty), &HorizScrollCursor, 0); - set_Xcursor(dsp, (char *)horizthumb_cursor.cuimage, (int)horizthumb_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)horizthumb_cursor.cuimage, (int)horizthumb_cursor.cuhotspotx, (int)(15 - horizthumb_cursor.cuhotspoty), &HorizThumbCursor, 0); - set_Xcursor(dsp, (char *)scrollright_cursor.cuimage, (int)scrollright_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)scrollright_cursor.cuimage, (int)scrollright_cursor.cuhotspotx, (int)(15 - scrollright_cursor.cuhotspoty), &ScrollRightCursor, 0); - set_Xcursor(dsp, (char *)scrollup_cursor.cuimage, (int)scrollup_cursor.cuhotspotx, + set_Xcursor(dsp, (unsigned char *)scrollup_cursor.cuimage, (int)scrollup_cursor.cuhotspotx, (int)(15 - scrollup_cursor.cuhotspoty), &ScrollUpCursor, 0); /********************************/ diff --git a/src/xmkicon.c b/src/xmkicon.c index 63e4ca4..3eef368 100644 --- a/src/xmkicon.c +++ b/src/xmkicon.c @@ -22,6 +22,8 @@ static char *id = "$Id: xmkicon.c,v 1.3 2001/12/24 01:09:09 sybalsky Exp $ Copyr #include "xdefs.h" #include "devif.h" +#include "xmkicondefs.h" + XImage IconImage; extern int Bitmap_Pad, Default_Depth, Lisp_icon_width, Lisp_icon_height; diff --git a/src/xrdopt.c b/src/xrdopt.c index 98d63c7..5e511c6 100644 --- a/src/xrdopt.c +++ b/src/xrdopt.c @@ -21,7 +21,7 @@ static char *id = "$Id: xrdopt.c,v 1.6 2001/12/26 22:17:07 sybalsky Exp $ Copyri #include /* needed for Ethernet stuff below */ #endif /* USE_DLPI */ #endif /* NOETHER */ -#if defined(SYSVONLY) || defined(OS5) +#if defined(SYSVONLY) || defined(OS5) || defined(MACOSX) #include #endif /* SYSVONLY */ #include @@ -35,6 +35,9 @@ static char *id = "$Id: xrdopt.c,v 1.6 2001/12/26 22:17:07 sybalsky Exp $ Copyri #include "xdefs.h" #include "dbprint.h" +#include "xrdoptdefs.h" +#include "maindefs.h" + XrmDatabase commandlineDB, applicationDB, serverDB, homeDB, rDB; int opTableEntries = 33; extern int LispWindowRequestedX, LispWindowRequestedY; diff --git a/src/xscroll.c b/src/xscroll.c index bb33a43..6404ba9 100644 --- a/src/xscroll.c +++ b/src/xscroll.c @@ -21,6 +21,9 @@ static char *id = "$Id: xscroll.c,v 1.2 1999/01/03 02:07:48 sybalsky Exp $ Copyr #include "xdefs.h" #include "devif.h" +#include "xscrolldefs.h" +#include "xwinmandefs.h" + int ScrollPitch = SCROLL_PITCH; /* Move the DisplayWindow and the ScrollButtons to a new */ diff --git a/src/xwinman.c b/src/xwinman.c index c0d7986..1eb2379 100644 --- a/src/xwinman.c +++ b/src/xwinman.c @@ -25,6 +25,10 @@ static char *id = "$Id: xwinman.c,v 1.3 2001/12/26 22:17:07 sybalsky Exp $ Copyr #include "devif.h" #include "xdefs.h" #include "xscroll.h" +#include "xwinmandefs.h" +#include "keyeventdefs.h" +#include "xlspwindefs.h" +#include "xscrolldefs.h" int Mouse_Included = FALSE; @@ -80,7 +84,7 @@ void Set_BitGravity(XButtonEvent *event, DspInterface dsp, Window window, int gr XUNLOCK; } /* end Set_BitGravity */ -void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int lspWinHeight) +static void lisp_Xconfigure(DspInterface dsp, int x, int y, int lspWinWidth, int lspWinHeight) { int GravSize, Col2, Row2, Col3, Row3; diff --git a/src/z2.c b/src/z2.c index 128a298..565f0ef 100644 --- a/src/z2.c +++ b/src/z2.c @@ -33,13 +33,17 @@ static char *id = "$Id: z2.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyright #include "address.h" #include "adr68k.h" #include "cell.h" -#include "car-cdr.h" -#include "conspage.h" #include "stack.h" #include "gc.h" +#include "mkcelldefs.h" #include "arith.h" #include "my.h" +#include "z2defs.h" +#include "car-cdrdefs.h" +#include "conspagedefs.h" +#include "vars3defs.h" + struct cadr_cell cadr(LispPTR cell_adr); /* N_OP_classoc() OP 33Q */