[src/trunk]: src/sys/arch/mips/mips [R3900/R3920] sync with

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

details:   https://anonhg.NetBSD.org/src/rev/2097b9826d28
branches:  trunk
changeset: 497082:2097b9826d28
user:      uch <uch%NetBSD.org@localhost>
date:      Mon Sep 18 18:17:32 2000 +0000

description:
[R3900/R3920] sync with
 | Module Name: syssrc
 | Committed By:        nisimura
 | Date:                Sat Sep 16 07:20:17 UTC 2000

diffstat:

 sys/arch/mips/mips/locore_mips1.S |  22 +++++++++++++---------
 sys/arch/mips/mips/mips_machdep.c |   7 ++++---
 2 files changed, 17 insertions(+), 12 deletions(-)

diffs (77 lines):

diff -r e165d1691755 -r 2097b9826d28 sys/arch/mips/mips/locore_mips1.S
--- a/sys/arch/mips/mips/locore_mips1.S Mon Sep 18 18:01:39 2000 +0000
+++ b/sys/arch/mips/mips/locore_mips1.S Mon Sep 18 18:17:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore_mips1.S,v 1.43 2000/09/16 04:54:44 nisimura Exp $       */
+/*     $NetBSD: locore_mips1.S,v 1.44 2000/09/18 18:17:32 uch Exp $    */
 
 /*
  * Copyright (c) 1992, 1993
@@ -1248,27 +1248,31 @@
  */
 
 /*
- * void mips1_ConfigCache(void)
+ * int mips1_icsize()  R3900/R3920 special
  */
-LEAF(mips1_ConfigCache)
+LEAF(mips1_icsize)     
        mfc0    t0, R3900_COP_0_CONFIG
        li      t1, R3900_CONFIG_ICS_MASK
        and     t1, t1, t0
        srl     t1, t1, R3900_CONFIG_ICS_SHIFT
        li      t2, R3900_C_SIZE_MIN
        sllv    t1, t2, t1
-       sw      t1, _C_LABEL(mips_L1ICacheSize)
+       j       ra
+       move    v0, t1
+END(mips1_icsize)      
 
+/*
+ * int mips1_dcsize() R3900/R3920 special
+ */
+LEAF(mips1_dcsize)     
        li      t1, R3900_CONFIG_DCS_MASK
        and     t1, t1, t0
        srl     t1, t1, R3900_CONFIG_DCS_SHIFT
        li      t2, R3900_C_SIZE_MIN
        sllv    t1, t2, t1
-       sw      t1, _C_LABEL(mips_L1DCacheSize)
-
-       j       ra
-       nop
-END(mips1_ConfigCache)
+       j       ra      
+       move    v0, t1
+END(mips1_dcsize)      
 
 /*
  *     void mips1_FlushDCache(vaddr_t addr, vsize_t len)       
diff -r e165d1691755 -r 2097b9826d28 sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Mon Sep 18 18:01:39 2000 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Mon Sep 18 18:17:32 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.102 2000/09/16 07:20:16 nisimura Exp $      */
+/*     $NetBSD: mips_machdep.c,v 1.103 2000/09/18 18:17:32 uch Exp $   */
 
 /*-
  * Copyright (c) 1998 The NetBSD Foundation, Inc.
@@ -52,7 +52,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.102 2000/09/16 07:20:16 nisimura Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.103 2000/09/18 18:17:32 uch Exp $");
 
 #include "opt_compat_netbsd.h"
 #include "opt_compat_ultrix.h"
@@ -375,7 +375,8 @@
                        mips_L1DCacheLSize = 16;
                        break;
                }
-               mips1_ConfigCache();
+               mips_L1ICacheSize = mips1_icsize();
+               mips_L1DCacheSize = mips1_dcsize();
                break;
 #endif /* ENABLE_MIPS_TX3900 */
 #endif /* MIPS1 */