[src/netbsd-1-4]: src/sys/arch/x68k/x68k pullup 1.41->1.42, 1.43->1.44 (minoura)

[perry <perry%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/2ae4e1756dd5
branches:  netbsd-1-4
changeset: 468743:2ae4e1756dd5
user:      perry <perry%NetBSD.org@localhost>
date:      Sun Jun 20 19:34:17 1999 +0000

description:
pullup 1.41->1.42, 1.43->1.44 (minoura)

diffstat:

 sys/arch/x68k/x68k/locore.s |  37 ++++++++++++++++++++++++++-----------
 1 files changed, 26 insertions(+), 11 deletions(-)

diffs (71 lines):

diff -r 712f55c991a0 -r 2ae4e1756dd5 sys/arch/x68k/x68k/locore.s
--- a/sys/arch/x68k/x68k/locore.s       Sun Jun 20 19:21:59 1999 +0000
+++ b/sys/arch/x68k/x68k/locore.s       Sun Jun 20 19:34:17 1999 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.41.2.1 1999/04/30 17:38:24 perry Exp $    */
+/*     $NetBSD: locore.s,v 1.41.2.2 1999/06/20 19:34:17 perry Exp $    */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -266,36 +266,51 @@
 /*
  * FP exceptions.
  */
-_fpfline:
+#include "opt_fpuemulate.h"
+ENTRY_NOPROFILE(fpfline)
 #if defined(M68040)
+       cmpl    #FPU_68040,_C_LABEL(fputype) | 64040 FPU?
+       jne     Lfp_unimp               | no, skip FPSP
        cmpw    #0x202c,sp@(6)          | format type 2?
-       jne     _illinst                | no, not an FP emulation
+       jne     _C_LABEL(illinst)       | no, not an FP emulation
 #ifdef FPSP
-       .globl fpsp_unimp
-       jmp     fpsp_unimp              | yes, go handle it
+       jmp     _ASM_LABEL(fpsp_unimp)  | yes, go handle it
 #else
        clrl    sp@-                    | stack adjust count
        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULI,d0           | denote as FP emulation trap
        jra     fault                   | do it
 #endif
+Lfp_unimp:
+#endif
+#ifdef FPU_EMULATE
+       clrl    sp@-                    | stack adjust count
+       moveml  #0xFFFF,sp@-            | save registers
+       moveq   #T_FPEMULD,d0           | denote as FP emulation trap
+       jra     _ASM_LABEL(fault)       | do it
 #else
-       jra     _illinst
+       jra     _C_LABEL(illinst)
 #endif
 
-_fpunsupp:
+ENTRY_NOPROFILE(fpunsupp)
 #if defined(M68040)
-       cmpl    #MMU_68040,_mmutype     | 68040?
-       jne     _illinst                | no, treat as illinst
+       cmpl    #FPU_68040,_C_LABEL(fputype) | 68040?
+       jne     Lfp_unsupp              | no, skip FPSP
 #ifdef FPSP
-       .globl  fpsp_unsupp
-       jmp     fpsp_unsupp             | yes, go handle it
+       jmp     _ASM_LABEL(fpsp_unsupp) | yes, go handle it
 #else
        clrl    sp@-                    | stack adjust count
        moveml  #0xFFFF,sp@-            | save registers
        moveq   #T_FPEMULD,d0           | denote as FP emulation trap
        jra     fault                   | do it
 #endif
+Lfp_unsupp:
+#endif
+#ifdef FPU_EMULATE
+       clrl    sp@-                    | stack adjust count
+       moveml  #0xFFFF,sp@-            | save registers
+       moveq   #T_FPEMULD,d0           | denote as FP emulation trap
+       jra     _ASM_LABEL(fault)       | do it
 #else
        jra     _illinst
 #endif