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

diff --git a/src/runtime/coreparse.c b/src/runtime/coreparse.c
index 1276c07..a00438c 100644
--- a/src/runtime/coreparse.c
+++ b/src/runtime/coreparse.c
@@ -18,6 +18,8 @@
 #include <stdlib.h>
 #include <sys/file.h>
 #include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
 #include <unistd.h>
 
 #ifdef irix
@@ -32,6 +34,10 @@
 #include "interr.h"
 #include "sbcl.h"
 
+unsigned char build_id[] =
+#include "../../output/build-id.tmp"
+;
+
 static void
 process_directory(int fd, u32 *ptr, int count)
 {
@@ -65,8 +71,8 @@ process_directory(int fd, u32 *ptr, int count)
 	       id, (long)free_pointer));
 
 	switch (id) {
-	case DYNAMIC_SPACE_ID:
-#ifdef GENCGC	  
+	case DYNAMIC_CORE_SPACE_ID:
+#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,7 +91,7 @@ process_directory(int fd, u32 *ptr, int count)
 /* FIXME: Should the conditional here be reg_ALLOC instead of
  *   defined(__i386__)
  * ? */
-#if defined(__i386__)
+#if defined(LISP_FEATURE_X86)
 	    SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer);
 #else
 	    dynamic_space_free_pointer = free_pointer;
@@ -96,14 +102,14 @@ process_directory(int fd, u32 *ptr, int count)
 	     * addr==DYNAMIC_SPACE_START.) */
 	    current_dynamic_space = (lispobj *)addr;
 	    break;
-	case STATIC_SPACE_ID:
+	case STATIC_CORE_SPACE_ID:
 	    if (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:
+	case READ_ONLY_CORE_SPACE_ID:
 	    if (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);
@@ -148,7 +154,7 @@ load_core_file(char *file)
     }
     SHOW("found CORE_MAGIC");
 
-    while (val != CORE_END) {
+    while (val != END_CORE_ENTRY_TYPE_CODE) {
 	val = *ptr++;
 	len = *ptr++;
 	remaining_len = len - 2; /* (-2 to cancel the two ++ operations) */
@@ -157,12 +163,12 @@ load_core_file(char *file)
 
 	switch (val) {
 
-	case CORE_END:
-	    SHOW("CORE_END case");
+	case END_CORE_ENTRY_TYPE_CODE:
+	    SHOW("END_CORE_ENTRY_TYPE_CODE case");
 	    break;
 
-	case CORE_VERSION:
-	    SHOW("CORE_VERSION case");
+	case VERSION_CORE_ENTRY_TYPE_CODE:
+	    SHOW("VERSION_CORE_ENTRY_TYPE_CODE case");
 	    if (*ptr != SBCL_CORE_VERSION_INTEGER) {
 		lose("core file version (%d) != runtime library version (%d)",
 		     *ptr,
@@ -170,8 +176,38 @@ load_core_file(char *file)
 	    }
 	    break;
 
-	case CORE_NDIRECTORY:
-	    SHOW("CORE_NDIRECTORY case");
+	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",
+			   ptr[i], 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,
 			      ptr,
 #ifndef alpha
@@ -184,8 +220,8 @@ load_core_file(char *file)
 			      );
 	    break;
 
-	case CORE_INITIAL_FUNCTION:
-	    SHOW("CORE_INITIAL_FUNCTION case");
+	case INITIAL_FUN_CORE_ENTRY_TYPE_CODE:
+	    SHOW("INITIAL_FUN_CORE_ENTRY_TYPE_CODE case");
 	    initial_function = (lispobj)*ptr;
 	    break;