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

fix bugs around GC

This commit is contained in:
Yuichi Nishiwaki 2013-10-14 18:21:56 +09:00
parent ed7a9d5758
commit 276e139ec6
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/picrin/gc.h
View File

@ -16,7 +16,7 @@ union header {
}; };
struct heap_page { struct heap_page {
union header *base, *freep; union header *base, *freep, *endp;
size_t heap_size; size_t heap_size;
}; };

5
src/gc.c
View File

@ -20,6 +20,8 @@ init_heap_page(struct heap_page *heap)
heap->freep = freep = base->s.ptr; heap->freep = freep = base->s.ptr;
freep->s.ptr = base; freep->s.ptr = base;
freep->s.size = ((char *)p + PIC_HEAP_SIZE - (char *)freep) / sizeof(union header); freep->s.size = ((char *)p + PIC_HEAP_SIZE - (char *)freep) / sizeof(union header);
heap->endp = freep + freep->s.size;
} }
void * void *
@ -217,6 +219,8 @@ gc_sweep_phase(pic_state *pic)
base = pic->heap->base; base = pic->heap->base;
for (p = base->s.ptr; p != base; p = p->s.ptr) { for (p = base->s.ptr; p != base; p = p->s.ptr) {
for (bp = p + p->s.size; bp != p->s.ptr; bp += bp->s.size) { for (bp = p + p->s.size; bp != p->s.ptr; bp += bp->s.size) {
if (p >= p->s.ptr && bp == pic->heap->endp)
break;
if (is_marked(bp)) { if (is_marked(bp)) {
gc_unmark(bp); gc_unmark(bp);
continue; continue;
@ -237,6 +241,7 @@ gc_sweep_phase(pic_state *pic)
else { else {
p->s.ptr = bp; p->s.ptr = bp;
} }
break;
} }
} }
} }