*/
#include <stdio.h>
-#include <sys/types.h>
+#include <stdlib.h>
+#include <string.h>
#include <sys/file.h>
+#include <sys/types.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
#ifdef irix
#include <fcntl.h>
-#include <stdlib.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, long *ptr, int count)
+process_directory(int fd, u32 *ptr, int count)
{
struct ndir_entry *entry;
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%x - in runtime: 0x%x \n",
- addr, (os_vm_address_t)DYNAMIC_SPACE_START);
- fprintf(stderr,"warning: core/runtime address mismatch: 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,"warning: core/runtime address mismatch: DYNAMIC_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__)
- * ? */
-#if defined(ibmrt) || defined(__i386__)
- 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
* 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%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:
+ case READ_ONLY_CORE_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;
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;
}
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) */
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,
}
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",
+ 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,
ptr,
#ifndef alpha
);
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;
projects / sbcl.git / blobdiff