1.0.14.38: build runtime with -Wsign-compare, and clean warnings on x86/Linux

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

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 354040b..ec5a100 100644 (file)
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -35,6 +35,13 @@
 #include "validate.h"
 #include "gc-internal.h"
 
+/* 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[] =
 #include "../../output/build-id.tmp"
 ;
@@ -101,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;
 
@@ -114,7 +121,7 @@ process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
         os_vm_address_t addr =
             (os_vm_address_t) (os_vm_page_size * entry->address);
         lispobj *free_pointer = (lispobj *) addr + entry->nwords;
-        long len = os_vm_page_size * entry->page_count;
+        unsigned long len = os_vm_page_size * entry->page_count;
 
         if (len != 0) {
             os_vm_address_t real_addr;
@@ -134,6 +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) {
+                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",
@@ -185,7 +199,8 @@ lispobj
 load_core_file(char *file, os_vm_offset_t file_offset)
 {
     lispobj *header, val, len, *ptr, remaining_len;
-    int fd = open_binary(file, O_RDONLY), count;
+    int fd = open_binary(file, O_RDONLY);
+    unsigned int count;
 
     lispobj initial_function = NIL;
     FSHOW((stderr, "/entering load_core_file(%s)\n", file));
@@ -239,7 +254,7 @@ load_core_file(char *file, os_vm_offset_t file_offset)
         case BUILD_ID_CORE_ENTRY_TYPE_CODE:
             SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case");
             {
-                int i;
+                unsigned int i;
 
                 FSHOW((stderr, "build_id[]=\"%s\"\n", build_id));
                 FSHOW((stderr, "remaining_len = %d\n", remaining_len));
@@ -285,6 +300,41 @@ load_core_file(char *file, os_vm_offset_t file_offset)
             initial_function = (lispobj)*ptr;
             break;
 
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
+        case LUTEX_TABLE_CORE_ENTRY_TYPE_CODE:
+            SHOW("LUTEX_TABLE_CORE_ENTRY_TYPE_CODE case");
+            {
+                size_t n_lutexes = *ptr;
+                size_t fdoffset = (*(ptr + 1) + 1) * (os_vm_page_size);
+                size_t data_length = n_lutexes * sizeof(struct sap *);
+                struct lutex **lutexes_to_resurrect = malloc(data_length);
+                long bytes_read;
+
+                lseek(fd, fdoffset + file_offset, SEEK_SET);
+
+                FSHOW((stderr, "attempting to read %ld lutexes from core\n", n_lutexes));
+                bytes_read = read(fd, lutexes_to_resurrect, data_length);
+
+                /* XXX */
+                if (bytes_read != data_length) {
+                    lose("Could not read the lutex table");
+                }
+                else {
+                    int i;
+
+                    for (i=0; i<n_lutexes; ++i) {
+                        struct lutex *lutex = lutexes_to_resurrect[i];
+
+                        FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
+                        lutex_init((tagged_lutex_t) lutex);
+                    }
+
+                    free(lutexes_to_resurrect);
+                }
+                break;
+            }
+#endif
+
 #ifdef LISP_FEATURE_GENCGC
         case PAGE_TABLE_CORE_ENTRY_TYPE_CODE:
         {
@@ -301,7 +351,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++;
                 }
             }