xnu-1228.3.13.tar.gz

[apple/xnu.git] / osfmk / ppc / pmap.h

diff --git a/osfmk/ppc/pmap.h b/osfmk/ppc/pmap.h
index 3ec636f54cf499dfad0c9ac47e551d06880bdfde..3edad1d4b5828fa81e3080721d751b7b2f67edc3 100644 (file)
--- a/osfmk/ppc/pmap.h
+++ b/osfmk/ppc/pmap.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2000-2005 Apple Computer, Inc. All rights reserved.
+ * Copyright (c) 2000-2007 Apple Inc. All rights reserved.
  *
  * @APPLE_OSREFERENCE_LICENSE_HEADER_START@
  * 
@@ -160,12 +160,13 @@ struct pmap {
        shexlock                pmapSXlk;                       /* Shared/Exclusive lock for mapping changes */
        unsigned int    space;                          /* space for this pmap */
 #define invalSpace 0x00000001                  /* Predefined always invalid space */
-       int                             ref_count;                      /* reference count */
+       uint32_t        ref_count;                      /* reference count */
        unsigned int    pmapFlags;                      /* Flags */
 #define pmapKeys       0x00000007                      /* Keys and no execute bit to use with this pmap */
 #define pmapKeyDef     0x00000006                      /* Default keys - Sup = 1, user = 1, no ex = 0 */
 #define pmapVMhost     0x00000010                      /* pmap with Virtual Machines attached to it */
 #define pmapVMgsaa     0x00000020                      /* Guest shadow assist active */
+#define pmapNXdisabled 0x00000040                      /* no-execute disabled for this pmap */
        unsigned int    spaceNum;                       /* Space number */
        unsigned int    pmapCCtl;                       /* Cache control */
 #define pmapCCtlVal    0xFFFF0000                      /* Valid entries */
@@ -260,6 +261,7 @@ extern pmapTransTab *pmapTrans;                     /* Space to pmap translate table */
 
 #define pmap_kernel()                  (kernel_pmap)
 #define        pmap_resident_count(pmap)       ((pmap)->stats.resident_count)
+#define        pmap_resident_max(pmap)         ((pmap)->stats.resident_max)
 #define pmap_remove_attributes(pmap,start,end)
 #define pmap_copy(dpmap,spmap,da,len,sa)
 #define        pmap_update()
@@ -282,13 +284,13 @@ extern pmapTransTab *pmapTrans;                   /* Space to pmap translate table */
 /* 
  * prototypes.
  */
-extern vm_offset_t phystokv(vm_offset_t pa);                                   /* Get kernel virtual address from physical */
-extern vm_offset_t kvtophys(vm_offset_t va);                                   /* Get physical address from kernel virtual */
+extern addr64_t                kvtophys(vm_offset_t va);                               /* Get physical address from kernel virtual */
 extern vm_map_offset_t kvtophys64(vm_map_offset_t va);                         /* Get 64-bit physical address from kernel virtual */
 extern vm_offset_t     pmap_map(vm_offset_t va,
                                 vm_offset_t spa,
                                 vm_offset_t epa,
-                                vm_prot_t prot);
+                                vm_prot_t prot,
+                                unsigned int flags);
 extern kern_return_t    pmap_add_physical_memory(vm_offset_t spa,
                                                 vm_offset_t epa,
                                                 boolean_t available,
@@ -308,13 +310,9 @@ extern void invalidate_dcache(vm_offset_t va, unsigned length, boolean_t phys);
 extern void invalidate_dcache64(addr64_t va, unsigned length, boolean_t phys);
 extern void invalidate_icache(vm_offset_t va, unsigned length, boolean_t phys);
 extern void invalidate_icache64(addr64_t va, unsigned length, boolean_t phys);
-extern void pmap_sync_page_data_phys(ppnum_t pa);
-extern void pmap_sync_page_attributes_phys(ppnum_t pa);
 extern void pmap_map_block(pmap_t pmap, addr64_t va, ppnum_t pa, uint32_t size, vm_prot_t prot, int attr, unsigned int flags);
 extern int pmap_map_block_rc(pmap_t pmap, addr64_t va, ppnum_t pa, uint32_t size, vm_prot_t prot, int attr, unsigned int flags);
 
-extern kern_return_t pmap_nest(pmap_t grand, pmap_t subord, addr64_t vstart, addr64_t nstart, uint64_t size);
-extern kern_return_t pmap_unnest(pmap_t grand, addr64_t vaddr);
 extern ppnum_t pmap_find_phys(pmap_t pmap, addr64_t va);
 extern void MapUserMemoryWindowInit(void);
 extern addr64_t MapUserMemoryWindow(vm_map_t map, addr64_t va);
@@ -324,10 +322,10 @@ extern int pmap_list_resident_pages(
        vm_offset_t     *listp,
        int             space);
 extern void pmap_init_sharedpage(vm_offset_t cpg);
-extern void pmap_map_sharedpage(task_t task, pmap_t pmap);
-extern void pmap_unmap_sharedpage(pmap_t pmap);
-
-
+extern void pmap_disable_NX(pmap_t pmap);
+/* Not required for ppc: */
+static inline void pmap_set_4GB_pagezero(__unused pmap_t pmap) {}
+static inline void pmap_clear_4GB_pagezero(__unused pmap_t pmap) {}
 
 #endif /* _PPC_PMAP_H_ */