projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change an AVER to CERROR 'bug
[sbcl.git]
/
src
/
runtime
/
gencgc-internal.h
diff --git
a/src/runtime/gencgc-internal.h
b/src/runtime/gencgc-internal.h
index
bb289fe
..
dfe9089
100644
(file)
--- 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 *);
\f
int gencgc_handle_wp_violation(void *);
\f
+#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
/* 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.
*/
/* 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).
*/
/* 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
unsigned
/* This is set when the page is write-protected. This should
@@
-66,10
+72,14
@@
struct page {
* OSes). This is useful for re-scavenging pages that are
* written during a GC. */
write_protected_cleared :1,
* OSes). This is useful for re-scavenging pages that are
* written during a GC. */
write_protected_cleared :1,
- /* the region the page is allocated to: 0 for a free page; 1
- * for boxed objects; 2 for unboxed objects. If the page is
- * free the following slots are invalid (well the bytes_used
- * must be 0). */
+ /* 000 free
+ * 10? boxed data
+ * 11? boxed code
+ * 01? unboxed data
+ * ??1 open region
+ *
+ * If the page is free the following slots are invalid, except
+ * for the bytes_used which must be zero. */
allocated :3,
/* If this page should not be moved during a GC then this flag
* is set. It's only valid during a GC for allocated pages. */
allocated :3,
/* If this page should not be moved during a GC then this flag
* is set. It's only valid during a GC for allocated pages. */
@@
-78,7
+88,7
@@
struct page {
* set. No other objects should be allocated to these pages.
* This is only valid when the page is allocated. */
large_object :1,
* set. No other objects should be allocated to these pages.
* This is only valid when the page is allocated. */
large_object :1,
- /* True if the page is known to contain only zeroes. */
+ /* Cleared if the page is known to contain only zeroes. */
need_to_zero :1;
/* the generation that this page belongs to. This should be valid
need_to_zero :1;
/* the generation that this page belongs to. This should be valid
@@
-115,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
{
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 {
return ((page_index < page_table_pages) &&
(page_table[page_index].gen == space));
} else {