Changeset 10726

Timestamp:

04/28/05 20:25:48 (4 years ago)

Author:

rtoy

Message:

Should close up any open alloc regions before purification. This bug
was mentioned by Dan Barlow on #lisp.

Files:

• trunk/src/lisp/purify.c (modified) (16 diffs)

trunk/src/lisp/purify.c

@@ -263 +263 @@
       if ((int)pointer != ((int)start_addr+type_FunctionPointer)) {
         if (pointer_filter_verbose)
-          fprintf(stderr,"*Wf2: %x %x %x\n", pointer, start_addr, *start_addr);
+          fprintf(stderr,"*Wf2: %p %p %lx\n", pointer, start_addr, *start_addr);
         return FALSE;
       }
@@ -269 +269 @@
     default:
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wf3: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wf3: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -276 +276 @@
     if ((int)pointer != ((int)start_addr+type_ListPointer)) {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wl1: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wl1: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -291 +291 @@
     else {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wl2: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wl2: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -297 +297 @@
     if ((int)pointer != ((int)start_addr+type_InstancePointer)) {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wi1: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wi1: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
     if (TypeOf(start_addr[0]) != type_InstanceHeader) {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wi2: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wi2: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -309 +309 @@
     if ((int)pointer != ((int)start_addr+type_OtherPointer)) {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo1: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo1: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -315 +315 @@
     if(Pointerp(start_addr[0]) || ((start_addr[0] & 3) == 0)) {
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo2: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo2: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -322 +322 @@
     case type_BaseChar:
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo3: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo3: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
       
@@ -332 +332 @@
     case type_DylanFunctionHeader:
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo4: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo4: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
       
     case type_InstanceHeader:
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo5: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo5: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
       
@@ -408 +408 @@
     default:
       if (pointer_filter_verbose)
-        fprintf(stderr,"*Wo6: %x %x %x\n", pointer, start_addr, *start_addr);
+        fprintf(stderr,"*Wo6: %p %p %lx\n", pointer, start_addr, *start_addr);
       return FALSE;
     }
@@ -414 +414 @@
   default:
     if (pointer_filter_verbose)
-      fprintf(stderr,"*W?: %x %x %x\n", pointer, start_addr, *start_addr);
+      fprintf(stderr,"*W?: %p %p %lx\n", pointer, start_addr, *start_addr);
     return FALSE;
   }
@@ -484 +484 @@
     pscav(&code_obj, 1, FALSE);
     if (pointer_filter_verbose)
-      fprintf(stderr, "*C moved RA %x to %x; for code object %x to %x\n",
+      fprintf(stderr, "*C moved RA %lx to %x; for code object %p to %lx\n",
               *valid_stack_ra_locations[i],
               (int) (*valid_stack_ra_locations[i])
@@ -592 +592 @@
       /* Copy it. */
       bcopy(old, new, nwords * sizeof(lispobj));
-      
+
       /* Deposit forwarding pointer. */
       result = (lispobj)new | LowtagOf(thing);
@@ -670 +670 @@
 
     vector = (struct vector *)PTR(thing);
+#ifdef __x86_64    
+    nwords = 2 + (CEILING((fixnum_value(vector->length)+extra)*bits,64)>>6);
+#else
     nwords = 2 + (CEILING((fixnum_value(vector->length)+extra)*bits,32)>>5);
+#endif
 
     if (boxed && !constant) {
@@ -743 +747 @@
        and apply a fixup at each address. */
     int length = fixnum_value(fixups_vector->length);
+    /* offset_vector still has 32-bit elements on amd64.
+       Eventually we will make this consistent with internals.h */
     unsigned int *offset_vector = fixups_vector->data;
     int i;
@@ -1018 +1024 @@
 
       case type_SimpleVector:
+#ifdef __x86_64    
+        return ptrans_vector(thing, 64, 0, TRUE, constant);
+#else
         return ptrans_vector(thing, 32, 0, TRUE, constant);
+#endif
 
       case type_SimpleArrayUnsignedByte2: