X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fruntime%2Fgencgc-internal.h;h=dfe9089aa165a17157c95a4065bd268a79bd7e6c;hb=534ad97e08a9725fb4c9618f47602d7e83583600;hp=84178ad5094518d64993f5dfdfd31e88f33f2c6f;hpb=9effe671fd4baacd924b58a25dac89587d38eb27;p=sbcl.git diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h index 84178ad..dfe9089 100644 --- a/src/runtime/gencgc-internal.h +++ b/src/runtime/gencgc-internal.h @@ -30,6 +30,16 @@ inline void *page_address(page_index_t); int gencgc_handle_wp_violation(void *); +#if GENCGC_CARD_BYTES > USHRT_MAX +# if GENCGC_CARD_BYTES > UINT_MAX +# error "GENCGC_CARD_BYTES unexpectedly large." +# else +typedef unsigned int page_bytes_t; +# endif +#else +typedef unsigned short page_bytes_t; +#endif + /* Note that this structure is also used from Lisp-side in * src/code/room.lisp, and the Lisp-side structure layout is currently * not groveled from C code but hardcoded. Any changes to the @@ -42,18 +52,14 @@ struct page { /* This is the offset from the start of the page to the start of * the alloc_region which contains/contained it. */ - unsigned long region_start_offset; + os_vm_size_t region_start_offset; /* the number of bytes of this page that are used. This may be less * than the actual bytes used for pages within the current * allocation regions. It should be 0 for all unallocated pages (not * hard to achieve). */ -#if PAGE_BYTES > USHRT_MAX - unsigned int bytes_used; -#else - unsigned short bytes_used; -#endif + page_bytes_t bytes_used; unsigned /* This is set when the page is write-protected. This should @@ -119,7 +125,7 @@ space_matches_p(lispobj obj, generation_index_t space) { if (obj >= DYNAMIC_SPACE_START) { page_index_t page_index=((pointer_sized_uint_t)obj - - DYNAMIC_SPACE_START) / PAGE_BYTES; + - DYNAMIC_SPACE_START) / GENCGC_CARD_BYTES; return ((page_index < page_table_pages) && (page_table[page_index].gen == space)); } else {