X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fcoreparse.c;h=6ac74bac77f88e1bd7779ac0794696ce46bcc239;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=e6f5e5bc91708506e0cae012d003dbb3155f8cd1;hpb=1bcf4fb22a25e713a0ab898d78abb97abe94c225;p=sbcl.git

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index e6f5e5b..6ac74ba 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -33,6 +33,11 @@
 #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)
@@ -68,7 +73,7 @@ process_directory(int fd, u32 *ptr, int count)
 
 	switch (id) {
 	case DYNAMIC_CORE_SPACE_ID:
-#ifdef GENCGC	  
+#ifdef LISP_FEATURE_GENCGC	  
 	    if (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);
@@ -85,10 +90,10 @@ process_directory(int fd, u32 *ptr, int count)
 	    }
 #endif
 /* FIXME: Should the conditional here be reg_ALLOC instead of
- *   defined(__i386__)
+ *   defined(LISP_FEATURE_X86)
  * ? */
-#if defined(__i386__)
-	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer);
+#if defined(LISP_FEATURE_X86)
+	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
 #else
 	    dynamic_space_free_pointer = free_pointer;
 #endif
@@ -172,6 +177,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,