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.7: fix argument quoting in run-sbcl.sh
[sbcl.git]
/
src
/
runtime
/
coreparse.c
diff --git
a/src/runtime/coreparse.c
b/src/runtime/coreparse.c
index
e7dbdfd
..
87891dc
100644
(file)
--- a/
src/runtime/coreparse.c
+++ b/
src/runtime/coreparse.c
@@
-38,6
+38,7
@@
/* lutex stuff */
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
#include "genesis/sap.h"
/* lutex stuff */
#if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX)
#include "genesis/sap.h"
+#include "pthread-lutex.h"
#endif
#endif
@@
-120,7
+121,7
@@
process_directory(int fd, lispobj *ptr, int count, os_vm_offset_t file_offset)
os_vm_address_t addr =
(os_vm_address_t) (os_vm_page_size * entry->address);
lispobj *free_pointer = (lispobj *) addr + entry->nwords;
os_vm_address_t addr =
(os_vm_address_t) (os_vm_page_size * entry->address);
lispobj *free_pointer = (lispobj *) addr + entry->nwords;
- long len = os_vm_page_size * entry->page_count;
+ unsigned long len = os_vm_page_size * entry->page_count;
if (len != 0) {
os_vm_address_t real_addr;
if (len != 0) {
os_vm_address_t real_addr;
@@
-198,7
+199,8
@@
lispobj
load_core_file(char *file, os_vm_offset_t file_offset)
{
lispobj *header, val, len, *ptr, remaining_len;
load_core_file(char *file, os_vm_offset_t file_offset)
{
lispobj *header, val, len, *ptr, remaining_len;
- int fd = open_binary(file, O_RDONLY), count;
+ int fd = open_binary(file, O_RDONLY);
+ unsigned int count;
lispobj initial_function = NIL;
FSHOW((stderr, "/entering load_core_file(%s)\n", file));
lispobj initial_function = NIL;
FSHOW((stderr, "/entering load_core_file(%s)\n", file));
@@
-252,7
+254,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
case BUILD_ID_CORE_ENTRY_TYPE_CODE:
SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case");
{
case BUILD_ID_CORE_ENTRY_TYPE_CODE:
SHOW("BUILD_ID_CORE_ENTRY_TYPE_CODE case");
{
- int i;
+ unsigned int i;
FSHOW((stderr, "build_id[]=\"%s\"\n", build_id));
FSHOW((stderr, "remaining_len = %d\n", remaining_len));
FSHOW((stderr, "build_id[]=\"%s\"\n", build_id));
FSHOW((stderr, "remaining_len = %d\n", remaining_len));
@@
-324,7
+326,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
struct lutex *lutex = lutexes_to_resurrect[i];
FSHOW((stderr, "re-init'ing lutex @ %p\n", lutex));
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);
}
free(lutexes_to_resurrect);
@@
-340,7
+342,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
size_t fdoffset = (*(ptr+1) + 1) * (os_vm_page_size);
size_t offset = 0;
long bytes_read;
size_t fdoffset = (*(ptr+1) + 1) * (os_vm_page_size);
size_t offset = 0;
long bytes_read;
- long data[4096];
+ unsigned long data[4096];
lseek(fd, fdoffset + file_offset, SEEK_SET);
while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 )))
> 0)
lseek(fd, fdoffset + file_offset, SEEK_SET);
while ((bytes_read = read(fd, data, (size < 4096 ? size : 4096 )))
> 0)
@@
-355,7
+357,7
@@
load_core_file(char *file, os_vm_offset_t file_offset)
* elements than the page table.
*/
if (data[i]) {
* elements than the page table.
*/
if (data[i]) {
- page_table[offset].first_object_offset = data[i];
+ page_table[offset].region_start_offset = data[i];
}
i++;
offset++;
}
i++;
offset++;