X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=d657bac7e96a488d3c021d003188e57772f27979;hb=975f1932acc3a8e90fb31d2b055bfbdde78ea927;hp=00598c570dfe5befa5b9d83f3d25c5d35f68cb02;hpb=1de12891f900d156ed035a097561ecd7755a256a;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 00598c5..d657bac 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -38,10 +38,11 @@
 /* lutex stuff */
 #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
 #include "genesis/sap.h"
+#include "pthread-lutex.h"
 #endif
 
 
-unsigned char build_id[] =
+char build_id[] =
 #include "../../output/build-id.tmp"
 ;
 
@@ -107,7 +108,7 @@ lose:
 }
 
 static void
-process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
+process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
 {
     struct ndir_entry *entry;
 
@@ -140,13 +141,13 @@ process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
 
         switch (id) {
         case DYNAMIC_CORE_SPACE_ID:
-	    if (len > dynamic_space_size) {
+            if (len > dynamic_space_size) {
                 fprintf(stderr,
                         "dynamic space too small for core: %ldKiB required, %ldKiB available.\n",
                         len >> 10,
                         (long)dynamic_space_size >> 10);
                 exit(1);
-            }		
+            }
 #ifdef LISP_FEATURE_GENCGC
             if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) {
                 fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx \n",
@@ -161,8 +162,8 @@ process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
                         (long)DYNAMIC_0_SPACE_START,
                         (long)DYNAMIC_1_SPACE_START);
                 lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START\n");
-            }	    
-#endif	    
+            }
+#endif
 #if defined(ALLOCATION_POINTER)
             SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
 #else
@@ -324,7 +325,7 @@ load_core_file(char *file, os_vm_offset_t file_offset)
                         struct lutex *lutex = lutexes_to_resurrect[i];
 
                         FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
-                        lutex_init(lutex);
+                        lutex_init((tagged_lutex_t) lutex);
                     }
 
                     free(lutexes_to_resurrect);
@@ -349,7 +350,16 @@ load_core_file(char *file, os_vm_offset_t file_offset)
                 size -= bytes_read;
                 while (bytes_read) {
                     bytes_read -= sizeof(long);
-                    page_table[offset++].first_object_offset = data[i++];
+                    /* Ignore all zeroes. The size of the page table
+                     * core entry was rounded up to os_vm_page_size
+                     * during the save, and might now have more
+                     * elements than the page table.
+                     */
+                    if (data[i]) {
+                        page_table[offset].first_object_offset = data[i];
+                    }
+                    i++;
+                    offset++;
                 }
             }