From 857100a29a4fa55dbc1faccc93cea7fe78c5a437 Mon Sep 17 00:00:00 2001 From: Bruce Mitchener Date: Tue, 15 Dec 2020 09:14:59 +0700 Subject: [PATCH] Remove AIX on PS/2 platform support. (#50) --- bin/compile-flags | 1 - bin/makefile-aix.ps2-x | 64 ------------------------------------------ inc/version.h | 10 ------- src/byteswap.c | 2 +- src/dsk.c | 12 +------- src/timer.c | 18 ++---------- 6 files changed, 4 insertions(+), 103 deletions(-) delete mode 100644 bin/makefile-aix.ps2-x diff --git a/bin/compile-flags b/bin/compile-flags index 392d176..fb80c37 100755 --- a/bin/compile-flags +++ b/bin/compile-flags @@ -23,7 +23,6 @@ NOPIXRECT Used to suppress pixrect/pixwin options when they're not needed or not available. True if XWINDOW is. AIX True if compiling for AIX -AIXPS2 True if compiling for PS/2 under AIX (our flag) sparc True if we're compiling on a SPARC machine. mc68020 True if we're compiling on a Motorola 680x0 machine. sun3 We're compiling for a Sun-3. diff --git a/bin/makefile-aix.ps2-x b/bin/makefile-aix.ps2-x deleted file mode 100644 index cfe817f..0000000 --- a/bin/makefile-aix.ps2-x +++ /dev/null @@ -1,64 +0,0 @@ -# Options for SunOS4, SPARC and X-Window - -XFILES = $(OBJECTDIR)XClose.o \ - $(OBJECTDIR)Cursor.o \ - $(OBJECTDIR)XWindow.o \ - $(OBJECTDIR)DoRing.o \ - $(OBJECTDIR)DoScroll.o \ - $(OBJECTDIR)XEvent.o \ - $(OBJECTDIR)XGravity.o \ - $(OBJECTDIR)XInit.o \ - $(OBJECTDIR)InitXevent.o \ - $(OBJECTDIR)XKbdMouse.o \ - $(OBJECTDIR)LispWindow.o \ - $(OBJECTDIR)LispXbitblt.o \ - $(OBJECTDIR)XKeyboard.o \ - $(OBJECTDIR)MakeXicon.o \ - $(OBJECTDIR)OpenDisplay.o \ - $(OBJECTDIR)ReadXoption.o \ - $(OBJECTDIR)XReconfig.o \ - $(OBJECTDIR)XScroll.o \ - $(OBJECTDIR)Scrollbar.o \ - $(OBJECTDIR)XCursor.o \ - $(OBJECTDIR)XMouse.o \ - $(OBJECTDIR)Subwindows.o \ - $(OBJECTDIR)VideoColor.o \ - $(OBJECTDIR)XWindowMgr.o - - -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) - -FPFLAGS = -DFLAGS = -DFSERROR -DAIX -D_BSD -DNOASM -DLOGINT -DNOPIXRECT $(XFLAGS) -DBYTESWAP -DAIXPS2 -DFLTINT -DNOETHER -DFORKCOMM -LDFLAGS = -lX11 -lc -lm -lbsd - -INLINE = -BITBLTFILE = -# for the files that need to be included in byte-swapped implementations: -BYTESWAPFILES = $(OBJECTDIR)byteswapfns$(OEXT) - -# This is to make the %$#@! Apollo cc happy -OEXT = .o - -OPTFLAGS = -O -fstrength-reduce -fcombine-regs -DISPOPTFLAGS = -O -fstrength-reduce -fcombine-regs -finline-functions -CC = gcc - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether - - -$(OBJECTDIR)xc.o : $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emulglobal.h \ - $(INCDIR)address.h \ - $(INCDIR)address68k.h $(INCDIR)stack.h $(INCDIR)lispglobal.h \ - $(INCDIR)lisptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ - $(INCDIR)initatoms.h $(INCDIR)gcdata.h \ - $(INCDIR)arith.h $(INCDIR)stream.h $(INCDIR)dbprint.h\ - $(INCDIR)tos1defs.h $(INCDIR)tosretmacro.h \ - $(INCDIR)tosfuncall.h $(INCDIR)inlineC.h \ - $(INCDIR)profile.h - $(CC) $(DISPRFLAGS) $(SRCDIR)xc.c $(INLINE) -o $(OBJECTDIR)xc.o - - diff --git a/inc/version.h b/inc/version.h index b03d370..1dd2ad7 100755 --- a/inc/version.h +++ b/inc/version.h @@ -228,16 +228,6 @@ typedef signed char s_char; - /********************************************************/ - /* */ - /********************************************************/ -#ifdef AIXPS2 -typedef signed char s_char; -#define GCC386 -#endif - - - /********************************************************/ /* */ /********************************************************/ diff --git a/src/byteswap.c b/src/byteswap.c index 50f244d..bbdc867 100644 --- a/src/byteswap.c +++ b/src/byteswap.c @@ -65,7 +65,7 @@ unsigned int word_swap_longword(word) #ifndef I386 #define word_swap_longword(word) (((word >> 16) & 0xffff) | ((word & 0xffff) << 16)) #endif -#endif /* AIXPS2 */ +#endif /* !ISC */ /****************************************************************/ /* */ diff --git a/src/dsk.c b/src/dsk.c index eb19ad9..99c8d4e 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -64,13 +64,11 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright #include #else #ifdef AIX -#if !defined(AIXPS2) #ifdef LINUX #include #else #include #endif -#endif /* AIXPS2 */ #endif /* AIX */ #endif /* MACOSX | FREEBSD */ @@ -2289,12 +2287,9 @@ LispPTR COM_getfreeblock(register LispPTR *args) #if defined(OS5) struct statvfs sfsbuf; #else -#ifndef AIXPS2 #ifndef DOS struct statfs sfsbuf; #endif /* DOS */ -#endif /* AIXPS2 */ - #endif /* OS5 */ #ifdef DOS struct diskfree_t sfsbuf; @@ -2377,10 +2372,7 @@ LispPTR COM_getfreeblock(register LispPTR *args) TIMEOUT(rval = statvfs(dir, &sfsbuf)); if (rval != 0) { #else -#ifndef AIXPS2 TIMEOUT(rval = statfs(dir, &sfsbuf)); -#endif /* AIXPS2 */ - if (rval != 0) { #endif *Lisp_errno = errno; @@ -2388,10 +2380,8 @@ LispPTR COM_getfreeblock(register LispPTR *args) } #if defined(SYSVONLY) || defined(OS5) *buf = sfsbuf.f_bfree; -#elif (!defined(AIXPS2)) - *buf = sfsbuf.f_bavail; #else - *buf = 200000; /* FAKE - pretend we have 200,000 blocks free! */ + *buf = sfsbuf.f_bavail; #endif #endif /* DOS */ return (ATOM_T); diff --git a/src/timer.c b/src/timer.c index e465474..3a8ab40 100644 --- a/src/timer.c +++ b/src/timer.c @@ -69,10 +69,6 @@ extern int ether_fd; #include -#ifdef AIXPS2 -#include -#endif /* AIXPS2 */ - #include "lispemul.h" #include "emlglob.h" #include "lspglob.h" @@ -783,18 +779,10 @@ int FP_error = 0; void int_fp_service(int sig, int code, struct sigcontext *scp) { switch (code) { -#ifdef AIXPS2 - case FPM_DENORM: - case FPM_DIVIDE_0: - case FPM_UNDERFLOW: - case FPM_OVERFLOW: - case FPM_PRECISION: -#else case FPE_FLTDIV_TRAP: case FPE_FLTUND_TRAP: case FPE_FLTOVF_TRAP: case FPE_FLTOPERR_TRAP: -#endif /* AIXPS2 */ FP_error = code; break; @@ -814,13 +802,11 @@ void int_fp_service(int sig, int code, struct sigcontext *scp) } void int_fp_init() { /* first set up the signal handler */ -#ifdef AIXPS2 - if (sigset(SIGFPE, int_fp_service)) -#elif OS5 +#ifdef OS5 if (sigset(SIGFPE, int_fp_service)) #else if (ieee_handler("set", "all", int_fp_service)) -#endif /* AIXPS2 */ +#endif /* OS5 */ perror("Sigvec for FPE failed"); DBPRINT(("FP interrupts enabled\n"));