0.7.4.40:

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

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index f314449..e6f5e5b 100644 (file)
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -15,12 +15,15 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
 
 #ifdef irix
 #include <fcntl.h>
-#include <stdlib.h>
 #endif
 
 #include "os.h"
@@ -32,7 +35,7 @@
 #include "sbcl.h"
 
 static void
-process_directory(int fd, long *ptr, int count)
+process_directory(int fd, u32 *ptr, int count)
 {
     struct ndir_entry *entry;
 
@@ -64,19 +67,20 @@ process_directory(int fd, long *ptr, int count)
               id, (long)free_pointer));
 
        switch (id) {
-       case DYNAMIC_SPACE_ID:
+       case DYNAMIC_CORE_SPACE_ID:
 #ifdef GENCGC    
            if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) {
-               fprintf(stderr, "in core: 0x%x - in runtime: 0x%x \n",
-                       addr, (os_vm_address_t)DYNAMIC_SPACE_START);
+               fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx \n",
+                       (long)addr, (long)DYNAMIC_SPACE_START);
                lose("core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #else
            if ((addr != (os_vm_address_t)DYNAMIC_0_SPACE_START) &&
                (addr != (os_vm_address_t)DYNAMIC_1_SPACE_START)) {
-               fprintf(stderr, "in core: 0x%x - in runtime: 0x%x or 0x%x\n",
-                       addr, (os_vm_address_t)DYNAMIC_0_SPACE_START,
-                       (os_vm_address_t)DYNAMIC_1_SPACE_START);
+               fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx or 0x%lx\n",
+                       (long)addr,
+                       (long)DYNAMIC_0_SPACE_START,
+                       (long)DYNAMIC_1_SPACE_START);
                lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #endif
@@ -94,17 +98,17 @@ process_directory(int fd, long *ptr, int count)
             * addr==DYNAMIC_SPACE_START.) */
            current_dynamic_space = (lispobj *)addr;
            break;
-       case STATIC_SPACE_ID:
+       case STATIC_CORE_SPACE_ID:
            if (addr != (os_vm_address_t)STATIC_SPACE_START) {
-               fprintf(stderr, "in core: 0x%p - in runtime: 0x%x\n",
-                       addr, (os_vm_address_t)STATIC_SPACE_START);
+               fprintf(stderr, "in core: 0x%lx - in runtime: 0x%lx\n",
+                       (long)addr, (long)STATIC_SPACE_START);
                lose("core/runtime address mismatch: STATIC_SPACE_START");
            }
            break;
-       case READ_ONLY_SPACE_ID:
+       case READ_ONLY_CORE_SPACE_ID:
            if (addr != (os_vm_address_t)READ_ONLY_SPACE_START) {
-               fprintf(stderr, "in core: 0x%x - in runtime: 0x%x\n",
-                       addr, (os_vm_address_t)READ_ONLY_SPACE_START);
+               fprintf(stderr, "in core: 0x%lx - in runtime: 0x%lx\n",
+                       (long)addr, (long)READ_ONLY_SPACE_START);
                lose("core/runtime address mismatch: READ_ONLY_SPACE_START");
            }
            break;
@@ -146,7 +150,7 @@ load_core_file(char *file)
     }
     SHOW("found CORE_MAGIC");
 
-    while (val != CORE_END) {
+    while (val != END_CORE_ENTRY_TYPE_CODE) {
        val = *ptr++;
        len = *ptr++;
        remaining_len = len - 2; /* (-2 to cancel the two ++ operations) */
@@ -155,12 +159,12 @@ load_core_file(char *file)
 
        switch (val) {
 
-       case CORE_END:
-           SHOW("CORE_END case");
+       case END_CORE_ENTRY_TYPE_CODE:
+           SHOW("END_CORE_ENTRY_TYPE_CODE case");
            break;
 
-       case CORE_VERSION:
-           SHOW("CORE_VERSION case");
+       case VERSION_CORE_ENTRY_TYPE_CODE:
+           SHOW("VERSION_CORE_ENTRY_TYPE_CODE case");
            if (*ptr != SBCL_CORE_VERSION_INTEGER) {
                lose("core file version (%d) != runtime library version (%d)",
                     *ptr,
@@ -168,8 +172,8 @@ load_core_file(char *file)
            }
            break;
 
-       case CORE_NDIRECTORY:
-           SHOW("CORE_NDIRECTORY case");
+       case NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE:
+           SHOW("NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE case");
            process_directory(fd,
                              ptr,
 #ifndef alpha
@@ -182,8 +186,8 @@ load_core_file(char *file)
                              );
            break;
 
-       case CORE_INITIAL_FUNCTION:
-           SHOW("CORE_INITIAL_FUNCTION case");
+       case INITIAL_FUN_CORE_ENTRY_TYPE_CODE:
+           SHOW("INITIAL_FUN_CORE_ENTRY_TYPE_CODE case");
            initial_function = (lispobj)*ptr;
            break;