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

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index b9bcddb..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,18 @@
 #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"
+;
 
 static void
 process_directory(int fd, u32 *ptr, int count)
@@ -84,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
@@ -121,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;
@@ -172,6 +175,36 @@ load_core_file(char *file)
 	    }
 	    break;
 
+	case BUILD_ID_CORE_ENTRY_TYPE_CODE:
+	    SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case");
+	    {
+		int i;
+
+		FSHOW((stderr, "build_id[]=\"%s\"\n", build_id));
+		FSHOW((stderr, "remaining_len = %d\n", remaining_len));
+		if (remaining_len != strlen(build_id))
+		    goto losing_build_id;
+		for (i = 0; i < remaining_len; ++i) {
+		    FSHOW((stderr, "ptr[%d] = char = %d, expected=%d\n",
+			   i, ptr[i], build_id[i]));
+		    if (ptr[i] != build_id[i])
+			goto losing_build_id;
+		}
+		break;
+	    losing_build_id:
+		/* .core files are not binary-compatible between
+		 * builds because we can't easily detect whether the
+		 * sources were patched between the time the
+		 * dumping-the-.core runtime was built and the time
+		 * that the loading-the-.core runtime was built.
+		 *
+		 * (We could easily detect whether version.lisp-expr
+		 * was changed, but people experimenting with patches
+		 * don't necessarily update version.lisp-expr.) */
+
+		lose("can't load .core for different runtime, sorry");
+	    } 
+
 	case NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE:
 	    SHOW("NEW_DIRECTORY_CORE_ENTRY_TYPE_CODE case");
 	    process_directory(fd,