X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=c9fe3b5b27f2256eb0c9e799b59cad32efdff4bd;hb=1de12891f900d156ed035a097561ecd7755a256a;hp=b8beae0023c428de945b92cb89bef885795807c1;hpb=a41c057bfe9d8b0b53d2765b8559f18327f28813;p=sbcl.git diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h index b8beae0..c9fe3b5 100644 --- a/src/runtime/gencgc-internal.h +++ b/src/runtime/gencgc-internal.h @@ -24,8 +24,6 @@ #include "gencgc-alloc-region.h" #include "genesis/code.h" -#define PAGE_BYTES GENCGC_PAGE_SIZE - void gc_free_heap(void); inline page_index_t find_page_index(void *); inline void *page_address(page_index_t); @@ -90,10 +88,8 @@ struct page { /* values for the page.allocated field */ -/* the number of pages needed for the dynamic space - rounding up */ -#define NUM_PAGES ((page_index_t) ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES)) - -extern struct page page_table[NUM_PAGES]; +extern unsigned page_table_pages; +extern struct page *page_table; /* forward declarations */ @@ -116,7 +112,7 @@ space_matches_p(lispobj obj, generation_index_t space) page_index_t page_index=(void*)obj - (void *)DYNAMIC_SPACE_START; return ((page_index >= 0) && ((page_index = - ((unsigned long)page_index)/PAGE_BYTES) < NUM_PAGES) + ((unsigned long)page_index)/PAGE_BYTES) < page_table_pages) && (page_table[page_index].gen == space)); }