X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fpurify.c;h=858169210e5024b28e835d8614fd45d5acb2317a;hb=3c65762b927af861c9c8bc416e4cbac9a14ec0c3;hp=d194d35ae0545927d4790cac7e395d49c6e059ae;hpb=a530bbe337109d898d5b4a001fc8f1afa3b5dc39;p=sbcl.git diff --git a/src/runtime/purify.c b/src/runtime/purify.c index d194d35..8581692 100644 --- a/src/runtime/purify.c +++ b/src/runtime/purify.c @@ -13,10 +13,6 @@ * files for more information. */ -/* - * $Header$ - */ - #include #include #include @@ -33,10 +29,13 @@ #include "gencgc.h" #endif -#undef PRINTNOISE +#define PRINTNOISE -#if defined(ibmrt) || defined(__i386__) -static lispobj *current_dynamic_space_free_pointer; +#if defined(__i386__) +/* again, what's so special about the x86 that this is differently + * visible there than on other platforms? -dan 20010125 + */ +static lispobj *dynamic_space_free_pointer; #endif #define gc_abort() \ @@ -63,7 +62,8 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant); #define LATERBLOCKSIZE 1020 #define LATERMAXCOUNT 10 -static struct later { +static struct +later { struct later *next; union { lispobj *ptr; @@ -75,10 +75,11 @@ static int later_count = 0; #define CEILING(x,y) (((x) + ((y) - 1)) & (~((y) - 1))) #define NWORDS(x,y) (CEILING((x),(y)) / (y)) +/* FIXME: (1) Shouldn't this be defined in sbcl.h? */ #ifdef sparc -#define RAW_ADDR_OFFSET 0 +#define FUN_RAW_ADDR_OFFSET 0 #else -#define RAW_ADDR_OFFSET (6*sizeof(lispobj) - type_FunctionPointer) +#define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG) #endif static boolean @@ -96,122 +97,25 @@ static boolean dynamic_pointer_p(lispobj ptr) { #ifndef __i386__ - return (ptr >= (lispobj)dynamic_0_space); + /* KLUDGE: This has an implicit dependence on the ordering of + * address spaces, and is therefore basically wrong. I'd fix it, + * but I don't have a non-386 port to test it on. Porters are + * encouraged to fix it. -- WHN 2000-10-17 */ + return (ptr >= (lispobj)DYNAMIC_SPACE_START); #else /* Be more conservative, and remember, this is a maybe. */ - return (ptr >= (lispobj)current_dynamic_space + return (ptr >= (lispobj)DYNAMIC_SPACE_START && - ptr < (lispobj)current_dynamic_space_free_pointer); + ptr < (lispobj)dynamic_space_free_pointer); #endif } #ifdef __i386__ -#ifdef WANT_CGC -/* original x86/CGC stack scavenging code by Paul Werkowski */ - -static int -maybe_can_move_p(lispobj thing) -{ - lispobj *thingp,header; - if (dynamic_pointer_p(thing)) { /* in dynamic space */ - thingp = (lispobj*)PTR(thing); - header = *thingp; - if(Pointerp(header) && forwarding_pointer_p(header)) - return -1; /* must change it */ - if(LowtagOf(thing) == type_ListPointer) - return type_ListPointer; /* can we check this somehow */ - else if (thing & 3) { /* not fixnum */ - int kind = TypeOf(header); - /* printf(" %x %x",header,kind); */ - switch (kind) { /* something with a header */ - case type_Bignum: - case type_SingleFloat: - case type_DoubleFloat: -#ifdef type_LongFloat - case type_LongFloat: -#endif - case type_Sap: - case type_SimpleVector: - case type_SimpleString: - case type_SimpleBitVector: - case type_SimpleArrayUnsignedByte2: - case type_SimpleArrayUnsignedByte4: - case type_SimpleArrayUnsignedByte8: - case type_SimpleArrayUnsignedByte16: - case type_SimpleArrayUnsignedByte32: -#ifdef type_SimpleArraySignedByte8 - case type_SimpleArraySignedByte8: -#endif -#ifdef type_SimpleArraySignedByte16 - case type_SimpleArraySignedByte16: -#endif -#ifdef type_SimpleArraySignedByte30 - case type_SimpleArraySignedByte30: -#endif -#ifdef type_SimpleArraySignedByte32 - case type_SimpleArraySignedByte32: -#endif - case type_SimpleArraySingleFloat: - case type_SimpleArrayDoubleFloat: -#ifdef type_SimpleArrayLongFloat - case type_SimpleArrayLongFloat: -#endif -#ifdef type_SimpleArrayComplexSingleFloat - case type_SimpleArrayComplexSingleFloat: -#endif -#ifdef type_SimpleArrayComplexDoubleFloat - case type_SimpleArrayComplexDoubleFloat: -#endif -#ifdef type_SimpleArrayComplexLongFloat - case type_SimpleArrayComplexLongFloat: -#endif - case type_CodeHeader: - case type_FunctionHeader: - case type_ClosureFunctionHeader: - case type_ReturnPcHeader: - case type_ClosureHeader: - case type_FuncallableInstanceHeader: - case type_InstanceHeader: - case type_ValueCellHeader: - case type_ByteCodeFunction: - case type_ByteCodeClosure: - case type_WeakPointer: - case type_Fdefn: - return kind; - break; - default: - return 0; - }}} - return 0; -} - -static int pverbose=0; -#define PVERBOSE pverbose -static void -carefully_pscav_stack(lispobj*lowaddr, lispobj*base) -{ - lispobj*sp = lowaddr; - while (sp < base) - { int k; - lispobj thing = *sp; - if((unsigned)thing & 0x3) /* may be pointer */ - { - /* need to check for valid float/double? */ - k = maybe_can_move_p(thing); - if(PVERBOSE)printf("%8x %8x %d\n",sp, thing, k); - if(k) - pscav(sp, 1, 0); - } - sp++; - } -} -#endif - #ifdef GENCGC /* - * Enhanced x86/GENCGC stack scavenging by Douglas Crosher. + * enhanced x86/GENCGC stack scavenging by Douglas Crosher * * Scavenging the stack on the i386 is problematic due to conservative * roots and raw return addresses. Here it is handled in two passes: @@ -222,197 +126,217 @@ carefully_pscav_stack(lispobj*lowaddr, lispobj*base) static unsigned pointer_filter_verbose = 0; +/* FIXME: This is substantially the same code as in gencgc.c. (There + * are some differences, at least (1) the gencgc.c code needs to worry + * about return addresses on the stack pinning code objects, (2) the + * gencgc.c code needs to worry about the GC maybe happening in an + * interrupt service routine when the main thread of control was + * interrupted just as it had allocated memory and before it + * initialized it, while PURIFY needn't worry about that, and (3) the + * gencgc.c code has mutated more under maintenance since the fork + * from CMU CL than the code here has.) The two versions should be + * made to explicitly share common code, instead of just two different + * cut-and-pasted versions. */ static int valid_dynamic_space_pointer(lispobj *pointer, lispobj *start_addr) { - /* If it's not a return address then it needs to be a valid Lisp - * pointer. */ - if (!Pointerp((lispobj)pointer)) - return 0; + /* If it's not a return address then it needs to be a valid Lisp + * pointer. */ + if (!is_lisp_pointer((lispobj)pointer)) + return 0; - /* Check that the object pointed to is consistent with the pointer - * low tag. */ - switch (LowtagOf((lispobj)pointer)) { - case type_FunctionPointer: - /* Start_addr should be the enclosing code object, or a closure - * header. */ - switch (TypeOf(*start_addr)) { - case type_CodeHeader: - /* This case is probably caught above. */ - break; - case type_ClosureHeader: - case type_FuncallableInstanceHeader: - case type_ByteCodeFunction: - case type_ByteCodeClosure: - if ((int)pointer != ((int)start_addr+type_FunctionPointer)) { + /* Check that the object pointed to is consistent with the pointer + * low tag. */ + switch (lowtag_of((lispobj)pointer)) { + case FUN_POINTER_LOWTAG: + /* Start_addr should be the enclosing code object, or a closure + * header. */ + switch (widetag_of(*start_addr)) { + case CODE_HEADER_WIDETAG: + /* This case is probably caught above. */ + break; + case CLOSURE_HEADER_WIDETAG: + case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: + if ((int)pointer != ((int)start_addr+FUN_POINTER_LOWTAG)) { + if (pointer_filter_verbose) { + fprintf(stderr,"*Wf2: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + break; + default: + if (pointer_filter_verbose) { + fprintf(stderr,"*Wf3: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + break; + case LIST_POINTER_LOWTAG: + if ((int)pointer != ((int)start_addr+LIST_POINTER_LOWTAG)) { + if (pointer_filter_verbose) + fprintf(stderr,"*Wl1: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + return 0; + } + /* Is it plausible cons? */ + if((is_lisp_pointer(start_addr[0]) + || ((start_addr[0] & 3) == 0) /* fixnum */ + || (widetag_of(start_addr[0]) == BASE_CHAR_WIDETAG) + || (widetag_of(start_addr[0]) == UNBOUND_MARKER_WIDETAG)) + && (is_lisp_pointer(start_addr[1]) + || ((start_addr[1] & 3) == 0) /* fixnum */ + || (widetag_of(start_addr[1]) == BASE_CHAR_WIDETAG) + || (widetag_of(start_addr[1]) == UNBOUND_MARKER_WIDETAG))) { + break; + } else { + if (pointer_filter_verbose) { + fprintf(stderr,"*Wl2: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + case INSTANCE_POINTER_LOWTAG: + if ((int)pointer != ((int)start_addr+INSTANCE_POINTER_LOWTAG)) { + if (pointer_filter_verbose) { + fprintf(stderr,"*Wi1: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *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 int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + break; + case OTHER_POINTER_LOWTAG: + if ((int)pointer != ((int)start_addr+OTHER_POINTER_LOWTAG)) { + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo1: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + /* Is it plausible? Not a cons. X should check the headers. */ + if(is_lisp_pointer(start_addr[0]) || ((start_addr[0] & 3) == 0)) { + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo2: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + switch (widetag_of(start_addr[0])) { + case UNBOUND_MARKER_WIDETAG: + case BASE_CHAR_WIDETAG: + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo3: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + + /* only pointed to by function pointers? */ + case CLOSURE_HEADER_WIDETAG: + case FUNCALLABLE_INSTANCE_HEADER_WIDETAG: + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo4: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + + case INSTANCE_HEADER_WIDETAG: + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo5: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + + /* the valid other immediate pointer objects */ + case SIMPLE_VECTOR_WIDETAG: + case RATIO_WIDETAG: + case COMPLEX_WIDETAG: +#ifdef COMPLEX_SINGLE_FLOAT_WIDETAG + case COMPLEX_SINGLE_FLOAT_WIDETAG: +#endif +#ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG + case COMPLEX_DOUBLE_FLOAT_WIDETAG: +#endif +#ifdef COMPLEX_LONG_FLOAT_WIDETAG + case COMPLEX_LONG_FLOAT_WIDETAG: +#endif + case SIMPLE_ARRAY_WIDETAG: + case COMPLEX_STRING_WIDETAG: + case COMPLEX_BIT_VECTOR_WIDETAG: + case COMPLEX_VECTOR_WIDETAG: + case COMPLEX_ARRAY_WIDETAG: + case VALUE_CELL_HEADER_WIDETAG: + case SYMBOL_HEADER_WIDETAG: + case FDEFN_WIDETAG: + case CODE_HEADER_WIDETAG: + case BIGNUM_WIDETAG: + case SINGLE_FLOAT_WIDETAG: + case DOUBLE_FLOAT_WIDETAG: +#ifdef LONG_FLOAT_WIDETAG + case LONG_FLOAT_WIDETAG: +#endif + case SIMPLE_STRING_WIDETAG: + case SIMPLE_BIT_VECTOR_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG: + case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: +#endif + case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG: + case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG: +#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: +#endif +#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: +#endif + case SAP_WIDETAG: + case WEAK_POINTER_WIDETAG: + break; + + default: + if (pointer_filter_verbose) { + fprintf(stderr,"*Wo6: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); + } + return 0; + } + break; + default: if (pointer_filter_verbose) { - fprintf(stderr,"*Wf2: %x %x %x\n", pointer, start_addr, *start_addr); + fprintf(stderr,"*W?: %x %x %x\n", (unsigned int) pointer, + (unsigned int) start_addr, *start_addr); } return 0; - } - break; - default: - if (pointer_filter_verbose) { - fprintf(stderr,"*Wf3: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - break; - case type_ListPointer: - if ((int)pointer != ((int)start_addr+type_ListPointer)) { - if (pointer_filter_verbose) - fprintf(stderr,"*Wl1: %x %x %x\n", pointer, start_addr, *start_addr); - return 0; - } - /* Is it plausible cons? */ - if((Pointerp(start_addr[0]) - || ((start_addr[0] & 3) == 0) /* fixnum */ - || (TypeOf(start_addr[0]) == type_BaseChar) - || (TypeOf(start_addr[0]) == type_UnboundMarker)) - && (Pointerp(start_addr[1]) - || ((start_addr[1] & 3) == 0) /* fixnum */ - || (TypeOf(start_addr[1]) == type_BaseChar) - || (TypeOf(start_addr[1]) == type_UnboundMarker))) { - break; - } else { - if (pointer_filter_verbose) { - fprintf(stderr,"*Wl2: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - case type_InstancePointer: - if ((int)pointer != ((int)start_addr+type_InstancePointer)) { - if (pointer_filter_verbose) { - fprintf(stderr,"*Wi1: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - if (TypeOf(start_addr[0]) != type_InstanceHeader) { - if (pointer_filter_verbose) { - fprintf(stderr,"*Wi2: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; } - break; - case type_OtherPointer: - if ((int)pointer != ((int)start_addr+type_OtherPointer)) { - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo1: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - /* Is it plausible? Not a cons. X should check the headers. */ - if(Pointerp(start_addr[0]) || ((start_addr[0] & 3) == 0)) { - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo2: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - switch (TypeOf(start_addr[0])) { - case type_UnboundMarker: - case type_BaseChar: - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo3: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - - /* only pointed to by function pointers? */ - case type_ClosureHeader: - case type_FuncallableInstanceHeader: - case type_ByteCodeFunction: - case type_ByteCodeClosure: - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo4: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - - case type_InstanceHeader: - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo5: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - - /* the valid other immediate pointer objects */ - case type_SimpleVector: - case type_Ratio: - case type_Complex: -#ifdef type_ComplexSingleFloat - case type_ComplexSingleFloat: -#endif -#ifdef type_ComplexDoubleFloat - case type_ComplexDoubleFloat: -#endif -#ifdef type_ComplexLongFloat - case type_ComplexLongFloat: -#endif - case type_SimpleArray: - case type_ComplexString: - case type_ComplexBitVector: - case type_ComplexVector: - case type_ComplexArray: - case type_ValueCellHeader: - case type_SymbolHeader: - case type_Fdefn: - case type_CodeHeader: - case type_Bignum: - case type_SingleFloat: - case type_DoubleFloat: -#ifdef type_LongFloat - case type_LongFloat: -#endif - case type_SimpleString: - case type_SimpleBitVector: - case type_SimpleArrayUnsignedByte2: - case type_SimpleArrayUnsignedByte4: - case type_SimpleArrayUnsignedByte8: - case type_SimpleArrayUnsignedByte16: - case type_SimpleArrayUnsignedByte32: -#ifdef type_SimpleArraySignedByte8 - case type_SimpleArraySignedByte8: -#endif -#ifdef type_SimpleArraySignedByte16 - case type_SimpleArraySignedByte16: -#endif -#ifdef type_SimpleArraySignedByte30 - case type_SimpleArraySignedByte30: -#endif -#ifdef type_SimpleArraySignedByte32 - case type_SimpleArraySignedByte32: -#endif - case type_SimpleArraySingleFloat: - case type_SimpleArrayDoubleFloat: -#ifdef type_SimpleArrayLongFloat - case type_SimpleArrayLongFloat: -#endif -#ifdef type_SimpleArrayComplexSingleFloat - case type_SimpleArrayComplexSingleFloat: -#endif -#ifdef type_SimpleArrayComplexDoubleFloat - case type_SimpleArrayComplexDoubleFloat: -#endif -#ifdef type_SimpleArrayComplexLongFloat - case type_SimpleArrayComplexLongFloat: -#endif - case type_Sap: - case type_WeakPointer: - break; - - default: - if (pointer_filter_verbose) { - fprintf(stderr,"*Wo6: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - break; - default: - if (pointer_filter_verbose) { - fprintf(stderr,"*W?: %x %x %x\n", pointer, start_addr, *start_addr); - } - return 0; - } - /* looks good */ - return 1; + /* looks good */ + return 1; } #define MAX_STACK_POINTERS 256 @@ -428,60 +352,61 @@ unsigned int num_valid_stack_ra_locations; static void setup_i386_stack_scav(lispobj *lowaddr, lispobj *base) { - lispobj *sp = lowaddr; - num_valid_stack_locations = 0; - num_valid_stack_ra_locations = 0; - for (sp = lowaddr; sp < base; sp++) { - lispobj thing = *sp; - /* Find the object start address */ - lispobj *start_addr = search_dynamic_space((void *)thing); - if (start_addr) { - /* We need to allow raw pointers into Code objects for return - * addresses. This will also pick up pointers to functions in code - * objects. */ - if (TypeOf(*start_addr) == type_CodeHeader) { - gc_assert(num_valid_stack_ra_locations < MAX_STACK_RETURN_ADDRESSES); - valid_stack_ra_locations[num_valid_stack_ra_locations] = sp; - valid_stack_ra_code_objects[num_valid_stack_ra_locations++] = - (lispobj *)((int)start_addr + type_OtherPointer); - } else { - if (valid_dynamic_space_pointer((void *)thing, start_addr)) { - gc_assert(num_valid_stack_locations < MAX_STACK_POINTERS); - valid_stack_locations[num_valid_stack_locations++] = sp; + lispobj *sp = lowaddr; + num_valid_stack_locations = 0; + num_valid_stack_ra_locations = 0; + for (sp = lowaddr; sp < base; sp++) { + lispobj thing = *sp; + /* Find the object start address */ + lispobj *start_addr = search_dynamic_space((void *)thing); + if (start_addr) { + /* We need to allow raw pointers into Code objects for + * return addresses. This will also pick up pointers to + * functions in code objects. */ + if (widetag_of(*start_addr) == CODE_HEADER_WIDETAG) { + gc_assert(num_valid_stack_ra_locations < + MAX_STACK_RETURN_ADDRESSES); + valid_stack_ra_locations[num_valid_stack_ra_locations] = sp; + valid_stack_ra_code_objects[num_valid_stack_ra_locations++] = + (lispobj *)((int)start_addr + OTHER_POINTER_LOWTAG); + } else { + if (valid_dynamic_space_pointer((void *)thing, start_addr)) { + gc_assert(num_valid_stack_locations < MAX_STACK_POINTERS); + valid_stack_locations[num_valid_stack_locations++] = sp; + } + } } - } } - } - if (pointer_filter_verbose) { - fprintf(stderr, "number of valid stack pointers = %d\n", - num_valid_stack_locations); - fprintf(stderr, "number of stack return addresses = %d\n", - num_valid_stack_ra_locations); - } + if (pointer_filter_verbose) { + fprintf(stderr, "number of valid stack pointers = %d\n", + num_valid_stack_locations); + fprintf(stderr, "number of stack return addresses = %d\n", + num_valid_stack_ra_locations); + } } static void pscav_i386_stack(void) { - int i; + int i; - for (i = 0; i < num_valid_stack_locations; i++) - pscav(valid_stack_locations[i], 1, 0); + for (i = 0; i < num_valid_stack_locations; i++) + pscav(valid_stack_locations[i], 1, 0); - for (i = 0; i < num_valid_stack_ra_locations; i++) { - 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], - (int)(*valid_stack_ra_locations[i]) - - ((int)valid_stack_ra_code_objects[i] - (int)code_obj), - valid_stack_ra_code_objects[i], code_obj); + for (i = 0; i < num_valid_stack_ra_locations; i++) { + 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], + (int)(*valid_stack_ra_locations[i]) + - ((int)valid_stack_ra_code_objects[i] - (int)code_obj), + (unsigned int) valid_stack_ra_code_objects[i], code_obj); + } + *valid_stack_ra_locations[i] = + ((int)(*valid_stack_ra_locations[i]) + - ((int)valid_stack_ra_code_objects[i] - (int)code_obj)); } - *valid_stack_ra_locations[i] = - ((int)(*valid_stack_ra_locations[i]) - - ((int)valid_stack_ra_code_objects[i] - (int)code_obj)); - } } #endif #endif @@ -516,7 +441,8 @@ pscav_later(lispobj *where, int count) } } -static lispobj ptrans_boxed(lispobj thing, lispobj header, boolean constant) +static lispobj +ptrans_boxed(lispobj thing, lispobj header, boolean constant) { int nwords; lispobj result, *new, *old; @@ -524,7 +450,7 @@ static lispobj ptrans_boxed(lispobj thing, lispobj header, boolean constant) nwords = 1 + HeaderValue(header); /* Allocate it */ - old = (lispobj *)PTR(thing); + old = (lispobj *)native_pointer(thing); if (constant) { new = read_only_free; read_only_free += CEILING(nwords, 2); @@ -538,7 +464,7 @@ static lispobj ptrans_boxed(lispobj thing, lispobj header, boolean constant) bcopy(old, new, nwords * sizeof(lispobj)); /* Deposit forwarding pointer. */ - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); *old = result; /* Scavenge it. */ @@ -548,12 +474,13 @@ static lispobj ptrans_boxed(lispobj thing, lispobj header, boolean constant) } /* We need to look at the layout to see whether it is a pure structure - * class, and only then can we transport as constant. If it is pure, we can - * ALWAYS transport as a constant. */ -static lispobj ptrans_instance(lispobj thing, lispobj header, boolean constant) + * class, and only then can we transport as constant. If it is pure, + * we can ALWAYS transport as a constant. */ +static lispobj +ptrans_instance(lispobj thing, lispobj header, boolean constant) { - lispobj layout = ((struct instance *)PTR(thing))->slots[0]; - lispobj pure = ((struct instance *)PTR(layout))->slots[15]; + lispobj layout = ((struct instance *)native_pointer(thing))->slots[0]; + lispobj pure = ((struct instance *)native_pointer(layout))->slots[15]; switch (pure) { case T: @@ -562,17 +489,18 @@ static lispobj ptrans_instance(lispobj thing, lispobj header, boolean constant) return (ptrans_boxed(thing, header, 0)); case 0: { - /* Substructure: special case for the compact-info-envs, where - * the instance may have a point to the dynamic space placed - * into it (e.g. the cache-name slot), but the lists and arrays - * at the time of a purify can be moved to the RO space. */ + /* Substructure: special case for the COMPACT-INFO-ENVs, + * where the instance may have a point to the dynamic + * space placed into it (e.g. the cache-name slot), but + * the lists and arrays at the time of a purify can be + * moved to the RO space. */ int nwords; lispobj result, *new, *old; nwords = 1 + HeaderValue(header); /* Allocate it */ - old = (lispobj *)PTR(thing); + old = (lispobj *)native_pointer(thing); new = static_free; static_free += CEILING(nwords, 2); @@ -580,7 +508,7 @@ static lispobj ptrans_instance(lispobj thing, lispobj header, boolean constant) bcopy(old, new, nwords * sizeof(lispobj)); /* Deposit forwarding pointer. */ - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); *old = result; /* Scavenge it. */ @@ -590,10 +518,12 @@ static lispobj ptrans_instance(lispobj thing, lispobj header, boolean constant) } default: gc_abort(); + return NIL; /* dummy value: return something ... */ } } -static lispobj ptrans_fdefn(lispobj thing, lispobj header) +static lispobj +ptrans_fdefn(lispobj thing, lispobj header) { int nwords; lispobj result, *new, *old, oldfn; @@ -602,7 +532,7 @@ static lispobj ptrans_fdefn(lispobj thing, lispobj header) nwords = 1 + HeaderValue(header); /* Allocate it */ - old = (lispobj *)PTR(thing); + old = (lispobj *)native_pointer(thing); new = static_free; static_free += CEILING(nwords, 2); @@ -610,20 +540,21 @@ static lispobj ptrans_fdefn(lispobj thing, lispobj header) bcopy(old, new, nwords * sizeof(lispobj)); /* Deposit forwarding pointer. */ - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); *old = result; /* Scavenge the function. */ fdefn = (struct fdefn *)new; - oldfn = fdefn->function; - pscav(&fdefn->function, 1, 0); - if ((char *)oldfn + RAW_ADDR_OFFSET == fdefn->raw_addr) - fdefn->raw_addr = (char *)fdefn->function + RAW_ADDR_OFFSET; + oldfn = fdefn->fun; + pscav(&fdefn->fun, 1, 0); + if ((char *)oldfn + FUN_RAW_ADDR_OFFSET == fdefn->raw_addr) + fdefn->raw_addr = (char *)fdefn->fun + FUN_RAW_ADDR_OFFSET; return result; } -static lispobj ptrans_unboxed(lispobj thing, lispobj header) +static lispobj +ptrans_unboxed(lispobj thing, lispobj header) { int nwords; lispobj result, *new, *old; @@ -631,7 +562,7 @@ static lispobj ptrans_unboxed(lispobj thing, lispobj header) nwords = 1 + HeaderValue(header); /* Allocate it */ - old = (lispobj *)PTR(thing); + old = (lispobj *)native_pointer(thing); new = read_only_free; read_only_free += CEILING(nwords, 2); @@ -639,20 +570,21 @@ static lispobj ptrans_unboxed(lispobj thing, lispobj header) bcopy(old, new, nwords * sizeof(lispobj)); /* Deposit forwarding pointer. */ - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); *old = result; return result; } -static lispobj ptrans_vector(lispobj thing, int bits, int extra, - boolean boxed, boolean constant) +static lispobj +ptrans_vector(lispobj thing, int bits, int extra, + boolean boxed, boolean constant) { struct vector *vector; int nwords; lispobj result, *new; - vector = (struct vector *)PTR(thing); + vector = (struct vector *)native_pointer(thing); nwords = 2 + (CEILING((fixnum_value(vector->length)+extra)*bits,32)>>5); if (boxed && !constant) { @@ -666,7 +598,7 @@ static lispobj ptrans_vector(lispobj thing, int bits, int extra, bcopy(vector, new, nwords * sizeof(lispobj)); - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); vector->header = result; if (boxed) @@ -682,17 +614,10 @@ apply_code_fixups_during_purify(struct code *old_code, struct code *new_code) int nheader_words, ncode_words, nwords; void *constants_start_addr, *constants_end_addr; void *code_start_addr, *code_end_addr; - lispobj p; lispobj fixups = NIL; unsigned displacement = (unsigned)new_code - (unsigned)old_code; struct vector *fixups_vector; - /* Byte compiled code has no fixups. The trace table offset will be - * a fixnum if it's x86 compiled code - check. */ - if (new_code->trace_table_offset & 0x3) - return; - - /* Else it's x86 machine code. */ ncode_words = fixnum_value(new_code->code_size); nheader_words = HeaderValue(*(lispobj *)new_code); nwords = ncode_words + nheader_words; @@ -708,7 +633,9 @@ apply_code_fixups_during_purify(struct code *old_code, struct code *new_code) /* It will be 0 or the unbound-marker if there are no fixups, and * will be an other-pointer to a vector if it is valid. */ - if ((fixups==0) || (fixups==type_UnboundMarker) || !Pointerp(fixups)) { + if ((fixups==0) || + (fixups==UNBOUND_MARKER_WIDETAG) || + !is_lisp_pointer(fixups)) { #ifdef GENCGC /* Check for a possible errors. */ sniff_code_object(new_code,displacement); @@ -716,16 +643,17 @@ apply_code_fixups_during_purify(struct code *old_code, struct code *new_code) return; } - fixups_vector = (struct vector *)PTR(fixups); + fixups_vector = (struct vector *)native_pointer(fixups); /* Could be pointing to a forwarding pointer. */ - if (Pointerp(fixups) && (dynamic_pointer_p(fixups)) + if (is_lisp_pointer(fixups) && (dynamic_pointer_p(fixups)) && forwarding_pointer_p(*(lispobj *)fixups_vector)) { /* If so then follow it. */ - fixups_vector = (struct vector *)PTR(*(lispobj *)fixups_vector); + fixups_vector = (struct vector *)native_pointer(*(lispobj *)fixups_vector); } - if (TypeOf(fixups_vector->header) == type_SimpleArrayUnsignedByte32) { + if (widetag_of(fixups_vector->header) == + SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG) { /* We got the fixups for the code block. Now work through the vector, * and apply a fixup at each address. */ int length = fixnum_value(fixups_vector->length); @@ -761,13 +689,14 @@ apply_code_fixups_during_purify(struct code *old_code, struct code *new_code) } #endif -static lispobj ptrans_code(lispobj thing) +static lispobj +ptrans_code(lispobj thing) { struct code *code, *new; int nwords; lispobj func, result; - code = (struct code *)PTR(thing); + code = (struct code *)native_pointer(thing); nwords = HeaderValue(code->header) + fixnum_value(code->code_size); new = (struct code *)read_only_free; @@ -779,7 +708,7 @@ static lispobj ptrans_code(lispobj thing) apply_code_fixups_during_purify(code,new); #endif - result = (lispobj)new | type_OtherPointer; + result = (lispobj)new | OTHER_POINTER_LOWTAG; /* Stick in a forwarding pointer for the code object. */ *(lispobj *)code = result; @@ -787,11 +716,11 @@ static lispobj ptrans_code(lispobj thing) /* Put in forwarding pointers for all the functions. */ for (func = code->entry_points; func != NIL; - func = ((struct function *)PTR(func))->next) { + func = ((struct simple_fun *)native_pointer(func))->next) { - gc_assert(LowtagOf(func) == type_FunctionPointer); + gc_assert(lowtag_of(func) == FUN_POINTER_LOWTAG); - *(lispobj *)PTR(func) = result + (func - thing); + *(lispobj *)native_pointer(func) = result + (func - thing); } /* Arrange to scavenge the debug info later. */ @@ -811,30 +740,32 @@ static lispobj ptrans_code(lispobj thing) pscav(&new->entry_points, 1, 1); for (func = new->entry_points; func != NIL; - func = ((struct function *)PTR(func))->next) { - gc_assert(LowtagOf(func) == type_FunctionPointer); + func = ((struct simple_fun *)native_pointer(func))->next) { + gc_assert(lowtag_of(func) == FUN_POINTER_LOWTAG); gc_assert(!dynamic_pointer_p(func)); #ifdef __i386__ - /* Temporarly convert the self pointer to a real function - pointer. */ - ((struct function *)PTR(func))->self -= RAW_ADDR_OFFSET; + /* Temporarly convert the self pointer to a real function pointer. */ + ((struct simple_fun *)native_pointer(func))->self + -= FUN_RAW_ADDR_OFFSET; #endif - pscav(&((struct function *)PTR(func))->self, 2, 1); + pscav(&((struct simple_fun *)native_pointer(func))->self, 2, 1); #ifdef __i386__ - ((struct function *)PTR(func))->self += RAW_ADDR_OFFSET; + ((struct simple_fun *)native_pointer(func))->self + += FUN_RAW_ADDR_OFFSET; #endif - pscav_later(&((struct function *)PTR(func))->name, 3); + pscav_later(&((struct simple_fun *)native_pointer(func))->name, 3); } return result; } -static lispobj ptrans_func(lispobj thing, lispobj header) +static lispobj +ptrans_func(lispobj thing, lispobj header) { int nwords; lispobj code, *new, *old, result; - struct function *function; + struct simple_fun *function; /* Thing can either be a function header, a closure function * header, a closure, or a funcallable-instance. If it's a closure @@ -842,16 +773,18 @@ static lispobj ptrans_func(lispobj thing, lispobj header) * Otherwise we have to do something strange, 'cause it is buried * inside a code object. */ - if (TypeOf(header) == type_FunctionHeader || - TypeOf(header) == type_ClosureFunctionHeader) { + if (widetag_of(header) == SIMPLE_FUN_HEADER_WIDETAG || + widetag_of(header) == CLOSURE_FUN_HEADER_WIDETAG) { /* We can only end up here if the code object has not been * scavenged, because if it had been scavenged, forwarding pointers * would have been left behind for all the entry points. */ - function = (struct function *)PTR(thing); - code = (PTR(thing)-(HeaderValue(function->header)*sizeof(lispobj))) | - type_OtherPointer; + function = (struct simple_fun *)native_pointer(thing); + code = + (native_pointer(thing) - + (HeaderValue(function->header)*sizeof(lispobj))) | + OTHER_POINTER_LOWTAG; /* This will cause the function's header to be replaced with a * forwarding pointer. */ @@ -863,10 +796,10 @@ static lispobj ptrans_func(lispobj thing, lispobj header) else { /* It's some kind of closure-like thing. */ nwords = 1 + HeaderValue(header); - old = (lispobj *)PTR(thing); + old = (lispobj *)native_pointer(thing); /* Allocate the new one. */ - if (TypeOf(header) == type_FuncallableInstanceHeader) { + if (widetag_of(header) == FUNCALLABLE_INSTANCE_HEADER_WIDETAG) { /* FINs *must* not go in read_only space. */ new = static_free; static_free += CEILING(nwords, 2); @@ -882,7 +815,7 @@ static lispobj ptrans_func(lispobj thing, lispobj header) bcopy(old, new, nwords * sizeof(lispobj)); /* Deposit forwarding pointer. */ - result = (lispobj)new | LowtagOf(thing); + result = (lispobj)new | lowtag_of(thing); *old = result; /* Scavenge it. */ @@ -892,7 +825,8 @@ static lispobj ptrans_func(lispobj thing, lispobj header) } } -static lispobj ptrans_returnpc(lispobj thing, lispobj header) +static lispobj +ptrans_returnpc(lispobj thing, lispobj header) { lispobj code, new; @@ -900,7 +834,7 @@ static lispobj ptrans_returnpc(lispobj thing, lispobj header) code = thing - HeaderValue(header)*sizeof(lispobj); /* Make sure it's been transported. */ - new = *(lispobj *)PTR(code); + new = *(lispobj *)native_pointer(code); if (!forwarding_pointer_p(new)) new = ptrans_code(code); @@ -910,7 +844,8 @@ static lispobj ptrans_returnpc(lispobj thing, lispobj header) #define WORDS_PER_CONS CEILING(sizeof(struct cons) / sizeof(lispobj), 2) -static lispobj ptrans_list(lispobj thing, boolean constant) +static lispobj +ptrans_list(lispobj thing, boolean constant) { struct cons *old, *new, *orig; int length; @@ -923,7 +858,7 @@ static lispobj ptrans_list(lispobj thing, boolean constant) do { /* Allocate a new cons cell. */ - old = (struct cons *)PTR(thing); + old = (struct cons *)native_pointer(thing); if (constant) { new = (struct cons *)read_only_free; read_only_free += WORDS_PER_CONS; @@ -938,100 +873,101 @@ static lispobj ptrans_list(lispobj thing, boolean constant) thing = new->cdr = old->cdr; /* Set up the forwarding pointer. */ - *(lispobj *)old = ((lispobj)new) | type_ListPointer; + *(lispobj *)old = ((lispobj)new) | LIST_POINTER_LOWTAG; /* And count this cell. */ length++; - } while (LowtagOf(thing) == type_ListPointer && + } while (lowtag_of(thing) == LIST_POINTER_LOWTAG && dynamic_pointer_p(thing) && - !(forwarding_pointer_p(*(lispobj *)PTR(thing)))); + !(forwarding_pointer_p(*(lispobj *)native_pointer(thing)))); /* Scavenge the list we just copied. */ pscav((lispobj *)orig, length * WORDS_PER_CONS, constant); - return ((lispobj)orig) | type_ListPointer; + return ((lispobj)orig) | LIST_POINTER_LOWTAG; } -static lispobj ptrans_otherptr(lispobj thing, lispobj header, boolean constant) +static lispobj +ptrans_otherptr(lispobj thing, lispobj header, boolean constant) { - switch (TypeOf(header)) { - case type_Bignum: - case type_SingleFloat: - case type_DoubleFloat: -#ifdef type_LongFloat - case type_LongFloat: + switch (widetag_of(header)) { + case BIGNUM_WIDETAG: + case SINGLE_FLOAT_WIDETAG: + case DOUBLE_FLOAT_WIDETAG: +#ifdef LONG_FLOAT_WIDETAG + case LONG_FLOAT_WIDETAG: #endif -#ifdef type_ComplexSingleFloat - case type_ComplexSingleFloat: +#ifdef COMPLEX_SINGLE_FLOAT_WIDETAG + case COMPLEX_SINGLE_FLOAT_WIDETAG: #endif -#ifdef type_ComplexDoubleFloat - case type_ComplexDoubleFloat: +#ifdef COMPLEX_DOUBLE_FLOAT_WIDETAG + case COMPLEX_DOUBLE_FLOAT_WIDETAG: #endif -#ifdef type_ComplexLongFloat - case type_ComplexLongFloat: +#ifdef COMPLEX_LONG_FLOAT_WIDETAG + case COMPLEX_LONG_FLOAT_WIDETAG: #endif - case type_Sap: + case SAP_WIDETAG: return ptrans_unboxed(thing, header); - case type_Ratio: - case type_Complex: - case type_SimpleArray: - case type_ComplexString: - case type_ComplexVector: - case type_ComplexArray: + case RATIO_WIDETAG: + case COMPLEX_WIDETAG: + case SIMPLE_ARRAY_WIDETAG: + case COMPLEX_STRING_WIDETAG: + case COMPLEX_VECTOR_WIDETAG: + case COMPLEX_ARRAY_WIDETAG: return ptrans_boxed(thing, header, constant); - case type_ValueCellHeader: - case type_WeakPointer: + case VALUE_CELL_HEADER_WIDETAG: + case WEAK_POINTER_WIDETAG: return ptrans_boxed(thing, header, 0); - case type_SymbolHeader: + case SYMBOL_HEADER_WIDETAG: return ptrans_boxed(thing, header, 0); - case type_SimpleString: + case SIMPLE_STRING_WIDETAG: return ptrans_vector(thing, 8, 1, 0, constant); - case type_SimpleBitVector: + case SIMPLE_BIT_VECTOR_WIDETAG: return ptrans_vector(thing, 1, 0, 0, constant); - case type_SimpleVector: + case SIMPLE_VECTOR_WIDETAG: return ptrans_vector(thing, 32, 0, 1, constant); - case type_SimpleArrayUnsignedByte2: + case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG: return ptrans_vector(thing, 2, 0, 0, constant); - case type_SimpleArrayUnsignedByte4: + case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG: return ptrans_vector(thing, 4, 0, 0, constant); - case type_SimpleArrayUnsignedByte8: -#ifdef type_SimpleArraySignedByte8 - case type_SimpleArraySignedByte8: + case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG: #endif return ptrans_vector(thing, 8, 0, 0, constant); - case type_SimpleArrayUnsignedByte16: -#ifdef type_SimpleArraySignedByte16 - case type_SimpleArraySignedByte16: + case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG: #endif return ptrans_vector(thing, 16, 0, 0, constant); - case type_SimpleArrayUnsignedByte32: -#ifdef type_SimpleArraySignedByte30 - case type_SimpleArraySignedByte30: + case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG: #endif -#ifdef type_SimpleArraySignedByte32 - case type_SimpleArraySignedByte32: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: #endif return ptrans_vector(thing, 32, 0, 0, constant); - case type_SimpleArraySingleFloat: + case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG: return ptrans_vector(thing, 32, 0, 0, constant); - case type_SimpleArrayDoubleFloat: + case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG: return ptrans_vector(thing, 64, 0, 0, constant); -#ifdef type_SimpleArrayLongFloat - case type_SimpleArrayLongFloat: +#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG: #ifdef __i386__ return ptrans_vector(thing, 96, 0, 0, constant); #endif @@ -1040,18 +976,18 @@ static lispobj ptrans_otherptr(lispobj thing, lispobj header, boolean constant) #endif #endif -#ifdef type_SimpleArrayComplexSingleFloat - case type_SimpleArrayComplexSingleFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: return ptrans_vector(thing, 64, 0, 0, constant); #endif -#ifdef type_SimpleArrayComplexDoubleFloat - case type_SimpleArrayComplexDoubleFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: return ptrans_vector(thing, 128, 0, 0, constant); #endif -#ifdef type_SimpleArrayComplexLongFloat - case type_SimpleArrayComplexLongFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: #ifdef __i386__ return ptrans_vector(thing, 192, 0, 0, constant); #endif @@ -1060,13 +996,13 @@ static lispobj ptrans_otherptr(lispobj thing, lispobj header, boolean constant) #endif #endif - case type_CodeHeader: + case CODE_HEADER_WIDETAG: return ptrans_code(thing); - case type_ReturnPcHeader: + case RETURN_PC_HEADER_WIDETAG: return ptrans_returnpc(thing, header); - case type_Fdefn: + case FDEFN_WIDETAG: return ptrans_fdefn(thing, header); default: @@ -1076,15 +1012,16 @@ static lispobj ptrans_otherptr(lispobj thing, lispobj header, boolean constant) } } -static int pscav_fdefn(struct fdefn *fdefn) +static int +pscav_fdefn(struct fdefn *fdefn) { boolean fix_func; - fix_func = ((char *)(fdefn->function+RAW_ADDR_OFFSET) == fdefn->raw_addr); + fix_func = ((char *)(fdefn->fun+FUN_RAW_ADDR_OFFSET) == fdefn->raw_addr); pscav(&fdefn->name, 1, 1); - pscav(&fdefn->function, 1, 0); + pscav(&fdefn->fun, 1, 0); if (fix_func) - fdefn->raw_addr = (char *)(fdefn->function + RAW_ADDR_OFFSET); + fdefn->raw_addr = (char *)(fdefn->fun + FUN_RAW_ADDR_OFFSET); return sizeof(struct fdefn) / sizeof(lispobj); } @@ -1097,19 +1034,6 @@ pscav_code(struct code*code) lispobj func; nwords = HeaderValue(code->header) + fixnum_value(code->code_size); - /* pw--The trace_table_offset slot can contain a list pointer. This - * occurs when the code object is a top level form that initializes - * a byte-compiled function. The fact that PURIFY was ignoring this - * slot may be a bug unrelated to the x86 port, except that TLF's - * normally become unreachable after the loader calls them and - * won't be seen by PURIFY at all!! */ - if(code->trace_table_offset & 0x3) -#if 0 - pscav(&code->trace_table_offset, 1, 0); -#else - code->trace_table_offset = NIL; /* limit lifetime */ -#endif - /* Arrange to scavenge the debug info later. */ pscav_later(&code->debug_info, 1); @@ -1120,59 +1044,62 @@ pscav_code(struct code*code) pscav(&code->entry_points, 1, 1); for (func = code->entry_points; func != NIL; - func = ((struct function *)PTR(func))->next) { - gc_assert(LowtagOf(func) == type_FunctionPointer); + func = ((struct simple_fun *)native_pointer(func))->next) { + gc_assert(lowtag_of(func) == FUN_POINTER_LOWTAG); gc_assert(!dynamic_pointer_p(func)); #ifdef __i386__ /* Temporarly convert the self pointer to a real function * pointer. */ - ((struct function *)PTR(func))->self -= RAW_ADDR_OFFSET; + ((struct simple_fun *)native_pointer(func))->self + -= FUN_RAW_ADDR_OFFSET; #endif - pscav(&((struct function *)PTR(func))->self, 2, 1); + pscav(&((struct simple_fun *)native_pointer(func))->self, 2, 1); #ifdef __i386__ - ((struct function *)PTR(func))->self += RAW_ADDR_OFFSET; + ((struct simple_fun *)native_pointer(func))->self + += FUN_RAW_ADDR_OFFSET; #endif - pscav_later(&((struct function *)PTR(func))->name, 3); + pscav_later(&((struct simple_fun *)native_pointer(func))->name, 3); } return CEILING(nwords,2); } #endif -static lispobj *pscav(lispobj *addr, int nwords, boolean constant) +static lispobj * +pscav(lispobj *addr, int nwords, boolean constant) { lispobj thing, *thingp, header; - int count; + int count = 0; /* (0 = dummy init value to stop GCC warning) */ struct vector *vector; while (nwords > 0) { thing = *addr; - if (Pointerp(thing)) { + if (is_lisp_pointer(thing)) { /* It's a pointer. Is it something we might have to move? */ if (dynamic_pointer_p(thing)) { /* Maybe. Have we already moved it? */ - thingp = (lispobj *)PTR(thing); + thingp = (lispobj *)native_pointer(thing); header = *thingp; - if (Pointerp(header) && forwarding_pointer_p(header)) + if (is_lisp_pointer(header) && forwarding_pointer_p(header)) /* Yep, so just copy the forwarding pointer. */ thing = header; else { /* Nope, copy the object. */ - switch (LowtagOf(thing)) { - case type_FunctionPointer: + switch (lowtag_of(thing)) { + case FUN_POINTER_LOWTAG: thing = ptrans_func(thing, header); break; - case type_ListPointer: + case LIST_POINTER_LOWTAG: thing = ptrans_list(thing, constant); break; - case type_InstancePointer: + case INSTANCE_POINTER_LOWTAG: thing = ptrans_instance(thing, header, constant); break; - case type_OtherPointer: + case OTHER_POINTER_LOWTAG: thing = ptrans_otherptr(thing, header, constant); break; @@ -1188,87 +1115,88 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant) else if (thing & 3) { /* It's an other immediate. Maybe the header for an unboxed */ /* object. */ - switch (TypeOf(thing)) { - case type_Bignum: - case type_SingleFloat: - case type_DoubleFloat: -#ifdef type_LongFloat - case type_LongFloat: -#endif - case type_Sap: + switch (widetag_of(thing)) { + case BIGNUM_WIDETAG: + case SINGLE_FLOAT_WIDETAG: + case DOUBLE_FLOAT_WIDETAG: +#ifdef LONG_FLOAT_WIDETAG + case LONG_FLOAT_WIDETAG: +#endif + case SAP_WIDETAG: /* It's an unboxed simple object. */ count = HeaderValue(thing)+1; break; - case type_SimpleVector: - if (HeaderValue(thing) == subtype_VectorValidHashing) - *addr = (subtype_VectorMustRehash<length)+1,4)+2,2); break; - case type_SimpleBitVector: + case SIMPLE_BIT_VECTOR_WIDETAG: vector = (struct vector *)addr; count = CEILING(NWORDS(fixnum_value(vector->length),32)+2,2); break; - case type_SimpleArrayUnsignedByte2: + case SIMPLE_ARRAY_UNSIGNED_BYTE_2_WIDETAG: vector = (struct vector *)addr; count = CEILING(NWORDS(fixnum_value(vector->length),16)+2,2); break; - case type_SimpleArrayUnsignedByte4: + case SIMPLE_ARRAY_UNSIGNED_BYTE_4_WIDETAG: vector = (struct vector *)addr; count = CEILING(NWORDS(fixnum_value(vector->length),8)+2,2); break; - case type_SimpleArrayUnsignedByte8: -#ifdef type_SimpleArraySignedByte8 - case type_SimpleArraySignedByte8: + case SIMPLE_ARRAY_UNSIGNED_BYTE_8_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_8_WIDETAG: #endif vector = (struct vector *)addr; count = CEILING(NWORDS(fixnum_value(vector->length),4)+2,2); break; - case type_SimpleArrayUnsignedByte16: -#ifdef type_SimpleArraySignedByte16 - case type_SimpleArraySignedByte16: + case SIMPLE_ARRAY_UNSIGNED_BYTE_16_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_16_WIDETAG: #endif vector = (struct vector *)addr; count = CEILING(NWORDS(fixnum_value(vector->length),2)+2,2); break; - case type_SimpleArrayUnsignedByte32: -#ifdef type_SimpleArraySignedByte30 - case type_SimpleArraySignedByte30: + case SIMPLE_ARRAY_UNSIGNED_BYTE_32_WIDETAG: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_30_WIDETAG: #endif -#ifdef type_SimpleArraySignedByte32 - case type_SimpleArraySignedByte32: +#ifdef SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG + case SIMPLE_ARRAY_SIGNED_BYTE_32_WIDETAG: #endif vector = (struct vector *)addr; count = CEILING(fixnum_value(vector->length)+2,2); break; - case type_SimpleArraySingleFloat: + case SIMPLE_ARRAY_SINGLE_FLOAT_WIDETAG: vector = (struct vector *)addr; count = CEILING(fixnum_value(vector->length)+2,2); break; - case type_SimpleArrayDoubleFloat: -#ifdef type_SimpleArrayComplexSingleFloat - case type_SimpleArrayComplexSingleFloat: + case SIMPLE_ARRAY_DOUBLE_FLOAT_WIDETAG: +#ifdef SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_SINGLE_FLOAT_WIDETAG: #endif vector = (struct vector *)addr; count = fixnum_value(vector->length)*2+2; break; -#ifdef type_SimpleArrayLongFloat - case type_SimpleArrayLongFloat: +#ifdef SIMPLE_ARRAY_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_LONG_FLOAT_WIDETAG: vector = (struct vector *)addr; #ifdef __i386__ count = fixnum_value(vector->length)*3+2; @@ -1279,15 +1207,15 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant) break; #endif -#ifdef type_SimpleArrayComplexDoubleFloat - case type_SimpleArrayComplexDoubleFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_DOUBLE_FLOAT_WIDETAG: vector = (struct vector *)addr; count = fixnum_value(vector->length)*4+2; break; #endif -#ifdef type_SimpleArrayComplexLongFloat - case type_SimpleArrayComplexLongFloat: +#ifdef SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG + case SIMPLE_ARRAY_COMPLEX_LONG_FLOAT_WIDETAG: vector = (struct vector *)addr; #ifdef __i386__ count = fixnum_value(vector->length)*6+2; @@ -1298,7 +1226,7 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant) break; #endif - case type_CodeHeader: + case CODE_HEADER_WIDETAG: #ifndef __i386__ gc_abort(); /* no code headers in static space */ #else @@ -1306,39 +1234,37 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant) #endif break; - case type_FunctionHeader: - case type_ClosureFunctionHeader: - case type_ReturnPcHeader: + case SIMPLE_FUN_HEADER_WIDETAG: + case CLOSURE_FUN_HEADER_WIDETAG: + case RETURN_PC_HEADER_WIDETAG: /* We should never hit any of these, 'cause they occur * buried in the middle of code objects. */ gc_abort(); break; #ifdef __i386__ - case type_ClosureHeader: - case type_FuncallableInstanceHeader: - case type_ByteCodeFunction: - case type_ByteCodeClosure: + 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. */ { - lispobj fun = ((struct closure *)addr)->function - - RAW_ADDR_OFFSET; + lispobj fun = ((struct closure *)addr)->fun + - FUN_RAW_ADDR_OFFSET; pscav(&fun, 1, constant); - ((struct closure *)addr)->function = fun + RAW_ADDR_OFFSET; + ((struct closure *)addr)->fun = fun + FUN_RAW_ADDR_OFFSET; } count = 2; break; #endif - case type_WeakPointer: + case WEAK_POINTER_WIDETAG: /* Weak pointers get preserved during purify, 'cause I * don't feel like figuring out how to break them. */ pscav(addr+1, 2, constant); count = 4; break; - case type_Fdefn: + case FDEFN_WIDETAG: /* We have to handle fdefn objects specially, so we * can fix up the raw function address. */ count = pscav_fdefn((struct fdefn *)addr); @@ -1361,7 +1287,8 @@ static lispobj *pscav(lispobj *addr, int nwords, boolean constant) return addr; } -int purify(lispobj static_roots, lispobj read_only_roots) +int +purify(lispobj static_roots, lispobj read_only_roots) { lispobj *clean; int count, i; @@ -1381,8 +1308,8 @@ int purify(lispobj static_roots, lispobj read_only_roots) return 0; } -#if defined(ibmrt) || defined(__i386__) - current_dynamic_space_free_pointer = +#if defined(__i386__) + dynamic_space_free_pointer = (lispobj*)SymbolValue(ALLOCATION_POINTER); #endif @@ -1397,8 +1324,8 @@ int purify(lispobj static_roots, lispobj read_only_roots) #endif #ifdef GENCGC - gc_assert(control_stack_end > ((&read_only_roots)+1)); - setup_i386_stack_scav(((&static_roots)-2), control_stack_end); + gc_assert((lispobj *)CONTROL_STACK_END > ((&read_only_roots)+1)); + setup_i386_stack_scav(((&static_roots)-2), (lispobj *)CONTROL_STACK_END); #endif pscav(&static_roots, 1, 0); @@ -1417,36 +1344,47 @@ int purify(lispobj static_roots, lispobj read_only_roots) fflush(stdout); #endif #ifndef __i386__ - pscav(control_stack, current_control_stack_pointer - control_stack, 0); + pscav((lispobj *)CONTROL_STACK_START, + current_control_stack_pointer - (lispobj *)CONTROL_STACK_START, + 0); #else #ifdef GENCGC pscav_i386_stack(); #endif -#ifdef WANT_CGC - gc_assert(control_stack_end > ((&read_only_roots)+1)); - carefully_pscav_stack(((&read_only_roots)+1), control_stack_end); -#endif #endif #ifdef PRINTNOISE printf(" bindings"); fflush(stdout); #endif -#if !defined(ibmrt) && !defined(__i386__) - pscav(binding_stack, current_binding_stack_pointer - binding_stack, 0); +#if !defined(__i386__) + pscav( (lispobj *)BINDING_STACK_START, + (lispobj *)current_binding_stack_pointer - (lispobj *)BINDING_STACK_START, + 0); #else - pscav(binding_stack, (lispobj *)SymbolValue(BINDING_STACK_POINTER) - binding_stack, 0); -#endif - -#ifdef SCAVENGE_READ_ONLY_SPACE - if (SymbolValue(SCAVENGE_READ_ONLY_SPACE) != type_UnboundMarker + pscav( (lispobj *)BINDING_STACK_START, + (lispobj *)SymbolValue(BINDING_STACK_POINTER) - + (lispobj *)BINDING_STACK_START, + 0); +#endif + + /* The original CMU CL code had scavenge-read-only-space code + * controlled by the Lisp-level variable + * *SCAVENGE-READ-ONLY-SPACE*. It was disabled by default, and it + * wasn't documented under what circumstances it was useful or + * safe to turn it on, so it's been turned off in SBCL. If you + * want/need this functionality, and can test and document it, + * please submit a patch. */ +#if 0 + if (SymbolValue(SCAVENGE_READ_ONLY_SPACE) != UNBOUND_MARKER_WIDETAG && SymbolValue(SCAVENGE_READ_ONLY_SPACE) != NIL) { unsigned read_only_space_size = - (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER) - read_only_space; + (lispobj *)SymbolValue(READ_ONLY_SPACE_FREE_POINTER) - + (lispobj *)READ_ONLY_SPACE_START; fprintf(stderr, "scavenging read only space: %d bytes\n", read_only_space_size * sizeof(lispobj)); - pscav(read_only_space, read_only_space_size, 0); + pscav( (lispobj *)READ_ONLY_SPACE_START, read_only_space_size, 0); } #endif @@ -1454,7 +1392,7 @@ int purify(lispobj static_roots, lispobj read_only_roots) printf(" static"); fflush(stdout); #endif - clean = static_space; + clean = (lispobj *)STATIC_SPACE_START; do { while (clean != static_free) clean = pscav(clean, static_free - clean, 0); @@ -1485,62 +1423,31 @@ int purify(lispobj static_roots, lispobj read_only_roots) fflush(stdout); #endif -#if defined(WANT_CGC) && defined(X86_CGC_ACTIVE_P) - if(SymbolValue(X86_CGC_ACTIVE_P) != T) - os_zero((os_vm_address_t) current_dynamic_space, - (os_vm_size_t) DYNAMIC_SPACE_SIZE); -#else os_zero((os_vm_address_t) current_dynamic_space, (os_vm_size_t) DYNAMIC_SPACE_SIZE); -#endif /* Zero the stack. Note that the stack is also zeroed by SUB-GC * calling SCRUB-CONTROL-STACK - this zeros the stack on the x86. */ #ifndef __i386__ os_zero((os_vm_address_t) current_control_stack_pointer, (os_vm_size_t) (CONTROL_STACK_SIZE - - ((current_control_stack_pointer - control_stack) * + ((current_control_stack_pointer - + (lispobj *)CONTROL_STACK_START) * sizeof(lispobj)))); #endif -#if defined(WANT_CGC) && defined(STATIC_BLUE_BAG) - { - lispobj bag = SymbolValue(STATIC_BLUE_BAG); - struct cons*cons = (struct cons*)static_free; - struct cons*pair = cons + 1; - static_free += 2*WORDS_PER_CONS; - if(bag == type_UnboundMarker) - bag = NIL; - cons->cdr = bag; - cons->car = (lispobj)pair | type_ListPointer; - pair->car = (lispobj)static_end; - pair->cdr = (lispobj)static_free; - bag = (lispobj)cons | type_ListPointer; - SetSymbolValue(STATIC_BLUE_BAG, bag); - } -#endif - /* It helps to update the heap free pointers so that free_heap can * verify after it's done. */ SetSymbolValue(READ_ONLY_SPACE_FREE_POINTER, (lispobj)read_only_free); SetSymbolValue(STATIC_SPACE_FREE_POINTER, (lispobj)static_free); -#if !defined(ibmrt) && !defined(__i386__) - current_dynamic_space_free_pointer = current_dynamic_space; -#else -#if defined(WANT_CGC) && defined(X86_CGC_ACTIVE_P) - /* X86 using CGC */ - if(SymbolValue(X86_CGC_ACTIVE_P) != T) - SetSymbolValue(ALLOCATION_POINTER, (lispobj)current_dynamic_space); - else - cgc_free_heap(); +#if !defined(__i386__) + dynamic_space_free_pointer = current_dynamic_space; #else #if defined GENCGC gc_free_heap(); #else - /* ibmrt using GC */ - SetSymbolValue(ALLOCATION_POINTER, (lispobj)current_dynamic_space); -#endif +#error unsupported case /* in CMU CL, was "ibmrt using GC" */ #endif #endif