X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgc-internal.h;h=78aeaa08249c5e0d393253512036f85cf6e6d616;hb=15d6e7c9a2c3234f95dfe278046fa2fee1b0c007;hp=54cf04c64c9212691b99c47f16cbbb3b567ed60c;hpb=9f10bc102adce15a820027777a03e49a7b7623da;p=sbcl.git diff --git a/src/runtime/gc-internal.h b/src/runtime/gc-internal.h index 54cf04c..78aeaa0 100644 --- a/src/runtime/gc-internal.h +++ b/src/runtime/gc-internal.h @@ -16,6 +16,8 @@ #ifndef _GC_INTERNAL_H_ #define _GC_INTERNAL_H_ +/* disabling gc assertions made no discernable difference to GC speed, + * last I tried it - dan 2003.12.21 */ #if 1 #define gc_assert(ex) do { \ if (!(ex)) gc_abort(); \ @@ -27,15 +29,32 @@ __FILE__, __LINE__) #define CEILING(x,y) (((x) + ((y) - 1)) & (~((y) - 1))) -#define NWORDS(x,y) (CEILING((x),(y)) / (y)) + +static inline unsigned int +NWORDS(unsigned int x, unsigned int n_bits) +{ + /* A good compiler should be able to constant-fold this whole thing, + even with the conditional. */ + if(n_bits <= N_WORD_BITS) { + unsigned int elements_per_word = N_WORD_BITS/n_bits; + + return CEILING(x, elements_per_word)/elements_per_word; + } + else { + /* FIXME: should have some sort of assertion that N_WORD_BITS + evenly divides n_bits */ + return x * (n_bits/N_WORD_BITS); + } +} /* FIXME: Shouldn't this be defined in sbcl.h? */ #define FUN_RAW_ADDR_OFFSET (6*sizeof(lispobj) - FUN_POINTER_LOWTAG) /* values for the *_alloc_* parameters */ -#define FREE_PAGE 0 -#define BOXED_PAGE 1 -#define UNBOXED_PAGE 2 +#define FREE_PAGE_FLAG 0 +#define BOXED_PAGE_FLAG 1 +#define UNBOXED_PAGE_FLAG 2 +#define OPEN_REGION_PAGE_FLAG 4 #define ALLOC_BOXED 0 #define ALLOC_UNBOXED 1 @@ -57,6 +76,46 @@ lispobj copy_unboxed_object(lispobj object, int nwords); lispobj copy_large_object(lispobj object, int nwords); lispobj copy_object(lispobj object, int nwords); +lispobj *search_read_only_space(void *pointer); +lispobj *search_static_space(void *pointer); +lispobj *search_dynamic_space(void *pointer); + +#include "fixnump.h" + +/* Scan an area looking for an object which encloses the given pointer. + * Return the object start on success or NULL on failure. */ +static lispobj * +search_space(lispobj *start, size_t words, lispobj *pointer) +{ + while (words > 0) { + size_t count = 1; + lispobj thing = *start; + + /* If thing is an immediate then this is a cons. */ + if (is_lisp_pointer(thing) + || (fixnump(thing)) + || (widetag_of(thing) == BASE_CHAR_WIDETAG) + || (widetag_of(thing) == UNBOUND_MARKER_WIDETAG)) + count = 2; + else + count = (sizetab[widetag_of(thing)])(start); + + /* Check whether the pointer is within this object. */ + if ((pointer >= start) && (pointer < (start+count))) { + /* found it! */ + /*FSHOW((stderr,"/found %x in %x %x\n", pointer, start, thing));*/ + return(start); + } + + /* Round up the count. */ + count = CEILING(count,2); + + start += count; + words -= count; + } + return (NULL); +} + #ifdef LISP_FEATURE_GENCGC #include "gencgc-internal.h" #else