2008-11-10 Samuel Thibault <samuel.thibault@ens-lyon.org>

[task #8135 --- ``PAE for GNU Mach']
	* i386/configfrag.ac: Add --enable-pae option, which defines PAE.
	* i386/i386/i386asm.sym (PDPSHIFT, PDEMASK): New assembly macros.
	* i386/i386/locore.S [PAE] (copyout_retry): Use page directory pointer
	bits.
	* i386/i386at/model_dep.c [PAE] (i386at_init): Set second initial 2MB
	page.  Enable PAE bit.  Set cr3 to page directory pointer table instead
	of page directory.
	* i386/intel/pmap.c [PAE] (pmap_bootstrap, pmap_create): Allocate 4
	pages for dirbase.  Setup pdpbase.
	[PAE] (pmap_destroy): Free 4 pages from dirbase.  Free pdpbase.
	* i386/intel/pmap.h [PAE] (pt_entry_t): Typedef to unsigned long long.
	[PAE] (PDPSHIFT, PDPNUM, PDPMASK): New macros.
	[PAE] (PDESHIFT, PDEMASK, PTEMASK): Set to PAE values.
	[PAE] (lin2pdenum, NPDES): Make them take the page directory pointer
	index into account too.
	[PAE] (struct pmap): Add `pdpbase' member.
	(set_dirbase): Remove macro, replaced by...
	(set_pmap): New macro, taking a pmap instead of the dirbase.
	(PMAP_ACTIVATE_USER): Use set_pmap instead of set_dirbase.

1 files changed, 33 insertions, 3 deletions

diff --git a/i386/intel/pmap.c b/i386/intel/pmap.c
index b08252e..a648592 100644
--- a/i386/intel/pmap.c
+++ b/i386/intel/pmap.c
@@ -579,7 +579,21 @@ void pmap_bootstrap()
 	/*
 	 * Allocate and clear a kernel page directory.
 	 */
+#if PAE
+	{
+		vm_offset_t addr;
+		init_alloc_aligned(PDPNUM * INTEL_PGBYTES, &addr);
+		kernel_pmap->dirbase = kernel_page_dir = (pt_entry_t*)addr;
+	}
+	kernel_pmap->pdpbase = (pt_entry_t*)pmap_grab_page();
+	{
+		int i;
+		for (i = 0; i < PDPNUM; i++)
+			kernel_pmap->pdpbase[i] = pa_to_pte((vm_offset_t) kernel_pmap->dirbase + i * INTEL_PGBYTES) | INTEL_PTE_VALID;
+	}
+#else	/* PAE */
 	kernel_pmap->dirbase = kernel_page_dir = (pt_entry_t*)pmap_grab_page();
+#endif	/* PAE */
 	{
 		int i;
 		for (i = 0; i < NPDES; i++)
@@ -859,11 +873,24 @@ pmap_t pmap_create(size)
 		panic("pmap_create");
 
 	if (kmem_alloc_wired(kernel_map,
-			     (vm_offset_t *)&p->dirbase, INTEL_PGBYTES)
+			     (vm_offset_t *)&p->dirbase, PDPNUM * INTEL_PGBYTES)
 							!= KERN_SUCCESS)
 		panic("pmap_create");
 
-	memcpy(p->dirbase, kernel_page_dir, INTEL_PGBYTES);
+	memcpy(p->dirbase, kernel_page_dir, PDPNUM * INTEL_PGBYTES);
+
+#if PAE
+	if (kmem_alloc_wired(kernel_map,
+			     (vm_offset_t *)&p->pdpbase, INTEL_PGBYTES)
+							!= KERN_SUCCESS)
+		panic("pmap_create");
+	{
+		int i;
+		for (i = 0; i < PDPNUM; i++)
+			p->pdpbase[i] = pa_to_pte(kvtophys((vm_offset_t) p->dirbase + i * INTEL_PGBYTES)) | INTEL_PTE_VALID;
+	}
+#endif	/* PAE */
+
 	p->ref_count = 1;
 
 	simple_lock_init(&p->lock);
@@ -927,7 +954,10 @@ void pmap_destroy(p)
 		vm_object_unlock(pmap_object);
 	    }
 	}
-	kmem_free(kernel_map, (vm_offset_t)p->dirbase, INTEL_PGBYTES);
+	kmem_free(kernel_map, (vm_offset_t)p->dirbase, PDPNUM * INTEL_PGBYTES);
+#if PAE
+	kmem_free(kernel_map, (vm_offset_t)p->pdpbase, INTEL_PGBYTES);
+#endif	/* PAE */
 	zfree(pmap_zone, (vm_offset_t) p);
 }