X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=a84bc6cf3f03c1630c31dec7ebeb1af23244c6e0;hb=cf4cb9554515c59eddbde38d1cf236339c37f55f;hp=a00438cb76d4256d13541ac839ba2cbecec15ca0;hpb=cd2c70c8b5d4dcc62b968f5a9bedd3c9c8698e82;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index a00438c..a84bc6c 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -16,6 +16,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <sys/file.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -26,13 +27,14 @@
 #include <fcntl.h>
 #endif
 
+#include "sbcl.h"
 #include "os.h"
 #include "runtime.h"
 #include "globals.h"
 #include "core.h"
 #include "arch.h"
 #include "interr.h"
-#include "sbcl.h"
+#include "thread.h"
 
 unsigned char build_id[] =
 #include "../../output/build-id.tmp"
@@ -88,11 +90,8 @@ process_directory(int fd, u32 *ptr, int count)
 		lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
 	    }
 #endif
-/* FIXME: Should the conditional here be reg_ALLOC instead of
- *   defined(__i386__)
- * ? */
-#if defined(LISP_FEATURE_X86)
-	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer);
+#if defined(ALLOCATION_POINTER)
+	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
 #else
 	    dynamic_space_free_pointer = free_pointer;
 #endif
@@ -125,7 +124,7 @@ process_directory(int fd, u32 *ptr, int count)
 lispobj
 load_core_file(char *file)
 {
-    u32 *header, val, len, *ptr, remaining_len;
+    lispobj *header, val, len, *ptr, remaining_len;
     int fd = open(file, O_RDONLY), count;
 
     lispobj initial_function = NIL;
@@ -187,7 +186,7 @@ load_core_file(char *file)
 		    goto losing_build_id;
 		for (i = 0; i < remaining_len; ++i) {
 		    FSHOW((stderr, "ptr[%d] = char = %d, expected=%d\n",
-			   ptr[i], i, build_id[i]));
+			   i, ptr[i], build_id[i]));
 		    if (ptr[i] != build_id[i])
 			goto losing_build_id;
 		}