#include <fcntl.h>
#include <unistd.h>
-#ifdef irix
-#include <fcntl.h>
-#endif
-
#include "sbcl.h"
#include "os.h"
#include "runtime.h"
#include "validate.h"
#include "gc-internal.h"
+/* lutex stuff */
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
+#include "genesis/sap.h"
+#endif
+
+
unsigned char build_id[] =
#include "../../output/build-id.tmp"
;
}
static void
-process_directory(int fd, u32 *ptr, int count, os_vm_offset_t file_offset)
+process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
{
struct ndir_entry *entry;
switch (id) {
case DYNAMIC_CORE_SPACE_ID:
+ if (len > dynamic_space_size) {
+ fprintf(stderr,
+ "dynamic space too small for core: %ldKiB required, %ldKiB available.\n",
+ len >> 10,
+ (long)dynamic_space_size >> 10);
+ exit(1);
+ }
#ifdef LISP_FEATURE_GENCGC
if (addr != (os_vm_address_t)DYNAMIC_SPACE_START) {
fprintf(stderr, "in core: 0x%lx; in runtime: 0x%lx \n",
initial_function = (lispobj)*ptr;
break;
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
+ case LUTEX_TABLE_CORE_ENTRY_TYPE_CODE:
+ SHOW("LUTEX_TABLE_CORE_ENTRY_TYPE_CODE case");
+ {
+ size_t n_lutexes = *ptr;
+ size_t fdoffset = (*(ptr + 1) + 1) * (os_vm_page_size);
+ size_t data_length = n_lutexes * sizeof(struct sap *);
+ struct lutex **lutexes_to_resurrect = malloc(data_length);
+ long bytes_read;
+
+ lseek(fd, fdoffset + file_offset, SEEK_SET);
+
+ FSHOW((stderr, "attempting to read %ld lutexes from core\n", n_lutexes));
+ bytes_read = read(fd, lutexes_to_resurrect, data_length);
+
+ /* XXX */
+ if (bytes_read != data_length) {
+ lose("Could not read the lutex table");
+ }
+ else {
+ int i;
+
+ for (i=0; i<n_lutexes; ++i) {
+ struct lutex *lutex = lutexes_to_resurrect[i];
+
+ FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
+ lutex_init(lutex);
+ }
+
+ free(lutexes_to_resurrect);
+ }
+ break;
+ }
+#endif
+
#ifdef LISP_FEATURE_GENCGC
case PAGE_TABLE_CORE_ENTRY_TYPE_CODE:
{
size -= bytes_read;
while (bytes_read) {
bytes_read -= sizeof(long);
- page_table[offset++].first_object_offset = data[i++];
+ /* Ignore all zeroes. The size of the page table
+ * core entry was rounded up to os_vm_page_size
+ * during the save, and might now have more
+ * elements than the page table.
+ */
+ if (data[i]) {
+ page_table[offset].first_object_offset = data[i];
+ }
+ i++;
+ offset++;
}
}