Module Name: src
Committed By: matt
Date: Thu Apr 14 09:25:05 UTC 2011
Modified Files:
src/sys/arch/mips/mips: db_interface.c mipsX_subr.S
src/sys/arch/mips/rmi: rmixl_fmnvar.h rmixl_subr.S
Log Message:
Use .set arch=xlr to access RMI specific instructions.
To generate a diff of this commit:
cvs rdiff -u -r1.71 -r1.72 src/sys/arch/mips/mips/db_interface.c
cvs rdiff -u -r1.44 -r1.45 src/sys/arch/mips/mips/mipsX_subr.S
cvs rdiff -u -r1.2 -r1.3 src/sys/arch/mips/rmi/rmixl_fmnvar.h
cvs rdiff -u -r1.4 -r1.5 src/sys/arch/mips/rmi/rmixl_subr.S
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/mips/mips/db_interface.c
diff -u src/sys/arch/mips/mips/db_interface.c:1.71 src/sys/arch/mips/mips/db_interface.c:1.72
--- src/sys/arch/mips/mips/db_interface.c:1.71 Thu Apr 14 05:09:34 2011
+++ src/sys/arch/mips/mips/db_interface.c Thu Apr 14 09:25:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: db_interface.c,v 1.71 2011/04/14 05:09:34 cliff Exp $ */
+/* $NetBSD: db_interface.c,v 1.72 2011/04/14 09:25:05 matt Exp $ */
/*
* Mach Operating System
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.71 2011/04/14 05:09:34 cliff Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.72 2011/04/14 09:25:05 matt Exp $");
#include "opt_multiprocessor.h"
#include "opt_cputype.h" /* which mips CPUs do we support? */
@@ -675,7 +675,7 @@
/* value = CR[addr] */
__asm volatile( \
".set push \n\t" \
- ".set mips64 \n\t" \
+ ".set arch=xlr \n\t" \
".set noat \n\t" \
"mfcr %0,%1 \n\t" \
".set pop \n\t" \
@@ -705,7 +705,7 @@
/* CR[addr] = value */
__asm volatile( \
".set push \n\t" \
- ".set mips64 \n\t" \
+ ".set arch=xlr \n\t" \
".set noat \n\t" \
"mtcr %0,%1 \n\t" \
".set pop \n\t" \
Index: src/sys/arch/mips/mips/mipsX_subr.S
diff -u src/sys/arch/mips/mips/mipsX_subr.S:1.44 src/sys/arch/mips/mips/mipsX_subr.S:1.45
--- src/sys/arch/mips/mips/mipsX_subr.S:1.44 Thu Apr 14 05:51:27 2011
+++ src/sys/arch/mips/mips/mipsX_subr.S Thu Apr 14 09:25:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: mipsX_subr.S,v 1.44 2011/04/14 05:51:27 cliff Exp $ */
+/* $NetBSD: mipsX_subr.S,v 1.45 2011/04/14 09:25:05 matt Exp $ */
/*
* Copyright 2002 Wasabi Systems, Inc.
@@ -1440,11 +1440,14 @@
PTR_LA k0, panic # return to panic
PTR_LA a0, 9f # panicstr
_MFC0 a1, MIPS_COP_0_ERROR_PC
-#if defined(MIPS64_XLS)
+#if defined(MIPS64_XLS) && defined(MIPS64)
+ .set push
+ .set arch=xlr
li k1, 0x309 /* L1D_CACHE_ERROR_LOG */
mfcr a2, k1
li k1, 0x30b /* L1D_CACHE_INTERRUPT */
mfcr a3, k1
+ .set pop
#if defined(__mips_o32)
#error O32 not supported.
#endif
Index: src/sys/arch/mips/rmi/rmixl_fmnvar.h
diff -u src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.2 src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.3
--- src/sys/arch/mips/rmi/rmixl_fmnvar.h:1.2 Sun Feb 20 07:48:37 2011
+++ src/sys/arch/mips/rmi/rmixl_fmnvar.h Thu Apr 14 09:25:05 2011
@@ -1,4 +1,4 @@
-/* $Id: rmixl_fmnvar.h,v 1.2 2011/02/20 07:48:37 matt Exp $ */
+/* $Id: rmixl_fmnvar.h,v 1.3 2011/04/14 09:25:05 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
* All rights reserved.
@@ -102,7 +102,7 @@
\
__asm volatile( \
".set push" "\n\t" \
- ".set mips64" "\n\t" \
+ ".set arch=xlr" "\n\t" \
"mfc2 %0,$%1,%2" "\n\t" \
".set pop" "\n\t" \
: "=r"(__val) : "n"(regnum), "n"(sel)); \
@@ -115,7 +115,7 @@
\
__asm volatile( \
".set push" "\n\t" \
- ".set mips64" "\n\t" \
+ ".set arch=xlr" "\n\t" \
"mtc2 %0,$%1,%2" "\n\t" \
".set pop" "\n\t" \
:: "r"(__val), "n"(regnum), "n"(sel)); \
@@ -150,7 +150,7 @@
__asm__ volatile (
".set push" "\n\t"
".set noreorder" "\n\t"
- ".set mips64" "\n\t"
+ ".set arch=xlr" "\n\t"
"sync" "\n\t"
"msgsnd %0" "\n\t"
".set pop" "\n\t"
@@ -163,7 +163,7 @@
__asm__ volatile (
".set push" "\n\t"
".set noreorder" "\n\t"
- ".set mips64" "\n\t"
+ ".set arch=xlr" "\n\t"
"msgld %0" "\n\t"
".set pop" "\n\t"
:: "r"(bucket));
@@ -179,7 +179,7 @@
__asm__ volatile (
".set push" "\n\t"
".set noreorder" "\n\t"
- ".set mips64" "\n\t"
+ ".set arch=xlr" "\n\t"
"addu %0,%0,0" "\n\t"
"msgwait %0" "\n\t"
".set pop" "\n\t"
Index: src/sys/arch/mips/rmi/rmixl_subr.S
diff -u src/sys/arch/mips/rmi/rmixl_subr.S:1.4 src/sys/arch/mips/rmi/rmixl_subr.S:1.5
--- src/sys/arch/mips/rmi/rmixl_subr.S:1.4 Thu Apr 14 05:20:08 2011
+++ src/sys/arch/mips/rmi/rmixl_subr.S Thu Apr 14 09:25:05 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: rmixl_subr.S,v 1.4 2011/04/14 05:20:08 cliff Exp $ */
+/* $NetBSD: rmixl_subr.S,v 1.5 2011/04/14 09:25:05 matt Exp $ */
/*-
* Copyright (c) 2010 The NetBSD Foundation, Inc.
@@ -37,17 +37,16 @@
#include <mips/asm.h>
#include <mips/cpuregs.h>
-RCSID("$NetBSD: rmixl_subr.S,v 1.4 2011/04/14 05:20:08 cliff Exp $");
+RCSID("$NetBSD: rmixl_subr.S,v 1.5 2011/04/14 09:25:05 matt Exp $");
#include "assym.h"
#define RMIXL_COP_0_EIRR _(9), 6
#define RMIXL_COP_0_EIMR _(9), 7
- .set push
- .set noreorder
- .set mips64
- .text
+ .set noreorder
+ .set arch=xlr
+ .text
/*
* read XLS Processor Control register
@@ -179,6 +178,3 @@
END(rmixl_cpu_trampoline)
#endif /* MULTIPROCESSOR */
-
- .set pop
-
