X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fpurify.c;h=aadf78b577adbb4377d331021aac0c4f99e34d15;hb=cb83aa22932bf4b9bc74ac6f0fcd91db1702ad33;hp=c784c255657debf9c011c8c75716fa499923eb3e;hpb=79cc569a97e444389350ea3f5b1017374fe16bec;p=sbcl.git diff --git a/src/runtime/purify.c b/src/runtime/purify.c index c784c25..aadf78b 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -37,27 +37,9 @@ #define PRINTNOISE -#if defined(LISP_FEATURE_GENCGC) -/* this is another artifact of the poor integration between gencgc and - * the rest of the runtime: on cheney gc there is a global - * dynamic_space_free_pointer which is valid whenever foreign function - * call is active, but in gencgc there's no such variable and we have - * to keep our own - */ -static lispobj *dynamic_space_free_pointer; -#endif extern unsigned long bytes_consed_between_gcs; -#define gc_abort() \ - lose("GC invariant lost, file \"%s\", line %d", __FILE__, __LINE__) - -#if 1 -#define gc_assert(ex) do { \ - if (!(ex)) gc_abort(); \ -} while (0) -#else -#define gc_assert(ex) -#endif +static lispobj *dynamic_space_purify_pointer; /* These hold the original end of the read_only and static spaces so @@ -88,14 +70,6 @@ static long later_count = 0; #define SIMPLE_ARRAY_WORD_WIDETAG SIMPLE_ARRAY_UNSIGNED_BYTE_64_WIDETAG #endif -/* FIXME: Shouldn't this be defined in sbcl.h? See also notes in - * cheneygc.c */ - -#ifdef LISP_FEATURE_SPARC -#define FUN_RAW_ADDR_OFFSET 0 -#else -#define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG) -#endif static boolean forwarding_pointer_p(lispobj obj) @@ -112,12 +86,12 @@ dynamic_pointer_p(lispobj ptr) #ifndef LISP_FEATURE_GENCGC return (ptr >= (lispobj)current_dynamic_space && - ptr < (lispobj)dynamic_space_free_pointer); + ptr < (lispobj)dynamic_space_purify_pointer); #else /* Be more conservative, and remember, this is a maybe. */ return (ptr >= (lispobj)DYNAMIC_SPACE_START && - ptr < (lispobj)dynamic_space_free_pointer); + ptr < (lispobj)dynamic_space_purify_pointer); #endif } @@ -127,9 +101,15 @@ newspace_alloc(long nwords, int constantp) lispobj *ret; nwords=CEILING(nwords,2); if(constantp) { + if(read_only_free + nwords >= (lispobj *)READ_ONLY_SPACE_END) { + lose("Ran out of read-only space while purifying!\n"); + } ret=read_only_free; read_only_free+=nwords; } else { + if(static_free + nwords >= (lispobj *)STATIC_SPACE_END) { + lose("Ran out of static space while purifying!\n"); + } ret=static_free; static_free+=nwords; } @@ -182,17 +162,16 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: if ((long)pointer != ((long)start_addr+FUN_POINTER_LOWTAG)) { if (pointer_filter_verbose) { - fprintf(stderr,"*Wf2: %x %x %x\n", - (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wf2: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } break; default: if (pointer_filter_verbose) { - fprintf(stderr,"*Wf3: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wf3: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } @@ -200,8 +179,8 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) case LIST_POINTER_LOWTAG: if ((long)pointer != ((long)start_addr+LIST_POINTER_LOWTAG)) { if (pointer_filter_verbose) - fprintf(stderr,"*Wl1: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wl1: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); return 0; } /* Is it plausible cons? */ @@ -222,23 +201,23 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) break; } else { if (pointer_filter_verbose) { - fprintf(stderr,"*Wl2: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wl2: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } case INSTANCE_POINTER_LOWTAG: if ((long)pointer != ((long)start_addr+INSTANCE_POINTER_LOWTAG)) { if (pointer_filter_verbose) { - fprintf(stderr,"*Wi1: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wi1: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } if (widetag_of(start_addr[0]) != INSTANCE_HEADER_WIDETAG) { if (pointer_filter_verbose) { - fprintf(stderr,"*Wi2: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wi2: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } @@ -246,16 +225,16 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) case OTHER_POINTER_LOWTAG: if ((long)pointer != ((long)start_addr+OTHER_POINTER_LOWTAG)) { if (pointer_filter_verbose) { - fprintf(stderr,"*Wo1: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo1: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } /* Is it plausible? Not a cons. XXX should check the headers. */ if (is_lisp_pointer(start_addr[0]) || ((start_addr[0] & FIXNUM_TAG_MASK) == 0)) { if (pointer_filter_verbose) { - fprintf(stderr,"*Wo2: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo2: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } @@ -266,8 +245,8 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) case SINGLE_FLOAT_WIDETAG: #endif if (pointer_filter_verbose) { - fprintf(stderr,"*Wo3: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo3: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; @@ -275,15 +254,15 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) case CLOSURE_HEADER_WIDETAG: case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: if (pointer_filter_verbose) { - fprintf(stderr,"*Wo4: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo4: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; case INSTANCE_HEADER_WIDETAG: if (pointer_filter_verbose) { - fprintf(stderr,"*Wo5: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo5: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; @@ -381,20 +360,23 @@ valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) #endif case SAP_WIDETAG: case WEAK_POINTER_WIDETAG: +#ifdef LUTEX_WIDETAG + case LUTEX_WIDETAG: +#endif break; default: if (pointer_filter_verbose) { - fprintf(stderr,"*Wo6: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*Wo6: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } break; default: if (pointer_filter_verbose) { - fprintf(stderr,"*W?: %x %x %x\n", (unsigned long) pointer, - (unsigned long) start_addr, *start_addr); + fprintf(stderr,"*W?: %p %p %p\n", + pointer, start_addr, (void *)*start_addr); } return 0; } @@ -447,9 +429,9 @@ setup_i386_stack_scav(lispobj *lowaddr, lispobj *base) } } if (pointer_filter_verbose) { - fprintf(stderr, "number of valid stack pointers = %d\n", + fprintf(stderr, "number of valid stack pointers = %ld\n", num_valid_stack_locations); - fprintf(stderr, "number of stack return addresses = %d\n", + fprintf(stderr, "number of stack return addresses = %ld\n", num_valid_stack_ra_locations); } } @@ -466,11 +448,12 @@ pscav_i386_stack(void) lispobj code_obj = (lispobj)valid_stack_ra_code_objects[i]; pscav(&code_obj, 1, 0); if (pointer_filter_verbose) { - fprintf(stderr,"*C moved RA %x to %x; for code object %x to %x\n", - *valid_stack_ra_locations[i], - (long)(*valid_stack_ra_locations[i]) - - ((long)valid_stack_ra_code_objects[i] - (long)code_obj), - (unsigned long) valid_stack_ra_code_objects[i], code_obj); + fprintf(stderr,"*C moved RA %p to %p; for code object %p to %p\n", + (void *)*valid_stack_ra_locations[i], + (void *)(*valid_stack_ra_locations[i]) - + ((void *)valid_stack_ra_code_objects[i] - + (void *)code_obj), + valid_stack_ra_code_objects[i], (void *)code_obj); } *valid_stack_ra_locations[i] = ((long)(*valid_stack_ra_locations[i]) @@ -541,8 +524,9 @@ ptrans_boxed(lispobj thing, lispobj header, boolean constant) static lispobj ptrans_instance(lispobj thing, lispobj header, boolean /* ignored */ constant) { - lispobj layout = ((struct instance *)native_pointer(thing))->slots[0]; - lispobj pure = ((struct instance *)native_pointer(layout))->slots[15]; + struct layout *layout = + (struct layout *) native_pointer(((struct instance *)native_pointer(thing))->slots[0]); + lispobj pure = layout->pure; switch (pure) { case T: @@ -956,6 +940,11 @@ ptrans_otherptr(lispobj thing, lispobj header, boolean constant) #endif case SAP_WIDETAG: return ptrans_unboxed(thing, header); +#ifdef LUTEX_WIDETAG + case LUTEX_WIDETAG: + gencgc_unregister_lutex(native_pointer(thing)); + return ptrans_unboxed(thing, header); +#endif case RATIO_WIDETAG: case COMPLEX_WIDETAG: @@ -1367,7 +1356,6 @@ pscav(lispobj *addr, long nwords, boolean constant) #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) case CLOSURE_HEADER_WIDETAG: - case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: /* The function self pointer needs special care on the * x86 because it is the real entry point. */ { @@ -1456,8 +1444,14 @@ purify(lispobj static_roots, lispobj read_only_roots) } #if defined(LISP_FEATURE_X86) || defined(LISP_FEATURE_X86_64) - dynamic_space_free_pointer = + dynamic_space_purify_pointer = (lispobj*)SymbolValue(ALLOCATION_POINTER,0); +#else +#if defined(LISP_FEATURE_GENCGC) + dynamic_space_purify_pointer = get_alloc_pointer(); +#else + dynamic_space_purify_pointer = dynamic_space_free_pointer; +#endif #endif read_only_end = read_only_free = @@ -1485,9 +1479,8 @@ purify(lispobj static_roots, lispobj read_only_roots) printf(" handlers"); fflush(stdout); #endif - pscav((lispobj *) all_threads->interrupt_data->interrupt_handlers, - sizeof(all_threads->interrupt_data->interrupt_handlers) - / sizeof(lispobj), + pscav((lispobj *) interrupt_handlers, + sizeof(interrupt_handlers) / sizeof(lispobj), 0); #ifdef PRINTNOISE @@ -1520,10 +1513,12 @@ purify(lispobj static_roots, lispobj read_only_roots) (lispobj *)SymbolValue(BINDING_STACK_POINTER,thread) - (lispobj *)thread->binding_stack_start, 0); +#ifdef LISP_FEATURE_SB_THREAD pscav( (lispobj *) (thread+1), fixnum_value(SymbolValue(FREE_TLS_INDEX,0)) - (sizeof (struct thread))/(sizeof (lispobj)), 0); +#endif } @@ -1585,7 +1580,7 @@ purify(lispobj static_roots, lispobj read_only_roots) #endif os_zero((os_vm_address_t) current_dynamic_space, - (os_vm_size_t) DYNAMIC_SPACE_SIZE); + (os_vm_size_t) dynamic_space_size); /* Zero the stack. Note that the stack is also zeroed by SUB-GC * calling SCRUB-CONTROL-STACK - this zeros the stack on the x86. */ @@ -1601,15 +1596,11 @@ purify(lispobj static_roots, lispobj read_only_roots) SetSymbolValue(READ_ONLY_SPACE_FREE_POINTER, (lispobj)read_only_free,0); SetSymbolValue(STATIC_SPACE_FREE_POINTER, (lispobj)static_free,0); -#if !defined(ALLOCATION_POINTER) - dynamic_space_free_pointer = current_dynamic_space; - set_auto_gc_trigger(bytes_consed_between_gcs); -#else #if defined LISP_FEATURE_GENCGC gc_free_heap(); #else -#error unsupported case /* in CMU CL, was "ibmrt using GC" */ -#endif + dynamic_space_free_pointer = current_dynamic_space; + set_auto_gc_trigger(bytes_consed_between_gcs); #endif /* Blast away instruction cache */