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

fix alignment issues

This commit is contained in:
Yuichi Nishiwaki 2017-04-12 13:35:50 +09:00
parent 03067f5ab5
commit 5436102a3e
1 changed files with 28 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
lib/gc.c
View File

@ -6,14 +6,10 @@
#include "object.h" #include "object.h"
#include "state.h" #include "state.h"
#define PAGE_UNITS ((PIC_HEAP_PAGE_SIZE - offsetof(struct heap_page, basep)) / sizeof(union header)) #define PAGE_UNITS ((PIC_HEAP_PAGE_SIZE - offsetof(struct heap_page, u)) / sizeof(union header))
union header { #define alignof(type) offsetof(struct { char c; type m; }, m)
struct { #define roundup(n,unit) (((n) + (unit) - 1) / (unit) * (unit))
union header *ptr;
size_t size;
} s;
};
struct object { struct object {
union { union {
@ -35,16 +31,31 @@ struct object {
} u; } u;
}; };
struct free_region {
union header *ptr;
size_t size;
};
union header {
struct free_region s;
char alignment[roundup(sizeof(struct free_region), alignof(struct object))];
};
struct heap_page {
struct heap_page *next;
union {
union header basep[1];
struct object alignment;
} u;
};
struct heap { struct heap {
union header base, *freep; union header base, *freep;
struct heap_page *pages; struct heap_page *pages;
struct weak *weaks; /* weak map chain */ struct weak *weaks; /* weak map chain */
}; };
struct heap_page { #define unitsof(type) (type2size(type) + sizeof(union header) - 1 / sizeof(union header) + 1)
struct heap_page *next;
union header basep[1];
};
struct heap * struct heap *
pic_heap_open(pic_state *pic) pic_heap_open(pic_state *pic)
@ -469,7 +480,7 @@ obj_alloc(pic_state *pic, int type)
struct object *obj; struct object *obj;
size_t nunits; size_t nunits;
nunits = (type2size(type) + sizeof(union header) - 1) / sizeof(union header) + 1; nunits = unitsof(type);
prevp = pic->heap->freep; prevp = pic->heap->freep;
for (p = prevp->s.ptr; ; prevp = p, p = p->s.ptr) { for (p = prevp->s.ptr; ; prevp = p, p = p->s.ptr) {
@ -533,11 +544,11 @@ heap_morecore(pic_state *pic)
page = pic_malloc(pic, PIC_HEAP_PAGE_SIZE); page = pic_malloc(pic, PIC_HEAP_PAGE_SIZE);
page->next = pic->heap->pages; page->next = pic->heap->pages;
bp = page->basep; bp = page->u.basep;
bp->s.size = 0; /* bp is never used for allocation */ bp->s.size = 0; /* bp is never used for allocation */
free_chunk(pic, bp); free_chunk(pic, bp);
np = page->basep + 1; np = page->u.basep + 1;
np->s.size = PAGE_UNITS - 1; np->s.size = PAGE_UNITS - 1;
free_chunk(pic, np); free_chunk(pic, np);
@ -551,10 +562,10 @@ gc_sweep_page(pic_state *pic, struct heap_page *page)
struct object *obj; struct object *obj;
size_t alive = 0; size_t alive = 0;
for (bp = page->basep; ; bp = bp->s.ptr) { for (bp = page->u.basep; ; bp = bp->s.ptr) {
p = bp + (bp->s.size ? bp->s.size : 1); /* first bp's size is 0, so force advnce */ p = bp + (bp->s.size ? bp->s.size : 1); /* first bp's size is 0, so force advnce */
for (; p != bp->s.ptr; p += p->s.size) { for (; p != bp->s.ptr; p += p->s.size) {
if (p < page->basep || page->basep + PAGE_UNITS <= p) { if (p < page->u.basep || page->u.basep + PAGE_UNITS <= p) {
goto escape; goto escape;
} }
obj = (struct object *)(p + 1); obj = (struct object *)(p + 1);
@ -562,7 +573,7 @@ gc_sweep_page(pic_state *pic, struct heap_page *page)
obj->u.basic.tt &= ~GC_MARK; obj->u.basic.tt &= ~GC_MARK;
alive += p->s.size; alive += p->s.size;
} else { } else {
gc_finalize_object(pic, (struct object *)(p + 1)); gc_finalize_object(pic, obj);
if (head == NULL) { if (head == NULL) {
head = p; head = p;
} }