From owner-p4-projects@FreeBSD.ORG  Fri Apr 11 15:48:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 737051065671; Fri, 11 Apr 2008 15:48:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 3547D106566B
	for <perforce@FreeBSD.org>; Fri, 11 Apr 2008 15:48:41 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
	[IPv6:2001:4f8:fff6::29])
	by mx1.freebsd.org (Postfix) with ESMTP id 1A6708FC1A
	for <perforce@FreeBSD.org>; Fri, 11 Apr 2008 15:48:41 +0000 (UTC)
	(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3BFmfbE040727
	for <perforce@FreeBSD.org>; Fri, 11 Apr 2008 15:48:41 GMT
	(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3BFme5r040725
	for perforce@freebsd.org; Fri, 11 Apr 2008 15:48:40 GMT
	(envelope-from gonzo@FreeBSD.org)
Date: Fri, 11 Apr 2008 15:48:40 GMT
Message-Id: <200804111548.m3BFme5r040725@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 139820 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
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: Fri, 11 Apr 2008 15:48:41 -0000

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

Change 139820 by gonzo@gonzo_jeeves on 2008/04/11 15:47:49

	o Set HAZARD_DELAY to 5 cycles for all machines till we
	   figure out the way to do it platform-wise.

Affected files ...

.. //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#23 edit

Differences ...

==== //depot/projects/mips2-jnpr/src/sys/mips/mips/exception.S#23 (text+ko) ====

@@ -96,17 +96,14 @@
 	.set	mips3
 #endif
 
-#define	ITLBNOPFIX	nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;
 /*
- * FREEBSD_DEVELOPERS_FIXME
- * Some MIPS CPU may need delays using nops between executing CP0 Instructions
+ * Assume that w alaways need nops to escape CP0 hazard
+ * TODO: Make hazard delays configurable. Stuck with 5 cycles on the moment
+ * For more info on CP0 hazards see Chapter 7 (p.99) of "MIPS32 Architecture 
+ *    For Programmers Volume III: The MIPS32 Privileged Resource Architecture"
  */
-#ifdef MIPS_CPU_NEEDS_DELAY
-#define	HAZARD_DELAY	nop ; nop ; nop ; nop
-#else
-#define	HAZARD_DELAY
-#endif
-
+#define	ITLBNOPFIX	nop;nop;nop;nop;nop;nop;nop;nop;nop;nop;
+#define	HAZARD_DELAY	nop;nop;nop;nop;nop;
 
 /*
  *----------------------------------------------------------------------------