From owner-p4-projects@FreeBSD.ORG  Mon Jun  2 22:35:16 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 9B15437B404; Mon,  2 Jun 2003 22:35:15 -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 3C0E137B401
	for <perforce@freebsd.org>; Mon,  2 Jun 2003 22:35:15 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D5EB143F75
	for <perforce@freebsd.org>; Mon,  2 Jun 2003 22:35:14 -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 h535ZE0U040739
	for <perforce@freebsd.org>; Mon, 2 Jun 2003 22:35:14 -0700 (PDT)
	(envelope-from jmallett@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h535ZE2H040736
	for perforce@freebsd.org; Mon, 2 Jun 2003 22:35:14 -0700 (PDT)
Date: Mon, 2 Jun 2003 22:35:14 -0700 (PDT)
Message-Id: <200306030535.h535ZE2H040736@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 32455 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: Tue, 03 Jun 2003 05:35:16 -0000

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

Change 32455 by jmallett@jmallett_dalek on 2003/06/02 22:34:43

	Update for new PTE header.

Affected files ...

.. //depot/projects/mips/sys/mips/mips/db_interface.c#5 edit

Differences ...

==== //depot/projects/mips/sys/mips/mips/db_interface.c#5 (text+ko) ====

@@ -295,17 +295,17 @@
 		for (i = 0; i < mips_num_tlb_entries; i++) {
 			mips64_TLBRead(i, &tlb);
 			db_printf("TLB%c%2d Hi 0x%016lx ",
-			(tlb.tlb_lo0 | tlb.tlb_lo1) & MIPS3_PG_V ? ' ' : '*',
+			(tlb.tlb_lo0 | tlb.tlb_lo1) & PG_V ? ' ' : '*',
 				i, tlb.tlb_hi);
 			db_printf("Lo0=0x%016lx %c%c attr %x ",
-				mips_tlbpfn_to_paddr(tlb.tlb_lo0),
-				(tlb.tlb_lo0 & MIPS3_PG_D) ? 'D' : ' ',
-				(tlb.tlb_lo0 & MIPS3_PG_G) ? 'G' : ' ',
+				MIPS_PFN_TO_PA(tlb.tlb_lo0),
+				(tlb.tlb_lo0 & PG_D) ? 'D' : ' ',
+				(tlb.tlb_lo0 & PG_G) ? 'G' : ' ',
 				(tlb.tlb_lo0 >> 3) & 7);
 			db_printf("Lo1=0x%016lx %c%c attr %x sz=%x\n",
-				mips_tlbpfn_to_paddr(tlb.tlb_lo1),
-				(tlb.tlb_lo1 & MIPS3_PG_D) ? 'D' : ' ',
-				(tlb.tlb_lo1 & MIPS3_PG_G) ? 'G' : ' ',
+				MIPS_PFN_TO_PA(tlb.tlb_lo1),
+				(tlb.tlb_lo1 & PG_D) ? 'D' : ' ',
+				(tlb.tlb_lo1 & PG_G) ? 'G' : ' ',
 				(tlb.tlb_lo1 >> 3) & 7,
 				tlb.tlb_mask);
 		}
@@ -345,16 +345,7 @@
 do {									\
 	uint64_t __val;							\
 									\
-	__asm __volatile(							\
-		".set push 			\n\t"			\
-		".set mips3			\n\t"			\
-		".set noat			\n\t"			\
-		"dmfc0 $1,$" __STRING(reg) "	\n\t"			\
-		"dsll %L0,$1,32			\n\t"			\
-		"dsrl %L0,%L0,32		\n\t"			\
-		"dsrl %M0,$1,32			\n\t"			\
-		".set pop"						\
-	    : "=r"(__val));						\
+	__asm __volatile("dmfc0 %0,$" __STRING(reg):"=r"(__val));	\
 	printf("  %s:%*s %#llx\n", name, FLDWIDTH - (int) strlen(name),	\
 	    "", __val);							\
 } while (0)