projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix attach_thread to allocate a TLS index for *gc-inhibit* if needed
[sbcl.git]
/
src
/
runtime
/
save.c
diff --git
a/src/runtime/save.c
b/src/runtime/save.c
index
8520eb9
..
d2f4f07
100644
(file)
--- a/
src/runtime/save.c
+++ b/
src/runtime/save.c
@@
-79,7
+79,7
@@
write_bytes_to_file(FILE * file, char *addr, long bytes, int compression)
{
if (compression == COMPRESSION_LEVEL_NONE) {
while (bytes > 0) {
{
if (compression == COMPRESSION_LEVEL_NONE) {
while (bytes > 0) {
- long count = fwrite(addr, 1, bytes, file);
+ sword_t count = fwrite(addr, 1, bytes, file);
if (count > 0) {
bytes -= count;
addr += count;
if (count > 0) {
bytes -= count;
addr += count;
@@
-190,14
+190,14
@@
output_space(FILE *file, int id, lispobj *addr, lispobj *end,
bytes = words * sizeof(lispobj);
bytes = words * sizeof(lispobj);
- printf("writing %lu bytes from the %s space at 0x%08lx\n",
- (unsigned long)bytes, names[id], (unsigned long)addr);
+ printf("writing %lu bytes from the %s space at 0x%p\n",
+ bytes, names[id], addr);
data = write_and_compress_bytes(file, (char *)addr, bytes, file_offset,
core_compression_level);
write_lispobj(data, file);
data = write_and_compress_bytes(file, (char *)addr, bytes, file_offset,
core_compression_level);
write_lispobj(data, file);
- write_lispobj((long)addr / os_vm_page_size, file);
+ write_lispobj((uword_t)addr / os_vm_page_size, file);
write_lispobj((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
}
write_lispobj((bytes + os_vm_page_size - 1) / os_vm_page_size, file);
}
@@
-309,12
+309,12
@@
save_to_filehandle(FILE *file, char *filename, lispobj init_function,
#ifdef LISP_FEATURE_GENCGC
{
#ifdef LISP_FEATURE_GENCGC
{
- size_t size = (last_free_page*sizeof(long)+os_vm_page_size-1)
+ size_t size = (last_free_page*sizeof(sword_t)+os_vm_page_size-1)
&~(os_vm_page_size-1);
&~(os_vm_page_size-1);
- unsigned long *data = calloc(size, 1);
+ uword_t *data = calloc(size, 1);
if (data) {
if (data) {
- unsigned long word;
- long offset;
+ uword_t word;
+ sword_t offset;
page_index_t i;
for (i = 0; i < last_free_page; i++) {
/* Thanks to alignment requirements, the two low bits
page_index_t i;
for (i = 0; i < last_free_page; i++) {
/* Thanks to alignment requirements, the two low bits