#define PRINTNOISE
-#if defined(ibmrt) || defined(__i386__)
+#if defined(__i386__)
/* again, what's so special about the x86 that this is differently
* visible there than on other platforms? -dan 20010125
*/
\f
#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 */
- } else 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
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))
+ if (!is_lisp_pointer((lispobj)pointer))
return 0;
/* Check that the object pointed to is consistent with the pointer
return 0;
}
/* Is it plausible cons? */
- if((Pointerp(start_addr[0])
+ if((is_lisp_pointer(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])
+ && (is_lisp_pointer(start_addr[1])
|| ((start_addr[1] & 3) == 0) /* fixnum */
|| (TypeOf(start_addr[1]) == type_BaseChar)
|| (TypeOf(start_addr[1]) == type_UnboundMarker))) {
return 0;
}
/* Is it plausible? Not a cons. X should check the headers. */
- if(Pointerp(start_addr[0]) || ((start_addr[0] & 3) == 0)) {
+ 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);
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);
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:
nwords = 1 + HeaderValue(header);
/* Allocate it */
- old = (lispobj *)PTR(thing);
+ old = (lispobj *)native_pointer(thing);
new = static_free;
static_free += CEILING(nwords, 2);
nwords = 1 + HeaderValue(header);
/* Allocate it */
- old = (lispobj *)PTR(thing);
+ old = (lispobj *)native_pointer(thing);
new = static_free;
static_free += CEILING(nwords, 2);
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);
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) {
/* 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==type_UnboundMarker) ||
+ !is_lisp_pointer(fixups)) {
#ifdef GENCGC
/* Check for a possible errors. */
sniff_code_object(new_code,displacement);
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) {
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;
/* Put in forwarding pointers for all the functions. */
for (func = code->entry_points;
func != NIL;
- func = ((struct function *)PTR(func))->next) {
+ func = ((struct function *)native_pointer(func))->next) {
gc_assert(LowtagOf(func) == type_FunctionPointer);
- *(lispobj *)PTR(func) = result + (func - thing);
+ *(lispobj *)native_pointer(func) = result + (func - thing);
}
/* Arrange to scavenge the debug info later. */
pscav(&new->entry_points, 1, 1);
for (func = new->entry_points;
func != NIL;
- func = ((struct function *)PTR(func))->next) {
+ func = ((struct function *)native_pointer(func))->next) {
gc_assert(LowtagOf(func) == type_FunctionPointer);
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 function *)native_pointer(func))->self -= RAW_ADDR_OFFSET;
#endif
- pscav(&((struct function *)PTR(func))->self, 2, 1);
+ pscav(&((struct function *)native_pointer(func))->self, 2, 1);
#ifdef __i386__
- ((struct function *)PTR(func))->self += RAW_ADDR_OFFSET;
+ ((struct function *)native_pointer(func))->self += RAW_ADDR_OFFSET;
#endif
- pscav_later(&((struct function *)PTR(func))->name, 3);
+ pscav_later(&((struct function *)native_pointer(func))->name, 3);
}
return result;
* 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))) |
+ function = (struct function *)native_pointer(thing);
+ code =
+ (native_pointer(thing) -
+ (HeaderValue(function->header)*sizeof(lispobj))) |
type_OtherPointer;
/* This will cause the function's header to be replaced with a
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) {
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);
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;
length++;
} while (LowtagOf(thing) == type_ListPointer &&
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);
pscav(&code->entry_points, 1, 1);
for (func = code->entry_points;
func != NIL;
- func = ((struct function *)PTR(func))->next) {
+ func = ((struct function *)native_pointer(func))->next) {
gc_assert(LowtagOf(func) == type_FunctionPointer);
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 function *)native_pointer(func))->self -= RAW_ADDR_OFFSET;
#endif
- pscav(&((struct function *)PTR(func))->self, 2, 1);
+ pscav(&((struct function *)native_pointer(func))->self, 2, 1);
#ifdef __i386__
- ((struct function *)PTR(func))->self += RAW_ADDR_OFFSET;
+ ((struct function *)native_pointer(func))->self += RAW_ADDR_OFFSET;
#endif
- pscav_later(&((struct function *)PTR(func))->name, 3);
+ pscav_later(&((struct function *)native_pointer(func))->name, 3);
}
return CEILING(nwords,2);
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 {
return 0;
}
-#if defined(ibmrt) || defined(__i386__)
+#if defined(__i386__)
dynamic_space_free_pointer =
(lispobj*)SymbolValue(ALLOCATION_POINTER);
#endif
#ifdef GENCGC
pscav_i386_stack();
#endif
-#ifdef WANT_CGC
- gc_assert((lispobj *)control_stack_end > ((&read_only_roots)+1));
- carefully_pscav_stack(((&read_only_roots)+1),
- (lispobj *)CONTROL_STACK_END);
-#endif
#endif
#ifdef PRINTNOISE
printf(" bindings");
fflush(stdout);
#endif
-#if !defined(ibmrt) && !defined(__i386__)
+#if !defined(__i386__)
pscav( (lispobj *)BINDING_STACK_START,
(lispobj *)current_binding_stack_pointer - (lispobj *)BINDING_STACK_START,
0);
0);
#endif
-#ifdef SCAVENGE_READ_ONLY_SPACE
+ /* 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) != type_UnboundMarker
&& SymbolValue(SCAVENGE_READ_ONLY_SPACE) != NIL) {
unsigned read_only_space_size =
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) DYNAMIC_SPACE_START,
- (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. */
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__)
+#if !defined(__i386__)
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)DYNAMIC_SPACE_START);
- else
- cgc_free_heap();
-#else
#if defined GENCGC
gc_free_heap();
#else
- /* ibmrt using GC */
- SetSymbolValue(ALLOCATION_POINTER, (lispobj)DYNAMIC_SPACE_START);
-#endif
+#error unsupported case /* in CMU CL, was "ibmrt using GC" */
#endif
#endif
projects / sbcl.git / blobdiff