conservatory
/
picrin
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove page->index

This commit is contained in:
Yuichi Nishiwaki 2016-06-20 00:42:43 +09:00
parent 026150a712
commit af6a53a5b4
1 changed files with 11 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
extlib/benz/gc/bitmap.c
View File

@ -11,10 +11,9 @@
struct heap_page { struct heap_page {
struct heap_page *next; struct heap_page *next;
size_t current; size_t freep;
uint32_t bitmap[BITMAP_SIZE]; uint32_t bitmap[BITMAP_SIZE];
uint32_t shadow[BITMAP_SIZE]; uint32_t shadow[BITMAP_SIZE];
uint32_t index[BITMAP_SIZE / UNIT_SIZE];
union header basep[1]; union header basep[1];
}; };
@ -93,16 +92,12 @@ heap_alloc(pic_state *pic, size_t size)
size_t index; size_t index;
union header *h; union header *h;
for (index = page->current; index < PAGE_UNITS - nunits; ++index) { for (index = page->freep; index < PAGE_UNITS - nunits; ++index) {
if (index % UNIT_SIZE == 0 && is_marked_at(page->index, index / UNIT_SIZE, 1)) {
index += UNIT_SIZE;
}
if (! is_marked_at(page->bitmap, index, nunits)) { if (! is_marked_at(page->bitmap, index, nunits)) {
mark_at(page, index, nunits); mark_at(page, index, nunits);
h = index2header(page, index); h = index2header(page, index);
h->s.size = nunits; h->s.size = nunits;
page->current = index + nunits; page->freep = index + nunits;
return (void *)(h + 1); return (void *)(h + 1);
} }
} }
@ -123,8 +118,7 @@ heap_morecore(pic_state *pic)
pic_panic(pic, "memory exhausted"); pic_panic(pic, "memory exhausted");
memset(page->bitmap, 0, sizeof(page->bitmap)); memset(page->bitmap, 0, sizeof(page->bitmap));
memset(page->index, 0, sizeof(page->index)); page->freep = 0;
page->current = 0;
page->next = pic->heap->pages; page->next = pic->heap->pages;
@ -136,13 +130,12 @@ is_marked(pic_state *pic, struct object *obj)
{ {
union header *h = ((union header *)obj) - 1; union header *h = ((union header *)obj) - 1;
struct heap_page *page; struct heap_page *page;
size_t i; size_t index;
page = obj2page(pic, h); page = obj2page(pic, h);
index = h - page->basep;
i = h - page->basep; return is_marked_at(page->bitmap, index, h->s.size);
return is_marked_at(page->bitmap, i, h->s.size);
} }
static void static void
@ -150,13 +143,12 @@ mark(pic_state *pic, struct object *obj)
{ {
union header *h = ((union header *)obj) - 1; union header *h = ((union header *)obj) - 1;
struct heap_page *page; struct heap_page *page;
size_t i; size_t index;
page = obj2page(pic, h); page = obj2page(pic, h);
index = h - page->basep;
i = h - page->basep; mark_at(page, index, h->s.size);
mark_at(page, i, h->s.size);
} }
static size_t static size_t
@ -190,8 +182,7 @@ gc_init(pic_state *pic)
/* clear mark bits */ /* clear mark bits */
memcpy(page->shadow, page->bitmap, sizeof(page->bitmap)); memcpy(page->shadow, page->bitmap, sizeof(page->bitmap));
memset(page->bitmap, 0, sizeof(page->bitmap)); memset(page->bitmap, 0, sizeof(page->bitmap));
memset(page->index, 0, sizeof(page->index)); page->freep = 0;
page->current = 0;
page = page->next; page = page->next;
} }
} }