Kill option GPL_MATH_EMULATE.

ok deraadt@ and many others.

10 files changed, 11 insertions, 54 deletions

diff --git a/sys/arch/i386/conf/GENERIC b/sys/arch/i386/conf/GENERIC
index 3884835fa02..5f30e440933 100644
--- a/sys/arch/i386/conf/GENERIC
+++ b/sys/arch/i386/conf/GENERIC
@@ -1,4 +1,4 @@
-#	$OpenBSD: GENERIC,v 1.509 2006/07/02 02:05:11 deraadt Exp $
+#	$OpenBSD: GENERIC,v 1.510 2006/07/25 19:16:51 kettenis Exp $
 #
 # For further information on compiling OpenBSD kernels, see the config(8)
 # man page.
@@ -17,7 +17,6 @@ option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
 option		I686_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation.
 
 option		USER_PCICONF	# user-space PCI configuration
 
diff --git a/sys/arch/i386/conf/RAMDISK b/sys/arch/i386/conf/RAMDISK
index 5069bb66199..d3c6387a81a 100644
--- a/sys/arch/i386/conf/RAMDISK
+++ b/sys/arch/i386/conf/RAMDISK
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK,v 1.143 2006/04/14 21:52:47 weingart Exp $
+#	$OpenBSD: RAMDISK,v 1.144 2006/07/25 19:16:51 kettenis Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -9,7 +9,6 @@ option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
 option		I686_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation
 
 option		SMALL_KERNEL
 option		NO_PROPOLICE
diff --git a/sys/arch/i386/conf/RAMDISKB b/sys/arch/i386/conf/RAMDISKB
index a466f8eb779..55a2e54abec 100644
--- a/sys/arch/i386/conf/RAMDISKB
+++ b/sys/arch/i386/conf/RAMDISKB
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKB,v 1.90 2006/06/15 22:25:37 deraadt Exp $
+#	$OpenBSD: RAMDISKB,v 1.91 2006/07/25 19:16:51 kettenis Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -9,7 +9,6 @@ option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
 option		I686_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation
 
 option		SMALL_KERNEL
 option		NO_PROPOLICE
diff --git a/sys/arch/i386/conf/RAMDISKC b/sys/arch/i386/conf/RAMDISKC
index 7c18ef0e6a8..8d1c96fda80 100644
--- a/sys/arch/i386/conf/RAMDISKC
+++ b/sys/arch/i386/conf/RAMDISKC
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISKC,v 1.68 2006/06/23 16:22:32 deraadt Exp $
+#	$OpenBSD: RAMDISKC,v 1.69 2006/07/25 19:16:51 kettenis Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -9,7 +9,6 @@ option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
 option		I686_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation
 
 option		SMALL_KERNEL
 option		NO_PROPOLICE
diff --git a/sys/arch/i386/conf/RAMDISK_CD b/sys/arch/i386/conf/RAMDISK_CD
index bd3f1eb9d8b..2f00b817f44 100644
--- a/sys/arch/i386/conf/RAMDISK_CD
+++ b/sys/arch/i386/conf/RAMDISK_CD
@@ -1,4 +1,4 @@
-#	$OpenBSD: RAMDISK_CD,v 1.124 2006/06/26 06:31:31 brad Exp $
+#	$OpenBSD: RAMDISK_CD,v 1.125 2006/07/25 19:16:51 kettenis Exp $
 
 machine		i386		# architecture, used by config; REQUIRED
 
@@ -9,7 +9,6 @@ option		I386_CPU	# CPU classes; at least one is REQUIRED
 option		I486_CPU
 option		I586_CPU
 option		I686_CPU
-#option		GPL_MATH_EMULATE	# floating point emulation
 
 option		SMALL_KERNEL
 option		NO_PROPOLICE
diff --git a/sys/arch/i386/conf/files.i386 b/sys/arch/i386/conf/files.i386
index 864003179a8..b8f1c34462b 100644
--- a/sys/arch/i386/conf/files.i386
+++ b/sys/arch/i386/conf/files.i386
@@ -1,4 +1,4 @@
-#	$OpenBSD: files.i386,v 1.149 2006/06/19 15:13:34 deraadt Exp $
+#	$OpenBSD: files.i386,v 1.150 2006/07/25 19:16:51 kettenis Exp $
 #
 # new style config file for i386 architecture
 #
@@ -167,9 +167,6 @@ device	npx
 attach	npx at isa
 file	arch/i386/isa/npx.c		npx needs-flag
 
-# Linux/GNU i387 floating point emulator
-include "../../../gnu/arch/i386/fpemul/files.fpemul"
-
 # attribute used to represent the "keyboard controller"
 # XXX should be a real device
 define pckbcport {[irq = -1], [port = -1]}
diff --git a/sys/arch/i386/i386/trap.c b/sys/arch/i386/i386/trap.c
index cd1570a67a3..a6ea427bad3 100644
--- a/sys/arch/i386/i386/trap.c
+++ b/sys/arch/i386/i386/trap.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: trap.c,v 1.75 2006/06/13 03:01:04 gwk Exp $	*/
+/*	$OpenBSD: trap.c,v 1.76 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: trap.c,v 1.95 1996/05/05 06:50:02 mycroft Exp $	*/
 
 /*-
@@ -411,19 +411,6 @@ trap(frame)
 		goto out;
 
 	case T_DNA|T_USER: {
-#if defined(GPL_MATH_EMULATE)
-		int rv;
-		if ((rv = math_emulate(&frame)) == 0) {
-			if (frame.tf_eflags & PSL_T)
-				goto trace;
-			return;
-		}
-		sv.sival_int = frame.tf_eip;
-		KERNEL_PROC_LOCK(p);
-		trapsignal(p, rv, type &~ T_USER, FPE_FLTINV, sv);
-		KERNEL_PROC_UNLOCK(p);
-		goto out;
-#else
 		printf("pid %d killed due to lack of floating point\n",
 		    p->p_pid);
 		sv.sival_int = frame.tf_eip;
@@ -431,7 +418,6 @@ trap(frame)
 		trapsignal(p, SIGKILL, type &~ T_USER, FPE_FLTINV, sv);
 		KERNEL_PROC_UNLOCK(p);
 		goto out;
-#endif
 	}
 
 	case T_BOUND|T_USER:
@@ -564,9 +550,6 @@ trap(frame)
 		KERNEL_PROC_UNLOCK(p);
 		break;
 	case T_TRCTRAP|T_USER:		/* trace trap */
-#if defined(GPL_MATH_EMULATE)
-	trace:
-#endif
 		sv.sival_int = rcr2();
 		KERNEL_PROC_LOCK(p);
 		trapsignal(p, SIGTRAP, type &~ T_USER, TRAP_TRACE, sv);
diff --git a/sys/arch/i386/include/cpu.h b/sys/arch/i386/include/cpu.h
index acf150c0ca4..78f04d974c7 100644
--- a/sys/arch/i386/include/cpu.h
+++ b/sys/arch/i386/include/cpu.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: cpu.h,v 1.79 2006/06/12 13:18:18 dim Exp $	*/
+/*	$OpenBSD: cpu.h,v 1.80 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: cpu.h,v 1.35 1996/05/05 19:29:26 christos Exp $	*/
 
 /*-
@@ -392,11 +392,6 @@ void	npxdrop(struct proc *);
 void	npxsave_proc(struct proc *, int);
 void	npxsave_cpu(struct cpu_info *, int);
 
-#if defined(GPL_MATH_EMULATE)
-/* math_emulate.c */
-int	math_emulate(struct trapframe *);
-#endif
-
 #ifdef USER_LDT
 /* sys_machdep.h */
 extern int user_ldt_enable;
diff --git a/sys/arch/i386/include/npx.h b/sys/arch/i386/include/npx.h
index f3b0fd1343c..c16157bc847 100644
--- a/sys/arch/i386/include/npx.h
+++ b/sys/arch/i386/include/npx.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.h,v 1.8 2004/07/20 05:37:14 kettenis Exp $	*/
+/*	$OpenBSD: npx.h,v 1.9 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: npx.h,v 1.11 1994/10/27 04:16:11 cgd Exp $	*/
 
 /*-
@@ -74,10 +74,6 @@ struct	fpacc87 {
 #endif
 };
 
-#ifdef GPL_MATH_EMULATE
-#include <gnu/arch/i386/fpemul/math_emu.h>
-#endif
-
 /* Floating point and emulator context */
 struct	save87 {
 	struct	env87 sv_env;		/* floating point control/status */
@@ -128,11 +124,6 @@ struct savexmm {
 union savefpu {
 	struct save87 sv_87;
 	struct savexmm sv_xmm;
-#ifdef GPL_MATH_EMULATE
-	union i387_union gplemu;
-#else
-	u_char emupad[176];		/* sizeof(i387_union) */
-#endif
 };
 
 /* Cyrix EMC memory - mapped coprocessor context switch information */
diff --git a/sys/arch/i386/isa/npx.c b/sys/arch/i386/isa/npx.c
index 27279230a84..42ad49dd328 100644
--- a/sys/arch/i386/isa/npx.c
+++ b/sys/arch/i386/isa/npx.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: npx.c,v 1.39 2006/04/19 15:48:17 mickey Exp $	*/
+/*	$OpenBSD: npx.c,v 1.40 2006/07/25 19:16:51 kettenis Exp $	*/
 /*	$NetBSD: npx.c,v 1.57 1996/05/12 23:12:24 mycroft Exp $	*/
 
 #if 0
@@ -196,7 +196,6 @@ static inline int
 npxprobe1(ia)
 	struct isa_attach_args *ia;
 {
-#ifndef ALWAYS_MATH_EMULATE
 	int control;
 	int status;
 
@@ -247,7 +246,7 @@ npxprobe1(ia)
 				npx_type = NPX_INTERRUPT;
 			} else {
 				/*
-				 * Worse, even IRQ13 is broken.  Use emulator.
+				 * Worse, even IRQ13 is broken.
 				 */
 				npx_type = NPX_BROKEN;
 				ia->ia_irq = IRQUNK;
@@ -255,9 +254,6 @@ npxprobe1(ia)
 			return 1;
 		}
 	}
-#else
-	npx_intrs_while_probing = npx_traps_while_probing = 0;
-#endif
 
 	/*
 	 * Probe failed.  There is no usable FPU.