From owner-p4-projects@FreeBSD.ORG  Fri Jul 14 15:14:20 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 6976516A4E0; Fri, 14 Jul 2006 15:14:20 +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 42C2C16A4DE
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 15:14:20 +0000 (UTC)
	(envelope-from bms@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0BA8B43D49
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 15:14:20 +0000 (GMT)
	(envelope-from bms@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 k6EFEJvx098810
	for <perforce@freebsd.org>; Fri, 14 Jul 2006 15:14:19 GMT
	(envelope-from bms@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k6EFEJU4098807
	for perforce@freebsd.org; Fri, 14 Jul 2006 15:14:19 GMT
	(envelope-from bms@freebsd.org)
Date: Fri, 14 Jul 2006 15:14:19 GMT
Message-Id: <200607141514.k6EFEJU4098807@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	bms@freebsd.org using -f
From: Bruce M Simpson <bms@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 101556 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: Fri, 14 Jul 2006 15:14:20 -0000

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

Change 101556 by bms@bms_montagne on 2006/07/14 15:13:50

	Fold 64-bit stuff under #ifdef MIPS64.
	Cut down comments

Affected files ...

.. //depot/projects/mips2/src/sys/mips/mips/tlb.c#5 edit

Differences ...

==== //depot/projects/mips2/src/sys/mips/mips/tlb.c#5 (text+ko) ====

@@ -107,22 +107,19 @@
 	 * Initialise ASID and clear TLB and set up for 4K pages.
 	 */
 	mips_wr_entryhi(0);
+	mips_wr_pagemask(0); /* XXX 4K */
 	tlb_invalidate_all();
-	mips_wr_pagemask(0); /* XXX 4K */
 
 	/*
 	 * Just one wired TLB entry.
 	 */
 	mips_wr_wired(1);
 
-	/*
-	 * XXXMIPS: Does xcontext exist on mips32?
-	 */
-#if 0
+#ifdef CPU_MIPS64
 	/*
 	 * Set up page table.
 	 */
-	mips_wr_xcontext((uintptr_t)kptmap); /* XXX: mips64 */
+	mips_wr_xcontext((uintptr_t)kptmap);
 #endif
 }
 
@@ -175,9 +172,6 @@
 	tlb_remove_pages(pmap, va, eva - va);
 }
 
-/*
- * XXXMIPS: Check this one.
- */
 void
 tlb_update(vm_offset_t va, pt_entry_t pte0, pt_entry_t pte1)
 {
@@ -185,11 +179,7 @@
 	int i;
 
 	va &= ~PAGE_MASK;
-	/*
-	 * XXXMIPS: This will probably mean bringing stuff from NetBSD, as
-	 * juli's code has offsets and sizes for mips64.
-	 */
-#if 0
+#ifdef CPU_MIPS64
 	ehi = MIPS_HI_ENTRY(va, /*asid*/0);
 #endif
 	ehi = 0;
@@ -225,9 +215,9 @@
 	/* Bogus VPN2. */
 	ehi = MIPS_KSEG1_END + 2 * i * PAGE_SIZE;
 	mips_wr_index(i);
-#if 0
+#ifdef CPU_MIPS64
 	mips_wr_entrylo0(0);
-	mips_wr_entrylo1(0);		/* XXX mips64 */
+	mips_wr_entrylo1(0);
 #else
 	mips_wr_entrylow(0);
 #endif
@@ -235,9 +225,6 @@
 	mips_tlbwi();
 }
 
-/*
- * XXXMIPS: Check this one.
- */
 void
 tlb_invalidate_page(vm_offset_t va)
 {
@@ -245,11 +232,7 @@
 	int i;
 
 	va &= ~PAGE_MASK;
-	/*
-	 * XXXMIPS: This will probably mean bringing stuff from NetBSD, as
-	 * juli's code has offsets and sizes for mips64.
-	 */
-#if 0
+#ifdef CPU_MIPS64
 	ehi = MIPS_HI_ENTRY(va, /*asid*/0);
 #endif
 	ehi = 0;