Remove UNSAFE flag. (#134)

waywardmonkeys · web-flow · commit 0880b2f3ddda · 2020-12-26T20:53:47.000Z
This flag was for SunOS 3 and 4 on sun3 hardware (68k).

It enabled some unsafe optimizations via assembler. This hasn't
actually been built since the DOS port (since the header for this
was renamed, but the code in `xc.c` wasn't updated).

The optimizations here made assumptions that were specific to the
68k hardware and register allocation. They aren't likely to be
of much use moving forward, and we've got plenty of safe performance
improvements from the last 30 years of hardware advances.
diff --git a/bin/compile-flags b/bin/compile-flags
@@ -27,7 +27,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.
 
-UNSAFE		If true, enables the "fast" version of 68020 opcodes.
 NOASM		If true, suppress any attempt to include assembler
 		versions of things in the emulator.  In 'lispemul.c',
 		if this is true, disables:
@@ -36,7 +35,6 @@ NOASM		If true, suppress any attempt to include assembler
 			SUN4_OS4_IL
 			OPDISP
 			NATIVETRAN
-			UNSAFE
 			PROFILE
 		and enables NOASMFNCALL
 C_ONLY
diff --git a/bin/makefile-sunos3.mc68020 b/bin/makefile-sunos3.mc68020
@@ -6,7 +6,7 @@ OEXT = .o
 OPTFLAGS = -O2
 DISPOPTFLAGS = -O
 FPFLAGS = -f68881
-DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DUNSAFE -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp68K.il
 BITBLTFILE = $(OBJECTDIR)bitblt68K.o
diff --git a/bin/makefile-sunos3.mc68020-multi b/bin/makefile-sunos3.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DOPDISP -DUNSAFE -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DOPDISP -DSUN3_OS3_IL -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos3.mc68020-x b/bin/makefile-sunos3.mc68020-x
@@ -33,7 +33,7 @@ OEXT = .o
 OPTFLAGS = -O2
 DISPOPTFLAGS = -O
 FPFLAGS = -f68881
-DFLAGS = -DNEW_STORAGE -DOPDISP -DUNSAFE -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
+DFLAGS = -DNEW_STORAGE -DOPDISP -DSUN3_OS3_IL -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lX11 -lpixrect -lc -lm
 INLINE = $(SRCDIR)disp68K.il
 BITBLTFILE = $(OBJECTDIR)bitblt68K.o
diff --git a/bin/makefile-sunos4.1.mc68020 b/bin/makefile-sunos4.1.mc68020
@@ -10,7 +10,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright multi'.  -osamu '90/02/07]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.1.mc68020-multi b/bin/makefile-sunos4.1.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.1.mc68020-x b/bin/makefile-sunos4.1.mc68020-x
@@ -37,7 +37,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright x'.  -osamu '90/02/27]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
+DFLAGS = -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lX11 -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.mc68020 b/bin/makefile-sunos4.mc68020
@@ -10,7 +10,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright multi'.  -osamu '90/02/07]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.mc68020-multi b/bin/makefile-sunos4.mc68020-multi
@@ -11,7 +11,7 @@ DISPOPTFLAGS = -O
 FPFLAGS = -f68881
 # DISPLAYBUFFER for Color Sparcstation code testing
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS
+DFLAGS = -DKBINT -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DDISPLAYBUFFER -DNEWBITBLT -DLOGINT -DSUNDISPLAY -DDISPLAYBUFFER -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lsuntool -lsunwindow -lpixrect -lc -lm
 
 INLINE = $(SRCDIR)disp68K.il
diff --git a/bin/makefile-sunos4.mc68020-x b/bin/makefile-sunos4.mc68020-x
@@ -37,7 +37,7 @@ FPFLAGS = -f68881
 # [I remove DISPLAYBUFFER option .
 # You may run 'makeright x'.  -osamu '90/02/27]
 # NEWBITBLT for assembler version of bitblt.
-DFLAGS = -DNEW_STORAGE -DOPDISP -DUNSAFE -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
+DFLAGS = -DNEW_STORAGE -DOPDISP -DOS4 -DSUN3_OS4_IL -DOS4_TYPE4BUG -DNEWBITBLT -DLOGINT $(XFLAGS) -DFORKCOMM -DBIGATOMS
 LDFLAGS = -lX11 -lpixrect -lc -lm
 LDELDFLAGS = -Bstatic -lX11 -lpixrect -Bdynamic -lc -lm
 
diff --git a/inc/inln68k+.h b/inc/inln68k+.h
diff --git a/inc/version.h b/inc/version.h
@@ -177,7 +177,6 @@ error Must specify RELEASE to build Medley.
 #undef SUN4_OS4_IL
 #undef OPDISP
 #undef NATIVETRAN
-#undef UNSAFE
 #undef PROFILE
 #define NOASMFNCALL	1
 #endif
diff --git a/src/xc.c b/src/xc.c
@@ -109,9 +109,6 @@ extern MouseInterface currentmouse;
 
 #ifdef SUN3_OS3_OR_OS4_IL
 #include "inln68k.h"
-#ifdef UNSAFE
-#include "fastinln68k.h"
-#endif
 #endif
 
 typedef struct conspage ConsPage;
@@ -230,10 +227,6 @@ void dispatch(void) {
 #endif
 #endif
 
-#ifdef UNSAFE
-  register int Save_D5_shift_amount;
-#endif
-
   /* OP_FN_COMMON arguments */
 
   DefCell *fn_defcell;
@@ -258,10 +251,6 @@ void dispatch(void) {
   table = (InstPtr *)compute_dispatch_table();
 #endif
 
-#ifdef UNSAFE
-  Save_D5_shift_amount = 15;
-#endif
-
 #ifdef I386
   goto setup_table;
 #else
@@ -1481,10 +1470,6 @@ op_ufn : {
 #ifndef ISC
   SaveD6 = 0;
 
-#ifdef UNSAFE
-  Save_D5_shift_amount = 15;
-#endif
-
   {
     int i;
     for (i = 0; i < 256; i++) { table[i] = (InstPtr)op_ufn; };
