projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
don't close runtime dlhandle on Darwin
[sbcl.git]
/
src
/
runtime
/
coreparse.c
diff --git
a/src/runtime/coreparse.c
b/src/runtime/coreparse.c
index
0cc32a9
..
fefa834
100644
(file)
--- a/
src/runtime/coreparse.c
+++ b/
src/runtime/coreparse.c
@@
-14,6
+14,19
@@
* files for more information.
*/
* files for more information.
*/
+#include "sbcl.h"
+
+#ifndef LISP_FEATURE_WIN32
+#ifdef LISP_FEATURE_LINUX
+/* For madvise */
+#define _BSD_SOURCE
+#include <sys/mman.h>
+#undef _BSD_SOURCE
+#else
+#include <sys/mman.h>
+#endif
+#endif
+
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@
-23,16
+36,6
@@
#include <fcntl.h>
#include <unistd.h>
#include <fcntl.h>
#include <unistd.h>
-#include "sbcl.h"
-
-#ifndef LISP_FEATURE_WIN32
-#ifdef LISP_FEATURE_LINUX
-/* For madvise */
-# define _BSD_SOURCE
-#endif
-#include <sys/mman.h>
-#endif
-
#include "os.h"
#include "runtime.h"
#include "globals.h"
#include "os.h"
#include "runtime.h"
#include "globals.h"
@@
-511,7
+514,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
*
* The low bits of each word are allocation flags.
*/
*
* The low bits of each word are allocation flags.
*/
- if (word=data[i]) {
+ if ((word=data[i])) {
page_table[offset].region_start_offset = word & ~0x03;
page_table[offset].allocated = word & 0x03;
}
page_table[offset].region_start_offset = word & ~0x03;
page_table[offset].allocated = word & 0x03;
}
@@
-529,7
+532,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
}
ptr += remaining_len;
}
ptr += remaining_len;
- FSHOW((stderr, "/new ptr=0x%"WORD_FTMX"\n", ptr));
+ FSHOW((stderr, "/new ptr=0x%"WORD_FMTX"\n", ptr));
}
SHOW("about to free(header)");
free(header);
}
SHOW("about to free(header)");
free(header);