cleanup: use os_vm_size_t in gc_find_freeish_pages and for granularity

[sbcl.git] / src / runtime / os-common.c

diff --git a/src/runtime/os-common.c b/src/runtime/os-common.c
index ef31ac9..3fdf925 100644 (file)
--- a/src/runtime/os-common.c
+++ b/src/runtime/os-common.c
@@ -9,14 +9,13 @@
  * files for more information.
  */
 
-/*
- * $Header$
- */
-
 #include <stdio.h>
 #include <errno.h>
+#include <string.h>
 
+#include "sbcl.h"
 #include "os.h"
+#include "interr.h"
 
 /* Except for os_zero, these routines are only called by Lisp code.
  * These routines may also be replaced by os-dependent versions
@@ -39,21 +38,21 @@ os_zero(os_vm_address_t addr, os_vm_size_t length)
     block_size = os_trunc_size_to_page(length);
 
     if (block_start > addr)
-       bzero((char *)addr, block_start-addr);
+        bzero((char *)addr, block_start-addr);
     if (block_size < length)
-       bzero((char *)block_start+block_size, length-block_size);
+        bzero((char *)block_start+block_size, length-block_size);
 
     if (block_size != 0) {
-       /* Now deallocate and allocate the block so that it faults in
-        * zero-filled. */
+        /* Now deallocate and allocate the block so that it faults in
+         * zero-filled. */
 
-       os_invalidate(block_start, block_size);
-       addr = os_validate(block_start, block_size);
+        os_invalidate(block_start, block_size);
+        addr = os_validate(block_start, block_size);
 
-       if(addr == NULL || addr != block_start)
-           lose("os_zero: block moved! 0x%08x ==> 0x%08x",
-                block_start,
-                addr);
+        if (addr == NULL || addr != block_start)
+            lose("os_zero: block moved! 0x%08x ==> 0x%08x\n",
+                 block_start,
+                 addr);
     }
 }
 
@@ -63,51 +62,12 @@ os_allocate(os_vm_size_t len)
     return os_validate((os_vm_address_t)NULL, len);
 }
 
-os_vm_address_t
-os_allocate_at(os_vm_address_t addr, os_vm_size_t len)
-{
-    return os_validate(addr, len);
-}
-
 void
 os_deallocate(os_vm_address_t addr, os_vm_size_t len)
 {
     os_invalidate(addr,len);
 }
 
-/* (This function once tried to grow the chunk by asking os_validate
- * whether the space was available, but that really only works under
- * Mach.) */
-os_vm_address_t
-os_reallocate(os_vm_address_t addr, os_vm_size_t old_len, os_vm_size_t len)
-{
-    addr=os_trunc_to_page(addr);
-    len=os_round_up_size_to_page(len);
-    old_len=os_round_up_size_to_page(old_len);
-
-    if(addr==NULL)
-       return os_allocate(len);
-    else{
-       long len_diff=len-old_len;
-
-       if(len_diff<0)
-           os_invalidate(addr+len,-len_diff);
-       else{
-           if(len_diff!=0){
-             os_vm_address_t new=os_allocate(len);
-
-             if(new!=NULL){
-               bcopy(addr,new,old_len);
-               os_invalidate(addr,old_len);
-               }
-               
-             addr=new;
-           }
-       }
-       return addr;
-    }
-}
-
 int
 os_get_errno(void)
 {