xnu-1228.0.2.tar.gz

[apple/xnu.git] / osfmk / i386 / phys.c

diff --git a/osfmk/i386/phys.c b/osfmk/i386/phys.c
index 5c3449325c635db9a3a75accd0c547ede88be915..7269aa283004e69e53fc190dab622baadfa6e24e 100644 (file)
--- a/osfmk/i386/phys.c
+++ b/osfmk/i386/phys.c
@@ -86,7 +86,6 @@
 #include <i386/tss.h>
 #include <i386/user_ldt.h>
 #include <i386/fpu.h>
-#include <i386/iopb_entries.h>
 #include <i386/misc_protos.h>
 
 /*
@@ -97,6 +96,7 @@ pmap_zero_page(
               ppnum_t pn)
 {
        assert(pn != vm_page_fictitious_addr);
+       assert(pn != vm_page_guard_addr);
        bzero_phys((addr64_t)i386_ptob(pn), PAGE_SIZE);
 }
 
@@ -111,6 +111,7 @@ pmap_zero_part_page(
        vm_size_t       len)
 {
        assert(pn != vm_page_fictitious_addr);
+       assert(pn != vm_page_guard_addr);
        assert(offset + len <= PAGE_SIZE);
        bzero_phys((addr64_t)(i386_ptob(pn) + offset), len);
 }
@@ -130,6 +131,8 @@ pmap_copy_part_page(
 
        assert(psrc != vm_page_fictitious_addr);
        assert(pdst != vm_page_fictitious_addr);
+       assert(psrc != vm_page_guard_addr);
+       assert(pdst != vm_page_guard_addr);
 
        src = i386_ptob(psrc);
        dst = i386_ptob(pdst);
@@ -156,19 +159,17 @@ pmap_copy_part_lpage(
         mapwindow_t *map;
 
        assert(pdst != vm_page_fictitious_addr);
+       assert(pdst != vm_page_guard_addr);
        assert((dst_offset + len) <= PAGE_SIZE);
 
         mp_disable_preemption();
 
         map = pmap_get_mapwindow(INTEL_PTE_VALID | INTEL_PTE_RW | (i386_ptob(pdst) & PG_FRAME) | 
                                  INTEL_PTE_REF | INTEL_PTE_MOD);
-       if (map == 0) {
-               panic("pmap_copy_part_lpage");
-        }
-       invlpg((uintptr_t)map->prv_CADDR);
 
        memcpy((void *) (map->prv_CADDR + (dst_offset & INTEL_OFFMASK)), (void *) src, len);
-       *map->prv_CMAP = 0;
+
+       pmap_put_mapwindow(map);
 
        mp_enable_preemption();
 }
@@ -187,19 +188,17 @@ pmap_copy_part_rpage(
         mapwindow_t *map;
 
        assert(psrc != vm_page_fictitious_addr);
+       assert(psrc != vm_page_guard_addr);
        assert((src_offset + len) <= PAGE_SIZE);
 
         mp_disable_preemption();
 
         map = pmap_get_mapwindow(INTEL_PTE_VALID | INTEL_PTE_RW | (i386_ptob(psrc) & PG_FRAME) | 
                                  INTEL_PTE_REF);
-       if (map == 0) {
-               panic("pmap_copy_part_rpage");
-        }
-       invlpg((uintptr_t) map->prv_CADDR);
 
        memcpy((void *) dst, (void *) (map->prv_CADDR + (src_offset & INTEL_OFFMASK)), len);
-       *map->prv_CMAP = 0;
+
+       pmap_put_mapwindow(map);
 
        mp_enable_preemption();
 }
@@ -215,14 +214,15 @@ kvtophys(
 {
         pt_entry_t *ptep;
        pmap_paddr_t pa;
-       
+ 
        mp_disable_preemption();
        if ((ptep = pmap_pte(kernel_pmap, (vm_map_offset_t)addr)) == PT_ENTRY_NULL) {
-               pa = 0;
+         pa = 0;
        } else {
-               pa =  pte_to_pa(*ptep) | (addr & INTEL_OFFMASK);
+         pa =  pte_to_pa(*ptep) | (addr & INTEL_OFFMASK);
        }
        mp_enable_preemption_no_check();
+
        return ((addr64_t)pa);
 }