Menu
▾
▴
[Sbcl-commits] CVS: sbcl/src/runtime alloc.c, 1.25, 1.26 alloc.h, 1.5, 1.6 backtrace.c, 1.32, 1.33 bsd-os.c, 1.47, 1.48 core.h, 1.9, 1.10 coreparse.c, 1.37, 1.38 darwin-langinfo.c, 1.1, 1.2 darwin-os.c, 1.3, 1.4 gencgc.c, 1.113, 1.114 interr.c, 1.21, 1.22 interrupt.c, 1.131, 1.132 interrupt.h, 1.30, 1.31 largefile.c, 1.3, 1.4 ppc-arch.c, 1.25, 1.26 ppc-arch.h, 1.4, 1.5 ppc-darwin-os.c, 1.8, 1.9 pseudo-atomic.h, 1.1, 1.2 pthread-lutex.c, 1.4, 1.5 purify.c, 1.68, 1.69 save.c, 1.29, 1.30 validate.c, 1.31, 1.32 x86-64-arch.c, 1.20, 1.21 x86-64-arch.h, 1.9, 1.10 x86-arch.h, 1.13, 1.14
Update of /cvsroot/sbcl/sbcl/src/runtime In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv6132/src/runtime Modified Files: alloc.c alloc.h backtrace.c bsd-os.c core.h coreparse.c darwin-langinfo.c darwin-os.c gencgc.c interr.c interrupt.c interrupt.h largefile.c ppc-arch.c ppc-arch.h ppc-darwin-os.c pseudo-atomic.h pthread-lutex.c purify.c save.c validate.c x86-64-arch.c x86-64-arch.h x86-arch.h Log Message: 1.0.6.51: clean up compiler warnings in the runtime * Patch by Robert Brown. Index: alloc.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/alloc.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- alloc.c 22 Feb 2006 12:11:27 -0000 1.25 +++ alloc.c 18 Jun 2007 16:18:34 -0000 1.26 @@ -61,13 +61,13 @@ #ifdef LISP_FEATURE_STACK_GROWS_DOWNWARD_NOT_UPWARD #error "!C_STACK_IS_CONTROL_STACK and STACK_GROWS_DOWNWARD_NOT_UPWARD is not supported" #endif - *current_control_stack_pointer = result; + *current_control_stack_pointer = (lispobj) result; current_control_stack_pointer += 1; #endif do_pending_interrupt(); #ifndef LISP_FEATURE_C_STACK_IS_CONTROL_STACK current_control_stack_pointer -= 1; - result = *current_control_stack_pointer; + result = (lispobj *) *current_control_stack_pointer; #endif } #else Index: alloc.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/alloc.h,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- alloc.h 10 Aug 2004 00:20:46 -0000 1.5 +++ alloc.h 18 Jun 2007 16:18:34 -0000 1.6 @@ -15,6 +15,10 @@ #include "sbcl.h" #include "runtime.h" +#ifdef LISP_FEATURE_GENCGC +extern lispobj *alloc(int bytes); +#endif + extern lispobj alloc_cons(lispobj car, lispobj cdr); extern lispobj alloc_number(long n); extern lispobj alloc_string(char *str); Index: backtrace.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/backtrace.c,v retrieving revision 1.32 retrieving revision 1.33 diff -u -d -r1.32 -r1.33 --- backtrace.c 17 Apr 2007 19:16:54 -0000 1.32 +++ backtrace.c 18 Jun 2007 16:18:34 -0000 1.33 @@ -286,9 +286,8 @@ static int altstack_pointer_p (void *p) { #ifndef LISP_FEATURE_WIN32 - char* stack_start = ((char *) arch_os_get_current_thread()) - + dynamic_values_bytes; - char* stack_end = stack_start + 32*SIGSTKSZ; + void* stack_start = arch_os_get_current_thread() + dynamic_values_bytes; + void* stack_end = stack_start + 32*SIGSTKSZ; return (p > stack_start && p <= stack_end); #else @@ -578,7 +577,6 @@ backtrace(int nframes) { void *fp; - int i; #if defined(LISP_FEATURE_X86) asm("movl %%ebp,%0" : "=g" (fp)); Index: bsd-os.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/bsd-os.c,v retrieving revision 1.47 retrieving revision 1.48 diff -u -d -r1.47 -r1.48 --- bsd-os.c 2 Apr 2007 08:37:36 -0000 1.47 +++ bsd-os.c 18 Jun 2007 16:18:34 -0000 1.48 @@ -152,16 +152,17 @@ is_valid_lisp_addr(os_vm_address_t addr) { struct thread *th; - 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_SPACE_START , dynamic_space_size)) + + 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_SPACE_START, dynamic_space_size)) return 1; for_each_thread(th) { - if(((os_vm_address_t)th->control_stack_start <= addr) && - (addr < (os_vm_address_t)th->control_stack_end)) + if (((os_vm_address_t)th->control_stack_start <= addr) && + (addr < (os_vm_address_t)th->control_stack_end)) return 1; - if(in_range_p(addr, (lispobj)th->binding_stack_start, - BINDING_STACK_SIZE)) + if (in_range_p(addr, (lispobj) th->binding_stack_start, + BINDING_STACK_SIZE)) return 1; } return 0; @@ -266,7 +267,9 @@ sigsegv_handler(int signal, siginfo_t *info, void* void_context) { os_context_t *context = arch_os_get_context(&void_context); +#if 0 unsigned int pc = (unsigned int *)(*os_context_pc_addr(context)); +#endif os_vm_address_t addr; addr = arch_get_bad_addr(signal, info, context); Index: core.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/core.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- core.h 5 Feb 2006 22:03:00 -0000 1.9 +++ core.h 18 Jun 2007 16:18:34 -0000 1.10 @@ -39,6 +39,6 @@ * against a .core built without :SB-SHOW (or against various grosser * mismatches, e.g. a .core built with an old version of the code * against a runtime with patches which add new C code) */ -extern unsigned char build_id[]; +extern char build_id[]; #endif Index: coreparse.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/coreparse.c,v retrieving revision 1.37 retrieving revision 1.38 diff -u -d -r1.37 -r1.38 --- coreparse.c 15 Jan 2007 22:15:49 -0000 1.37 +++ coreparse.c 18 Jun 2007 16:18:34 -0000 1.38 @@ -38,10 +38,11 @@ /* lutex stuff */ #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) #include "genesis/sap.h" +#include "pthread-lutex.h" #endif -unsigned char build_id[] = +char build_id[] = #include "../../output/build-id.tmp" ; @@ -324,7 +325,7 @@ 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); Index: darwin-langinfo.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/darwin-langinfo.c,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- darwin-langinfo.c 31 Aug 2006 07:48:06 -0000 1.1 +++ darwin-langinfo.c 18 Jun 2007 16:18:34 -0000 1.2 @@ -17,6 +17,7 @@ */ #include <stdlib.h> +#include <string.h> #include "darwin-langinfo.h" char *nl_langinfo(nl_item item) Index: darwin-os.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/darwin-os.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- darwin-os.c 3 Mar 2007 00:42:02 -0000 1.3 +++ darwin-os.c 18 Jun 2007 16:18:34 -0000 1.4 @@ -28,7 +28,7 @@ os_get_runtime_executable_path() { char path[PATH_MAX + 1]; - size_t size = sizeof(path); + uint32_t size = sizeof(path); if (_NSGetExecutablePath(path, &size) == -1) return NULL; Index: gencgc.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/gencgc.c,v retrieving revision 1.113 retrieving revision 1.114 diff -u -d -r1.113 -r1.114 --- gencgc.c 10 Apr 2007 04:18:10 -0000 1.113 +++ gencgc.c 18 Jun 2007 16:18:34 -0000 1.114 @@ -50,9 +50,9 @@ #include "genesis/hash-table.h" #include "genesis/instance.h" #include "genesis/layout.h" - -#ifdef LUTEX_WIDETAG -#include "genesis/lutex.h" +#include "gencgc.h" +#if defined(LUTEX_WIDETAG) +#include "pthread-lutex.h" #endif /* forward declarations */ @@ -1938,7 +1938,7 @@ while (lutex) { struct lutex *next = lutex->next; if (!lutex->live) { - lutex_destroy(lutex); + lutex_destroy((tagged_lutex_t) lutex); gencgc_unregister_lutex(lutex); } lutex = next; @@ -1997,7 +1997,7 @@ static lispobj trans_lutex(lispobj object) { - struct lutex *lutex = native_pointer(object); + struct lutex *lutex = (struct lutex *) native_pointer(object); lispobj copied; size_t words = CEILING(sizeof(struct lutex)/sizeof(lispobj), 2); gc_assert(is_lisp_pointer(object)); @@ -2005,13 +2005,14 @@ /* Update the links, since the lutex moved in memory. */ if (lutex->next) { - lutex->next->prev = native_pointer(copied); + lutex->next->prev = (struct lutex *) native_pointer(copied); } if (lutex->prev) { - lutex->prev->next = native_pointer(copied); + lutex->prev->next = (struct lutex *) native_pointer(copied); } else { - generations[lutex->gen].lutexes = native_pointer(copied); + generations[lutex->gen].lutexes = + (struct lutex *) native_pointer(copied); } return copied; @@ -2115,6 +2116,8 @@ (lispobj *)pointer)); } +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) + /* Is there any possibility that pointer is a valid Lisp object * reference, and/or something else (e.g. subroutine call return * address) which should prevent us from moving the referred-to thing? @@ -2387,8 +2390,6 @@ return 1; } -#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) - /* Adjust large bignum and vector objects. This will adjust the * allocated region if the size has shrunk, and move unboxed objects * into unboxed pages. The pages are not promoted here, and the @@ -2563,8 +2564,6 @@ return; } -#endif - /* Take a possible pointer to a Lisp object and mark its page in the * page_table so that it will not be relocated during a GC. * @@ -2578,8 +2577,6 @@ * It is also assumed that the current gc_alloc() region has been * flushed and the tables updated. */ -#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) - static void preserve_pointer(void *addr) { @@ -2696,7 +2693,7 @@ gc_assert(page_table[addr_page_index].dont_move != 0); } -#endif +#endif // defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) /* If the given page is not write-protected, then scan it for pointers @@ -3856,7 +3853,9 @@ unsigned long bytes_freed; page_index_t i; unsigned long static_space_size; +#if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) struct thread *th; +#endif gc_assert(generation <= HIGHEST_NORMAL_GENERATION); /* The oldest generation can't be raised. */ Index: interr.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/interr.c,v retrieving revision 1.21 retrieving revision 1.22 diff -u -d -r1.21 -r1.22 --- interr.c 7 Jun 2006 16:25:10 -0000 1.21 +++ interr.c 18 Jun 2007 16:18:35 -0000 1.22 @@ -54,7 +54,7 @@ va_list ap; fprintf(stderr, "fatal error encountered in SBCL pid %d",getpid()); #if defined(LISP_FEATURE_SB_THREAD) - fprintf(stderr, "(tid %lu)",thread_self()); + fprintf(stderr, "(tid %lu)", (unsigned long) thread_self()); #endif if (fmt) { fprintf(stderr, ":\n"); Index: interrupt.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/interrupt.c,v retrieving revision 1.131 retrieving revision 1.132 diff -u -d -r1.131 -r1.132 --- interrupt.c 15 May 2007 14:14:33 -0000 1.131 +++ interrupt.c 18 Jun 2007 16:18:35 -0000 1.132 @@ -898,8 +898,10 @@ *(register_save_area + 7) = *os_context_register_addr(context,reg_EAX); *(register_save_area + 8) = *context_eflags_addr(context); - *os_context_pc_addr(context) = call_into_lisp_tramp; - *os_context_register_addr(context,reg_ECX) = register_save_area; + *os_context_pc_addr(context) = + (os_context_register_t) call_into_lisp_tramp; + *os_context_register_addr(context,reg_ECX) = + (os_context_register_t) register_save_area; #else /* return address for call_into_lisp: */ @@ -1158,9 +1160,7 @@ void undoably_install_low_level_interrupt_handler (int signal, - void handler(int, - siginfo_t*, - void*)) + interrupt_handler_t handler) { struct sigaction sa; Index: interrupt.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/interrupt.h,v retrieving revision 1.30 retrieving revision 1.31 diff -u -d -r1.30 -r1.31 --- interrupt.h 2 Apr 2007 15:20:51 -0000 1.30 +++ interrupt.h 18 Jun 2007 16:18:35 -0000 1.31 @@ -27,6 +27,8 @@ #define REAL_SIGSET_SIZE_BYTES ((NSIG/8)) extern void check_blockables_blocked_or_lose(); +extern void check_gc_signals_unblocked_or_lose(); +extern void unblock_gc_signals(); static inline void sigcopyset(sigset_t *new, sigset_t *old) @@ -80,13 +82,12 @@ extern void interrupt_thread_handler(int, siginfo_t*, void*); extern void sig_stop_for_gc_handler(int, siginfo_t*, void*); #endif -extern void undoably_install_low_level_interrupt_handler (int signal, - void - handler(int, - siginfo_t*, - void*)); +typedef void (*interrupt_handler_t)(int, siginfo_t *, void *); +extern void undoably_install_low_level_interrupt_handler ( + int signal, + interrupt_handler_t handler); extern unsigned long install_handler(int signal, - void handler(int, siginfo_t*, void*)); + interrupt_handler_t handler); extern union interrupt_handler interrupt_handlers[NSIG]; Index: largefile.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/largefile.c,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- largefile.c 3 Dec 2006 15:24:14 -0000 1.3 +++ largefile.c 18 Jun 2007 16:18:36 -0000 1.4 @@ -63,7 +63,7 @@ struct dirent64 * readdir_largefile(DIR *dir) { - return readdir(dir); + return readdir64(dir); } #endif Index: ppc-arch.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/ppc-arch.c,v retrieving revision 1.25 retrieving revision 1.26 diff -u -d -r1.25 -r1.26 --- ppc-arch.c 15 May 2007 14:14:33 -0000 1.25 +++ ppc-arch.c 18 Jun 2007 16:18:36 -0000 1.26 @@ -21,6 +21,7 @@ #include "interrupt.h" #include "interr.h" #include "breakpoint.h" +#include "alloc.h" #if defined(LISP_FEATURE_GENCGC) #include "gencgc-alloc-region.h" @@ -422,9 +423,10 @@ } static void -sigtrap_handler(int signal, siginfo_t *siginfo, os_context_t *context) +sigtrap_handler(int signal, siginfo_t *siginfo, void *void_context) { unsigned int code; + os_context_t *context = void_context; #ifdef LISP_FEATURE_LINUX os_restore_fp_control(context); @@ -469,7 +471,7 @@ return; } - interrupt_handle_now(signal, code, context); + interrupt_handle_now(signal, (siginfo_t *)code, context); #ifdef LISP_FEATURE_DARWIN /* Work around G5 bug */ DARWIN_FIX_CONTEXT(context); @@ -479,8 +481,8 @@ void arch_install_interrupt_handlers() { - undoably_install_low_level_interrupt_handler(SIGILL,sigtrap_handler); - undoably_install_low_level_interrupt_handler(SIGTRAP,sigtrap_handler); + undoably_install_low_level_interrupt_handler(SIGILL, sigtrap_handler); + undoably_install_low_level_interrupt_handler(SIGTRAP, sigtrap_handler); } void Index: ppc-arch.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/ppc-arch.h,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- ppc-arch.h 14 Jul 2005 15:41:21 -0000 1.4 +++ ppc-arch.h 18 Jun 2007 16:18:36 -0000 1.5 @@ -16,4 +16,6 @@ #define ARCH_HAS_LINK_REGISTER +extern void ppc_flush_icache(os_vm_address_t address, os_vm_size_t length); + #endif /* _PPC_ARCH_H */ Index: ppc-darwin-os.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/ppc-darwin-os.c,v retrieving revision 1.8 retrieving revision 1.9 diff -u -d -r1.8 -r1.9 --- ppc-darwin-os.c 20 Dec 2006 16:19:34 -0000 1.8 +++ ppc-darwin-os.c 18 Jun 2007 16:18:36 -0000 1.9 @@ -21,7 +21,8 @@ #include <ucontext.h> #include <limits.h> #include <mach-o/dyld.h> -#include "bsd-os.h" +#include "arch.h" +#include "interr.h" /* for declaration of lose */ #ifdef LISP_FEATURE_SB_THREAD #error "Define threading support functions" @@ -40,82 +41,84 @@ ppc_saved_state_t *state = &context->uc_mcontext->ss; switch(offset) { case 0: - return &state->r0; + return (os_context_register_t *) &state->r0; case 1: - return &state->r1; + return (os_context_register_t *) &state->r1; case 2: - return &state->r2; + return (os_context_register_t *) &state->r2; case 3: - return &state->r3; + return (os_context_register_t *) &state->r3; case 4: - return &state->r4; + return (os_context_register_t *) &state->r4; case 5: - return &state->r5; + return (os_context_register_t *) &state->r5; case 6: - return &state->r6; + return (os_context_register_t *) &state->r6; case 7: - return &state->r7; + return (os_context_register_t *) &state->r7; case 8: - return &state->r8; + return (os_context_register_t *) &state->r8; case 9: - return &state->r9; + return (os_context_register_t *) &state->r9; case 10: - return &state->r10; + return (os_context_register_t *) &state->r10; case 11: - return &state->r11; + return (os_context_register_t *) &state->r11; case 12: - return &state->r12; + return (os_context_register_t *) &state->r12; case 13: - return &state->r13; + return (os_context_register_t *) &state->r13; case 14: - return &state->r14; + return (os_context_register_t *) &state->r14; case 15: - return &state->r15; + return (os_context_register_t *) &state->r15; case 16: - return &state->r16; + return (os_context_register_t *) &state->r16; case 17: - return &state->r17; + return (os_context_register_t *) &state->r17; case 18: - return &state->r18; + return (os_context_register_t *) &state->r18; case 19: - return &state->r19; + return (os_context_register_t *) &state->r19; case 20: - return &state->r20; + return (os_context_register_t *) &state->r20; case 21: - return &state->r21; + return (os_context_register_t *) &state->r21; case 22: - return &state->r22; + return (os_context_register_t *) &state->r22; case 23: - return &state->r23; + return (os_context_register_t *) &state->r23; case 24: - return &state->r24; + return (os_context_register_t *) &state->r24; case 25: - return &state->r25; + return (os_context_register_t *) &state->r25; case 26: - return &state->r26; + return (os_context_register_t *) &state->r26; case 27: - return &state->r27; + return (os_context_register_t *) &state->r27; case 28: - return &state->r28; + return (os_context_register_t *) &state->r28; case 29: - return &state->r29; + return (os_context_register_t *) &state->r29; case 30: - return &state->r30; + return (os_context_register_t *) &state->r30; case 31: - return &state->r31; + return (os_context_register_t *) &state->r31; case 41: /* PT_DAR */ - return &context->uc_mcontext->es.dar; + return (os_context_register_t *) &context->uc_mcontext->es.dar; case 42: /* PT_DSISR */ - return &context->uc_mcontext->es.dsisr; + return (os_context_register_t *) &context->uc_mcontext->es.dsisr; + default: + lose("bad offset to os_context_register_addr"); } } os_context_register_t * os_context_lr_addr(os_context_t *context) { - return &context->uc_mcontext->ss.lr; + return (os_context_register_t *) &context->uc_mcontext->ss.lr; } os_context_register_t * Index: pseudo-atomic.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/pseudo-atomic.h,v retrieving revision 1.1 retrieving revision 1.2 diff -u -d -r1.1 -r1.2 --- pseudo-atomic.h 13 Sep 2006 17:30:31 -0000 1.1 +++ pseudo-atomic.h 18 Jun 2007 16:18:36 -0000 1.2 @@ -53,8 +53,9 @@ #elif defined(LISP_FEATURE_PPC) && defined(LISP_FEATURE_GENCGC) #define set_alloc_pointer(value) \ - (dynamic_space_free_pointer = \ - (value) | (((unsigned long)dynamic_space_free_pointer) & LOWTAG_MASK)) + (dynamic_space_free_pointer = \ + ((lispobj *) \ + ((value) | (((unsigned long)dynamic_space_free_pointer) & LOWTAG_MASK)))) #define get_alloc_pointer() \ ((unsigned long) dynamic_space_free_pointer & ~LOWTAG_MASK) Index: pthread-lutex.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/pthread-lutex.c,v retrieving revision 1.4 retrieving revision 1.5 diff -u -d -r1.4 -r1.5 --- pthread-lutex.c 11 Apr 2007 07:30:58 -0000 1.4 +++ pthread-lutex.c 18 Jun 2007 16:18:36 -0000 1.5 @@ -22,11 +22,11 @@ #include "arch.h" #include "target-arch-os.h" #include "os.h" +#include "pthread-lutex.h" +#include "gencgc.h" #include "genesis/lutex.h" -typedef unsigned long tagged_lutex_t; - #if 1 # define lutex_assert(ex) \ do { \ Index: purify.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/purify.c,v retrieving revision 1.68 retrieving revision 1.69 diff -u -d -r1.68 -r1.69 --- purify.c 30 Apr 2007 20:55:43 -0000 1.68 +++ purify.c 18 Jun 2007 16:18:36 -0000 1.69 @@ -34,6 +34,7 @@ #include "genesis/primitive-objects.h" #include "genesis/static-symbols.h" #include "genesis/layout.h" +#include "gencgc.h" /* We don't ever do purification with GENCGC as of 1.0.5.*. There was * a lot of hairy and fragile ifdeffage in here to support purify on @@ -497,7 +498,7 @@ return ptrans_unboxed(thing, header); #ifdef LUTEX_WIDETAG case LUTEX_WIDETAG: - gencgc_unregister_lutex(native_pointer(thing)); + gencgc_unregister_lutex((struct lutex *) native_pointer(thing)); return ptrans_unboxed(thing, header); #endif Index: save.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/save.c,v retrieving revision 1.29 retrieving revision 1.30 diff -u -d -r1.29 -r1.30 --- save.c 2 May 2007 17:46:03 -0000 1.29 +++ save.c 18 Jun 2007 16:18:36 -0000 1.30 @@ -230,7 +230,7 @@ file); { unsigned char *p; - for (p = build_id; *p; ++p) + for (p = (unsigned char *)build_id; *p; ++p) write_lispobj(*p, file); } @@ -302,7 +302,7 @@ #if defined(LISP_FEATURE_SB_THREAD) && defined(LISP_FEATURE_SB_LUTEX) if(n_lutexes > 0) { long offset; - printf("writing %d lutexes to the core...\n", n_lutexes); + printf("writing %ld lutexes to the core...\n", n_lutexes); write_lispobj(LUTEX_TABLE_CORE_ENTRY_TYPE_CODE, file); /* word count of the entry */ write_lispobj(4, file); Index: validate.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/validate.c,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- validate.c 26 Dec 2006 23:10:25 -0000 1.31 +++ validate.c 18 Jun 2007 16:18:36 -0000 1.32 @@ -22,6 +22,8 @@ #include "globals.h" #include "interr.h" #include "validate.h" +#include "interr.h" /* for declaration of lose */ + static void ensure_space(lispobj *start, unsigned long size) Index: x86-64-arch.c =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-64-arch.c,v retrieving revision 1.20 retrieving revision 1.21 diff -u -d -r1.20 -r1.21 --- x86-64-arch.c 4 Apr 2007 13:11:19 -0000 1.20 +++ x86-64-arch.c 18 Jun 2007 16:18:36 -0000 1.21 @@ -231,7 +231,6 @@ void sigtrap_handler(int signal, siginfo_t *info, void *void_context) { - int code = info->si_code; os_context_t *context = (os_context_t*)void_context; unsigned int trap; Index: x86-64-arch.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-64-arch.h,v retrieving revision 1.9 retrieving revision 1.10 diff -u -d -r1.9 -r1.10 --- x86-64-arch.h 10 Apr 2007 04:18:10 -0000 1.9 +++ x86-64-arch.h 18 Jun 2007 16:18:36 -0000 1.10 @@ -9,6 +9,8 @@ #error genesis/config.h (or sbcl.h) must be included before this file #endif +#include "interr.h" /* for declaration of lose() */ + #define ARCH_HAS_STACK_POINTER /* FIXME: Do we also want Index: x86-arch.h =================================================================== RCS file: /cvsroot/sbcl/sbcl/src/runtime/x86-arch.h,v retrieving revision 1.13 retrieving revision 1.14 diff -u -d -r1.13 -r1.14 --- x86-arch.h 3 Jun 2006 20:26:53 -0000 1.13 +++ x86-arch.h 18 Jun 2007 16:18:36 -0000 1.14 @@ -9,6 +9,8 @@ #error genesis/config.h (or sbcl.h) must be included before this file #endif +#include "interr.h" /* for declaration of lose() */ + #define ARCH_HAS_STACK_POINTER /* FIXME: Do we also want |