1.0.3.16: experimental x86-64/darwin suport
[sbcl.git] / src / runtime / purify.c
index 3750895..e753c13 100644 (file)
 #include "thread.h"
 #include "genesis/primitive-objects.h"
 #include "genesis/static-symbols.h"
+#include "genesis/layout.h"
 
 #define PRINTNOISE
 
-#if defined(LISP_FEATURE_GENCGC)
-/* this is another artifact of the poor integration between gencgc and
- * the rest of the runtime: on cheney gc there is a global
- * dynamic_space_free_pointer which is valid whenever foreign function
- * call is active, but in gencgc there's no such variable and we have
- * to keep our own
- */
-static lispobj *dynamic_space_free_pointer;
-#endif
 extern unsigned long bytes_consed_between_gcs;
 
-#define gc_abort() \
-  lose("GC invariant lost, file \"%s\", line %d", __FILE__, __LINE__)
-
-#if 1
-#define gc_assert(ex) do { \
-       if (!(ex)) gc_abort(); \
-} while (0)
-#else
-#define gc_assert(ex)
-#endif
+static lispobj *dynamic_space_purify_pointer;
 
 \f
 /* These hold the original end of the read_only and static spaces so
@@ -66,7 +49,7 @@ static lispobj *read_only_end, *static_end;
 
 static lispobj *read_only_free, *static_free;
 
-static lispobj *pscav(lispobj *addr, int nwords, boolean constant);
+static lispobj *pscav(lispobj *addr, long nwords, boolean constant);
 
 #define LATERBLOCKSIZE 1020
 #define LATERMAXCOUNT 10
@@ -76,19 +59,17 @@ later {
     struct later *next;
     union {
         lispobj *ptr;
-        int count;
+        long count;
     } u[LATERBLOCKSIZE];
 } *later_blocks = NULL;
-static int later_count = 0;
+static long later_count = 0;
 
-/* FIXME: Shouldn't this be defined in sbcl.h?  See also notes in
- * cheneygc.c */
-
-#ifdef sparc
-#define FUN_RAW_ADDR_OFFSET 0
-#else
-#define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG)
+#if N_WORD_BITS == 32
+ #define SIMPLE_ARRAY_WORD_WIDETAG SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG
+#elif N_WORD_BITS == 64
+ #define SIMPLE_ARRAY_WORD_WIDETAG SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG
 #endif
+
 \f
 static boolean
 forwarding_pointer_p(lispobj obj)
@@ -104,34 +85,40 @@ dynamic_pointer_p(lispobj ptr)
 {
 #ifndef LISP_FEATURE_GENCGC
     return (ptr >= (lispobj)current_dynamic_space
-           &&
-           ptr < (lispobj)dynamic_space_free_pointer);
+            &&
+            ptr < (lispobj)dynamic_space_purify_pointer);
 #else
     /* Be more conservative, and remember, this is a maybe. */
     return (ptr >= (lispobj)DYNAMIC_SPACE_START
-           &&
-           ptr < (lispobj)dynamic_space_free_pointer);
+            &&
+            ptr < (lispobj)dynamic_space_purify_pointer);
 #endif
 }
 
 static inline lispobj *
-newspace_alloc(int nwords, int constantp) 
+newspace_alloc(long nwords, int constantp)
 {
     lispobj *ret;
     nwords=CEILING(nwords,2);
     if(constantp) {
-       ret=read_only_free;
-       read_only_free+=nwords;
+        if(read_only_free + nwords >= (lispobj *)READ_ONLY_SPACE_END) {
+            lose("Ran out of read-only space while purifying!\n");
+        }
+        ret=read_only_free;
+        read_only_free+=nwords;
     } else {
-       ret=static_free;
-       static_free+=nwords;
+        if(static_free + nwords >= (lispobj *)STATIC_SPACE_END) {
+            lose("Ran out of static space while purifying!\n");
+        }
+        ret=static_free;
+        static_free+=nwords;
     }
     return ret;
 }
 
 
 \f
-#ifdef LISP_FEATURE_X86
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
 
 #ifdef LISP_FEATURE_GENCGC
 /*
@@ -159,208 +146,239 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr)
     /* If it's not a return address then it needs to be a valid Lisp
      * pointer. */
     if (!is_lisp_pointer((lispobj)pointer))
-       return 0;
+        return 0;
 
     /* Check that the object pointed to is consistent with the pointer
      * low tag. */
     switch (lowtag_of((lispobj)pointer)) {
     case FUN_POINTER_LOWTAG:
-       /* Start_addr should be the enclosing code object, or a closure
-        * header. */
-       switch (widetag_of(*start_addr)) {
-       case CODE_HEADER_WIDETAG:
-           /* This case is probably caught above. */
-           break;
-       case CLOSURE_HEADER_WIDETAG:
-       case FUNCALLABLE_INSTANCE_HEADER_WIDETAG:
-           if ((int)pointer != ((int)start_addr+FUN_POINTER_LOWTAG)) {
-               if (pointer_filter_verbose) {
-                   fprintf(stderr,"*Wf2: %x %x %x\n", (unsigned int) pointer, 
-                           (unsigned int) start_addr, *start_addr);
-               }
-               return 0;
-           }
-           break;
-       default:
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wf3: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       break;
+        /* Start_addr should be the enclosing code object, or a closure
+         * header. */
+        switch (widetag_of(*start_addr)) {
+        case CODE_HEADER_WIDETAG:
+            /* This case is probably caught above. */
+            break;
+        case CLOSURE_HEADER_WIDETAG:
+        case FUNCALLABLE_INSTANCE_HEADER_WIDETAG:
+            if ((long)pointer != ((long)start_addr+FUN_POINTER_LOWTAG)) {
+                if (pointer_filter_verbose) {
+                    fprintf(stderr,"*Wf2: %p %p %p\n",
+                            pointer, start_addr, (void *)*start_addr);
+                }
+                return 0;
+            }
+            break;
+        default:
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wf3: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        break;
     case LIST_POINTER_LOWTAG:
-       if ((int)pointer != ((int)start_addr+LIST_POINTER_LOWTAG)) {
-           if (pointer_filter_verbose)
-               fprintf(stderr,"*Wl1: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           return 0;
-       }
-       /* Is it plausible cons? */
-       if ((is_lisp_pointer(start_addr[0])
-           || ((start_addr[0] & 3) == 0) /* fixnum */
-           || (widetag_of(start_addr[0]) == CHARACTER_WIDETAG)
-           || (widetag_of(start_addr[0]) == UNBOUND_MARKER_WIDETAG))
-          && (is_lisp_pointer(start_addr[1])
-              || ((start_addr[1] & 3) == 0) /* fixnum */
-              || (widetag_of(start_addr[1]) == CHARACTER_WIDETAG)
-              || (widetag_of(start_addr[1]) == UNBOUND_MARKER_WIDETAG))) {
-           break;
-       } else {
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wl2: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
+        if ((long)pointer != ((long)start_addr+LIST_POINTER_LOWTAG)) {
+            if (pointer_filter_verbose)
+                fprintf(stderr,"*Wl1: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            return 0;
+        }
+        /* Is it plausible cons? */
+        if ((is_lisp_pointer(start_addr[0])
+            || ((start_addr[0] & FIXNUM_TAG_MASK) == 0) /* fixnum */
+            || (widetag_of(start_addr[0]) == CHARACTER_WIDETAG)
+#if N_WORD_BITS == 64
+            || (widetag_of(start_addr[0]) == SINGLE_FLOAT_WIDETAG)
+#endif
+            || (widetag_of(start_addr[0]) == UNBOUND_MARKER_WIDETAG))
+           && (is_lisp_pointer(start_addr[1])
+               || ((start_addr[1] & FIXNUM_TAG_MASK) == 0) /* fixnum */
+               || (widetag_of(start_addr[1]) == CHARACTER_WIDETAG)
+#if N_WORD_BITS == 64
+               || (widetag_of(start_addr[1]) == SINGLE_FLOAT_WIDETAG)
+#endif
+               || (widetag_of(start_addr[1]) == UNBOUND_MARKER_WIDETAG))) {
+            break;
+        } else {
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wl2: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
     case INSTANCE_POINTER_LOWTAG:
-       if ((int)pointer != ((int)start_addr+INSTANCE_POINTER_LOWTAG)) {
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wi1: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       if (widetag_of(start_addr[0]) != INSTANCE_HEADER_WIDETAG) {
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wi2: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       break;
+        if ((long)pointer != ((long)start_addr+INSTANCE_POINTER_LOWTAG)) {
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wi1: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        if (widetag_of(start_addr[0]) != INSTANCE_HEADER_WIDETAG) {
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wi2: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        break;
     case OTHER_POINTER_LOWTAG:
-       if ((int)pointer != ((int)start_addr+OTHER_POINTER_LOWTAG)) {
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo1: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       /* Is it plausible? Not a cons. XXX should check the headers. */
-       if (is_lisp_pointer(start_addr[0]) || ((start_addr[0] & 3) == 0)) {
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo2: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       switch (widetag_of(start_addr[0])) {
-       case UNBOUND_MARKER_WIDETAG:
-       case CHARACTER_WIDETAG:
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo3: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-
-           /* only pointed to by function pointers? */
-       case CLOSURE_HEADER_WIDETAG:
-       case FUNCALLABLE_INSTANCE_HEADER_WIDETAG:
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo4: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-
-       case INSTANCE_HEADER_WIDETAG:
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo5: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-
-           /* the valid other immediate pointer objects */
-       case SIMPLE_VECTOR_WIDETAG:
-       case RATIO_WIDETAG:
-       case COMPLEX_WIDETAG:
+        if ((long)pointer != ((long)start_addr+OTHER_POINTER_LOWTAG)) {
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo1: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        /* Is it plausible? Not a cons. XXX should check the headers. */
+        if (is_lisp_pointer(start_addr[0]) || ((start_addr[0] & FIXNUM_TAG_MASK) == 0)) {
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo2: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        switch (widetag_of(start_addr[0])) {
+        case UNBOUND_MARKER_WIDETAG:
+        case CHARACTER_WIDETAG:
+#if N_WORD_BITS == 64
+        case SINGLE_FLOAT_WIDETAG:
+#endif
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo3: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+
+            /* only pointed to by function pointers? */
+        case CLOSURE_HEADER_WIDETAG:
+        case FUNCALLABLE_INSTANCE_HEADER_WIDETAG:
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo4: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+
+        case INSTANCE_HEADER_WIDETAG:
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo5: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+
+            /* the valid other immediate pointer objects */
+        case SIMPLE_VECTOR_WIDETAG:
+        case RATIO_WIDETAG:
+        case COMPLEX_WIDETAG:
 #ifdef COMPLEX_SINGLE_FLOAT_WIDETAG
-       case COMPLEX_SINGLE_FLOAT_WIDETAG:
+        case COMPLEX_SINGLE_FLOAT_WIDETAG:
 #endif
 #ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG
-       case COMPLEX_DOUBLE_FLOAT_WIDETAG:
+        case COMPLEX_DOUBLE_FLOAT_WIDETAG:
 #endif
 #ifdef COMPLEX_LONG_FLOAT_WIDETAG
-       case COMPLEX_LONG_FLOAT_WIDETAG:
+        case COMPLEX_LONG_FLOAT_WIDETAG:
 #endif
-       case SIMPLE_ARRAY_WIDETAG:
-       case COMPLEX_BASE_STRING_WIDETAG:
+        case SIMPLE_ARRAY_WIDETAG:
+        case COMPLEX_BASE_STRING_WIDETAG:
 #ifdef COMPLEX_CHARACTER_STRING_WIDETAG
-       case COMPLEX_CHARACTER_STRING_WIDETAG:
-#endif
-       case COMPLEX_VECTOR_NIL_WIDETAG:
-       case COMPLEX_BIT_VECTOR_WIDETAG:
-       case COMPLEX_VECTOR_WIDETAG:
-       case COMPLEX_ARRAY_WIDETAG:
-       case VALUE_CELL_HEADER_WIDETAG:
-       case SYMBOL_HEADER_WIDETAG:
-       case FDEFN_WIDETAG:
-       case CODE_HEADER_WIDETAG:
-       case BIGNUM_WIDETAG:
-       case SINGLE_FLOAT_WIDETAG:
-       case DOUBLE_FLOAT_WIDETAG:
+        case COMPLEX_CHARACTER_STRING_WIDETAG:
+#endif
+        case COMPLEX_VECTOR_NIL_WIDETAG:
+        case COMPLEX_BIT_VECTOR_WIDETAG:
+        case COMPLEX_VECTOR_WIDETAG:
+        case COMPLEX_ARRAY_WIDETAG:
+        case VALUE_CELL_HEADER_WIDETAG:
+        case SYMBOL_HEADER_WIDETAG:
+        case FDEFN_WIDETAG:
+        case CODE_HEADER_WIDETAG:
+        case BIGNUM_WIDETAG:
+#if N_WORD_BITS != 64
+        case SINGLE_FLOAT_WIDETAG:
+#endif
+        case DOUBLE_FLOAT_WIDETAG:
 #ifdef LONG_FLOAT_WIDETAG
-       case LONG_FLOAT_WIDETAG:
+        case LONG_FLOAT_WIDETAG:
 #endif
-       case SIMPLE_ARRAY_NIL_WIDETAG:
-       case SIMPLE_BASE_STRING_WIDETAG:
+        case SIMPLE_ARRAY_NIL_WIDETAG:
+        case SIMPLE_BASE_STRING_WIDETAG:
 #ifdef SIMPLE_CHARACTER_STRING_WIDETAG
-       case SIMPLE_CHARACTER_STRING_WIDETAG:
-#endif
-       case SIMPLE_BIT_VECTOR_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG:
-       case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG:
+        case SIMPLE_CHARACTER_STRING_WIDETAG:
+#endif
+        case SIMPLE_BIT_VECTOR_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_7_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_15_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG:
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG:
+#endif
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_31_WIDETAG:
+        case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG:
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_60_WIDETAG
+                case SIMPLE_ARRAY_UNSIGNED_BYTE_60_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG
+                case SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG
+                case SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG:
+#endif
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG
-       case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG:
+        case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG
-       case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG:
+        case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG
-       case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG:
+        case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG
-       case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG:
+        case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_SIGNED_BYTE_61_WIDETAG
+                case SIMPLE_ARRAY_SIGNED_BYTE_61_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG
+                case SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG:
 #endif
-       case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG:
-       case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG:
+        case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG:
+        case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG:
 #ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG
-       case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG:
+        case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG
-       case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG:
+        case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG
-       case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG:
+        case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG
-       case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG:
-#endif
-       case SAP_WIDETAG:
-       case WEAK_POINTER_WIDETAG:
-           break;
-
-       default:
-           if (pointer_filter_verbose) {
-               fprintf(stderr,"*Wo6: %x %x %x\n", (unsigned int) pointer, 
-                       (unsigned int) start_addr, *start_addr);
-           }
-           return 0;
-       }
-       break;
+        case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG:
+#endif
+        case SAP_WIDETAG:
+        case WEAK_POINTER_WIDETAG:
+#ifdef LUTEX_WIDETAG
+        case LUTEX_WIDETAG:
+#endif
+            break;
+
+        default:
+            if (pointer_filter_verbose) {
+                fprintf(stderr,"*Wo6: %p %p %p\n",
+                        pointer, start_addr, (void *)*start_addr);
+            }
+            return 0;
+        }
+        break;
     default:
-       if (pointer_filter_verbose) {
-           fprintf(stderr,"*W?: %x %x %x\n", (unsigned int) pointer, 
-                   (unsigned int) start_addr, *start_addr);
-       }
-       return 0;
+        if (pointer_filter_verbose) {
+            fprintf(stderr,"*W?: %p %p %p\n",
+                    pointer, start_addr, (void *)*start_addr);
+        }
+        return 0;
     }
 
     /* looks good */
@@ -369,12 +387,12 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr)
 
 #define MAX_STACK_POINTERS 256
 lispobj *valid_stack_locations[MAX_STACK_POINTERS];
-unsigned int num_valid_stack_locations;
+unsigned long num_valid_stack_locations;
 
 #define MAX_STACK_RETURN_ADDRESSES 128
 lispobj *valid_stack_ra_locations[MAX_STACK_RETURN_ADDRESSES];
 lispobj *valid_stack_ra_code_objects[MAX_STACK_RETURN_ADDRESSES];
-unsigned int num_valid_stack_ra_locations;
+unsigned long num_valid_stack_ra_locations;
 
 /* Identify valid stack slots. */
 static void
@@ -384,61 +402,62 @@ setup_i386_stack_scav(lispobj *lowaddr, lispobj *base)
     num_valid_stack_locations = 0;
     num_valid_stack_ra_locations = 0;
     for (sp = lowaddr; sp < base; sp++) {
-       lispobj thing = *sp;
-       /* Find the object start address */
-       lispobj *start_addr = search_dynamic_space((void *)thing);
-       if (start_addr) {
-           /* We need to allow raw pointers into Code objects for
-            * return addresses. This will also pick up pointers to
-            * functions in code objects. */
-           if (widetag_of(*start_addr) == CODE_HEADER_WIDETAG) {
-               /* FIXME asserting here is a really dumb thing to do.
-                * If we've overflowed some arbitrary static limit, we
-                * should just refuse to purify, instead of killing
-                * the whole lisp session
-                */
-               gc_assert(num_valid_stack_ra_locations <
-                         MAX_STACK_RETURN_ADDRESSES);
-               valid_stack_ra_locations[num_valid_stack_ra_locations] = sp;
-               valid_stack_ra_code_objects[num_valid_stack_ra_locations++] =
-                   (lispobj *)((int)start_addr + OTHER_POINTER_LOWTAG);
-           } else {
-               if (valid_dynamic_space_pointer((void *)thing, start_addr)) {
-                   gc_assert(num_valid_stack_locations < MAX_STACK_POINTERS);
-                   valid_stack_locations[num_valid_stack_locations++] = sp;
-               }
-           }
-       }
+        lispobj thing = *sp;
+        /* Find the object start address */
+        lispobj *start_addr = search_dynamic_space((void *)thing);
+        if (start_addr) {
+            /* We need to allow raw pointers into Code objects for
+             * return addresses. This will also pick up pointers to
+             * functions in code objects. */
+            if (widetag_of(*start_addr) == CODE_HEADER_WIDETAG) {
+                /* FIXME asserting here is a really dumb thing to do.
+                 * If we've overflowed some arbitrary static limit, we
+                 * should just refuse to purify, instead of killing
+                 * the whole lisp session
+                 */
+                gc_assert(num_valid_stack_ra_locations <
+                          MAX_STACK_RETURN_ADDRESSES);
+                valid_stack_ra_locations[num_valid_stack_ra_locations] = sp;
+                valid_stack_ra_code_objects[num_valid_stack_ra_locations++] =
+                    (lispobj *)((long)start_addr + OTHER_POINTER_LOWTAG);
+            } else {
+                if (valid_dynamic_space_pointer((void *)thing, start_addr)) {
+                    gc_assert(num_valid_stack_locations < MAX_STACK_POINTERS);
+                    valid_stack_locations[num_valid_stack_locations++] = sp;
+                }
+            }
+        }
     }
     if (pointer_filter_verbose) {
-       fprintf(stderr, "number of valid stack pointers = %d\n",
-               num_valid_stack_locations);
-       fprintf(stderr, "number of stack return addresses = %d\n",
-               num_valid_stack_ra_locations);
+        fprintf(stderr, "number of valid stack pointers = %ld\n",
+                num_valid_stack_locations);
+        fprintf(stderr, "number of stack return addresses = %ld\n",
+                num_valid_stack_ra_locations);
     }
 }
 
 static void
 pscav_i386_stack(void)
 {
-    int i;
+    long i;
 
     for (i = 0; i < num_valid_stack_locations; i++)
-       pscav(valid_stack_locations[i], 1, 0);
+        pscav(valid_stack_locations[i], 1, 0);
 
     for (i = 0; i < num_valid_stack_ra_locations; i++) {
-       lispobj code_obj = (lispobj)valid_stack_ra_code_objects[i];
-       pscav(&code_obj, 1, 0);
-       if (pointer_filter_verbose) {
-           fprintf(stderr,"*C moved RA %x to %x; for code object %x to %x\n",
-                   *valid_stack_ra_locations[i],
-                   (int)(*valid_stack_ra_locations[i])
-                   - ((int)valid_stack_ra_code_objects[i] - (int)code_obj),
-                   (unsigned int) valid_stack_ra_code_objects[i], code_obj);
-       }
-       *valid_stack_ra_locations[i] =
-           ((int)(*valid_stack_ra_locations[i])
-            - ((int)valid_stack_ra_code_objects[i] - (int)code_obj));
+        lispobj code_obj = (lispobj)valid_stack_ra_code_objects[i];
+        pscav(&code_obj, 1, 0);
+        if (pointer_filter_verbose) {
+            fprintf(stderr,"*C moved RA %p to %p; for code object %p to %p\n",
+                    (void *)*valid_stack_ra_locations[i],
+                    (void *)(*valid_stack_ra_locations[i]) -
+                    ((void *)valid_stack_ra_code_objects[i] -
+                     (void *)code_obj),
+                    valid_stack_ra_code_objects[i], (void *)code_obj);
+        }
+        *valid_stack_ra_locations[i] =
+            ((long)(*valid_stack_ra_locations[i])
+             - ((long)valid_stack_ra_code_objects[i] - (long)code_obj));
     }
 }
 #endif
@@ -446,7 +465,7 @@ pscav_i386_stack(void)
 
 \f
 static void
-pscav_later(lispobj *where, int count)
+pscav_later(lispobj *where, long count)
 {
     struct later *new;
 
@@ -477,10 +496,10 @@ pscav_later(lispobj *where, int count)
 static lispobj
 ptrans_boxed(lispobj thing, lispobj header, boolean constant)
 {
-    int nwords;
+    long nwords;
     lispobj result, *new, *old;
 
-    nwords = 1 + HeaderValue(header);
+    nwords = CEILING(1 + HeaderValue(header), 2);
 
     /* Allocate it */
     old = (lispobj *)native_pointer(thing);
@@ -505,60 +524,61 @@ ptrans_boxed(lispobj thing, lispobj header, boolean constant)
 static lispobj
 ptrans_instance(lispobj thing, lispobj header, boolean /* ignored */ constant)
 {
-    lispobj layout = ((struct instance *)native_pointer(thing))->slots[0];
-    lispobj pure = ((struct instance *)native_pointer(layout))->slots[15];
+    struct layout *layout =
+      (struct layout *) native_pointer(((struct instance *)native_pointer(thing))->slots[0]);
+    lispobj pure = layout->pure;
 
     switch (pure) {
     case T:
-       return (ptrans_boxed(thing, header, 1));
+        return (ptrans_boxed(thing, header, 1));
     case NIL:
-       return (ptrans_boxed(thing, header, 0));
+        return (ptrans_boxed(thing, header, 0));
     case 0:
-       {
-           /* Substructure: special case for the COMPACT-INFO-ENVs,
-            * where the instance may have a point to the dynamic
-            * space placed into it (e.g. the cache-name slot), but
-            * the lists and arrays at the time of a purify can be
-            * moved to the RO space. */
-           int nwords;
-           lispobj result, *new, *old;
+        {
+            /* Substructure: special case for the COMPACT-INFO-ENVs,
+             * where the instance may have a point to the dynamic
+             * space placed into it (e.g. the cache-name slot), but
+             * the lists and arrays at the time of a purify can be
+             * moved to the RO space. */
+            long nwords;
+            lispobj result, *new, *old;
 
-           nwords = 1 + HeaderValue(header);
+            nwords = CEILING(1 + HeaderValue(header), 2);
 
-           /* Allocate it */
-           old = (lispobj *)native_pointer(thing);
-           new = newspace_alloc(nwords, 0); /*  inconstant */
+            /* Allocate it */
+            old = (lispobj *)native_pointer(thing);
+            new = newspace_alloc(nwords, 0); /*  inconstant */
 
-           /* Copy it. */
-           bcopy(old, new, nwords * sizeof(lispobj));
+            /* Copy it. */
+            bcopy(old, new, nwords * sizeof(lispobj));
 
-           /* Deposit forwarding pointer. */
-           result = make_lispobj(new, lowtag_of(thing));
-           *old = result;
+            /* Deposit forwarding pointer. */
+            result = make_lispobj(new, lowtag_of(thing));
+            *old = result;
 
-           /* Scavenge it. */
-           pscav(new, nwords, 1);
+            /* Scavenge it. */
+            pscav(new, nwords, 1);
 
-           return result;
-       }
+            return result;
+        }
     default:
-       gc_abort();
-       return NIL; /* dummy value: return something ... */
+        gc_abort();
+        return NIL; /* dummy value: return something ... */
     }
 }
 
 static lispobj
 ptrans_fdefn(lispobj thing, lispobj header)
 {
-    int nwords;
+    long nwords;
     lispobj result, *new, *old, oldfn;
     struct fdefn *fdefn;
 
-    nwords = 1 + HeaderValue(header);
+    nwords = CEILING(1 + HeaderValue(header), 2);
 
     /* Allocate it */
     old = (lispobj *)native_pointer(thing);
-    new = newspace_alloc(nwords, 0);   /* inconstant */
+    new = newspace_alloc(nwords, 0);    /* inconstant */
 
     /* Copy it. */
     bcopy(old, new, nwords * sizeof(lispobj));
@@ -580,18 +600,18 @@ ptrans_fdefn(lispobj thing, lispobj header)
 static lispobj
 ptrans_unboxed(lispobj thing, lispobj header)
 {
-    int nwords;
+    long nwords;
     lispobj result, *new, *old;
-    
-    nwords = 1 + HeaderValue(header);
-    
+
+    nwords = CEILING(1 + HeaderValue(header), 2);
+
     /* Allocate it */
     old = (lispobj *)native_pointer(thing);
-    new = newspace_alloc(nwords,1);    /* always constant */
-    
+    new = newspace_alloc(nwords,1);     /* always constant */
+
     /* copy it. */
     bcopy(old, new, nwords * sizeof(lispobj));
-    
+
     /* Deposit forwarding pointer. */
     result = make_lispobj(new , lowtag_of(thing));
     *old = result;
@@ -600,15 +620,22 @@ ptrans_unboxed(lispobj thing, lispobj header)
 }
 
 static lispobj
-ptrans_vector(lispobj thing, int bits, int extra,
-             boolean boxed, boolean constant)
+ptrans_vector(lispobj thing, long bits, long extra,
+              boolean boxed, boolean constant)
 {
     struct vector *vector;
-    int nwords;
+    long nwords;
     lispobj result, *new;
+    long length;
 
     vector = (struct vector *)native_pointer(thing);
-    nwords = 2 + (CEILING((fixnum_value(vector->length)+extra)*bits,32)>>5);
+    length = fixnum_value(vector->length)+extra;
+    // Argh, handle simple-vector-nil separately.
+    if (bits == 0) {
+      nwords = 2;
+    } else {
+      nwords = CEILING(NWORDS(length, bits) + 2, 2);
+    }
 
     new=newspace_alloc(nwords, (constant || !boxed));
     bcopy(vector, new, nwords * sizeof(lispobj));
@@ -622,25 +649,25 @@ ptrans_vector(lispobj thing, int bits, int extra,
     return result;
 }
 
-#ifdef LISP_FEATURE_X86
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
 static void
 apply_code_fixups_during_purify(struct code *old_code, struct code *new_code)
 {
-    int nheader_words, ncode_words, nwords;
+    long nheader_words, ncode_words, nwords;
     void  *constants_start_addr, *constants_end_addr;
     void  *code_start_addr, *code_end_addr;
     lispobj fixups = NIL;
-    unsigned  displacement = (unsigned)new_code - (unsigned)old_code;
+    unsigned long displacement = (unsigned long)new_code - (unsigned long)old_code;
     struct vector *fixups_vector;
 
     ncode_words = fixnum_value(new_code->code_size);
     nheader_words = HeaderValue(*(lispobj *)new_code);
     nwords = ncode_words + nheader_words;
 
-    constants_start_addr = (void *)new_code + 5*4;
-    constants_end_addr = (void *)new_code + nheader_words*4;
-    code_start_addr = (void *)new_code + nheader_words*4;
-    code_end_addr = (void *)new_code + nwords*4;
+    constants_start_addr = (void *)new_code + 5 * N_WORD_BYTES;
+    constants_end_addr = (void *)new_code + nheader_words*N_WORD_BYTES;
+    code_start_addr = (void *)new_code + nheader_words*N_WORD_BYTES;
+    code_end_addr = (void *)new_code + nwords*N_WORD_BYTES;
 
     /* The first constant should be a pointer to the fixups for this
      * code objects. Check. */
@@ -649,51 +676,50 @@ apply_code_fixups_during_purify(struct code *old_code, struct code *new_code)
     /* It will be 0 or the unbound-marker if there are no fixups, and
      * will be an other-pointer to a vector if it is valid. */
     if ((fixups==0) ||
-       (fixups==UNBOUND_MARKER_WIDETAG) ||
-       !is_lisp_pointer(fixups)) {
+        (fixups==UNBOUND_MARKER_WIDETAG) ||
+        !is_lisp_pointer(fixups)) {
 #ifdef LISP_FEATURE_GENCGC
-       /* Check for a possible errors. */
-       sniff_code_object(new_code,displacement);
+        /* Check for a possible errors. */
+        sniff_code_object(new_code,displacement);
 #endif
-       return;
+        return;
     }
 
     fixups_vector = (struct vector *)native_pointer(fixups);
 
     /* Could be pointing to a forwarding pointer. */
     if (is_lisp_pointer(fixups) && (dynamic_pointer_p(fixups))
-       && forwarding_pointer_p(*(lispobj *)fixups_vector)) {
-       /* If so then follow it. */
-       fixups_vector =
-           (struct vector *)native_pointer(*(lispobj *)fixups_vector);
+        && forwarding_pointer_p(*(lispobj *)fixups_vector)) {
+        /* If so then follow it. */
+        fixups_vector =
+            (struct vector *)native_pointer(*(lispobj *)fixups_vector);
     }
 
-    if (widetag_of(fixups_vector->header) ==
-       SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG) {
-       /* We got the fixups for the code block. Now work through the
-        * vector, and apply a fixup at each address. */
-       int length = fixnum_value(fixups_vector->length);
-       int i;
-       for (i=0; i<length; i++) {
-           unsigned offset = fixups_vector->data[i];
-           /* Now check the current value of offset. */
-           unsigned old_value =
-               *(unsigned *)((unsigned)code_start_addr + offset);
-
-           /* If it's within the old_code object then it must be an
-            * absolute fixup (relative ones are not saved) */
-           if ((old_value>=(unsigned)old_code)
-               && (old_value<((unsigned)old_code + nwords*4)))
-               /* So add the dispacement. */
-               *(unsigned *)((unsigned)code_start_addr + offset) = old_value
-                   + displacement;
-           else
-               /* It is outside the old code object so it must be a relative
-                * fixup (absolute fixups are not saved). So subtract the
-                * displacement. */
-               *(unsigned *)((unsigned)code_start_addr + offset) = old_value
-                   - displacement;
-       }
+    if (widetag_of(fixups_vector->header) == SIMPLE_ARRAY_WORD_WIDETAG) {
+        /* We got the fixups for the code block. Now work through the
+         * vector, and apply a fixup at each address. */
+        long length = fixnum_value(fixups_vector->length);
+        long i;
+        for (i=0; i<length; i++) {
+            unsigned offset = fixups_vector->data[i];
+            /* Now check the current value of offset. */
+            unsigned long old_value =
+                *(unsigned long *)((unsigned long)code_start_addr + offset);
+
+            /* If it's within the old_code object then it must be an
+             * absolute fixup (relative ones are not saved) */
+            if ((old_value>=(unsigned long)old_code)
+                && (old_value<((unsigned long)old_code + nwords * N_WORD_BYTES)))
+                /* So add the dispacement. */
+                *(unsigned long *)((unsigned long)code_start_addr + offset) = old_value
+                    + displacement;
+            else
+                /* It is outside the old code object so it must be a relative
+                 * fixup (absolute fixups are not saved). So subtract the
+                 * displacement. */
+                *(unsigned long *)((unsigned long)code_start_addr + offset) = old_value
+                    - displacement;
+        }
     }
 
     /* No longer need the fixups. */
@@ -710,17 +736,18 @@ static lispobj
 ptrans_code(lispobj thing)
 {
     struct code *code, *new;
-    int nwords;
+    long nwords;
     lispobj func, result;
 
     code = (struct code *)native_pointer(thing);
-    nwords = HeaderValue(code->header) + fixnum_value(code->code_size);
+    nwords = CEILING(HeaderValue(code->header) + fixnum_value(code->code_size),
+                     2);
 
     new = (struct code *)newspace_alloc(nwords,1); /* constant */
 
     bcopy(code, new, nwords * sizeof(lispobj));
 
-#ifdef LISP_FEATURE_X86
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
     apply_code_fixups_during_purify(code,new);
 #endif
 
@@ -749,7 +776,7 @@ ptrans_code(lispobj thing)
        src/compiler/target-disassem.lisp.  -- CSR, 2004-01-08 */
     if (!(fixnump(new->trace_table_offset)))
 #if 0
-       pscav(&new->trace_table_offset, 1, 0);
+        pscav(&new->trace_table_offset, 1, 0);
 #else
         new->trace_table_offset = NIL; /* limit lifetime */
 #endif
@@ -765,17 +792,17 @@ ptrans_code(lispobj thing)
         gc_assert(lowtag_of(func) == FUN_POINTER_LOWTAG);
         gc_assert(!dynamic_pointer_p(func));
 
-#ifdef LISP_FEATURE_X86
-       /* Temporarily convert the self pointer to a real function pointer. */
-       ((struct simple_fun *)native_pointer(func))->self
-           -= FUN_RAW_ADDR_OFFSET;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+        /* Temporarily convert the self pointer to a real function pointer. */
+        ((struct simple_fun *)native_pointer(func))->self
+            -= FUN_RAW_ADDR_OFFSET;
 #endif
         pscav(&((struct simple_fun *)native_pointer(func))->self, 2, 1);
-#ifdef LISP_FEATURE_X86
-       ((struct simple_fun *)native_pointer(func))->self
-           += FUN_RAW_ADDR_OFFSET;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+        ((struct simple_fun *)native_pointer(func))->self
+            += FUN_RAW_ADDR_OFFSET;
 #endif
-        pscav_later(&((struct simple_fun *)native_pointer(func))->name, 3);
+        pscav_later(&((struct simple_fun *)native_pointer(func))->name, 4);
     }
 
     return result;
@@ -784,7 +811,7 @@ ptrans_code(lispobj thing)
 static lispobj
 ptrans_func(lispobj thing, lispobj header)
 {
-    int nwords;
+    long nwords;
     lispobj code, *new, *old, result;
     struct simple_fun *function;
 
@@ -796,17 +823,17 @@ ptrans_func(lispobj thing, lispobj header)
 
     if (widetag_of(header) == SIMPLE_FUN_HEADER_WIDETAG) {
 
-       /* We can only end up here if the code object has not been
+        /* We can only end up here if the code object has not been
          * scavenged, because if it had been scavenged, forwarding pointers
          * would have been left behind for all the entry points. */
 
         function = (struct simple_fun *)native_pointer(thing);
         code =
-           make_lispobj
-           ((native_pointer(thing) -
-             (HeaderValue(function->header))), OTHER_POINTER_LOWTAG);
-       
-        /* This will cause the function's header to be replaced with a 
+            make_lispobj
+            ((native_pointer(thing) -
+              (HeaderValue(function->header))), OTHER_POINTER_LOWTAG);
+
+        /* This will cause the function's header to be replaced with a
          * forwarding pointer. */
 
         ptrans_code(code);
@@ -815,16 +842,16 @@ ptrans_func(lispobj thing, lispobj header)
         return function->header;
     }
     else {
-       /* It's some kind of closure-like thing. */
-        nwords = 1 + HeaderValue(header);
+        /* It's some kind of closure-like thing. */
+        nwords = CEILING(1 + HeaderValue(header), 2);
         old = (lispobj *)native_pointer(thing);
 
-       /* Allocate the new one.  FINs *must* not go in read_only
-        * space.  Closures can; they never change */
+        /* Allocate the new one.  FINs *must* not go in read_only
+         * space.  Closures can; they never change */
+
+        new = newspace_alloc
+            (nwords,(widetag_of(header)!=FUNCALLABLE_INSTANCE_HEADER_WIDETAG));
 
-       new = newspace_alloc
-           (nwords,(widetag_of(header)!=FUNCALLABLE_INSTANCE_HEADER_WIDETAG));
-            
         /* Copy it. */
         bcopy(old, new, nwords * sizeof(lispobj));
 
@@ -862,7 +889,7 @@ static lispobj
 ptrans_list(lispobj thing, boolean constant)
 {
     struct cons *old, *new, *orig;
-    int length;
+    long length;
 
     orig = (struct cons *) newspace_alloc(0,constant);
     length = 0;
@@ -870,7 +897,7 @@ ptrans_list(lispobj thing, boolean constant)
     do {
         /* Allocate a new cons cell. */
         old = (struct cons *)native_pointer(thing);
-       new = (struct cons *) newspace_alloc(WORDS_PER_CONS,constant);
+        new = (struct cons *) newspace_alloc(WORDS_PER_CONS,constant);
 
         /* Copy the cons cell and keep a pointer to the cdr. */
         new->car = old->car;
@@ -895,7 +922,7 @@ static lispobj
 ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
 {
     switch (widetag_of(header)) {
-       /* FIXME: this needs a reindent */
+        /* FIXME: this needs a reindent */
       case BIGNUM_WIDETAG:
       case SINGLE_FLOAT_WIDETAG:
       case DOUBLE_FLOAT_WIDETAG:
@@ -912,7 +939,12 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
       case COMPLEX_LONG_FLOAT_WIDETAG:
 #endif
       case SAP_WIDETAG:
-         return ptrans_unboxed(thing, header);
+          return ptrans_unboxed(thing, header);
+#ifdef LUTEX_WIDETAG
+      case LUTEX_WIDETAG:
+          gencgc_unregister_lutex(native_pointer(thing));
+          return ptrans_unboxed(thing, header);
+#endif
 
       case RATIO_WIDETAG:
       case COMPLEX_WIDETAG:
@@ -926,7 +958,7 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
       case COMPLEX_VECTOR_WIDETAG:
       case COMPLEX_ARRAY_WIDETAG:
         return ptrans_boxed(thing, header, constant);
-       
+
       case VALUE_CELL_HEADER_WIDETAG:
       case WEAK_POINTER_WIDETAG:
         return ptrans_boxed(thing, header, 0);
@@ -942,14 +974,14 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
 
 #ifdef SIMPLE_CHARACTER_STRING_WIDETAG
     case SIMPLE_CHARACTER_STRING_WIDETAG:
-       return ptrans_vector(thing, 32, 1, 0, constant);
+        return ptrans_vector(thing, 32, 1, 0, constant);
 #endif
 
       case SIMPLE_BIT_VECTOR_WIDETAG:
         return ptrans_vector(thing, 1, 0, 0, constant);
 
       case SIMPLE_VECTOR_WIDETAG:
-        return ptrans_vector(thing, 32, 0, 1, constant);
+        return ptrans_vector(thing, N_WORD_BITS, 0, 1, constant);
 
       case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG:
         return ptrans_vector(thing, 2, 0, 0, constant);
@@ -982,6 +1014,25 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
 #endif
         return ptrans_vector(thing, 32, 0, 0, constant);
 
+#if N_WORD_BITS == 64
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_60_WIDETAG
+      case SIMPLE_ARRAY_UNSIGNED_BYTE_60_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG
+      case SIMPLE_ARRAY_UNSIGNED_BYTE_63_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG
+      case SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_SIGNED_BYTE_61_WIDETAG
+      case SIMPLE_ARRAY_SIGNED_BYTE_61_WIDETAG:
+#endif
+#ifdef SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG
+      case SIMPLE_ARRAY_SIGNED_BYTE_64_WIDETAG:
+#endif
+        return ptrans_vector(thing, 64, 0, 0, constant);
+#endif
+
       case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG:
         return ptrans_vector(thing, 32, 0, 0, constant);
 
@@ -993,7 +1044,7 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
 #ifdef LISP_FEATURE_X86
         return ptrans_vector(thing, 96, 0, 0, constant);
 #endif
-#ifdef sparc
+#ifdef LISP_FEATURE_SPARC
         return ptrans_vector(thing, 128, 0, 0, constant);
 #endif
 #endif
@@ -1013,7 +1064,7 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
 #ifdef LISP_FEATURE_X86
         return ptrans_vector(thing, 192, 0, 0, constant);
 #endif
-#ifdef sparc
+#ifdef LISP_FEATURE_SPARC
         return ptrans_vector(thing, 256, 0, 0, constant);
 #endif
 #endif
@@ -1025,16 +1076,17 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant)
         return ptrans_returnpc(thing, header);
 
       case FDEFN_WIDETAG:
-       return ptrans_fdefn(thing, header);
+        return ptrans_fdefn(thing, header);
 
       default:
+        fprintf(stderr, "Invalid widetag: %d\n", widetag_of(header));
         /* Should only come across other pointers to the above stuff. */
         gc_abort();
-       return NIL;
+        return NIL;
     }
 }
 
-static int
+static long
 pscav_fdefn(struct fdefn *fdefn)
 {
     boolean fix_func;
@@ -1047,14 +1099,15 @@ pscav_fdefn(struct fdefn *fdefn)
     return sizeof(struct fdefn) / sizeof(lispobj);
 }
 
-#ifdef LISP_FEATURE_X86
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
 /* now putting code objects in static space */
-static int
+static long
 pscav_code(struct code*code)
 {
-    int nwords;
+    long nwords;
     lispobj func;
-    nwords = HeaderValue(code->header) + fixnum_value(code->code_size);
+    nwords = CEILING(HeaderValue(code->header) + fixnum_value(code->code_size),
+                     2);
 
     /* Arrange to scavenge the debug info later. */
     pscav_later(&code->debug_info, 1);
@@ -1070,18 +1123,18 @@ pscav_code(struct code*code)
         gc_assert(lowtag_of(func) == FUN_POINTER_LOWTAG);
         gc_assert(!dynamic_pointer_p(func));
 
-#ifdef LISP_FEATURE_X86
-       /* Temporarily convert the self pointer to a real function
-        * pointer. */
-       ((struct simple_fun *)native_pointer(func))->self
-           -= FUN_RAW_ADDR_OFFSET;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+        /* Temporarily convert the self pointer to a real function
+         * pointer. */
+        ((struct simple_fun *)native_pointer(func))->self
+            -= FUN_RAW_ADDR_OFFSET;
 #endif
         pscav(&((struct simple_fun *)native_pointer(func))->self, 2, 1);
-#ifdef LISP_FEATURE_X86
-       ((struct simple_fun *)native_pointer(func))->self
-           += FUN_RAW_ADDR_OFFSET;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+        ((struct simple_fun *)native_pointer(func))->self
+            += FUN_RAW_ADDR_OFFSET;
 #endif
-        pscav_later(&((struct simple_fun *)native_pointer(func))->name, 3);
+        pscav_later(&((struct simple_fun *)native_pointer(func))->name, 4);
     }
 
     return CEILING(nwords,2);
@@ -1089,10 +1142,10 @@ pscav_code(struct code*code)
 #endif
 
 static lispobj *
-pscav(lispobj *addr, int nwords, boolean constant)
+pscav(lispobj *addr, long nwords, boolean constant)
 {
     lispobj thing, *thingp, header;
-    int count = 0; /* (0 = dummy init value to stop GCC warning) */
+    long count = 0; /* (0 = dummy init value to stop GCC warning) */
     struct vector *vector;
 
     while (nwords > 0) {
@@ -1101,7 +1154,7 @@ pscav(lispobj *addr, int nwords, boolean constant)
             /* It's a pointer. Is it something we might have to move? */
             if (dynamic_pointer_p(thing)) {
                 /* Maybe. Have we already moved it? */
-               thingp = (lispobj *)native_pointer(thing);
+                thingp = (lispobj *)native_pointer(thing);
                 header = *thingp;
                 if (is_lisp_pointer(header) && forwarding_pointer_p(header))
                     /* Yep, so just copy the forwarding pointer. */
@@ -1134,7 +1187,12 @@ pscav(lispobj *addr, int nwords, boolean constant)
             }
             count = 1;
         }
-        else if (thing & 3) {  /* FIXME: 3?  not 2? */
+#if N_WORD_BITS == 64
+        else if (widetag_of(thing) == SINGLE_FLOAT_WIDETAG) {
+            count = 1;
+        }
+#endif
+        else if (thing & FIXNUM_TAG_MASK) {
             /* It's an other immediate. Maybe the header for an unboxed */
             /* object. */
             switch (widetag_of(thing)) {
@@ -1146,20 +1204,20 @@ pscav(lispobj *addr, int nwords, boolean constant)
 #endif
               case SAP_WIDETAG:
                 /* It's an unboxed simple object. */
-                count = HeaderValue(thing)+1;
+                count = CEILING(HeaderValue(thing)+1, 2);
                 break;
 
               case SIMPLE_VECTOR_WIDETAG:
-                 if (HeaderValue(thing) == subtype_VectorValidHashing) {
+                  if (HeaderValue(thing) == subtype_VectorValidHashing) {
                     *addr = (subtype_VectorMustRehash << N_WIDETAG_BITS) |
                         SIMPLE_VECTOR_WIDETAG;
-                 }
-                count = 1;
+                  }
+                count = 2;
                 break;
 
-             case SIMPLE_ARRAY_NIL_WIDETAG:
-               count = 2;
-               break;
+              case SIMPLE_ARRAY_NIL_WIDETAG:
+                count = 2;
+                break;
 
               case SIMPLE_BASE_STRING_WIDETAG:
                 vector = (struct vector *)addr;
@@ -1167,10 +1225,10 @@ pscav(lispobj *addr, int nwords, boolean constant)
                 break;
 
 #ifdef SIMPLE_CHARACTER_STRING_WIDETAG
-           case SIMPLE_CHARACTER_STRING_WIDETAG:
-               vector = (struct vector *)addr;
-               count = CEILING(NWORDS(fixnum_value(vector->length)+1,32)+2,2);
-               break;
+            case SIMPLE_CHARACTER_STRING_WIDETAG:
+                vector = (struct vector *)addr;
+                count = CEILING(NWORDS(fixnum_value(vector->length)+1,32)+2,2);
+                break;
 #endif
 
               case SIMPLE_BIT_VECTOR_WIDETAG:
@@ -1209,7 +1267,7 @@ pscav(lispobj *addr, int nwords, boolean constant)
               case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG:
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG
               case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG:
-             case SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG:
+              case SIMPLE_ARRAY_UNSIGNED_BYTE_29_WIDETAG:
 #endif
 #ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG
               case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG:
@@ -1236,7 +1294,8 @@ pscav(lispobj *addr, int nwords, boolean constant)
 
               case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG:
                 vector = (struct vector *)addr;
-                count = CEILING(fixnum_value(vector->length)+2,2);
+                count = CEILING(NWORDS(fixnum_value(vector->length), 32) + 2,
+                                2);
                 break;
 
               case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG:
@@ -1244,7 +1303,8 @@ pscav(lispobj *addr, int nwords, boolean constant)
               case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG:
 #endif
                 vector = (struct vector *)addr;
-                count = fixnum_value(vector->length)*2+2;
+                count = CEILING(NWORDS(fixnum_value(vector->length), 64) + 2,
+                                2);
                 break;
 
 #ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG
@@ -1253,7 +1313,7 @@ pscav(lispobj *addr, int nwords, boolean constant)
 #ifdef LISP_FEATURE_X86
                 count = fixnum_value(vector->length)*3+2;
 #endif
-#ifdef sparc
+#ifdef LISP_FEATURE_SPARC
                 count = fixnum_value(vector->length)*4+2;
 #endif
                 break;
@@ -1262,7 +1322,8 @@ pscav(lispobj *addr, int nwords, boolean constant)
 #ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG
               case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG:
                 vector = (struct vector *)addr;
-                count = fixnum_value(vector->length)*4+2;
+                count = CEILING(NWORDS(fixnum_value(vector->length), 128) + 2,
+                                2);
                 break;
 #endif
 
@@ -1272,17 +1333,17 @@ pscav(lispobj *addr, int nwords, boolean constant)
 #ifdef LISP_FEATURE_X86
                 count = fixnum_value(vector->length)*6+2;
 #endif
-#ifdef sparc
+#ifdef LISP_FEATURE_SPARC
                 count = fixnum_value(vector->length)*8+2;
 #endif
                 break;
 #endif
 
               case CODE_HEADER_WIDETAG:
-#ifndef LISP_FEATURE_X86
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
                 gc_abort(); /* no code headers in static space */
 #else
-               count = pscav_code((struct code*)addr);
+                count = pscav_code((struct code*)addr);
 #endif
                 break;
 
@@ -1291,35 +1352,46 @@ pscav(lispobj *addr, int nwords, boolean constant)
                 /* We should never hit any of these, 'cause they occur
                  * buried in the middle of code objects. */
                 gc_abort();
-               break;
+                break;
 
-#ifdef LISP_FEATURE_X86
-             case CLOSURE_HEADER_WIDETAG:
-             case FUNCALLABLE_INSTANCE_HEADER_WIDETAG:
-               /* The function self pointer needs special care on the
-                * x86 because it is the real entry point. */
-               {
-                 lispobj fun = ((struct closure *)addr)->fun
-                   - FUN_RAW_ADDR_OFFSET;
-                 pscav(&fun, 1, constant);
-                 ((struct closure *)addr)->fun = fun + FUN_RAW_ADDR_OFFSET;
-               }
-               count = 2;
-               break;
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+              case CLOSURE_HEADER_WIDETAG:
+                /* The function self pointer needs special care on the
+                 * x86 because it is the real entry point. */
+                {
+                  lispobj fun = ((struct closure *)addr)->fun
+                    - FUN_RAW_ADDR_OFFSET;
+                  pscav(&fun, 1, constant);
+                  ((struct closure *)addr)->fun = fun + FUN_RAW_ADDR_OFFSET;
+                }
+                count = 2;
+                break;
 #endif
 
               case WEAK_POINTER_WIDETAG:
                 /* Weak pointers get preserved during purify, 'cause I
-                * don't feel like figuring out how to break them. */
+                 * don't feel like figuring out how to break them. */
                 pscav(addr+1, 2, constant);
                 count = 4;
                 break;
 
-             case FDEFN_WIDETAG:
-               /* We have to handle fdefn objects specially, so we
-                * can fix up the raw function address. */
-               count = pscav_fdefn((struct fdefn *)addr);
-               break;
+              case FDEFN_WIDETAG:
+                /* We have to handle fdefn objects specially, so we
+                 * can fix up the raw function address. */
+                count = pscav_fdefn((struct fdefn *)addr);
+                break;
+
+              case INSTANCE_HEADER_WIDETAG:
+                {
+                    struct instance *instance = (struct instance *) addr;
+                    struct layout *layout
+                        = (struct layout *) native_pointer(instance->slots[0]);
+                    long nuntagged = fixnum_value(layout->n_untagged_slots);
+                    long nslots = HeaderValue(*addr);
+                    pscav(addr + 1, nslots - nuntagged, constant);
+                    count = CEILING(1 + nslots, 2);
+                }
+                break;
 
               default:
                 count = 1;
@@ -1342,16 +1414,16 @@ int
 purify(lispobj static_roots, lispobj read_only_roots)
 {
     lispobj *clean;
-    int count, i;
+    long count, i;
     struct later *laters, *next;
     struct thread *thread;
 
     if(all_threads->next) {
-       /* FIXME: there should be _some_ sensible error reporting 
-        * convention.  See following comment too */
-       fprintf(stderr,"Can't purify when more than one thread exists\n");
-       fflush(stderr);
-       return 0;
+        /* FIXME: there should be _some_ sensible error reporting
+         * convention.  See following comment too */
+        fprintf(stderr,"Can't purify when more than one thread exists\n");
+        fflush(stderr);
+        return 0;
     }
 
 #ifdef PRINTNOISE
@@ -1362,18 +1434,24 @@ purify(lispobj static_roots, lispobj read_only_roots)
     gc_alloc_update_all_page_tables();
 #endif
     for_each_thread(thread)
-       if (fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)) != 0) {
-       /* FIXME: 1. What does this mean? 2. It shouldn't be reporting
-        * its error simply by a. printing a string b. to stdout instead
-        * of stderr. */
+        if (fixnum_value(SymbolValue(FREE_INTERRUPT_CONTEXT_INDEX,thread)) != 0) {
+        /* FIXME: 1. What does this mean? 2. It shouldn't be reporting
+         * its error simply by a. printing a string b. to stdout instead
+         * of stderr. */
         printf(" Ack! Can't purify interrupt contexts. ");
         fflush(stdout);
         return 0;
     }
 
-#if defined(LISP_FEATURE_X86)
-    dynamic_space_free_pointer =
+#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64)
+    dynamic_space_purify_pointer =
       (lispobj*)SymbolValue(ALLOCATION_POINTER,0);
+#else
+#if defined(LISP_FEATURE_GENCGC)
+    dynamic_space_purify_pointer = get_alloc_pointer();
+#else
+    dynamic_space_purify_pointer = dynamic_space_free_pointer;
+#endif
 #endif
 
     read_only_end = read_only_free =
@@ -1386,12 +1464,12 @@ purify(lispobj static_roots, lispobj read_only_roots)
     fflush(stdout);
 #endif
 
-#if (defined(LISP_FEATURE_GENCGC) && defined(LISP_FEATURE_X86))
-    /* note this expects only one thread to be active.  We'd have to 
-     * stop all the others in the same way as GC does if we wanted 
+#if defined(LISP_FEATURE_GENCGC) && (defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
+    /* note this expects only one thread to be active.  We'd have to
+     * stop all the others in the same way as GC does if we wanted
      * PURIFY to work when >1 thread exists */
     setup_i386_stack_scav(((&static_roots)-2),
-                         ((void *)all_threads->control_stack_end));
+                          ((void *)all_threads->control_stack_end));
 #endif
 
     pscav(&static_roots, 1, 0);
@@ -1401,20 +1479,19 @@ purify(lispobj static_roots, lispobj read_only_roots)
     printf(" handlers");
     fflush(stdout);
 #endif
-    pscav((lispobj *) all_threads->interrupt_data->interrupt_handlers,
-          sizeof(all_threads->interrupt_data->interrupt_handlers)
-         / sizeof(lispobj),
+    pscav((lispobj *) interrupt_handlers,
+          sizeof(interrupt_handlers) / sizeof(lispobj),
           0);
 
 #ifdef PRINTNOISE
     printf(" stack");
     fflush(stdout);
 #endif
-#ifndef LISP_FEATURE_X86
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
     pscav((lispobj *)all_threads->control_stack_start,
-         current_control_stack_pointer - 
-         all_threads->control_stack_start,
-         0);
+          current_control_stack_pointer -
+          all_threads->control_stack_start,
+          0);
 #else
 #ifdef LISP_FEATURE_GENCGC
     pscav_i386_stack();
@@ -1425,21 +1502,23 @@ purify(lispobj static_roots, lispobj read_only_roots)
     printf(" bindings");
     fflush(stdout);
 #endif
-#if !defined(LISP_FEATURE_X86)
+#if !(defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64))
     pscav( (lispobj *)all_threads->binding_stack_start,
-         (lispobj *)current_binding_stack_pointer -
-          all_threads->binding_stack_start,
-         0);
+          (lispobj *)current_binding_stack_pointer -
+           all_threads->binding_stack_start,
+          0);
 #else
     for_each_thread(thread) {
-       pscav( (lispobj *)thread->binding_stack_start,
-              (lispobj *)SymbolValue(BINDING_STACK_POINTER,thread) -
-              (lispobj *)thread->binding_stack_start,
-         0);
-       pscav( (lispobj *) (thread+1),
-              fixnum_value(SymbolValue(FREE_TLS_INDEX,0)) -
-              (sizeof (struct thread))/(sizeof (lispobj)),
-         0);
+        pscav( (lispobj *)thread->binding_stack_start,
+               (lispobj *)SymbolValue(BINDING_STACK_POINTER,thread) -
+               (lispobj *)thread->binding_stack_start,
+          0);
+#ifdef LISP_FEATURE_SB_THREAD
+        pscav( (lispobj *) (thread+1),
+               fixnum_value(SymbolValue(FREE_TLS_INDEX,0)) -
+               (sizeof (struct thread))/(sizeof (lispobj)),
+          0);
+#endif
     }
 
 
@@ -1454,13 +1533,13 @@ purify(lispobj static_roots, lispobj read_only_roots)
      * please submit a patch. */
 #if 0
     if (SymbolValue(SCAVENGE_READ_ONLY_SPACE) != UNBOUND_MARKER_WIDETAG
-       && SymbolValue(SCAVENGE_READ_ONLY_SPACE) != NIL) {
+        && SymbolValue(SCAVENGE_READ_ONLY_SPACE) != NIL) {
       unsigned  read_only_space_size =
-         (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER) -
-         (lispobj *)READ_ONLY_SPACE_START;
+          (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER) -
+          (lispobj *)READ_ONLY_SPACE_START;
       fprintf(stderr,
-             "scavenging read only space: %d bytes\n",
-             read_only_space_size * sizeof(lispobj));
+              "scavenging read only space: %d bytes\n",
+              read_only_space_size * sizeof(lispobj));
       pscav( (lispobj *)READ_ONLY_SPACE_START, read_only_space_size, 0);
     }
 #endif
@@ -1486,7 +1565,7 @@ purify(lispobj static_roots, lispobj read_only_roots)
                     i++;
                 } else {
                     pscav(laters->u[i].ptr, 1, 1);
-               }
+                }
             }
             next = laters->next;
             free(laters);
@@ -1501,15 +1580,15 @@ purify(lispobj static_roots, lispobj read_only_roots)
 #endif
 
     os_zero((os_vm_address_t) current_dynamic_space,
-            (os_vm_size_t) DYNAMIC_SPACE_SIZE);
+            (os_vm_size_t) dynamic_space_size);
 
     /* Zero the stack. Note that the stack is also zeroed by SUB-GC
      * calling SCRUB-CONTROL-STACK - this zeros the stack on the x86. */
-#ifndef LISP_FEATURE_X86
+#if !defined(LISP_FEATURE_X86) && !defined(LISP_FEATURE_X86_64)
     os_zero((os_vm_address_t) current_control_stack_pointer,
             (os_vm_size_t)
-           ((all_threads->control_stack_end -
-             current_control_stack_pointer) * sizeof(lispobj)));
+            ((all_threads->control_stack_end -
+              current_control_stack_pointer) * sizeof(lispobj)));
 #endif
 
     /* It helps to update the heap free pointers so that free_heap can
@@ -1517,17 +1596,17 @@ purify(lispobj static_roots, lispobj read_only_roots)
     SetSymbolValue(READ_ONLY_SPACE_FREE_POINTER, (lispobj)read_only_free,0);
     SetSymbolValue(STATIC_SPACE_FREE_POINTER, (lispobj)static_free,0);
 
-#if !defined(ALLOCATION_POINTER)
-    dynamic_space_free_pointer = current_dynamic_space;
-    set_auto_gc_trigger(bytes_consed_between_gcs);
-#else
 #if defined LISP_FEATURE_GENCGC
     gc_free_heap();
 #else
-#error unsupported case /* in CMU CL, was "ibmrt using GC" */
-#endif
+    dynamic_space_free_pointer = current_dynamic_space;
+    set_auto_gc_trigger(bytes_consed_between_gcs);
 #endif
 
+    /* Blast away instruction cache */
+    os_flush_icache((os_vm_address_t)READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE);
+    os_flush_icache((os_vm_address_t)STATIC_SPACE_START, STATIC_SPACE_SIZE);
+
 #ifdef PRINTNOISE
     printf(" done]\n");
     fflush(stdout);