From fe71946f82c8bdbd9f821366758721a529ac08f9 Mon Sep 17 00:00:00 2001 From: Nick Briggs Date: Tue, 5 Nov 2024 14:02:27 -0800 Subject: [PATCH] Removes vmemsave.h and merges #defines (all local, mostly unused) into vmemsave.c --- CMakeLists.txt | 1 - bin/makefile-dos | 2 +- bin/makefile-tail | 2 +- inc/vmemsave.h | 25 ------------------------- src/vmemsave.c | 7 ++++++- 5 files changed, 8 insertions(+), 29 deletions(-) delete mode 100644 inc/vmemsave.h diff --git a/CMakeLists.txt b/CMakeLists.txt index 561f49d..cd86018 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -436,7 +436,6 @@ SET(MAIKO_HDRS inc/vars3defs.h inc/version.h inc/vmemsavedefs.h - inc/vmemsave.h inc/xcdefs.h inc/z2defs.h ) diff --git a/bin/makefile-dos b/bin/makefile-dos index f4cd82f..85d28b0 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -18,7 +18,7 @@ SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk. OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arithops.obj lowlev2.obj subr0374.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj draw.obj main.obj testtool.obj array.obj dsk.obj inet.obj misc7.obj timer.obj array2.obj dspif.obj initdsp.obj miscn.obj typeof.obj array3.obj initkbd.obj ubf1.obj array4.obj dspsubrs.obj initsout.obj mkatom.obj ubf2.obj array5.obj eqf.obj intcall.obj mkcell.obj ubf3.obj array6.obj ether.obj ufn.obj atom.obj findkey.obj kbdsubrs.obj mouseif.obj ufs.obj bbtsub.obj foreign.obj keyevent.obj unixcomm.obj bin.obj fp.obj binds.obj fvar.obj mvs.obj unwind.obj bitblt.obj gc.obj uraid.obj blt.obj gc2.obj kprint.obj osmsg.obj usrsubr.obj byteswap.obj gcarray.obj perrno.obj uutils.obj carcdr.obj asmbbt.obj gccode.obj vars3.obj gcfinal.obj ldsout.obj return.obj vmemsave.obj chardev.obj gchtfind.obj lineblt8.obj rpc.obj xc.obj common.obj gcmain3.obj lisp2c.obj rplcons.obj z2.obj vdate.obj $(COLORFILES) $(ARCHFILES) $(LPFILES) -HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h ether.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h vmemsave.h xdefs.h xbitmaps.h xkeymap.h +HFILES = address.h adr68k.h arithopsdefs.h arith.h cell.h dbprint.h display.h dspif.h ifpage.h iopage.h lispemul.h lispmap.h lsptypes.h miscstat.h lspglob.h array.h bb.h bitblt.h debug.h devconf.h dspdata.h ether.h fast_dsp.h gcdata.h initatms.h inlinec.h keyboard.h lispver1.h lispver2.h lldsp.h locfile.h medleyfp.h mouseif.h my.h opcodes.h osmsg.h pilotbbt.h print.h return.h stack.h stream.h subrs.h timeout.h tos1defs.h tosfns.h tosret.h xdefs.h xbitmaps.h xkeymap.h diff --git a/bin/makefile-tail b/bin/makefile-tail index b198638..61d34d8 100644 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -908,7 +908,7 @@ $(OBJECTDIR)vars3.o: $(SRCDIR)vars3.c $(REQUIRED-INCS) \ $(OBJECTDIR)vmemsave.o: $(SRCDIR)vmemsave.c $(REQUIRED-INCS) \ $(INCDIR)lispemul.h \ $(INCDIR)lispmap.h $(INCDIR)lspglob.h $(INCDIR)ifpage.h $(INCDIR)iopage.h \ - $(INCDIR)miscstat.h $(INCDIR)vmemsave.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \ + $(INCDIR)miscstat.h $(INCDIR)timeout.h $(INCDIR)adr68k.h \ $(INCDIR)lsptypes.h $(INCDIR)locfile.h $(INCDIR)lispver2.h $(INCDIR)dbprint.h \ $(INCDIR)devif.h $(INCDIR)vmemsavedefs.h $(INCDIR)byteswapdefs.h $(INCDIR)commondefs.h \ $(INCDIR)dskdefs.h $(INCDIR)initkbddefs.h $(INCDIR)perrnodefs.h \ diff --git a/inc/vmemsave.h b/inc/vmemsave.h deleted file mode 100644 index 9188b8c..0000000 --- a/inc/vmemsave.h +++ /dev/null @@ -1,25 +0,0 @@ -#ifndef VMEMSAVE_H -#define VMEMSAVE_H 1 -/* $Id: vmemsave.h,v 1.2 1999/01/03 02:06:29 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - - - -/************************************************************************/ -/* */ -/* (C) Copyright 1989-96 Venue. All Rights Reserved. */ -/* Manufactured in the United States of America. */ -/* */ -/************************************************************************/ - - -/* - File Name : vmemsave.h - DEfinition for vmemsave -*/ - -#define FP_IFPAGE 512 /* IFPAGE address in sysoutfile by Byte */ -#define DOMINOPAGES 301 /* skip dominopages in fptovp */ -#define SKIPPAGES 301 /* save first filepage */ -#define SKIP_DOMINOPAGES 153600 /* Byte size in sysoutfile for dominocode */ -#define SAVE_IFPAGE 223 /* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */ -#endif /* VMEMSAVE_H */ diff --git a/src/vmemsave.c b/src/vmemsave.c index 3ea6f09..0ccd58a 100644 --- a/src/vmemsave.c +++ b/src/vmemsave.c @@ -41,7 +41,6 @@ #include "lispemul.h" #include "lispmap.h" #include "lspglob.h" -#include "vmemsave.h" #include "timeout.h" #include "adr68k.h" #include "lsptypes.h" @@ -58,6 +57,12 @@ #include "perrnodefs.h" #include "ufsdefs.h" +/* Definitions incorporated from vmemsave.h (removed) */ +#define FP_IFPAGE 512 /* IFPAGE address in sysoutfile by Byte */ +#define DOMINOPAGES 301 /* skip dominopages in fptovp */ +#define SKIPPAGES 301 /* save first filepage */ +#define SKIP_DOMINOPAGES 153600 /* Byte size in sysoutfile for dominocode */ +#define SAVE_IFPAGE 223 /* Virtual address for IFPAGES's buffer page. This value is \EMUSWAPBUFFERS in lisp. */ /* Error return values from VMEMSAVE */ #define COMPLETESYSOUT NIL