projects
/
sbcl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
sb-bsd-sockets: foreign memory leak in GET-PROTOCOL-BY-NAME
[sbcl.git]
/
src
/
runtime
/
gencgc-internal.h
diff --git
a/src/runtime/gencgc-internal.h
b/src/runtime/gencgc-internal.h
index
94e3f09
..
e4a34fb
100644
(file)
--- a/
src/runtime/gencgc-internal.h
+++ b/
src/runtime/gencgc-internal.h
@@
-49,7
+49,7
@@
struct page {
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
*/
* allocation regions. It should be 0 for all unallocated pages (not
* hard to achieve).
*/
-#if PAGE_BYTES > USHRT_MAX
+#if GENCGC_CARD_BYTES > USHRT_MAX
unsigned int bytes_used;
#else
unsigned short bytes_used;
unsigned int bytes_used;
#else
unsigned short bytes_used;
@@
-66,10
+66,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
+82,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
@@
-102,8
+106,7
@@
void sniff_code_object(struct code *code, unsigned long displacement);
void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
long update_dynamic_space_free_pointer(void);
void gencgc_apply_code_fixups(struct code *old_code, struct code *new_code);
long update_dynamic_space_free_pointer(void);
-void gc_alloc_update_page_tables(int unboxed,
- struct alloc_region *alloc_region);
+void gc_alloc_update_page_tables(int page_type_flag, struct alloc_region *alloc_region);
void gc_alloc_update_all_page_tables(void);
void gc_set_region_empty(struct alloc_region *region);
void gc_alloc_update_all_page_tables(void);
void gc_set_region_empty(struct alloc_region *region);
@@
-116,7
+119,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 {