From 0bc6029aa850b25cdd27efd91578989cbbd269d5 Mon Sep 17 00:00:00 2001 From: Nikodemus Siivola Date: Fri, 25 Nov 2011 14:39:25 +0200 Subject: [PATCH] cleanup: struct page member types .region_start_offset is os_vm_size_t .bytes_used is page_bytes_t (new typedef) Also add a compile-time check to guard against GENCGC_CARD_BYTES greater than UINT_MAX. --- src/runtime/gencgc-internal.h | 18 ++++++++++++------ 1 file changed, 12 insertions(+), 6 deletions(-) diff --git a/src/runtime/gencgc-internal.h b/src/runtime/gencgc-internal.h index e4a34fb..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 GENCGC_CARD_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 -- 1.7.10.4