From 5cb18c0710d221003956fa73e5ecfd401787f8f1 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 12 Jan 2021 13:45:49 +0700 Subject: [PATCH] Merge hacks.c into foreign.c. (#212) This code was not really valid ANSI C in the way that it was used, and it was only used by foreign.c, which is #ifdef'd out. --- CMakeLists.txt | 2 -- bin/dosmkfil | 9 ++------- bin/makefile-dos | 9 ++------- bin/makefile-tail | 4 ---- bin/makefile.dos | 9 ++------- bin/mkdos | 4 ++-- bin/mkfile | 4 ++-- bin/mkfile.c | 4 ++-- bin/mkfile.i | 4 ++-- inc/hacksdefs.h | 7 ------- src/foreign.c | 13 ++++++++++++- src/hacks.c | 24 ------------------------ 12 files changed, 26 insertions(+), 67 deletions(-) delete mode 100644 inc/hacksdefs.h delete mode 100644 src/hacks.c diff --git a/CMakeLists.txt b/CMakeLists.txt index 1a4093d..f91e75f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -177,7 +177,6 @@ SET(MAIKO_SRCS src/gcrcell.c src/gcscan.c src/gvar2.c - src/hacks.c src/hardrtn.c src/inet.c src/initdsp.c @@ -306,7 +305,6 @@ SET(MAIKO_HDRS inc/gcrdefs.h inc/gcscandefs.h inc/gvar2defs.h - inc/hacksdefs.h inc/hardrtndefs.h inc/hdw_conf.h inc/ifpage.h diff --git a/bin/dosmkfil b/bin/dosmkfil index 777f702..adf8fe9 100644 --- a/bin/dosmkfil +++ b/bin/dosmkfil @@ -15,9 +15,9 @@ LDFLAGS = -g graphics.lib binmode.lib mouse.lib RM = del -SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c hacks.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c +SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c -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 arith2.obj hacks.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) +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 arith2.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) HFILES = address.h adr68k.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 hdw_conf.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 profile.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 @@ -214,11 +214,6 @@ arith2.obj : ../src/arith2.c $(CC) @copts ../src/arith2.c -I ../inc -c $@ del copts -hacks.obj : ../src/hacks.c - @ echo $(CFLAGS) > copts - $(CC) @copts ../src/hacks.c -I ../inc -c $@ - del copts - lowlev2.obj : ../src/lowlev2.c @ echo $(CFLAGS) > copts $(CC) @copts ../src/lowlev2.c -I ../inc -c $@ diff --git a/bin/makefile-dos b/bin/makefile-dos index 777f702..adf8fe9 100644 --- a/bin/makefile-dos +++ b/bin/makefile-dos @@ -15,9 +15,9 @@ LDFLAGS = -g graphics.lib binmode.lib mouse.lib RM = del -SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c hacks.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c +SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c -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 arith2.obj hacks.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) +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 arith2.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) HFILES = address.h adr68k.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 hdw_conf.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 profile.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 @@ -214,11 +214,6 @@ arith2.obj : ../src/arith2.c $(CC) @copts ../src/arith2.c -I ../inc -c $@ del copts -hacks.obj : ../src/hacks.c - @ echo $(CFLAGS) > copts - $(CC) @copts ../src/hacks.c -I ../inc -c $@ - del copts - lowlev2.obj : ../src/lowlev2.c @ echo $(CFLAGS) > copts $(CC) @copts ../src/lowlev2.c -I ../inc -c $@ diff --git a/bin/makefile-tail b/bin/makefile-tail index 4c3c66a..b4640b9 100755 --- a/bin/makefile-tail +++ b/bin/makefile-tail @@ -125,7 +125,6 @@ OFILES = $(OBJECTDIR)arith2.o \ $(OBJECTDIR)perrno.o \ $(OBJECTDIR)foreign.o \ $(OBJECTDIR)lisp2c.o \ - $(OBJECTDIR)hacks.o \ $(OBJECTDIR)osmsg.o # $(OBJECTDIR)mnxmeth.o \ # $(OBJECTDIR)mnwevent.o @@ -842,9 +841,6 @@ $(OBJECTDIR)xwinman.o : $(SRCDIR)xwinman.c $(REQUIRED-INCS) $(INCDIR)xdefs.h \ $(INCDIR)MyWindow.h $(INCDIR)dbprint.h $(CC) $(RFLAGS) $(SRCDIR)xwinman.c -o $(OBJECTDIR)xwinman$(OEXT) -$(OBJECTDIR)hacks.o : $(SRCDIR)hacks.c $(REQUIRED-INCS) $(INCLUDEDIR)dld.h - $(CC) $(RFLAGS) $(SRCDIR)hacks.c -o $(OBJECTDIR)hacks$(OEXT) - $(OBJECTDIR)foreign.o : $(SRCDIR)foreign.c $(REQUIRED-INCS) $(INCLUDEDIR)dld.h $(CC) $(RFLAGS) $(SRCDIR)foreign.c $(INLINE) -o $(OBJECTDIR)foreign$(OEXT) diff --git a/bin/makefile.dos b/bin/makefile.dos index 2ec0dbc..9370578 100644 --- a/bin/makefile.dos +++ b/bin/makefile.dos @@ -14,9 +14,9 @@ LDFLAGS = -g graphics.lib binmode.lib mouse.lib RM = del -SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c hacks.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c +SRCFILES = conspage.c gcoflow.c shift.c dbgtool.c gcr.c gcrcell.c llstk.c gcscan.c loopsops.c storage.c allocmds.c dir.c gvar2.c lowlev1.c subr.c arith2.c lowlev2.c subr0374.c arith3.c doscomm.c hardrtn.c lsthandl.c sxhash.c arith4.c draw.c main.c testtool.c array.c dsk.c inet.c misc7.c timer.c array2.c dspif.c initdsp.c miscn.c typeof.c array3.c initkbd.c ubf1.c array4.c dspsubrs.c initsout.c mkatom.c ubf2.c array5.c eqf.c intcall.c mkcell.c ubf3.c array6.c ether.c mkvdate.c ufn.c atom.c findkey.c kbdsubrs.c mouseif.c ufs.c bbtsub.c foreign.c keyevent.c unixcomm.c bin.c fp.c keylib.c binds.c asmbbt.c fvar.c mvs.c unwind.c bitblt.c gc.c uraid.c blt.c gc2.c kprint.c keytstno.c keytst.c osmsg.c usrsubr.c byteswap.c gcarray.c perrno.c ldeboot.c ldeether.c uutils.c carcdr.c gccode.c rawcolor.c vars3.c gcfinal.c ldsout.c return.c vmemsave.c chardev.c gchtfind.c lineblt8.c rpc.c xc.c common.c gcmain3.c lisp2c.c rplcons.c z2.c find-dsp.l dsphack.l xmkicon.c xbbt.c xinit.c xscroll.c xcursor.c xlspwin.c xrdopt.c xwinman.c dosmouse.c vesafns.asm vesainit.c vgainit.c kbdif.c dspsparc.il copyright launch.asm lpread.c lpsolve.c lpmain.c lpwrite.c lpdual.c lptran.c -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 arith2.obj hacks.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) +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 arith2.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) $(LPFILES) HFILES = address.h adr68k.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 hdw_conf.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 profile.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 @@ -213,11 +213,6 @@ arith2.obj : ../dossrc/arith2.c $(CC) @copts ../dossrc/arith2.c -I ../dosinc -c $@ del copts -hacks.obj : ../dossrc/hacks.c - @ echo $(CFLAGS) > copts - $(CC) @copts ../dossrc/hacks.c -I ../dosinc -c $@ - del copts - lowlev2.obj : ../dossrc/lowlev2.c @ echo $(CFLAGS) > copts $(CC) @copts ../dossrc/lowlev2.c -I ../dosinc -c $@ diff --git a/bin/mkdos b/bin/mkdos index 6d94ab3..5e2999b 100644 --- a/bin/mkdos +++ b/bin/mkdos @@ -53,7 +53,7 @@ LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS SRCFILES = $(SRCDIR)conspage.c $(SRCDIR)gcoflow.c $(SRCDIR)shift.c $(SRCDIR)dbgtool.c $(SRCDIR)gcr.c\ $(SRCDIR)llcolor.c $(SRCDIR)gcrcell.c $(SRCDIR)llstk.c $(SRCDIR)gcscan.c $(SRCDIR)loopsops.c\ $(SRCDIR)storage.c $(SRCDIR)allocmds.c $(SRCDIR)dir.c $(SRCDIR)gvar2.c $(SRCDIR)lowlev1.c\ - $(SRCDIR)subr.c $(SRCDIR)arith2.c $(SRCDIR)hacks.c $(SRCDIR)lowlev2.c $(SRCDIR)subr0374.c \ + $(SRCDIR)subr.c $(SRCDIR)arith2.c $(SRCDIR)lowlev2.c $(SRCDIR)subr0374.c \ $(SRCDIR)arith3.c $(SRCDIR)doscomm.c $(SRCDIR)hardrtn.c $(SRCDIR)lsthandl.c $(SRCDIR)sxhash.c \ $(SRCDIR)arith4.c $(SRCDIR)draw.c $(SRCDIR)main.c $(SRCDIR)testtool.c $(SRCDIR)array.c $(SRCDIR)dsk.c \ $(SRCDIR)inet.c $(SRCDIR)misc7.c $(SRCDIR)timer.c $(SRCDIR)array2.c $(SRCDIR)dspif.c $(SRCDIR)initdsp.c \ @@ -80,7 +80,7 @@ OFILES = $(OBJECTDIR)conspage.OEXT $(OBJECTDIR)gcoflow.OEXT $(OBJECTDIR)shift.OE $(OBJECTDIR)gcr.OEXT $(OBJECTDIR)llcolor.OEXT $(OBJECTDIR)gcrcell.OEXT $(OBJECTDIR)llstk.OEXT \ $(OBJECTDIR)gcscan.OEXT $(OBJECTDIR)loopsops.OEXT $(OBJECTDIR)storage.OEXT \ $(OBJECTDIR)allocmds.OEXT $(OBJECTDIR)dir.OEXT $(OBJECTDIR)gvar2.OEXT $(OBJECTDIR)lowlev1.OEXT \ - $(OBJECTDIR)subr.OEXT $(OBJECTDIR)arith2.OEXT $(OBJECTDIR)hacks.OEXT $(OBJECTDIR)lowlev2.OEXT \ + $(OBJECTDIR)subr.OEXT $(OBJECTDIR)arith2.OEXT $(OBJECTDIR)lowlev2.OEXT \ $(OBJECTDIR)subr0374.OEXT $(OBJECTDIR)arith3.OEXT $(OBJECTDIR)doscomm.OEXT \ $(OBJECTDIR)hardrtn.OEXT $(OBJECTDIR)lsthandl.OEXT $(OBJECTDIR)sxhash.OEXT $(OBJECTDIR)arith4.OEXT \ $(OBJECTDIR)draw.OEXT $(OBJECTDIR)main.OEXT $(OBJECTDIR)testtool.OEXT $(OBJECTDIR)array.OEXT \ diff --git a/bin/mkfile b/bin/mkfile index 46c97ef..5a9c9bb 100644 --- a/bin/mkfile +++ b/bin/mkfile @@ -58,7 +58,7 @@ LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS SRCFILES = SRCDIR/conspage.c SRCDIR/gcoflow.c SRCDIR/shift.c SRCDIR/dbgtool.c SRCDIR/gcr.c\ SRCDIR/llcolor.c SRCDIR/gcrcell.c SRCDIR/llstk.c SRCDIR/gcscan.c SRCDIR/loopsops.c\ SRCDIR/storage.c SRCDIR/allocmds.c SRCDIR/dir.c SRCDIR/gvar2.c SRCDIR/lowlev1.c\ - SRCDIR/subr.c SRCDIR/arith2.c SRCDIR/hacks.c SRCDIR/lowlev2.c SRCDIR/subr0374.c \ + SRCDIR/subr.c SRCDIR/arith2.c SRCDIR/lowlev2.c SRCDIR/subr0374.c \ SRCDIR/arith3.c SRCDIR/doscomm.c SRCDIR/hardrtn.c SRCDIR/lsthandl.c SRCDIR/sxhash.c \ SRCDIR/arith4.c SRCDIR/draw.c SRCDIR/main.c SRCDIR/testtool.c SRCDIR/array.c SRCDIR/dsk.c \ SRCDIR/inet.c SRCDIR/misc7.c SRCDIR/timer.c SRCDIR/array2.c SRCDIR/dspif.c SRCDIR/initdsp.c \ @@ -85,7 +85,7 @@ OFILES = conspage.OEXT gcoflow.OEXT shift.OEXT dbgtool.OEXT \ gcr.OEXT llcolor.OEXT gcrcell.OEXT llstk.OEXT \ gcscan.OEXT loopsops.OEXT storage.OEXT \ allocmds.OEXT dir.OEXT gvar2.OEXT lowlev1.OEXT \ - subr.OEXT arith2.OEXT hacks.OEXT lowlev2.OEXT \ + subr.OEXT arith2.OEXT lowlev2.OEXT \ subr0374.OEXT arith3.OEXT doscomm.OEXT \ hardrtn.OEXT lsthandl.OEXT sxhash.OEXT arith4.OEXT \ draw.OEXT main.OEXT testtool.OEXT array.OEXT \ diff --git a/bin/mkfile.c b/bin/mkfile.c index 46c97ef..5a9c9bb 100644 --- a/bin/mkfile.c +++ b/bin/mkfile.c @@ -58,7 +58,7 @@ LDFLAGS = DEBUG EXTRALDFLAGS XLDFLAGS SRCFILES = SRCDIR/conspage.c SRCDIR/gcoflow.c SRCDIR/shift.c SRCDIR/dbgtool.c SRCDIR/gcr.c\ SRCDIR/llcolor.c SRCDIR/gcrcell.c SRCDIR/llstk.c SRCDIR/gcscan.c SRCDIR/loopsops.c\ SRCDIR/storage.c SRCDIR/allocmds.c SRCDIR/dir.c SRCDIR/gvar2.c SRCDIR/lowlev1.c\ - SRCDIR/subr.c SRCDIR/arith2.c SRCDIR/hacks.c SRCDIR/lowlev2.c SRCDIR/subr0374.c \ + SRCDIR/subr.c SRCDIR/arith2.c SRCDIR/lowlev2.c SRCDIR/subr0374.c \ SRCDIR/arith3.c SRCDIR/doscomm.c SRCDIR/hardrtn.c SRCDIR/lsthandl.c SRCDIR/sxhash.c \ SRCDIR/arith4.c SRCDIR/draw.c SRCDIR/main.c SRCDIR/testtool.c SRCDIR/array.c SRCDIR/dsk.c \ SRCDIR/inet.c SRCDIR/misc7.c SRCDIR/timer.c SRCDIR/array2.c SRCDIR/dspif.c SRCDIR/initdsp.c \ @@ -85,7 +85,7 @@ OFILES = conspage.OEXT gcoflow.OEXT shift.OEXT dbgtool.OEXT \ gcr.OEXT llcolor.OEXT gcrcell.OEXT llstk.OEXT \ gcscan.OEXT loopsops.OEXT storage.OEXT \ allocmds.OEXT dir.OEXT gvar2.OEXT lowlev1.OEXT \ - subr.OEXT arith2.OEXT hacks.OEXT lowlev2.OEXT \ + subr.OEXT arith2.OEXT lowlev2.OEXT \ subr0374.OEXT arith3.OEXT doscomm.OEXT \ hardrtn.OEXT lsthandl.OEXT sxhash.OEXT arith4.OEXT \ draw.OEXT main.OEXT testtool.OEXT array.OEXT \ diff --git a/bin/mkfile.i b/bin/mkfile.i index 089f9f1..5555b32 100644 --- a/bin/mkfile.i +++ b/bin/mkfile.i @@ -28,9 +28,9 @@ CFLAGS = -I. -DDOS -DBYTESWAP -DKBINT -DNOPIXRECT -O2 LDFLAGS = -O2 graphics.lib binmode.lib mouse.lib -SRCFILES = ./conspage.c ./gcoflow.c ./shift.c ./dbgtool.c ./gcr.c ./llcolor.c ./gcrcell.c ./llstk.c ./gcscan.c ./loopsops.c ./storage.c ./allocmds.c ./dir.c ./gvar2.c ./lowlev1.c ./subr.c ./arith2.c ./hacks.c ./lowlev2.c ./subr0374.c ./arith3.c ./doscomm.c ./hardrtn.c ./lsthandl.c ./sxhash.c ./arith4.c ./draw.c ./main.c ./testtool.c ./array.c ./dsk.c ./inet.c ./misc7.c ./timer.c ./array2.c ./dspif.c ./initdsp.c ./miscn.c ./typeof.c ./array3.c ./initkbd.c ./ubf1.c ./array4.c ./dspsubrs.c ./initsout.c ./mkatom.c ./ubf2.c ./array5.c ./eqf.c ./intcall.c ./mkcell.c ./ubf3.c ./array6.c ./ether.c ./mkvdate.c ./ufn.c ./atom.c ./findkey.c ./kbdsubrs.c ./mouseif.c ./ufs.c ./bbtsub.c ./foreign.c ./keyevent.c ./unixcomm.c ./bin.c ./fp.c ./keylib.c ./binds.c ./asmbbt.c ./fvar.c ./mvs.c ./unwind.c ./bitblt.c ./gc.c ./uraid.c ./blt.c ./gc2.c ./kprint.c ./keytstno.c ./keytst.c ./osmsg.c usrsubr.c ./byteswap.c ./gcarray.c ./perrno.c ./ldeboot.c ./ldeether.c ./uutils.c ./carcdr.c ./gccode.c ./rawcolor.c ./vars3.c ./gcfinal.c ./ldsout.c ./return.c ./vmemsave.c ./chardev.c ./gchtfind.c ./lineblt8.c ./rpc.c ./xc.c ./common.c ./gcmain3.c ./lisp2c.c ./rplcons.c ./z2.c ./find-dsp.l ./dsphack.l ./xmkicon.c ./xbbt.c ./xinit.c ./xscroll.c ./xcursor.c ./xlspwin.c ./xrdopt.c ./xwinman.c ./dosmouse.c ./vesafns.asm ./vesainit.c ./vgainit.c ./kbdif.c ./dspsparc.il ./copyright ./launch.asm +SRCFILES = ./conspage.c ./gcoflow.c ./shift.c ./dbgtool.c ./gcr.c ./llcolor.c ./gcrcell.c ./llstk.c ./gcscan.c ./loopsops.c ./storage.c ./allocmds.c ./dir.c ./gvar2.c ./lowlev1.c ./subr.c ./arith2.c ./lowlev2.c ./subr0374.c ./arith3.c ./doscomm.c ./hardrtn.c ./lsthandl.c ./sxhash.c ./arith4.c ./draw.c ./main.c ./testtool.c ./array.c ./dsk.c ./inet.c ./misc7.c ./timer.c ./array2.c ./dspif.c ./initdsp.c ./miscn.c ./typeof.c ./array3.c ./initkbd.c ./ubf1.c ./array4.c ./dspsubrs.c ./initsout.c ./mkatom.c ./ubf2.c ./array5.c ./eqf.c ./intcall.c ./mkcell.c ./ubf3.c ./array6.c ./ether.c ./mkvdate.c ./ufn.c ./atom.c ./findkey.c ./kbdsubrs.c ./mouseif.c ./ufs.c ./bbtsub.c ./foreign.c ./keyevent.c ./unixcomm.c ./bin.c ./fp.c ./keylib.c ./binds.c ./asmbbt.c ./fvar.c ./mvs.c ./unwind.c ./bitblt.c ./gc.c ./uraid.c ./blt.c ./gc2.c ./kprint.c ./keytstno.c ./keytst.c ./osmsg.c usrsubr.c ./byteswap.c ./gcarray.c ./perrno.c ./ldeboot.c ./ldeether.c ./uutils.c ./carcdr.c ./gccode.c ./rawcolor.c ./vars3.c ./gcfinal.c ./ldsout.c ./return.c ./vmemsave.c ./chardev.c ./gchtfind.c ./lineblt8.c ./rpc.c ./xc.c ./common.c ./gcmain3.c ./lisp2c.c ./rplcons.c ./z2.c ./find-dsp.l ./dsphack.l ./xmkicon.c ./xbbt.c ./xinit.c ./xscroll.c ./xcursor.c ./xlspwin.c ./xrdopt.c ./xwinman.c ./dosmouse.c ./vesafns.asm ./vesainit.c ./vgainit.c ./kbdif.c ./dspsparc.il ./copyright ./launch.asm -OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj llcolor.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arith2.obj hacks.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) +OFILES = conspage.obj gcoflow.obj shift.obj dbgtool.obj gcr.obj llcolor.obj gcrcell.obj llstk.obj gcscan.obj loopsops.obj storage.obj allocmds.obj dir.obj gvar2.obj lowlev1.obj subr.obj arith2.obj lowlev2.obj subr0374.obj arith3.obj doscomm.obj hardrtn.obj lsthandl.obj sxhash.obj arith4.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 keylib.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 $(KEY) $(COLORFILES) $(ARCHFILES) HFILES = ../inc/address.h ../inc/adr68k.h ../inc/arith.h ../inc/cell.h ../inc/dbprint.h ../inc/display.h ../inc/dspif.h ../inc/ifpage.h ../inc/iopage.h ../inc/lispemul.h ../inc/lispmap.h ../inc/lsptypes.h ../inc/miscstat.h ../inc/lspglob.h ../inc/array.h ../inc/bb.h ../inc/bitblt.h ../inc/debug.h ../inc/devconf.h ../inc/dspdata.h ../inc/ether.h ../inc/fast_dsp.h ../inc/gcdata.h ../inc/hdw_conf.h ../inc/initatms.h ../inc/inlinec.h ../inc/keyboard.h ../inc/lispver1.h ../inc/lispver2.h ../inc/lldsp.h ../inc/locfile.h ../inc/medleyfp.h ../inc/mouseif.h ../inc/my.h ../inc/opcodes.h ../inc/osmsg.h ../inc/pilotbbt.h ../inc/print.h ../inc/profile.h ../inc/return.h ../inc/stack.h ../inc/stream.h ../inc/subrs.h ../inc/timeout.h ../inc/tos1defs.h ../inc/tosfns.h ../inc/tosret.h ../inc/vmemsave.h ../inc/xdefs.h ../inc/xbitmaps.h ../inc/xkeymap.h diff --git a/inc/hacksdefs.h b/inc/hacksdefs.h deleted file mode 100644 index d67c991..0000000 --- a/inc/hacksdefs.h +++ /dev/null @@ -1,7 +0,0 @@ -#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/src/foreign.c b/src/foreign.c index 8460cda..ea1a1ff 100644 --- a/src/foreign.c +++ b/src/foreign.c @@ -345,6 +345,18 @@ LispPTR call_c_fn(LispPTR *args) { } } +/* 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 entities on the stack */ + +/* These used to live in hacks.c, but were only used here. The code */ +/* involved here is not valid ANSI C and will have to be fixed before */ +/* this code can be used again. */ +static int pickapart1(int i1, int i2, int i3, int i4) { return (i1); } +static int pickapart2(int i1, int i2, int i3, int i4) { return (i2); } +static int pickapart3(int i1, int i2, int i3, int i4) { return (i3); } +static int pickapart4(int i1, int i2, int i3, int i4) { return (i4); } + /************************************************************************/ /* */ /* S M A S H I N G _ C _ F N */ @@ -371,7 +383,6 @@ LispPTR call_c_fn(LispPTR *args) { LispPTR smashing_c_fn(LispPTR *args) { int intarg[Max_Arg], result, i, j; int fnaddr, resulttype, *errorflag, arglistlength, *descriptorblock; - PFI pickapart1, pickapart2, pickapart3, pickapart4; float fresult; int *valueplace; diff --git a/src/hacks.c b/src/hacks.c deleted file mode 100644 index 5d090b7..0000000 --- a/src/hacks.c +++ /dev/null @@ -1,24 +0,0 @@ -/* $Id: hacks.c,v 1.3 1999/05/31 23:35:33 sybalsky Exp $ (C) Copyright Venue, All Rights Reserved */ - -/************************************************************************/ -/* */ -/* (C) Copyright 1989-95 Venue. All Rights Reserved. */ -/* Manufactured in the United States of America. */ -/* */ -/************************************************************************/ - -#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 */ - -int pickapart1(int i1, int i2, int i3, int i4) { return (i1); } - -int pickapart2(int i1, int i2, int i3, int i4) { return (i2); } - -int pickapart3(int i1, int i2, int i3, int i4) { return (i3); } - -int pickapart4(int i1, int i2, int i3, int i4) { return (i4); }