PERFORCE change 32455 for review

[Juli Mallett]

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

Change 32455 by jmallett at 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)