vm: rename min/max macros to start/end variants

The real problem actually only applies to "max" names, for which the
value is ambiguous, as "max" usually implies the value is included in
the associated range, which is not the case for these macros.

4 files changed, 11 insertions, 11 deletions

diff --git a/vm/vm_kmem.c b/vm/vm_kmem.c
index d526804c..0583bb9c 100644
--- a/vm/vm_kmem.c
+++ b/vm/vm_kmem.c
@@ -44,8 +44,8 @@ static struct vm_object vm_kmem_kernel_object;
 static uint64_t
 vm_kmem_offset(uintptr_t va)
 {
-    assert(va >= PMAP_MIN_KMEM_ADDRESS);
-    return va - PMAP_MIN_KMEM_ADDRESS;
+    assert(va >= PMAP_START_KMEM_ADDRESS);
+    return va - PMAP_START_KMEM_ADDRESS;
 }
 
 static int __init
@@ -53,7 +53,7 @@ vm_kmem_setup(void)
 {
     uint64_t size;
 
-    size = vm_kmem_offset(PMAP_MAX_KMEM_ADDRESS);
+    size = vm_kmem_offset(PMAP_END_KMEM_ADDRESS);
     vm_object_init(&vm_kmem_kernel_object, size);
     return 0;
 }
diff --git a/vm/vm_kmem.h b/vm/vm_kmem.h
index e10c2201..9bb90dc4 100644
--- a/vm/vm_kmem.h
+++ b/vm/vm_kmem.h
@@ -28,9 +28,9 @@
  * The kernel space is required not to start at address 0, which is used to
  * report allocation errors.
  */
-#if PMAP_MIN_KMEM_ADDRESS == 0
+#if PMAP_START_KMEM_ADDRESS == 0
 #error "kernel space must not start at address 0"
-#endif /* PMAP_MIN_KMEM_ADDRESS == 0 */
+#endif /* PMAP_START_KMEM_ADDRESS == 0 */
 
 /*
  * Special kernel addresses.
diff --git a/vm/vm_map.c b/vm/vm_map.c
index da0b2cfd..180419ae 100644
--- a/vm/vm_map.c
+++ b/vm/vm_map.c
@@ -748,7 +748,7 @@ static int __init
 vm_map_bootstrap(void)
 {
     vm_map_init(kernel_map, kernel_pmap,
-                PMAP_MIN_KMEM_ADDRESS, PMAP_MAX_KMEM_ADDRESS);
+                PMAP_START_KMEM_ADDRESS, PMAP_END_KMEM_ADDRESS);
     kmem_cache_init(&vm_map_entry_cache, "vm_map_entry",
                     sizeof(struct vm_map_entry), 0, NULL,
                     KMEM_CACHE_PAGE_ONLY);
@@ -792,7 +792,7 @@ vm_map_create(struct vm_map **mapp)
         goto error_pmap;
     }
 
-    vm_map_init(map, pmap, PMAP_MIN_ADDRESS, PMAP_MAX_ADDRESS);
+    vm_map_init(map, pmap, PMAP_START_ADDRESS, PMAP_END_ADDRESS);
     *mapp = map;
     return 0;
 
diff --git a/vm/vm_page.h b/vm/vm_page.h
index e9ca321c..844ad066 100644
--- a/vm/vm_page.h
+++ b/vm/vm_page.h
@@ -120,15 +120,15 @@ static inline uintptr_t
 vm_page_direct_va(phys_addr_t pa)
 {
     assert(pa < PMEM_DIRECTMAP_LIMIT);
-    return ((uintptr_t)pa + PMAP_MIN_DIRECTMAP_ADDRESS);
+    return ((uintptr_t)pa + PMAP_START_DIRECTMAP_ADDRESS);
 }
 
 static inline phys_addr_t
 vm_page_direct_pa(uintptr_t va)
 {
-    assert(va >= PMAP_MIN_DIRECTMAP_ADDRESS);
-    assert(va < PMAP_MAX_DIRECTMAP_ADDRESS);
-    return (va - PMAP_MIN_DIRECTMAP_ADDRESS);
+    assert(va >= PMAP_START_DIRECTMAP_ADDRESS);
+    assert(va < PMAP_END_DIRECTMAP_ADDRESS);
+    return (va - PMAP_START_DIRECTMAP_ADDRESS);
 }
 
 static inline void *