From: Juho Snellman <jsnell@iki.fi>
Date: Sat, 4 Mar 2006 21:45:33 +0000 (+0000)
Subject: 0.9.10.14:
X-Git-Url: http://repo.macrolet.net/gitweb/?a=commitdiff_plain;h=854a7c8f6987e05b6aebe186f30b7e125693afaf;p=sbcl.git

0.9.10.14:
	Kill some dead code.
---

diff --git a/src/code/target-allocate.lisp b/src/code/target-allocate.lisp
index 2eec4aa..702fe5e 100644
--- a/src/code/target-allocate.lisp
+++ b/src/code/target-allocate.lisp
@@ -15,17 +15,6 @@
                                system-area-pointer
   (bytes sb!alien:unsigned-long))
 
-(sb!alien:define-alien-routine ("os_allocate_at" allocate-system-memory-at)
-                               system-area-pointer
-  (address system-area-pointer)
-  (bytes sb!alien:unsigned-long))
-
-(sb!alien:define-alien-routine ("os_reallocate" reallocate-system-memory)
-                               system-area-pointer
-  (old system-area-pointer)
-  (old-size sb!alien:unsigned-long)
-  (new-size sb!alien:unsigned-long))
-
 (sb!alien:define-alien-routine ("os_deallocate" deallocate-system-memory)
                                sb!alien:void
   (addr system-area-pointer)
diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 07b96ae..354040b 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -23,10 +23,6 @@
 #include <fcntl.h>
 #include <unistd.h>
 
-#ifdef irix
-#include <fcntl.h>
-#endif
-
 #include "sbcl.h"
 #include "os.h"
 #include "runtime.h"
diff --git a/src/runtime/os-common.c b/src/runtime/os-common.c
index 80a34d2..3fdf925 100644
--- a/src/runtime/os-common.c
+++ b/src/runtime/os-common.c
@@ -62,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)
 {
diff --git a/src/runtime/os.h b/src/runtime/os.h
index d71b819..7eb58f1 100644
--- a/src/runtime/os.h
+++ b/src/runtime/os.h
@@ -144,17 +144,10 @@ sigset_t *os_context_sigmask_addr(os_context_t *context);
 /* These are not architecture-specific functions, but are instead
  * general utilities defined in terms of the architecture-specific
  * function os_validate(..) and os_invalidate(..).
- *
- * FIXME: os_reallocate(..) is complicated and seems no longer to be
- * used for anything. Perhaps we could delete it? */
+ */
 extern os_vm_address_t os_allocate(os_vm_size_t len);
-extern os_vm_address_t os_allocate_at(os_vm_address_t addr, os_vm_size_t len);
-extern os_vm_address_t os_reallocate(os_vm_address_t addr,
-                                     os_vm_size_t old_len,
-                                     os_vm_size_t len);
 extern void os_deallocate(os_vm_address_t addr, os_vm_size_t len);
 
-
 /* FIXME: The os_trunc_foo(..) and os_round_foo(..) macros here could
  * be functions. */
 
diff --git a/version.lisp-expr b/version.lisp-expr
index 6f01015..92092f6 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -17,4 +17,4 @@
 ;;; checkins which aren't released. (And occasionally for internal
 ;;; versions, especially for internal versions off the main CVS
 ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".)
-"0.9.10.13"
+"0.9.10.14"