0.6.12.49:

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

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 75a32df..f314449 100644 (file)
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -69,7 +69,7 @@ process_directory(int fd, long *ptr, int count)
            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,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
+               lose("core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #else
            if ((addr != (os_vm_address_t)DYNAMIC_0_SPACE_START) &&
@@ -77,13 +77,13 @@ process_directory(int fd, long *ptr, int count)
                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,"warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
+               lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
            }
 #endif
 /* FIXME: Should the conditional here be reg_ALLOC instead of
- *   defined(ibmrt) || defined(__i386__)
+ *   defined(__i386__)
  * ? */
-#if defined(ibmrt) || defined(__i386__)
+#if defined(__i386__)
            SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer);
 #else
            dynamic_space_free_pointer = free_pointer;
@@ -117,20 +117,9 @@ process_directory(int fd, long *ptr, int count)
 lispobj
 load_core_file(char *file)
 {
+    u32 *header, val, len, *ptr, remaining_len;
     int fd = open(file, O_RDONLY), count;
 
-    /* KLUDGE: This kind of conditionalization everywhere that 32-bit
-     * ints are used is really nasty. It would be much nicer to define
-     * a typedef like addr_as_int once and for all in each
-     * architecture file, then use that everywhere. -- WHN 19990904 */
-#ifndef alpha
-    long *header,  val, len, *ptr;
-    long remaining_len;
-#else
-    u32 *header, val, len, *ptr;
-    u32 remaining_len;
-#endif
-
     lispobj initial_function = NIL;
     FSHOW((stderr, "/entering load_core_file(%s)\n", file));
     if (fd < 0) {