/* lutex stuff */
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
#include "genesis/sap.h"
+#include "pthread-lutex.h"
#endif
-unsigned char build_id[] =
+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",
struct lutex *lutex = lutexes_to_resurrect[i];
FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
- lutex_init(lutex);
+ lutex_init((tagged_lutex_t) lutex);
}
free(lutexes_to_resurrect);
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++;
}
}