[src/netbsd-3-0]: src/sys/arch/mips Pull up following revision(s) (requested ...

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

details:   https://anonhg.NetBSD.org/src/rev/3da21fd53cf3
branches:  netbsd-3-0
changeset: 579200:3da21fd53cf3
user:      tron <tron%NetBSD.org@localhost>
date:      Wed Apr 19 15:39:13 2006 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1259):
        sys/arch/mips/mips/fp.S: revision 1.30
        sys/arch/mips/include/cpu.h: revision 1.77
include/cpu.h: make sure MIPS3_PLUS properly defined even if _LOCORE is defined
mips/fp.S:     include <mips/cpu.h> for #ifdef MIPS3_PLUS
Closes PR port-mips/27298.

diffstat:

 sys/arch/mips/include/cpu.h |  52 +++++++++++++++++++++-----------------------
 sys/arch/mips/mips/fp.S     |   4 +-
 2 files changed, 27 insertions(+), 29 deletions(-)

diffs (106 lines):

diff -r 18d56a8c0f7d -r 3da21fd53cf3 sys/arch/mips/include/cpu.h
--- a/sys/arch/mips/include/cpu.h       Tue Apr 18 21:16:46 2006 +0000
+++ b/sys/arch/mips/include/cpu.h       Wed Apr 19 15:39:13 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: cpu.h,v 1.73 2004/09/22 11:32:03 yamt Exp $    */
+/*     $NetBSD: cpu.h,v 1.73.18.1 2006/04/19 15:39:13 tron Exp $       */
 
 /*-
  * Copyright (c) 1992, 1993
@@ -110,13 +110,25 @@
 #endif
 
 #ifdef _KERNEL
-#ifndef _LOCORE
-extern struct cpu_info cpu_info_store;
+#ifdef _LKM
+/* Assume all CPU architectures are valid for LKM's */
+#define        MIPS1   1
+#define        MIPS3   1
+#define        MIPS4   1
+#define        MIPS32  1
+#define        MIPS64  1
+#endif
 
-#define        curcpu()        (&cpu_info_store)
-#define        cpu_number()    (0)
-#define        cpu_proc_fork(p1, p2)
-#endif /* !_LOCORE */
+#if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS64) == 0
+#error at least one of MIPS1, MIPS3, MIPS4, MIPS32 or MIPS64 must be specified
+#endif
+
+/* Shortcut for MIPS3 or above defined */
+#if defined(MIPS3) || defined(MIPS4) || defined(MIPS32) || defined(MIPS64)
+#define        MIPS3_PLUS      1
+#else
+#undef MIPS3_PLUS
+#endif
 
 /*
  * Macros to find the CPU architecture we're on at run-time,
@@ -133,6 +145,12 @@
 #define        CPU_ARCH_MIPS64 (1 << 6)
 
 #ifndef _LOCORE
+extern struct cpu_info cpu_info_store;
+
+#define        curcpu()        (&cpu_info_store)
+#define        cpu_number()    (0)
+#define        cpu_proc_fork(p1, p2)
+
 /* XXX simonb
  * Should the following be in a cpu_info type structure?
  * And how many of these are per-cpu vs. per-system?  (Ie,
@@ -160,19 +178,6 @@
 #define        CPU_MIPS_I_D_CACHE_COHERENT     0x0800  /* I-cache funcs don't need to flush the D-cache */
 #define        MIPS_NOT_SUPP                   0x8000
 
-#ifdef _LKM
-/* Assume all CPU architectures are valid for LKM's */
-#define        MIPS1   1
-#define        MIPS3   1
-#define        MIPS4   1
-#define        MIPS32  1
-#define        MIPS64  1
-#endif
-
-#if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS64) == 0
-#error at least one of MIPS1, MIPS3, MIPS4, MIPS32 or MIPS64 must be specified
-#endif
-
 #if (MIPS1 + MIPS3 + MIPS4 + MIPS32 + MIPS64) == 1
 #ifdef MIPS1
 # define CPUISMIPS3            0
@@ -237,13 +242,6 @@
 #define        MIPS_HAS_CLOCK  (cpu_arch >= CPU_ARCH_MIPS3)
 #endif /* run-time test */
 
-/* Shortcut for MIPS3 or above defined */
-#if defined(MIPS3) || defined(MIPS4) || defined(MIPS32) || defined(MIPS64)
-#define        MIPS3_PLUS      1
-#else
-#undef MIPS3_PLUS
-#endif
-
 
 /*
  * definitions of cpu-dependent requirements
diff -r 18d56a8c0f7d -r 3da21fd53cf3 sys/arch/mips/mips/fp.S
--- a/sys/arch/mips/mips/fp.S   Tue Apr 18 21:16:46 2006 +0000
+++ b/sys/arch/mips/mips/fp.S   Wed Apr 19 15:39:13 2006 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: fp.S,v 1.28 2003/10/25 22:10:34 mycroft Exp $  */
+/*     $NetBSD: fp.S,v 1.28.26.1 2006/04/19 15:39:13 tron Exp $        */
 
 /*
  * Copyright (c) 1992, 1993
@@ -37,7 +37,7 @@
 #include <sys/cdefs.h>
 
 #include <mips/asm.h>
-#include <mips/cpuregs.h>
+#include <mips/cpu.h>
 #include <mips/trap.h>
 
 #include "assym.h"