From 4fa6bd72374a1f1a715cfcac618f54ab4cb6b689 Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Tue, 30 Mar 2004 12:24:46 +0000 Subject: [PATCH] 0.8.9.9: "more warnings fixes" (Perry E. Metzger sbcl-devel 2004-03-29) ... except with s/GENCGC/X86/ for fun_header and return_pc_header scav functions --- src/runtime/gc-common.c | 4 ++++ src/runtime/gencgc.c | 5 +++-- src/runtime/interrupt.c | 6 ++++-- src/runtime/purify.c | 3 ++- src/runtime/thread.c | 2 +- version.lisp-expr | 2 +- 6 files changed, 15 insertions(+), 7 deletions(-) diff --git a/src/runtime/gc-common.c b/src/runtime/gc-common.c index 26bc938..a3e7366 100644 --- a/src/runtime/gc-common.c +++ b/src/runtime/gc-common.c @@ -395,6 +395,7 @@ size_code_header(lispobj *where) return nwords; } +#ifndef LISP_FEATURE_X86 static int scav_return_pc_header(lispobj *where, lispobj object) { @@ -403,6 +404,7 @@ scav_return_pc_header(lispobj *where, lispobj object) (unsigned long) object); return 0; /* bogus return value to satisfy static type checking */ } +#endif /* LISP_FEATURE_X86 */ static lispobj trans_return_pc_header(lispobj object) @@ -447,6 +449,7 @@ scav_closure_header(lispobj *where, lispobj object) } #endif +#ifndef LISP_FEATURE_X86 static int scav_fun_header(lispobj *where, lispobj object) { @@ -455,6 +458,7 @@ scav_fun_header(lispobj *where, lispobj object) (unsigned long) object); return 0; /* bogus return value to satisfy static type checking */ } +#endif /* LISP_FEATURE_X86 */ static lispobj trans_fun_header(lispobj object) diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index 2b56009..092a201 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -295,7 +295,7 @@ count_generation_pages(int generation) return count; } -/* Count the number of dont_move pages. */ +#if QSHOW static int count_dont_move_pages(void) { @@ -308,6 +308,7 @@ count_dont_move_pages(void) } return count; } +#endif /* QSHOW */ /* Work through the pages and add up the number of bytes used for the * given generation. */ @@ -3518,8 +3519,8 @@ garbage_collect_generation(int generation, int raise) for_each_thread(th) { void **ptr; void **esp=(void **)-1; - int i,free; #ifdef LISP_FEATURE_SB_THREAD + int i,free; if(th==arch_os_get_current_thread()) { esp = (void **) &raise; } else { diff --git a/src/runtime/interrupt.c b/src/runtime/interrupt.c index 7f26e76..efd81bb 100644 --- a/src/runtime/interrupt.c +++ b/src/runtime/interrupt.c @@ -612,9 +612,11 @@ extern lispobj call_into_lisp(lispobj fun, lispobj *args, int nargs); extern void post_signal_tramp(void); void arrange_return_to_lisp_function(os_context_t *context, lispobj function) { +#ifndef LISP_FEATURE_X86 void * fun=native_pointer(function); - char *code = &(((struct simple_fun *) fun)->code); - + void *code = &(((struct simple_fun *) fun)->code); +#endif + /* Build a stack frame showing `interrupted' so that the * user's backtrace makes (as much) sense (as usual) */ #ifdef LISP_FEATURE_X86 diff --git a/src/runtime/purify.c b/src/runtime/purify.c index 2d87694..f64e290 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -113,7 +113,8 @@ dynamic_pointer_p(lispobj ptr) #endif } -static inline newspace_alloc(int nwords, int constantp) +static inline lispobj * +newspace_alloc(int nwords, int constantp) { lispobj *ret; nwords=CEILING(nwords,2); diff --git a/src/runtime/thread.c b/src/runtime/thread.c index 3cfab33..83c9e72 100644 --- a/src/runtime/thread.c +++ b/src/runtime/thread.c @@ -204,7 +204,7 @@ void link_thread(struct thread *th,pid_t kid_pid) th->pid=kid_pid; /* child will not start until this is set */ } -pid_t create_initial_thread(lispobj initial_function) { +void create_initial_thread(lispobj initial_function) { struct thread *th=create_thread_struct(initial_function); pid_t kid_pid=getpid(); if(th && kid_pid>0) { diff --git a/version.lisp-expr b/version.lisp-expr index e880698..1a1c21e 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.9.8" +"0.8.9.9" -- 1.7.10.4