diff options
| author | gclarkii <gclarkii@FreeBSD.org> | 1994-04-29 21:39:55 +0000 |
|---|---|---|
| committer | gclarkii <gclarkii@FreeBSD.org> | 1994-04-29 21:39:55 +0000 |
| commit | b7713cb195150e569ee5e3c30fd77f486087c204 (patch) | |
| tree | 5eecf900971de94d908ddf1e17d639caf5b74fcc | |
| parent | b31b483302a53ec0f76f16e4a4fff881b51a5abb (diff) | |
| download | FreeBSD-src-b7713cb195150e569ee5e3c30fd77f486087c204.zip FreeBSD-src-b7713cb195150e569ee5e3c30fd77f486087c204.tar.gz | |
Added ifdef for GPL_MATH_EMULATE to keep the sytem from panicing when
using it.
| -rw-r--r-- | sys/amd64/amd64/trap.c | 8 | ||||
| -rw-r--r-- | sys/i386/i386/trap.c | 8 | ||||
| -rw-r--r-- | sys/kern/subr_trap.c | 8 |
3 files changed, 12 insertions, 12 deletions
diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 0106835..9bb38e1 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.21 1994/04/02 07:00:31 davidg Exp $ + * $Id: trap.c,v 1.22 1994/04/07 10:51:00 davidg Exp $ */ /* @@ -221,12 +221,12 @@ skiptoswitch: /* if a transparent fault (due to context switch "late") */ if (npxdna()) return; #endif /* NNPX > 0 */ -#ifdef MATH_EMULATE +#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) i = math_emulate(&frame); if (i == 0) return; -#else /* MATH_EMULATE */ +#else /* MATH_EMULATE || GPL_MATH_EMULATE */ panic("trap: math emulation necessary!"); -#endif /* MATH_EMULATE */ +#endif /* MATH_EMULATE || GPL_MATH_EMULATE */ ucode = FPE_FPU_NP_TRAP; break; diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 0106835..9bb38e1 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.21 1994/04/02 07:00:31 davidg Exp $ + * $Id: trap.c,v 1.22 1994/04/07 10:51:00 davidg Exp $ */ /* @@ -221,12 +221,12 @@ skiptoswitch: /* if a transparent fault (due to context switch "late") */ if (npxdna()) return; #endif /* NNPX > 0 */ -#ifdef MATH_EMULATE +#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) i = math_emulate(&frame); if (i == 0) return; -#else /* MATH_EMULATE */ +#else /* MATH_EMULATE || GPL_MATH_EMULATE */ panic("trap: math emulation necessary!"); -#endif /* MATH_EMULATE */ +#endif /* MATH_EMULATE || GPL_MATH_EMULATE */ ucode = FPE_FPU_NP_TRAP; break; diff --git a/sys/kern/subr_trap.c b/sys/kern/subr_trap.c index 0106835..9bb38e1 100644 --- a/sys/kern/subr_trap.c +++ b/sys/kern/subr_trap.c @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)trap.c 7.4 (Berkeley) 5/13/91 - * $Id: trap.c,v 1.21 1994/04/02 07:00:31 davidg Exp $ + * $Id: trap.c,v 1.22 1994/04/07 10:51:00 davidg Exp $ */ /* @@ -221,12 +221,12 @@ skiptoswitch: /* if a transparent fault (due to context switch "late") */ if (npxdna()) return; #endif /* NNPX > 0 */ -#ifdef MATH_EMULATE +#if defined(MATH_EMULATE) || defined(GPL_MATH_EMULATE) i = math_emulate(&frame); if (i == 0) return; -#else /* MATH_EMULATE */ +#else /* MATH_EMULATE || GPL_MATH_EMULATE */ panic("trap: math emulation necessary!"); -#endif /* MATH_EMULATE */ +#endif /* MATH_EMULATE || GPL_MATH_EMULATE */ ucode = FPE_FPU_NP_TRAP; break; |
