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

don't use PIC_VTYPE_FOO constants outside type.h

This commit is contained in:
Yuichi Nishiwaki 2015-07-20 14:07:19 +09:00
parent f5b07cacd2
commit 7dc26dd674
1 changed files with 18 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
extlib/benz/gc.c
View File

@ -126,14 +126,10 @@ gc_protect(pic_state *pic, struct pic_object *obj)
pic_value pic_value
pic_gc_protect(pic_state *pic, pic_value v) pic_gc_protect(pic_state *pic, pic_value v)
{ {
struct pic_object *obj; if (! pic_obj_p(v))
if (pic_vtype(v) != PIC_VTYPE_HEAP) {
return v; return v;
}
obj = pic_obj_ptr(v);
gc_protect(pic, obj); gc_protect(pic, pic_obj_ptr(v));
return v; return v;
} }
@ -238,7 +234,7 @@ heap_morecore(pic_state *pic)
pic->heap->pages = page; pic->heap->pages = page;
} }
static void gc_mark(pic_state *, pic_value); static void gc_mark_object(pic_state *, struct pic_object *);
static bool static bool
gc_is_marked(union header *p) gc_is_marked(union header *p)
@ -256,18 +252,6 @@ gc_obj_is_marked(struct pic_object *obj)
return gc_is_marked(p); return gc_is_marked(p);
} }
static bool
gc_value_need_mark(pic_value value)
{
return pic_obj_p(value) && (! gc_obj_is_marked(pic_obj_ptr(value)));
}
static void
gc_unmark(union header *p)
{
p->s.mark = PIC_GC_UNMARK;
}
static void static void
gc_unmark_object(struct pic_object *obj) gc_unmark_object(struct pic_object *obj)
{ {
@ -278,6 +262,15 @@ gc_unmark_object(struct pic_object *obj)
p->s.mark = PIC_GC_UNMARK; p->s.mark = PIC_GC_UNMARK;
} }
static void
gc_mark(pic_state *pic, pic_value v)
{
if (! pic_obj_p(v))
return;
gc_mark_object(pic, pic_obj_ptr(v));
}
static void static void
gc_mark_object(pic_state *pic, struct pic_object *obj) gc_mark_object(pic_state *pic, struct pic_object *obj)
{ {
@ -448,18 +441,6 @@ gc_mark_object(pic_state *pic, struct pic_object *obj)
} }
} }
static void
gc_mark(pic_state *pic, pic_value v)
{
struct pic_object *obj;
if (pic_vtype(v) != PIC_VTYPE_HEAP)
return;
obj = pic_obj_ptr(v);
gc_mark_object(pic, obj);
}
#define M(x) gc_mark_object(pic, (struct pic_object *)pic->x) #define M(x) gc_mark_object(pic, (struct pic_object *)pic->x)
static void static void
@ -587,9 +568,11 @@ gc_mark_phase(pic_state *pic)
continue; continue;
key = kh_key(h, it); key = kh_key(h, it);
val = kh_val(h, it); val = kh_val(h, it);
if (gc_obj_is_marked(key) && gc_value_need_mark(val)) { if (gc_obj_is_marked(key)) {
gc_mark(pic, val); if (pic_obj_p(val) && ! gc_obj_is_marked(pic_obj_ptr(val))) {
++j; gc_mark(pic, val);
++j;
}
} }
} }
reg = reg->prev; reg = reg->prev;
@ -716,7 +699,7 @@ gc_sweep_page(pic_state *pic, struct heap_page *page)
goto escape; goto escape;
} }
if (gc_is_marked(p)) { if (gc_is_marked(p)) {
gc_unmark(p); p->s.mark = PIC_GC_UNMARK;
alive += p->s.size; alive += p->s.size;
} else { } else {
if (head == NULL) { if (head == NULL) {