X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=1276c077fa3e36ffc94c689a023c6f17ae9e0a8d;hb=3bd7a97d1b11a2b0aee086ef211cae807f3dfc35;hp=64c495d27a754ee44630da3fded1feedae77b115;hpb=b19093fa94d6e1785abee99c35c9a610e8777671;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 64c495d..1276c07 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -15,12 +15,13 @@
  */
 
 #include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
 #include <sys/file.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #ifdef irix
 #include <fcntl.h>
-#include <stdlib.h>
 #endif
 
 #include "os.h"
@@ -32,7 +33,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;
 
@@ -67,23 +68,24 @@ process_directory(int fd, long *ptr, int count)
 	case DYNAMIC_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
 /* 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;
@@ -96,15 +98,15 @@ process_directory(int fd, long *ptr, int count)
 	    break;
 	case STATIC_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:
 	    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;