From 864c24bdd0abbf86dd35529c79657c9ed3db62ac Mon Sep 17 00:00:00 2001 From: Carl Shapiro <cshapiro@common-lisp.net> Date: Sun, 11 Aug 2013 00:21:33 -0700 Subject: [PATCH] Fix compiler warnings in the runtime. --- src/lisp/Darwin-os.c | 4 ---- src/lisp/FreeBSD-os.c | 4 ---- src/lisp/Linux-os.c | 4 ---- src/lisp/NetBSD-os.c | 4 ---- src/lisp/OpenBSD-os.c | 5 ----- src/lisp/elf.c | 3 +-- src/lisp/interrupt.c | 4 +++- src/lisp/search.c | 3 +-- src/lisp/solaris-os.c | 5 ----- 9 files changed, 5 insertions(+), 31 deletions(-) diff --git a/src/lisp/Darwin-os.c b/src/lisp/Darwin-os.c index c18d47fb5..693cbf672 100644 --- a/src/lisp/Darwin-os.c +++ b/src/lisp/Darwin-os.c @@ -484,10 +484,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - if (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) || in_range_p(addr, STATIC_SPACE_START, static_space_size) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) diff --git a/src/lisp/FreeBSD-os.c b/src/lisp/FreeBSD-os.c index e42ea5b6f..51c295b3f 100644 --- a/src/lisp/FreeBSD-os.c +++ b/src/lisp/FreeBSD-os.c @@ -218,10 +218,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - if (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) || in_range_p(addr, STATIC_SPACE_START, static_space_size) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) diff --git a/src/lisp/Linux-os.c b/src/lisp/Linux-os.c index cbd25fd1a..7f7a4d7ac 100644 --- a/src/lisp/Linux-os.c +++ b/src/lisp/Linux-os.c @@ -381,10 +381,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - if (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) || in_range_p(addr, STATIC_SPACE_START, static_space_size) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) diff --git a/src/lisp/NetBSD-os.c b/src/lisp/NetBSD-os.c index e73d693b2..7b73529de 100644 --- a/src/lisp/NetBSD-os.c +++ b/src/lisp/NetBSD-os.c @@ -271,10 +271,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - if (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) || in_range_p(addr, STATIC_SPACE_START, static_space_size) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) diff --git a/src/lisp/OpenBSD-os.c b/src/lisp/OpenBSD-os.c index 088d96a1b..20acdf51c 100644 --- a/src/lisp/OpenBSD-os.c +++ b/src/lisp/OpenBSD-os.c @@ -143,11 +143,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - int ret; - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - if (in_range_p(addr, READ_ONLY_SPACE_START, READ_ONLY_SPACE_SIZE) || in_range_p(addr, STATIC_SPACE_START, STATIC_SPACE_SIZE) || in_range_p(addr, DYNAMIC_0_SPACE_START, dynamic_space_size) diff --git a/src/lisp/elf.c b/src/lisp/elf.c index 16e519635..130795ec7 100644 --- a/src/lisp/elf.c +++ b/src/lisp/elf.c @@ -247,8 +247,7 @@ write_string_section(int fd) int ret; if(buffer == NULL) { - - write(0, "Out of memory in write_string_section()\n", 40); + perror("Out of memory in write_string_section()"); ret = -1; } else { diff --git a/src/lisp/interrupt.c b/src/lisp/interrupt.c index f03e27ef0..a87bc579a 100644 --- a/src/lisp/interrupt.c +++ b/src/lisp/interrupt.c @@ -244,7 +244,9 @@ interrupt_handle_now_handler(HANDLER_ARGS) void interrupt_handle_now(HANDLER_ARGS) { +#if !(defined(i386) || defined(__x86_64)) int were_in_lisp; +#endif ucontext_t *ucontext = (ucontext_t *) context; union interrupt_handler handler; @@ -256,8 +258,8 @@ interrupt_handle_now(HANDLER_ARGS) return; SAVE_CONTEXT(); - /**/ were_in_lisp = !foreign_function_call_active; #if ! (defined(i386) || defined(_x86_64)) + were_in_lisp = !foreign_function_call_active; if (were_in_lisp) #endif fake_foreign_function_call(context); diff --git a/src/lisp/search.c b/src/lisp/search.c index 234207e3a..6b7c8550f 100644 --- a/src/lisp/search.c +++ b/src/lisp/search.c @@ -14,12 +14,11 @@ boolean search_for_type(int type, lispobj ** start, int *count) { - lispobj obj, *addr; + lispobj obj; while ((*count == -1 || (*count > 0)) && valid_addr((os_vm_address_t) * start)) { obj = **start; - addr = *start; if (*count != -1) *count -= 2; diff --git a/src/lisp/solaris-os.c b/src/lisp/solaris-os.c index b28c3cc95..e3647f7e0 100644 --- a/src/lisp/solaris-os.c +++ b/src/lisp/solaris-os.c @@ -185,11 +185,6 @@ in_range_p(os_vm_address_t a, lispobj sbeg, size_t slen) boolean valid_addr(os_vm_address_t addr) { - /* Stolen from Linux-os.c */ - os_vm_address_t newaddr; - - newaddr = os_trunc_to_page(addr); - /* Just assume address is valid if it lies within one of the known spaces. (Unlike sunos-os which keeps track of every valid page.) */ return (in_range_p(addr, READ_ONLY_SPACE_START, read_only_space_size) -- GitLab