projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
1.0.21.6: muffle compiler notes from EVAL and function generator construction
[sbcl.git]
/
src
/
runtime
/
save.c
diff --git
a/src/runtime/save.c
b/src/runtime/save.c
index
33f7e36
..
51c01a1
100644
(file)
--- a/
src/runtime/save.c
+++ b/
src/runtime/save.c
@@
-34,7
+34,7
@@
#include "genesis/static-symbols.h"
#include "genesis/symbol.h"
#include "genesis/static-symbols.h"
#include "genesis/symbol.h"
-#ifdef LISP_FEATURE_SB_LUTEX
+#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
#include "genesis/lutex.h"
#endif
#include "genesis/lutex.h"
#endif
@@
-170,8
+170,8
@@
output_space(FILE *file, int id, lispobj *addr, lispobj *end, os_vm_offset_t fil
scan_for_lutexes((char *)addr, words);
#endif
scan_for_lutexes((char *)addr, words);
#endif
- printf("writing %ld bytes from the %s space at 0x%08lx\n",
- bytes, names[id], (unsigned long)addr);
+ printf("writing %lu bytes from the %s space at 0x%08lx\n",
+ (unsigned long)bytes, names[id], (unsigned long)addr);
data = write_bytes(file, (char *)addr, bytes, file_offset);
data = write_bytes(file, (char *)addr, bytes, file_offset);
@@
-230,7
+230,7
@@
save_to_filehandle(FILE *file, char *filename, lispobj init_function,
file);
{
unsigned char *p;
file);
{
unsigned char *p;
- for (p = build_id; *p; ++p)
+ for (p = (unsigned char *)build_id; *p; ++p)
write_lispobj(*p, file);
}
write_lispobj(*p, file);
}
@@
-283,12
+283,12
@@
save_to_filehandle(FILE *file, char *filename, lispobj init_function,
{
size_t size = (last_free_page*sizeof(long)+os_vm_page_size-1)
&~(os_vm_page_size-1);
{
size_t size = (last_free_page*sizeof(long)+os_vm_page_size-1)
&~(os_vm_page_size-1);
- long *data = calloc(size, 1);
+ unsigned long *data = calloc(size, 1);
if (data) {
long offset;
int i;
for (i = 0; i < last_free_page; i++) {
if (data) {
long offset;
int i;
for (i = 0; i < last_free_page; i++) {
- data[i] = page_table[i].first_object_offset;
+ data[i] = page_table[i].region_start_offset;
}
write_lispobj(PAGE_TABLE_CORE_ENTRY_TYPE_CODE, file);
write_lispobj(4, file);
}
write_lispobj(PAGE_TABLE_CORE_ENTRY_TYPE_CODE, file);
write_lispobj(4, file);
@@
-302,7
+302,7
@@
save_to_filehandle(FILE *file, char *filename, lispobj init_function,
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
if(n_lutexes > 0) {
long offset;
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
if(n_lutexes > 0) {
long offset;
- printf("writing %d lutexes to the core...\n", n_lutexes);
+ printf("writing %ld lutexes to the core...\n", n_lutexes);
write_lispobj(LUTEX_TABLE_CORE_ENTRY_TYPE_CODE, file);
/* word count of the entry */
write_lispobj(4, file);
write_lispobj(LUTEX_TABLE_CORE_ENTRY_TYPE_CODE, file);
/* word count of the entry */
write_lispobj(4, file);