From owner-p4-projects@FreeBSD.ORG  Sat Nov  8 15:42:56 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C144B16A4D1; Sat,  8 Nov 2003 15:42:55 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 9C15716A4CF
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 15:42:55 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0204643FD7
	for <perforce@freebsd.org>; Sat,  8 Nov 2003 15:42:55 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.9/8.12.9) with ESMTP id hA8NgsXJ018167
	for <perforce@freebsd.org>; Sat, 8 Nov 2003 15:42:54 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.9/8.12.9/Submit) id hA8Ngsw6018164
	for perforce@freebsd.org; Sat, 8 Nov 2003 15:42:54 -0800 (PST)
	(envelope-from jmallett@freebsd.org)
Date: Sat, 8 Nov 2003 15:42:54 -0800 (PST)
Message-Id: <200311082342.hA8Ngsw6018164@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jmallett@freebsd.org using -f
From: Juli Mallett <jmallett@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 41772 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.1
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 08 Nov 2003 23:42:56 -0000

http://perforce.freebsd.org/chv.cgi?CH=41772

Change 41772 by jmallett@jmallett_dalek on 2003/11/08 15:42:41

	Add mips_barrier(), 8 NOPs and a memory barrier, to avoid any CP0/...
	hazards, and keep the compiler from doing *bad* things.  Gets us much
	further.  Oh how much pain has been caused by not working with the
	compiler.

Affected files ...

.. //depot/projects/mips/sys/mips/include/cpufunc.h#15 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/cpufunc.h#15 (text+ko) ====

@@ -34,33 +34,54 @@
 #include <machine/cpuregs.h>
 
 static __inline void
+mips_barrier(void)
+{
+	__asm __volatile (".set noreorder\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  "nop\n\t"
+			  ".set reorder\n\t"
+			  : : : "memory");
+}
+
+static __inline void
 mips_tlbp(void)
 {
 	__asm __volatile ("tlbp");
+	mips_barrier();
 }
 
 static __inline void
 mips_tlbr(void)
 {
 	__asm __volatile ("tlbr");
+	mips_barrier();
 }
 
 static __inline void
 mips_tlbwi(void)
 {
 	__asm __volatile ("tlbwi");
+	mips_barrier();
 }
 
 static __inline void
 mips_tlbwr(void)
 {
 	__asm __volatile ("tlbwr");
+	mips_barrier();
 }
 
 static __inline void
 mips_wbflush(void)
 {
 	__asm __volatile ("sync" : : : "memory");
+	mips_barrier();
 }
 
 #define	MIPS_RDRW64_COP0(n,r)					\
@@ -70,6 +91,7 @@
 	int v0;							\
 	__asm __volatile ("dmfc0 %[v0], $"__XSTRING(r)";"	\
 			  : [v0] "=&r"(v0));			\
+	mips_barrier();						\
 	return (v0);						\
 }								\
 static __inline void						\
@@ -81,6 +103,7 @@
 			 "nop;"					\
 			 :					\
 			 : [a0] "r"(a0));			\
+	mips_barrier();						\
 }
 
 MIPS_RDRW64_COP0(entrylo0, MIPS_COP_0_TLB_LO0)
@@ -98,6 +121,7 @@
 	int v0;							\
 	__asm __volatile ("mfc0 %[v0], $"__XSTRING(r)";"	\
 			  : [v0] "=&r"(v0));			\
+	mips_barrier();						\
 	return (v0);						\
 }								\
 static __inline void						\
@@ -109,6 +133,7 @@
 			 "nop;"					\
 			 :					\
 			 : [a0] "r"(a0));			\
+	mips_barrier();						\
 }
 
 MIPS_RDRW32_COP0(compare, MIPS_COP_0_COMPARE)