From owner-p4-projects@FreeBSD.ORG  Thu May 22 20:27:09 2003
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id AC85837B404; Thu, 22 May 2003 20:27:08 -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 65B6537B401
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:27:08 -0700 (PDT)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0B0B043F93
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:27:08 -0700 (PDT)
	(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 h4N3R70U001067
	for <perforce@freebsd.org>; Thu, 22 May 2003 20:27:07 -0700 (PDT)
	(envelope-from peter@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h4N3R7iO001064
	for perforce@freebsd.org; Thu, 22 May 2003 20:27:07 -0700 (PDT)
Date: Thu, 22 May 2003 20:27:07 -0700 (PDT)
Message-Id: <200305230327.h4N3R7iO001064@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 31670 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: Fri, 23 May 2003 03:27:10 -0000

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

Change 31670 by peter@peter_hammer on 2003/05/22 20:26:20

	re-enable pmap_copy().  Thats all of the stubbed out functions
	repaired.

Affected files ...

.. //depot/projects/hammer/sys/amd64/amd64/pmap.c#11 edit

Differences ...

==== //depot/projects/hammer/sys/amd64/amd64/pmap.c#11 (text+ko) ====

@@ -701,6 +701,16 @@
 }
 
 /*
+ * Are we current address space or kernel?
+ */
+static __inline int
+pmap_is_current(pmap_t pmap)
+{
+	return (pmap == kernel_pmap ||
+	    (pmap->pm_pml4[PML4PML4I] & PG_FRAME) == (PML4pml4e[0] & PG_FRAME));
+}
+
+/*
  *	Routine:	pmap_extract
  *	Function:
  *		Extract the physical page address associated
@@ -2518,7 +2528,6 @@
 pmap_copy(pmap_t dst_pmap, pmap_t src_pmap, vm_offset_t dst_addr, vm_size_t len,
 	  vm_offset_t src_addr)
 {
-#if 0
 	vm_offset_t addr;
 	vm_offset_t end_addr = src_addr + len;
 	vm_offset_t pdnxt;
@@ -2533,7 +2542,7 @@
 	for (addr = src_addr; addr < end_addr; addr = pdnxt) {
 		pt_entry_t *src_pte, *dst_pte;
 		vm_page_t dstmpte, srcmpte;
-		pd_entry_t srcptepaddr;
+		pd_entry_t srcptepaddr, *pde;
 		unsigned ptepindex;
 
 		if (addr >= UPT_MIN_ADDRESS)
@@ -2551,13 +2560,25 @@
 		pdnxt = (addr + NBPDR) & ~PDRMASK;
 		ptepindex = pmap_pde_pindex(addr);
 
-		srcptepaddr = src_pmap->pm_pdir[ptepindex];
+		pde = pmap_pde(src_pmap, addr);
+		if (pde)
+			srcptepaddr = *pde;
+		else
+			continue;
 		if (srcptepaddr == 0)
 			continue;
 			
 		if (srcptepaddr & PG_PS) {
-			if (dst_pmap->pm_pdir[ptepindex] == 0) {
-				dst_pmap->pm_pdir[ptepindex] = srcptepaddr;
+			pde = pmap_pde(dst_pmap, addr);
+			if (pde == 0) {
+				/*
+				 * XXX should do an allocpte here to
+				 * instantiate the pde
+				 */
+				continue;
+			}
+			if (*pde == 0) {
+				*pde = srcptepaddr;
 				dst_pmap->pm_stats.resident_count +=
 				    NBPDR / PAGE_SIZE;
 			}
@@ -2610,7 +2631,6 @@
 			src_pte++;
 		}
 	}
-#endif
 }	
 
 /*