[src/trunk]: src/sys/arch/sparc64/sparc64 Move some macro definitions out of ...

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

details:   https://anonhg.NetBSD.org/src/rev/74bf24454a81
branches:  trunk
changeset: 494811:74bf24454a81
user:      eeh <eeh%NetBSD.org@localhost>
date:      Fri Jul 14 21:04:16 2000 +0000

description:
Move some macro definitions out of genassym and into locore.s

diffstat:

 sys/arch/sparc64/sparc64/genassym.c  |   5 +----
 sys/arch/sparc64/sparc64/genassym.cf |   5 +----
 sys/arch/sparc64/sparc64/locore.s    |  10 +++++++---
 3 files changed, 9 insertions(+), 11 deletions(-)

diffs (75 lines):

diff -r 4ba1e8004167 -r 74bf24454a81 sys/arch/sparc64/sparc64/genassym.c
--- a/sys/arch/sparc64/sparc64/genassym.c       Fri Jul 14 21:02:11 2000 +0000
+++ b/sys/arch/sparc64/sparc64/genassym.c       Fri Jul 14 21:04:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: genassym.c,v 1.17 2000/07/03 17:56:08 eeh Exp $ */
+/*     $NetBSD: genassym.c,v 1.18 2000/07/14 21:04:16 eeh Exp $ */
 
 /*
  * Copyright (c) 1992, 1993
@@ -153,9 +153,6 @@
        off("CI_SPINUP", struct cpu_info, ci_spinup);
        off("CI_INITSTACK", struct cpu_info, ci_initstack);
        off("CI_PADDR", struct cpu_info, ci_paddr);
-       def("CURPROC", (CPUINFO_VA+CI_CURPROC));
-       def("CPCB", (CPUINFO_VA+CI_CPCB));
-       def("FPPROC", (CPUINFO_VA+CI_FPPROC));
 
        /* FPU state */
        off("FS_REGS", struct fpstate64, fs_regs);
diff -r 4ba1e8004167 -r 74bf24454a81 sys/arch/sparc64/sparc64/genassym.cf
--- a/sys/arch/sparc64/sparc64/genassym.cf      Fri Jul 14 21:02:11 2000 +0000
+++ b/sys/arch/sparc64/sparc64/genassym.cf      Fri Jul 14 21:04:16 2000 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: genassym.cf,v 1.19 2000/07/03 17:56:08 eeh Exp $
+#      $NetBSD: genassym.cf,v 1.20 2000/07/14 21:04:16 eeh Exp $
 
 #
 # Copyright (c) 1997 The NetBSD Foundation, Inc.
@@ -155,9 +155,6 @@
 define CI_SPINUP       offsetof(struct cpu_info, ci_spinup)
 define CI_INITSTACK    offsetof(struct cpu_info, ci_initstack)
 define CI_PADDR        offsetof(struct cpu_info, ci_paddr)
-define CURPROC         (CPUINFO_VA+CI_CURPROC)
-define CPCB            (CPUINFO_VA+CI_CPCB)
-define FPPROC          (CPUINFO_VA+CI_FPPROC)
 
 # FPU state
 define FS_REGS         offsetof(struct fpstate64, fs_regs)
diff -r 4ba1e8004167 -r 74bf24454a81 sys/arch/sparc64/sparc64/locore.s
--- a/sys/arch/sparc64/sparc64/locore.s Fri Jul 14 21:02:11 2000 +0000
+++ b/sys/arch/sparc64/sparc64/locore.s Fri Jul 14 21:04:16 2000 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: locore.s,v 1.71 2000/07/08 05:04:01 mrg Exp $  */
+/*     $NetBSD: locore.s,v 1.72 2000/07/14 21:04:17 eeh Exp $  */
 /*
  * Copyright (c) 1996-1999 Eduardo Horvath
  * Copyright (c) 1996 Paul Kranenburg
@@ -100,13 +100,17 @@
 #endif
 #include <machine/asm.h>
 
-#ifndef MULTIPROCESSOR
 #undef CURPROC
 #undef CPCB
 #undef FPPROC
+#ifndef MULTIPROCESSOR
 #define        CURPROC _C_LABEL(curproc)
 #define CPCB   _C_LABEL(cpcb)
 #define        FPPROC  _C_LABEL(fpproc)
+#else
+#define        CURPROC (CPUINFO_VA+CI_CURPROC)
+#define CPCB   (CPUINFO_VA+CI_CPCB)
+#define        FPPROC  (CPUINFO_VA+CI_FPPROC)
 #endif
 
 /* Let us use same syntax as C code */
@@ -5435,7 +5439,7 @@
 #ifdef NO_VCACHE
        !! Turn off D$ in LSU
        ldxa    [%g0] ASI_LSU_CONTROL_REGISTER, %g1
-       bclr    %g1, MCCR_DCACHE_EN
+       bclr    MCCR_DCACHE_EN, %g1
        stxa    %g1, [%g0] ASI_LSU_CONTROL_REGISTER
        membar  #Sync
 #endif