[src/netbsd-1-5]: src/sys/arch/x68k/x68k Pullup rev.1.61. Approved by thorpej.

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

details:   https://anonhg.NetBSD.org/src/rev/bcbba3fe169d
branches:  netbsd-1-5
changeset: 489327:bcbba3fe169d
user:      minoura <minoura%NetBSD.org@localhost>
date:      Thu Aug 31 14:53:44 2000 +0000

description:
Pullup rev.1.61.  Approved by thorpej.
Set fputype earlier, before proc0 initialization.

diffstat:

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

diffs (44 lines):

diff -r b7f68fef90f3 -r bcbba3fe169d sys/arch/x68k/x68k/locore.s
--- a/sys/arch/x68k/x68k/locore.s       Thu Aug 31 14:50:22 2000 +0000
+++ b/sys/arch/x68k/x68k/locore.s       Thu Aug 31 14:53:44 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.59 2000/06/11 14:20:46 minoura Exp $      */
+/*     $NetBSD: locore.s,v 1.59.2.1 2000/08/31 14:53:44 minoura Exp $  */
 
 /*
  * Copyright (c) 1988 University of Utah.
@@ -779,24 +779,18 @@
        movl    #MMU_68040,a0@          | with a 68040 compatible MMU 
        RELOC(cputype, a0)
        movl    #CPU_68060,a0@          | and a 68060 CPU
-       RELOC(fputype, a0)
-       movl    #FPU_68060,a0@          | and a 68060 FPU
        jra     Lstart1
 Lis68040:
        RELOC(mmutype, a0)
        movl    #MMU_68040,a0@          | with a 68040 MMU
        RELOC(cputype, a0)
        movl    #CPU_68040,a0@          | and a 68040 CPU
-       RELOC(fputype, a0)
-       movl    #FPU_68040,a0@          | and a 68040 FPU
        jra     Lstart1
 Lis68020:
        RELOC(mmutype, a0)
        movl    #MMU_68851,a0@          | we have PMMU
        RELOC(cputype, a0)
        movl    #CPU_68020,a0@          | and a 68020 CPU
-       RELOC(fputype, a0)
-       movl    #FPU_68881,a0@          | and a 68881 FPU
 
 Lstart1:
 /* initialize source/destination control registers for movs */
@@ -917,6 +911,9 @@
 /* select the software page size now */
        lea     _ASM_LABEL(tmpstk),sp   | temporary stack
        jbsr    _C_LABEL(uvm_setpagesize)  | select software page size
+/* detect FPU type */
+       jbsr    _C_LABEL(fpu_probe)
+       movl    d0,_C_LABEL(fputype)
 /* set kernel stack, user SP, and initial pcb */
        movl    _C_LABEL(proc0paddr),a1 | get proc0 pcb addr
        lea     a1@(USPACE-4),sp        | set kernel stack to end of area