From owner-p4-projects@FreeBSD.ORG  Tue Jun 28 20:30:06 2005
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 1150A16A420; Tue, 28 Jun 2005 20:30:06 +0000 (GMT)
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 E128216A41C
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 20:30:05 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id CCA5343D1F
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 20:30:05 +0000 (GMT)
	(envelope-from ps@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id j5SKU5T2001350
	for <perforce@freebsd.org>; Tue, 28 Jun 2005 20:30:05 GMT
	(envelope-from ps@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id j5SKU57a001347
	for perforce@freebsd.org; Tue, 28 Jun 2005 20:30:05 GMT
	(envelope-from ps@freebsd.org)
Date: Tue, 28 Jun 2005 20:30:05 GMT
Message-Id: <200506282030.j5SKU57a001347@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	ps@freebsd.org using -f
From: Paul Saab <ps@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 79108 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: Tue, 28 Jun 2005 20:30:06 -0000

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

Change 79108 by ps@butter.corp on 2005/06/28 20:29:41

	Support 2MB pages in PAE mode.
	Submitted by:	peter

Affected files ...

.. //depot/projects/hammer/lib/libkvm/kvm_i386.c#6 edit

Differences ...

==== //depot/projects/hammer/lib/libkvm/kvm_i386.c#6 (text+ko) ====

@@ -75,7 +75,8 @@
 
 #define	PG_FRAME_PAE	(~((uint64_t)PAGE_MASK))
 #define	PDRSHIFT_PAE	21
-#define NPTEPG_PAE	(PAGE_SIZE/sizeof(uint64_t))
+#define	NPTEPG_PAE	(PAGE_SIZE/sizeof(uint64_t))
+#define	NBPDR_PAE	(1<<PDRSHIFT_PAE)
 
 struct vmstate {
 	void		*mmapbase;
@@ -360,21 +361,21 @@
 
 	if ((u_long)pde & PG_PS) {
 	      /*
-	       * No second-level page table; ptd describes one 4MB page.
+	       * No second-level page table; ptd describes one 2MB page.
 	       * (We assume that the kernel wouldn't set PG_PS without enabling
 	       * it cr0, and that the kernel doesn't support 36-bit physical
 	       * addresses).
 	       */
-#define	PAGE4M_MASK	(NBPDR - 1)
-#define	PG_FRAME4M	(~PAGE4M_MASK)
-		pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK);
+#define	PAGE2M_MASK	(NBPDR_PAE - 1)
+#define	PG_FRAME2M	(~PAGE2M_MASK)
+		pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK);
 		s = _kvm_pa2off(kd, pde_pa, &ofs);
 		if (s <= sizeof pde) {
 			_kvm_syserr(kd, kd->program, "_kvm_vatop_pae: pde_pa not found");
 			goto invalid;
 		}
 		*pa = ofs;
-		return (NBPDR - (va & PAGE4M_MASK));
+		return (NBPDR_PAE - (va & PAGE2M_MASK));
 	}
 
 	pteindex = (va >> PAGE_SHIFT) & (NPTEPG_PAE-1);