X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=eaa789849a3b24ca7e48959b95a070d9751c19fd;hb=c3699db2053ff3b5ac6a98d4431c3789496002d8;hp=f4022828fbf4eaff9f5f168eb2883326eb154e30;hpb=3bb2fb5b9ecdeebecaded4ac6e5af0f653be8867;p=sbcl.git diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h index f402282..eaa7898 100644 --- a/src/runtime/gencgc-internal.h +++ b/src/runtime/gencgc-internal.h @@ -22,6 +22,12 @@ #include "gencgc-alloc-region.h" #include "genesis/code.h" +/* Size of a page, in bytes. FIXME: needs to be conditionalized per + * architecture, preferably by someone with a clue as to what page + * sizes are on archs other than x86 and PPC - Patrik */ +#define PAGE_BYTES 4096 + + void gc_free_heap(void); inline int find_page_index(void *); inline void *page_address(int); @@ -76,11 +82,10 @@ struct page { /* the number of pages needed for the dynamic space - rounding up */ -#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+4095)/4096) +#define NUM_PAGES ((DYNAMIC_SPACE_SIZE+PAGE_BYTES-1)/PAGE_BYTES) extern struct page page_table[NUM_PAGES]; -void gencgc_pickup_dynamic(void); void sniff_code_object(struct code *code, unsigned displacement); void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code); @@ -96,7 +101,8 @@ space_matches_p(lispobj obj, int space) { int page_index=(void*)obj - (void *)DYNAMIC_SPACE_START; return ((page_index >= 0) - && ((page_index = ((unsigned int)page_index)/4096) < NUM_PAGES) + && ((page_index = + ((unsigned int)page_index)/PAGE_BYTES) < NUM_PAGES) && (page_table[page_index].gen == space)); }