From e0697854ef9f4999c8585b64be1b282ce4725176 Mon Sep 17 00:00:00 2001 From: Nathan Froyd Date: Fri, 6 Aug 2004 15:37:35 +0000 Subject: [PATCH] 0.8.13.32: Various C fixes, mostly to make gcc a little quieter --- src/runtime/alloc.h | 1 + src/runtime/gencgc-internal.h | 4 ++++ src/runtime/gencgc.c | 2 -- src/runtime/interr.c | 6 +++--- src/runtime/ppc-arch.c | 1 - src/runtime/thread.h | 2 +- version.lisp-expr | 2 +- 7 files changed, 10 insertions(+), 8 deletions(-) diff --git a/src/runtime/alloc.h b/src/runtime/alloc.h index fe7aef3..361d5cb 100644 --- a/src/runtime/alloc.h +++ b/src/runtime/alloc.h @@ -18,5 +18,6 @@ extern lispobj alloc_cons(lispobj car, lispobj cdr); extern lispobj alloc_number(long n); extern lispobj alloc_string(char *str); extern lispobj alloc_sap(void *ptr); +extern lispobj alloc_base_string(char *str); #endif /* _ALLOC_H_ */ diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h index c130b57..cca1602 100644 --- a/src/runtime/gencgc-internal.h +++ b/src/runtime/gencgc-internal.h @@ -87,6 +87,7 @@ struct page { extern struct page page_table[NUM_PAGES]; +/* forward declarations */ void sniff_code_object(struct code *code, unsigned displacement); void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code); @@ -94,6 +95,9 @@ void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code); int update_x86_dynamic_space_free_pointer(void); void gc_alloc_update_page_tables(int unboxed, struct alloc_region *alloc_region); +void gc_alloc_update_all_page_tables(void); +void gc_set_region_empty(struct alloc_region *region); + /* * predicates */ diff --git a/src/runtime/gencgc.c b/src/runtime/gencgc.c index bdf74f3..7ebb353 100644 --- a/src/runtime/gencgc.c +++ b/src/runtime/gencgc.c @@ -49,8 +49,6 @@ void do_pending_interrupt(void); /* forward declarations */ int gc_find_freeish_pages(int *restart_page_ptr, int nbytes, int unboxed); -void gc_set_region_empty(struct alloc_region *region); -void gc_alloc_update_all_page_tables(void); static void gencgc_pickup_dynamic(void); boolean interrupt_maybe_gc_int(int, siginfo_t *, void *); diff --git a/src/runtime/interr.c b/src/runtime/interr.c index 5734ac1..ba6d54d 100644 --- a/src/runtime/interr.c +++ b/src/runtime/interr.c @@ -136,13 +136,13 @@ describe_internal_error(os_context_t *context) #ifdef sc_WordPointerReg case sc_WordPointerReg: #endif - printf("\t0x%08x\n", *os_context_register_addr(context, offset)); + printf("\t0x%08lx\n", *os_context_register_addr(context, offset)); break; case sc_SignedReg: - printf("\t%d\n", *os_context_register_addr(context, offset)); + printf("\t%ld\n", *os_context_register_addr(context, offset)); break; case sc_UnsignedReg: - printf("\t%u\n", *os_context_register_addr(context, offset)); + printf("\t%lu\n", *os_context_register_addr(context, offset)); break; #ifdef sc_SingleFloatReg case sc_SingleFloatReg: diff --git a/src/runtime/ppc-arch.c b/src/runtime/ppc-arch.c index aa8a522..a8df962 100644 --- a/src/runtime/ppc-arch.c +++ b/src/runtime/ppc-arch.c @@ -2,7 +2,6 @@ #include "sbcl.h" #include "arch.h" -#include "sbcl.h" #include "globals.h" #include "validate.h" #include "os.h" diff --git a/src/runtime/thread.h b/src/runtime/thread.h index 825c412..a4318fe 100644 --- a/src/runtime/thread.h +++ b/src/runtime/thread.h @@ -119,6 +119,6 @@ static inline struct thread *arch_os_get_current_thread() { int arch_os_thread_init(struct thread *thread); -extern struct thread *arch_os_get_current_thread(); +extern void create_initial_thread(lispobj); #endif /* _INCLUDE_THREAD_H_ */ diff --git a/version.lisp-expr b/version.lisp-expr index 87b4d6a..ea223e7 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.13.31" +"0.8.13.32" -- 1.7.10.4