From owner-p4-projects@FreeBSD.ORG  Wed May 14 12:59:47 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 2E37F37B404; Wed, 14 May 2003 12:59:47 -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 BEEBB37B401
	for <perforce@freebsd.org>; Wed, 14 May 2003 12:59:46 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 6841543F75
	for <perforce@freebsd.org>; Wed, 14 May 2003 12:59:46 -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 h4EJxk0U053687
	for <perforce@freebsd.org>; Wed, 14 May 2003 12:59:46 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4EJxjoj053684
	for perforce@freebsd.org; Wed, 14 May 2003 12:59:45 -0700 (PDT)
Date: Wed, 14 May 2003 12:59:45 -0700 (PDT)
Message-Id: <200305141959.h4EJxjoj053684@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 31183 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: Wed, 14 May 2003 19:59:48 -0000

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

Change 31183 by jmallett@jmallett_dalek on 2003/05/14 12:59:33

	Use vm_offset_t, not 'unsigned' for the MIPS_foo_TO_bar
	macros.  Add XKSEG definition.  Might be good to redo
	this header with Modern Times in mind, at least the addr
	bits.

Affected files ...

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

Differences ...

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

@@ -76,6 +76,7 @@
  */
 
 #define	MIPS_KUSEG_START		0x0
+#define	MIPS_XKSEG_START		0xc000000000000000
 #define	MIPS_KSEG0_START		0xffffffff80000000
 #define	MIPS_KSEG1_START		0xffffffffa0000000
 #define	MIPS_KSEG2_START		0xffffffffc0000000
@@ -84,16 +85,14 @@
 
 #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)
+#define	MIPS_KSEG0_TO_PHYS(x)	((vm_offset_t)(x) & MIPS_PHYS_MASK)
+#define	MIPS_PHYS_TO_KSEG0(x)	((vm_offset_t)(x) | MIPS_KSEG0_START)
+#define	MIPS_KSEG1_TO_PHYS(x)	((vm_offset_t)(x) & MIPS_PHYS_MASK)
+#define	MIPS_PHYS_TO_KSEG1(x)	((vm_offset_t)(x) | MIPS_KSEG1_START)
 
 /* Map virtual address to index in mips3 r4k virtually-indexed cache */
 #define	MIPS3_VA_TO_CINDEX(x) \
-		((unsigned)(x) & 0xffffff | MIPS_KSEG0_START)
+		((vm_offset_t)(x) & 0xffffff | MIPS_KSEG0_START)
 
 #define	MIPS_PHYS_TO_XKPHYS(cca,x) \
 	((0x2ULL << 62) | ((unsigned long long)(cca) << 59) | (x))