projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
0.8.19.25:
[sbcl.git]
/
src
/
runtime
/
coreparse.c
diff --git
a/src/runtime/coreparse.c
b/src/runtime/coreparse.c
index
e01bf33
..
a84bc6c
100644
(file)
--- a/
src/runtime/coreparse.c
+++ b/
src/runtime/coreparse.c
@@
-16,6
+16,7
@@
#include <stdio.h>
#include <stdlib.h>
#include <stdio.h>
#include <stdlib.h>
+#include <string.h>
#include <sys/file.h>
#include <sys/types.h>
#include <sys/stat.h>
#include <sys/file.h>
#include <sys/types.h>
#include <sys/stat.h>
@@
-89,10
+90,7
@@
process_directory(int fd, u32 *ptr, int count)
lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
}
#endif
lose("warning: core/runtime address mismatch: DYNAMIC_SPACE_START");
}
#endif
-/* FIXME: Should the conditional here be reg_ALLOC instead of
- * defined(LISP_FEATURE_X86)
- * ? */
-#if defined(LISP_FEATURE_X86)
+#if defined(ALLOCATION_POINTER)
SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
#else
dynamic_space_free_pointer = free_pointer;
SetSymbolValue(ALLOCATION_POINTER, (lispobj)free_pointer,0);
#else
dynamic_space_free_pointer = free_pointer;
@@
-126,7
+124,7
@@
process_directory(int fd, u32 *ptr, int count)
lispobj
load_core_file(char *file)
{
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;
int fd = open(file, O_RDONLY), count;
lispobj initial_function = NIL;