From owner-p4-projects@FreeBSD.ORG  Fri Apr  4 23:03:13 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id C2F5937B404; Fri,  4 Apr 2003 23:03:12 -0800 (PST)
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 65B4037B401
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 23:03:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 11B8543F3F
	for <perforce@freebsd.org>; Fri,  4 Apr 2003 23:03:12 -0800 (PST)
	(envelope-from peter@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 h3573B0U023928
	for <perforce@freebsd.org>; Fri, 4 Apr 2003 23:03:11 -0800 (PST)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h3573BiU023925
	for perforce@freebsd.org; Fri, 4 Apr 2003 23:03:11 -0800 (PST)
Date: Fri, 4 Apr 2003 23:03:11 -0800 (PST)
Message-Id: <200304050703.h3573BiU023925@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	peter@freebsd.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Subject: PERFORCE change 28189 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: Sat, 05 Apr 2003 07:03:13 -0000

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

Change 28189 by peter@peter_overcee on 2003/04/04 23:02:12

	Hook up level 3 and level 4 page directory glue
	(stolen from Jake's PAE diffs)

Affected files ...

.. //depot/projects/hammer/sys/x86_64/x86_64/locore.s#23 edit

Differences ...

==== //depot/projects/hammer/sys/x86_64/x86_64/locore.s#23 (text+ko) ====

@@ -298,9 +298,10 @@
 	movl	%esi,R(KPTphys)
 
 /* Allocate Page Table Directory */
-	/* XXX only need 32 bytes (easier for now) */
 	ALLOCPAGES(1)
 	movl	%esi,R(IdlePML4)
+	ALLOCPAGES(1)
+	movl	%esi,R(IdlePDP)
 	ALLOCPAGES(NPGPTD)
 	movl	%esi,R(IdlePTD)
 
@@ -338,6 +339,10 @@
 	movl	$1, %ecx
 	fillkptphys($PG_RW)
 
+	movl	R(IdlePDP), %eax
+	movl	$1, %ecx
+	fillkptphys($PG_RW)
+
 	movl	R(IdlePTD), %eax
 	movl	$NPGPTD, %ecx
 	fillkptphys($PG_RW)
@@ -378,6 +383,11 @@
 	movl	R(IdlePTD), %eax
 	xorl	%ebx, %ebx
 	movl	$NPGPTD, %ecx
+	fillkpt(R(IdlePDP), $0x0)
+
+	movl	R(IdlePDP), %eax
+	xorl	%ebx, %ebx
+	movl	$1, %ecx
 	fillkpt(R(IdlePML4), $0x0)
 
 	ret