From owner-p4-projects@FreeBSD.ORG  Wed Apr 30 18:31:49 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 056CD37B405; Wed, 30 Apr 2003 18:31:49 -0700 (PDT)
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 ABA6637B401
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:31:48 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 20A0E43FB1
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:31:48 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h411Vl0U071857
	for <perforce@freebsd.org>; Wed, 30 Apr 2003 18:31:47 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h411VlJt071849
	for perforce@freebsd.org; Wed, 30 Apr 2003 18:31:47 -0700 (PDT)
Date: Wed, 30 Apr 2003 18:31:47 -0700 (PDT)
Message-Id: <200305010131.h411VlJt071849@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 30223 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: Thu, 01 May 2003 01:31:50 -0000

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

Change 30223 by jmallett@jmallett_dalek on 2003/04/30 18:31:10

	Zero-extend PHYS_MASK (bogus..), add KSEG2 conversion macros.

Affected files ...

.. //depot/projects/mips/sys/mips/include/cpuregs.h#6 edit

Differences ...

==== //depot/projects/mips/sys/mips/include/cpuregs.h#6 (text+ko) ====

@@ -82,12 +82,14 @@
 #define	MIPS_MAX_MEM_ADDR		0xbe000000
 #define	MIPS_RESERVED_ADDR		0xbfc80000
 
-#define	MIPS_PHYS_MASK			0x1fffffff
+#define	MIPS_PHYS_MASK			0x000000001fffffff
 
 #define	MIPS_KSEG0_TO_PHYS(x)	((unsigned)(x) & MIPS_PHYS_MASK)
 #define	MIPS_PHYS_TO_KSEG0(x)	((unsigned)(x) | MIPS_KSEG0_START)
 #define	MIPS_KSEG1_TO_PHYS(x)	((unsigned)(x) & MIPS_PHYS_MASK)
 #define	MIPS_PHYS_TO_KSEG1(x)	((unsigned)(x) | MIPS_KSEG1_START)
+#define	MIPS_KSEG2_TO_PHYS(x)	((unsigned)(x) & MIPS_PHYS_MASK)
+#define	MIPS_PHYS_TO_KSEG2(x)	((unsigned)(x) | MIPS_KSEG2_START)
 
 /* Map virtual address to index in mips3 r4k virtually-indexed cache */
 #define	MIPS3_VA_TO_CINDEX(x) \