diff --git a/bin/compile-flags b/bin/compile-flags index a36315f..9d24b0d 100755 --- a/bin/compile-flags +++ b/bin/compile-flags @@ -30,7 +30,6 @@ 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. RS6000 We're compiling for the RS/6000 processor. -DEC3100 We're compiling for the DECStation 3100. RISCOS We're compiling for the MIPS RISCstation under RISCOS. UNSAFE If true, enables the "fast" version of 68020 opcodes. diff --git a/bin/makefile-osf1.dec-x b/bin/makefile-osf1.dec-x deleted file mode 100644 index 304dc6c..0000000 --- a/bin/makefile-osf1.dec-x +++ /dev/null @@ -1,69 +0,0 @@ -# Options for OSF1, DECStation 3100, and X-Window - - -CC = cc - -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)Xevinit.o \ - $(OBJECTDIR)Xkbdmus.o \ - $(OBJECTDIR)Xlspwin.o \ - $(OBJECTDIR)Xbbt.o \ - $(OBJECTDIR)Xkbd.o \ - $(OBJECTDIR)Xmkicon.o \ - $(OBJECTDIR)Xopendsp.o \ - $(OBJECTDIR)Xrdopt.o \ - $(OBJECTDIR)Xreconf.o \ - $(OBJECTDIR)XScroll.o \ - $(OBJECTDIR)Xscrolb.o \ - $(OBJECTDIR)XCursor.o \ - $(OBJECTDIR)XMouse.o \ - $(OBJECTDIR)Xsubwin.o \ - $(OBJECTDIR)Xcolor.o \ - $(OBJECTDIR)Xwinman.o - -BYTESWAPFILES = $(OBJECTDIR)byteswap.o - -XVERSION = XV11R4 -XFLAGS = -DXWINDOW -D$(XVERSION) - -# This is to make the %$#@! Apollo cc happy -OEXT = .o -# OPTFLAGS is normally -O2. -OPTFLAGS = -O2 -Olimit 999 -DISPOPTFLAGS = -O2 -Olimit 999 - -FPFLAGS = -DFLAGS = -DFSERROR -DNEW_STORAGE -DAIX -DOLD_CURSOR -DNOPIXRECT -DBYTESWAP \ --DFORKCOMM -DLOGINT -DSYS5 -DDEC3100 -DNOFORN -DNOETHER -DBIGATOMS \ - -DDECSTN -D_BSD -DOSF1 $(XFLAGS) -LDFLAGS = -lX11 -lc -lm -LDELDFLAGS = -lX11 -lc -lm -# -Dsparc? -INLINE = - - -OBJECTDIR = ../$(RELEASENAME)/ - -default : ../$(OSARCHNAME)/lde ../$(OSARCHNAME)/ldeether - -# Special rules to create xc.c on Sun4 - -#run cpp to expand macros -$(OBJECTDIR)xc.o: $(SRCDIR)xc.c $(INCDIR)lispemul.h $(INCDIR)emlglob.h $(INCDIR)address.h \ - $(INCDIR)adr68k.h $(INCDIR)stack.h $(INCDIR)lspglob.h \ - $(INCDIR)lsptypes.h $(INCDIR)lispmap.h $(INCDIR)cell.h \ - $(INCDIR)initatms.h $(INCDIR)gcdata.h \ - $(INCDIR)arith.h $(INCDIR)stream.h \ - $(INCDIR)tos1defs.h $(INCDIR)tosret.h \ - $(INCDIR)tosfns.h $(INCDIR)inlineC.h \ - $(INCDIR)inln68k.h - $(CC) -c $(DFLAGS) -I$(INCDIR) $(SRCDIR)xc.c -o $(OBJECTDIR)xc.o - - diff --git a/inc/medleyfp.h b/inc/medleyfp.h index 8f99849..ced48ca 100755 --- a/inc/medleyfp.h +++ b/inc/medleyfp.h @@ -67,11 +67,6 @@ volatile extern int FP_error; #define FPCLEAR #define FPTEST(result) (isinf(result) || isnan(result)) -#elif defined(OSF1) -#include -#define FPCLEAR -#define FPTEST(result) (!FINITE(result)) - #elif defined(AIX) #define FPCLEAR #define FPTEST(result) ((!finite(result)) || isnan(result)) diff --git a/inc/nfswatch.h b/inc/nfswatch.h index e74594a..cd440d2 100755 --- a/inc/nfswatch.h +++ b/inc/nfswatch.h @@ -188,13 +188,6 @@ typedef u_int32 ipaddrt; #define NIT_CHUNKSIZE 8192 /* chunk size for grabbing pkts */ #endif -/* - * Pfilt definitions. - */ -#ifdef USE_PFILT -#define PFILT_CHUNKSIZE 8192 /* chunk size for grabbing pkts */ -#endif - /* * Data Link Provider Interface (DLPI) definitions. */ diff --git a/inc/os.h b/inc/os.h index 6a577ae..f1019fe 100755 --- a/inc/os.h +++ b/inc/os.h @@ -104,9 +104,3 @@ #define bcmp(a,b,n) memcmp(a,b,n) #define bcopy(a,b,n) memcpy(b,a,n) #endif - -#ifdef DECOSF -#ifndef USE_PFILT -#define USE_PFILT 1 -#endif -#endif diff --git a/inc/version.h b/inc/version.h index 6321482..e15ee05 100755 --- a/inc/version.h +++ b/inc/version.h @@ -228,25 +228,6 @@ typedef signed char s_char; - /********************************************************/ - /* */ - /********************************************************/ -#ifdef DEC3100 -#undef UNALIGNED_FETCH_OK -#ifdef OSF1 -typedef signed char s_char; -#undef UNSIGNED -#undef INT -#define UNSIGNED unsigned long long -#define INT long long -#undef REGISTER -#define REGISTER -#endif /* OSF1 */ -#endif /* DEC3100 */ - - - - /********************************************************/ /* */ /********************************************************/ diff --git a/src/dsk.c b/src/dsk.c index 41377fa..df18eb0 100644 --- a/src/dsk.c +++ b/src/dsk.c @@ -112,7 +112,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright #include "commondefs.h" #include "ufsdefs.h" -#if defined(OSF1) || defined(MACOSX) || defined(FREEBSD) +#if defined(MACOSX) || defined(FREEBSD) #include #else #ifdef AIX @@ -127,7 +127,7 @@ static char *id = "$Id: dsk.c,v 1.4 2001/12/24 01:09:01 sybalsky Exp $ Copyright #define d_fileno d_ino #endif /* AIX */ -#endif /* OSF1 | MACOSX | FREEBSD */ +#endif /* MACOSX | FREEBSD */ #ifdef GCC386 #include "inlnPS2.h" @@ -2421,10 +2421,7 @@ LispPTR COM_getfreeblock(register LispPTR *args) *buf = sfsbuf.avail_clusters * sfsbuf.sectors_per_cluster * sfsbuf.bytes_per_sector; } #else -#if OSF1 - TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs))); - if (rval <= 0) { -#elif defined(ISC) +#if defined(ISC) TIMEOUT(rval = statfs(dir, &sfsbuf, sizeof(struct statfs), 0)); if (rval != 0) { #elif defined(LINUX) @@ -2445,7 +2442,7 @@ LispPTR COM_getfreeblock(register LispPTR *args) #endif /* AIXPS2 */ if (rval != 0) { -#endif /* OSF1 */ +#endif /* ISC */ *Lisp_errno = errno; return (NIL); } diff --git a/src/initkbd.c b/src/initkbd.c index 9811bd8..200b472 100644 --- a/src/initkbd.c +++ b/src/initkbd.c @@ -252,42 +252,6 @@ u_char SUNLispKeyMap_RS6000[128] = { /* 127 */ 104, 80, 106, 107, 92, 76, 14, 61 }; -/* For DECStation 3100 */ - -u_char SUNLispKeyMap_DEC3100[256] = { - /* 7 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 15 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 23 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 31 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 39 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 47 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 55 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 63 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 71 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 79 */ 255, 255, 255, 255, 255, 255, 255, 97, - /* 87 */ 99, 100, 67, 68, 255, 255, 255, 255, - /* 95 */ 255, 255, 255, 255, 255, 101, 66, 104, - /* 103 */ 80, 106, 255, 255, 255, 255, 255, 255, - /* 111 */ 255, 255, 107, 108, 255, 255, 255, 255, - /* 119 */ 255, 255, 255, 255, 255, 92, 76, 255, - /* 127 */ 255, 255, 255, 255, 255, 255, 255, 255, - /* 135 */ 255, 255, 255, 90, 91, 46, 93, 89, - /* 143 */ 47, 255, 255, 98, 255, 13, 76, 94, - /* 151 */ 69, 70, 84, 85, 87, 102, 81, 82, - /* 159 */ 83, 255, 255, 255, 255, 255, 255, 255, - /* 167 */ 129, 132, 131, 130, 255, 255, 255, 41, - /* 175 */ 36, 56, 31, 255, 255, 255, 255, 255, - /* 183 */ 255, 255, 255, 255, 255, 15, 44, 34, - /* 191 */ 33, 32, 19, 21, 40, 255, 17, 18, - /* 199 */ 20, 24, 45, 255, 16, 3, 5, 37, - /* 207 */ 255, 1, 48, 35, 7, 57, 255, 0, - /* 215 */ 49, 50, 39, 255, 2, 51, 52, 54, - /* 223 */ 255, 4, 6, 38, 55, 255, 53, 23, - /* 231 */ 9, 27, 255, 22, 25, 26, 42, 255, - /* 239 */ 8, 11, 255, 43, 12, 255, 59, 29, - /* 247 */ 105, 255, 10, 58, 28, 255, 255, 255, -}; - u_char *XGenericKeyMap; /* filled in with malloc if needed */ /* For the IBM-101 kbd FF marks exceptions */ @@ -450,8 +414,8 @@ char *getenv(); /* ---- external entry points --------*/ #define MIN_KEYTYPE 3 #define KB_AS3000J (7 + MIN_KEYTYPE) #define KB_RS6000 (8 + MIN_KEYTYPE) -#define KB_DEC3100 (9 + MIN_KEYTYPE) -#define KB_HP9000 (10 + MIN_KEYTYPE) // TODO: Can we remove this? +#define KB_DEC3100 (9 + MIN_KEYTYPE) /* TODO: Can we remove this? */ +#define KB_HP9000 (10 + MIN_KEYTYPE) /* TODO: Can we remove this? */ #define KB_X (11 + MIN_KEYTYPE) #define KB_DOS (12 + MIN_KEYTYPE) @@ -576,12 +540,11 @@ static u_char *make_X_keymap() { /* */ /* Determine what kind of keyboard we're dealing with, by */ /* checking the LDEKBDTYPE shell variable. It it's not set, */ -/* either default it (for DEC, IBM), or complain and exit. */ +/* either default it (for Sun, IBM), or complain and exit. */ /* Valid LDEKBDTYPE values: */ /* type3 Sun type-3 keyboard */ /* type4 Sun type-4 keyboard */ /* rs6000 IBM RS/6000 */ -/* dec3100 DECstation 3100 or 5000 */ /* x generic X keyboard map */ /* */ /* */ @@ -620,9 +583,6 @@ void keyboardtype(int fd) printf(" (one of type2, type3, type4, jle, or as3000j)"); exit(0); /* exit to shell */ #else -#ifdef DECSTN - type = KB_DEC3100; -#else #ifdef RS6000 type = KB_RS6000; #else @@ -639,8 +599,6 @@ void keyboardtype(int fd) #endif /* RS6000 */ -#endif /* DECSTN */ - #endif /* FUJI */ #ifdef XWINDOW @@ -659,8 +617,6 @@ void keyboardtype(int fd) type = KB_JLE; else if (strcmp("rs6000", key) == 0) type = KB_RS6000; - else if (strcmp("dec3100", key) == 0) - type = KB_DEC3100; else if (strcmp("X", key) == 0) type = KB_X; else if (strcmp("x", key) == 0) @@ -698,9 +654,6 @@ void keyboardtype(int fd) SUNLispKeyMap = SUNLispKeyMap_RS6000; InterfacePage->devconfig |= KB_SUN3 - MIN_KEYTYPE; /* 8 */ break; - case KB_DEC3100: - SUNLispKeyMap = SUNLispKeyMap_DEC3100; - InterfacePage->devconfig |= KB_SUN3 - MIN_KEYTYPE; /* 9 */ break; #ifdef XWINDOW case KB_X: diff --git a/src/keytst.c b/src/keytst.c index a44843c..27992db 100644 --- a/src/keytst.c +++ b/src/keytst.c @@ -97,8 +97,6 @@ int read_hex(char *s1, long unsigned int *array) { /* convert key to numeric format*/ #if defined(RS6000) *(array + i) = strtoul(ptr, NULL, 16); /* On RS/6000, must convert to unsigned */ -#elif defined(OSF1) - *(array + i) = strtoul(ptr, NULL, 16); /* On Alpha, must convert to unsigned */ #else *(array + i) = strtol(ptr, NULL, 16); /* On suns, this works OK */ #endif diff --git a/src/ldsout.c b/src/ldsout.c index 57c84bf..9e41dd8 100644 --- a/src/ldsout.c +++ b/src/ldsout.c @@ -58,10 +58,10 @@ extern int errno; is going to expand or not */ int Storage_expanded; /* T or NIL */ -/* RISCOS and OSF1 don't have valloc, and malloc works OK there. */ -#if defined(SYSVONLY) || defined(OSF1) || defined(RISCOS) +/* RISCOS doesn't have valloc, and malloc works OK there. */ +#if defined(SYSVONLY) || defined(RISCOS) #define valloc malloc -#endif /* SYSVONLY || OSF1 || RISCOS */ +#endif /* SYSVONLY || RISCOS */ /************************************************************************/ /* */ diff --git a/src/mkvdate.c b/src/mkvdate.c index 287ab19..c968954 100644 --- a/src/mkvdate.c +++ b/src/mkvdate.c @@ -28,7 +28,7 @@ static char *id = "$Id: mkvdate.c,v 1.5 2001/12/26 22:17:03 sybalsky Exp $ Copyr /* */ /************************************************************************/ -#if defined(OSF1) || defined(LINUX) +#if defined(LINUX) #include "time.h" #endif diff --git a/src/timer.c b/src/timer.c index cb306d7..cf8ed5f 100644 --- a/src/timer.c +++ b/src/timer.c @@ -82,11 +82,6 @@ extern int ether_fd; #include #endif /* AIXPS2 */ -#ifdef OSF1 -/* This is where FPE_FLTOVF & friends are defined */ -#include -#endif /* OSF1 */ - #include "lispemul.h" #include "emlglob.h" #include "lspglob.h" @@ -821,13 +816,6 @@ void int_fp_service(int sig, int code, struct sigcontext *scp) case FPM_UNDERFLOW: case FPM_OVERFLOW: case FPM_PRECISION: -#elif OSF1 - case FPE_FLTDIV: - case FPE_FLTOVF: - case FPE_FLTUND: - case FPE_FLTRES: - case FPE_FLTINV: - case FPE_FLTSUB: #else #ifndef ISC case FPE_FLTDIV_TRAP: @@ -860,8 +848,6 @@ void int_fp_init() { /* first set up the signal handler */ if (sigset(SIGFPE, int_fp_service)) #elif OS5 if (sigset(SIGFPE, int_fp_service)) -#elif OSF1 - if (SIG_ERR == sigset(SIGFPE, int_fp_service)) #else if (ieee_handler("set", "all", int_fp_service)) #endif /* AIXPS2 */ @@ -1069,11 +1055,6 @@ static void int_panic_init() { sigset(SIGSYS, panicuraid); #endif sigset(SIGTERM, panicuraid); -#ifndef FLTINT -#ifdef OSF1 - sigignore(SIGFPE); -#endif /* OSF1 */ -#endif /* FLTINT */ #endif #else static struct sigvec panicv; @@ -1114,11 +1095,6 @@ static void int_panic_init() { sigvec(SIGUSR1, &panicv, 0); sigvec(SIGUSR2, &panicv, 0); -#ifndef FLTINT -#ifdef OSF1 - sigignore(SIGFPE); -#endif /* OSF1 */ -#endif #endif /* SYSVSIGNALS */ DBPRINT(("Panic interrupts enabled\n")); @@ -1140,10 +1116,6 @@ void int_init() { #ifdef FLTINT int_fp_init(); /* Floating-point exception handler */ -#else -#ifdef OSF1 - sigignore(SIGFPE); -#endif #endif int_unblock(); /* Turn on interrupts */ diff --git a/src/unixfork.c b/src/unixfork.c index 53c4bf2..c875936 100644 --- a/src/unixfork.c +++ b/src/unixfork.c @@ -42,13 +42,6 @@ static char *id = "$Id: unixfork.c,v 1.6 2001/12/26 22:17:05 sybalsky Exp $ Copy #endif /* MACOSX or FREEBSD */ #endif /* USETERMIOS */ -#ifdef OSF1 -#define _CLOCK_ID_T -typedef int clockid_t; -#include "time.h" -#include -#endif /* OSF1 */ - #if defined(SYSVONLY) || defined(OS5) || defined(FREEBSD) || defined(MACOSX) #include #include diff --git a/src/xc.c b/src/xc.c index f905678..0d1ac4e 100644 --- a/src/xc.c +++ b/src/xc.c @@ -21,10 +21,6 @@ static char *id = "$Id: xc.c,v 1.4 2001/12/26 22:17:06 sybalsky Exp $ Copyright /* */ /************************************************************************/ -#ifdef OSF1 -#include "time.h" -#endif - #include #ifdef DOS #include /* Defines "#pragma interrupt" */ diff --git a/src/xc.c.orig b/src/xc.c.orig index 716aa39..e9049f5 100644 --- a/src/xc.c.orig +++ b/src/xc.c.orig @@ -25,10 +25,6 @@ static char *id = "$Id: xc.c,v 1.3 1999/05/31 23:35:47 sybalsky Exp $ Copyright /* */ /************************************************************************/ -#ifdef OSF1 -#include "time.h" -#endif - #include #ifdef DOS #include /* Defines "#pragma interrupt" */