[src/trunk]: src/sys/arch/mips/mips Move LLSC feature test for mips1 to cputa...

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

details:   https://anonhg.NetBSD.org/src/rev/ab136dc39b14
branches:  trunk
changeset: 534832:ab136dc39b14
user:      gmcgarry <gmcgarry%NetBSD.org@localhost>
date:      Sun Aug 04 02:27:51 2002 +0000

description:
Move LLSC feature test for mips1 to cputab[].

diffstat:

 sys/arch/mips/mips/mips_machdep.c |  13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

diffs (43 lines):

diff -r 13f6b7d551e0 -r ab136dc39b14 sys/arch/mips/mips/mips_machdep.c
--- a/sys/arch/mips/mips/mips_machdep.c Sun Aug 04 02:26:18 2002 +0000
+++ b/sys/arch/mips/mips/mips_machdep.c Sun Aug 04 02:27:51 2002 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: mips_machdep.c,v 1.139 2002/08/04 01:47:15 gmcgarry Exp $      */
+/*     $NetBSD: mips_machdep.c,v 1.140 2002/08/04 02:27:51 gmcgarry Exp $      */
 
 /*
  * Copyright 2002 Wasabi Systems, Inc.
@@ -120,7 +120,7 @@
 
 #include <sys/cdefs.h>                 /* RCS ID & Copyright macro defns */
 
-__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.139 2002/08/04 01:47:15 gmcgarry Exp $");
+__KERNEL_RCSID(0, "$NetBSD: mips_machdep.c,v 1.140 2002/08/04 02:27:51 gmcgarry Exp $");
 
 #include "opt_cputype.h"
 #include "opt_compat_netbsd.h"
@@ -251,11 +251,11 @@
 
 static const struct pridtab cputab[] = {
        { 0, MIPS_R2000, -1, -1,                CPU_ARCH_MIPS1, 64,
-         0,                                    "MIPS R2000 CPU"        },
+         CPU_MIPS_NO_LLSC,                     "MIPS R2000 CPU"        },
        { 0, MIPS_R3000, MIPS_REV_R3000, -1,    CPU_ARCH_MIPS1, 64,
-         0,                                    "MIPS R3000 CPU"        },
+         CPU_MIPS_NO_LLSC,                     "MIPS R3000 CPU"        },
        { 0, MIPS_R3000, MIPS_REV_R3000A, -1,   CPU_ARCH_MIPS1, 64,
-         0,                                    "MIPS R3000A CPU"       },
+         CPU_MIPS_NO_LLSC,                     "MIPS R3000A CPU"       },
        { 0, MIPS_R6000, -1, -1,                CPU_ARCH_MIPS2, 32,
          MIPS_NOT_SUPP,                        "MIPS R6000 CPU"        },
 
@@ -831,8 +831,7 @@
         */
        mips_cpu_flags = mycpu->cpu_flags;
        mips_has_r4k_mmu = mips_cpu_flags & CPU_MIPS_R4K_MMU;
-       mips_has_llsc =
-           (CPUISMIPS3 ? !(mips_cpu_flags & CPU_MIPS_NO_LLSC) : 0);
+       mips_has_llsc = (mips_cpu_flags & CPU_MIPS_NO_LLSC) != 0;
 
        if (mycpu->cpu_flags & CPU_MIPS_HAVE_SPECIAL_CCA) {
                uint32_t cca;