From owner-p4-projects@FreeBSD.ORG  Sun Jul  9 22:03:22 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 52B0816A4E1; Sun,  9 Jul 2006 22:03:22 +0000 (UTC)
X-Original-To: perforce@FreeBSD.org
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 16C1D16A4DF
	for <perforce@FreeBSD.org>; Sun,  9 Jul 2006 22:03:22 +0000 (UTC)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 9496D43D72
	for <perforce@FreeBSD.org>; Sun,  9 Jul 2006 22:03:21 +0000 (GMT)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k69M3LAr067263
	for <perforce@FreeBSD.org>; Sun, 9 Jul 2006 22:03:21 GMT
	(envelope-from wkoszek@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k69M3LgI067260
	for perforce@freebsd.org; Sun, 9 Jul 2006 22:03:21 GMT
	(envelope-from wkoszek@FreeBSD.org)
Date: Sun, 9 Jul 2006 22:03:21 GMT
Message-Id: <200607092203.k69M3LgI067260@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wkoszek@FreeBSD.org using -f
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 101171 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: Sun, 09 Jul 2006 22:03:22 -0000

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

Change 101171 by wkoszek@wkoszek_laptop on 2006/07/09 22:03:12

	
	Remove MIPS_SR_SR, as we don't have this one in NetBSD's cpuregs.h.
	I tried to find a replacement, and came up with a
	MIPS_SR_SOFT_RESET. Unfortunately, even on NetBSD it's defined to
	something like:
	
	#define MIPS_SR_SOFT_RESET <othermacro_which_doesn't_exists>

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/locore.S#8 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/locore.S#8 (text+ko) ====

@@ -48,7 +48,16 @@
 	 * 	Soft reset
 	 *	Boot exception vectors (firmware-provided)
 	 */
-	li	t0, MIPS_SR_BEV | MIPS_SR_SR
+/*
+ * XXXMIPS: I get absolute expression required `li' with this below.
+ * Probably because cpuregs.h from NetBSD defines MIPS_SR_SOFT_RESET as
+ * another macro which is not defined.
+ */
+#if 0
+	li	t0, (MIPS_SR_BEV | MIPS_SR_SOFT_RESET)
+#endif
+	li	t0, MIPS_SR_BEV
+
 	/*
 	 * t1: Bits to set explicitly:
 	 *	Kernel mode is 64-bit
@@ -58,7 +67,7 @@
  * XXXMIPS: look at this. I think "Kernel mode is 64-bit" == MIPS_SR_KX, so
  * it's probably worth to remove it soon.
  */
- #if 0
+#if 0
 	li	t1, MIPS_SR_KX | MIPS_SR_COP_1_BIT
 #endif
 	li	t1, MIPS_SR_COP_1_BIT