--- Gnu-Mach/vm/pmap.h	2020/09/02 04:42:53	1.1.1.2
+++ Gnu-Mach/vm/pmap.h	2020/09/02 04:52:08	1.1.1.5
@@ -42,6 +42,7 @@
 #include <mach/machine/vm_types.h>
 #include <mach/vm_prot.h>
 #include <mach/boolean.h>
+#include <kern/thread.h>
 
 /*
  *	The following is a description of the interface to the
@@ -62,21 +63,12 @@
  *	but it is not part of the interface.
  */
 
-extern vm_offset_t	pmap_steal_memory();	/* During VM initialization,
-						 * steal a chunk of memory.
-						 */
-extern unsigned int	pmap_free_pages();	/* During VM initialization,
-						 * report remaining unused
-						 * physical pages.
-						 */
-extern void		pmap_startup();		/* During VM initialization,
-						 * use remaining physical pages
-						 * to allocate page frames.
-						 */
-extern void		pmap_init();		/* Initialization,
-						 * after kernel runs
-						 * in virtual memory.
-						 */
+/* During VM initialization, steal a chunk of memory.  */
+extern vm_offset_t	pmap_steal_memory(vm_size_t);
+/* During VM initialization, report remaining unused physical pages.  */
+extern unsigned int	pmap_free_pages(void);
+/* Initialization, after kernel runs in virtual memory.  */
+extern void		pmap_init(void);
 
 #ifndef	MACHINE_PAGES
 /*
@@ -85,24 +77,16 @@ extern void		pmap_init();		/* Initializa
  *	Otherwise, it must implement
  *		pmap_free_pages
  *		pmap_virtual_space
- *		pmap_next_page
  *		pmap_init
- *	and vm/vm_resident.c implements pmap_steal_memory and pmap_startup
- *	using pmap_free_pages, pmap_next_page, pmap_virtual_space,
- *	and pmap_enter.  pmap_free_pages may over-estimate the number
- *	of unused physical pages, and pmap_next_page may return FALSE
- *	to indicate that there are no more unused pages to return.
+ *	and vm/vm_resident.c implements pmap_steal_memory using
+ *	pmap_free_pages, pmap_virtual_space, and pmap_enter.
+ *
+ *	pmap_free_pages may over-estimate the number of unused physical pages.
  *	However, for best performance pmap_free_pages should be accurate.
  */
 
-extern boolean_t	pmap_next_page();	/* During VM initialization,
-						 * return the next unused
-						 * physical page.
-						 */
-extern void		pmap_virtual_space();	/* During VM initialization,
-						 * report virtual space
-						 * available for the kernel.
-						 */
+/* During VM initialization, report virtual space available for the kernel.  */
+extern void		pmap_virtual_space(vm_offset_t *, vm_offset_t *);
 #endif	/* MACHINE_PAGES */
 
 /*
@@ -139,12 +123,10 @@ void pmap_protect(pmap_t pmap, vm_offset
 /*
  *	Routines to set up hardware state for physical maps to be used.
  */
-extern void		pmap_activate();	/* Prepare pmap_t to run
-						 * on a given processor.
-						 */
-extern void		pmap_deactivate();	/* Release pmap_t from
-						 * use on processor.
-						 */
+/* Prepare pmap_t to run on a given processor.  */
+extern void		pmap_activate(pmap_t, thread_t, int);
+/* Release pmap_t from use on processor.  */
+extern void		pmap_deactivate(pmap_t, thread_t, int);
 
 
 /*
@@ -174,64 +156,61 @@ void pmap_clear_modify(vm_offset_t pa);
 /* Return modify bit */
 boolean_t pmap_is_modified(vm_offset_t pa);
 
-
-/*
- *	Statistics routines
- */
-extern void		pmap_statistics();	/* Return statistics */
-
-#ifndef	pmap_resident_count
-extern int		pmap_resident_count();
-#endif	/* pmap_resident_count */
-
 /*
  *	Sundry required routines
  */
-extern vm_offset_t	pmap_extract();		/* Return a virtual-to-physical
-						 * mapping, if possible.
-						 */
-
-extern boolean_t	pmap_access();		/* Is virtual address valid? */
-
-extern void		pmap_collect();		/* Perform garbage
-						 * collection, if any
-						 */
-
-extern void		pmap_change_wiring();	/* Specify pageability */
-
-#ifndef	pmap_phys_address
-extern vm_offset_t	pmap_phys_address();	/* Transform address
-						 * returned by device
-						 * driver mapping function
-						 * to physical address
-						 * known to this module.
-						 */
-#endif	/* pmap_phys_address */
-#ifndef	pmap_phys_to_frame
-extern int		pmap_phys_to_frame();	/* Inverse of
-						 * pmap_phys_address,
-						 * for use by device driver
-						 * mapping function in
-						 * machine-independent
-						 * pseudo-devices.
-						 */
-#endif	/* pmap_phys_to_frame */
+/* Return a virtual-to-physical mapping, if possible.  */
+extern vm_offset_t	pmap_extract(pmap_t, vm_offset_t);
+/* Perform garbage collection, if any.  */
+extern void		pmap_collect(pmap_t);
+/* Specify pageability.  */
+extern void		pmap_change_wiring(pmap_t, vm_offset_t, boolean_t);
 
 /*
  *	Optional routines
  */
 #ifndef	pmap_copy
-extern void		pmap_copy();		/* Copy range of
-						 * mappings, if desired.
-						 */
+/* Copy range of mappings, if desired.  */
+extern void		pmap_copy(pmap_t, pmap_t, vm_offset_t, vm_size_t,
+				  vm_offset_t);
 #endif	/* pmap_copy */
 #ifndef pmap_attribute
-extern kern_return_t	pmap_attribute();	/* Get/Set special
-						 * memory attributes
-						 */
+/* Get/Set special memory attributes.  */
+extern kern_return_t	pmap_attribute(void);
 #endif	/* pmap_attribute */
 
 /*
+ *	Grab a physical page:
+ *	the standard memory allocation mechanism
+ *	during system initialization.
+ */
+extern vm_offset_t pmap_grab_page (void);
+
+extern boolean_t pmap_valid_page(vm_offset_t x);
+
+/*
+ *      Make the specified pages (by pmap, offset)
+ *      pageable (or not) as requested.
+ */
+extern void pmap_pageable(
+    pmap_t      pmap,
+    vm_offset_t start,
+    vm_offset_t end,
+    boolean_t   pageable);
+
+/*
+ *      Back-door routine for mapping kernel VM at initialization.
+ *      Useful for mapping memory outside the range
+ *      [phys_first_addr, phys_last_addr) (i.e., devices).
+ *      Otherwise like pmap_map.
+ */
+extern vm_offset_t pmap_map_bd(
+        vm_offset_t virt,
+        vm_offset_t start,
+        vm_offset_t end,
+        vm_prot_t prot);
+
+/*
  * Routines defined as macros.
  */
 #ifndef	PMAP_ACTIVATE_USER