0.pre8.25:

[sbcl.git] / src / runtime / gencgc.c

diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c
index 2af538d..aec65cd 100644 (file)
--- a/src/runtime/gencgc.c
+++ b/src/runtime/gencgc.c
@@ -26,8 +26,6 @@
 
 #include <stdio.h>
 #include <signal.h>
-#include <sys/ptrace.h>
-#include <linux/user.h>
 #include <errno.h>
 #include "runtime.h"
 #include "sbcl.h"
@@ -979,7 +977,7 @@ gc_find_freeish_pages(int *restart_page_ptr, int nbytes, int unboxed, struct all
                if((page_table[first_page].allocated ==
                    (unboxed ? UNBOXED_PAGE : BOXED_PAGE)) &&
                   (page_table[first_page].large_object == 0) &&
-                  (gc_alloc_genration == 0) &&
+                  (gc_alloc_generation == 0) &&
                   (page_table[first_page].gen == gc_alloc_generation) &&
                   (page_table[first_page].bytes_used < (4096-32)) &&
                   (page_table[first_page].write_protected == 0) &&
@@ -2308,6 +2306,7 @@ possibly_valid_dynamic_space_pointer(lispobj *pointer)
 #endif
        case SIMPLE_STRING_WIDETAG:
        case SIMPLE_BIT_VECTOR_WIDETAG:
+       case SIMPLE_ARRAY_NIL_WIDETAG:
        case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
        case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
        case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG:
@@ -2391,6 +2390,7 @@ maybe_adjust_large_object(lispobj *where)
     case BIGNUM_WIDETAG:
     case SIMPLE_STRING_WIDETAG:
     case SIMPLE_BIT_VECTOR_WIDETAG:
+    case SIMPLE_ARRAY_NIL_WIDETAG:
     case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
     case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
     case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG:
@@ -3382,6 +3382,7 @@ verify_space(lispobj *start, size_t words)
 #endif
                case SIMPLE_STRING_WIDETAG:
                case SIMPLE_BIT_VECTOR_WIDETAG:
+               case SIMPLE_ARRAY_NIL_WIDETAG:
                case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
                case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
                case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG: