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

calculate object size from type

This commit is contained in:
Yuichi Nishiwaki 2017-04-12 13:18:06 +09:00
parent 8d886db1db
commit 619a014adf
15 changed files with 53 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/blob.c
View File

@ -10,7 +10,7 @@ pic_blob_value(pic_state *pic, const unsigned char *buf, int len)
{ {
struct blob *bv; struct blob *bv;
bv = (struct blob *)pic_obj_alloc(pic, sizeof(struct blob), PIC_TYPE_BLOB); bv = (struct blob *)pic_obj_alloc(pic, PIC_TYPE_BLOB);
bv->data = pic_malloc(pic, len); bv->data = pic_malloc(pic, len);
bv->len = len; bv->len = len;
if (buf) { if (buf) {

2
lib/data.c
View File

@ -25,7 +25,7 @@ pic_data_value(pic_state *pic, void *userdata, const pic_data_type *type)
{ {
struct data *data; struct data *data;
data = (struct data *)pic_obj_alloc(pic, sizeof(struct data), PIC_TYPE_DATA); data = (struct data *)pic_obj_alloc(pic, PIC_TYPE_DATA);
data->type = type; data->type = type;
data->data = userdata; data->data = userdata;

2
lib/dict.c
View File

@ -12,7 +12,7 @@ pic_make_dict(pic_state *pic)
{ {
struct dict *dict; struct dict *dict;
dict = (struct dict *)pic_obj_alloc(pic, sizeof(struct dict), PIC_TYPE_DICT); dict = (struct dict *)pic_obj_alloc(pic, PIC_TYPE_DICT);
kh_init(dict, &dict->hash); kh_init(dict, &dict->hash);
return obj_value(pic, dict); return obj_value(pic, dict);
} }

2
lib/error.c
View File

@ -85,7 +85,7 @@ pic_make_error(pic_state *pic, const char *type, const char *msg, pic_value irrs
struct error *e; struct error *e;
pic_value ty = pic_intern_cstr(pic, type); pic_value ty = pic_intern_cstr(pic, type);
e = (struct error *)pic_obj_alloc(pic, sizeof(struct error), PIC_TYPE_ERROR); e = (struct error *)pic_obj_alloc(pic, PIC_TYPE_ERROR);
e->type = sym_ptr(pic, ty); e->type = sym_ptr(pic, ty);
e->msg = str_ptr(pic, pic_cstr_value(pic, msg)); e->msg = str_ptr(pic, pic_cstr_value(pic, msg));
e->irrs = irrs; e->irrs = irrs;

2
lib/ext/load.c
View File

@ -416,7 +416,7 @@ codegen_context_destroy(pic_state *pic, codegen_context *cxt)
struct irep *irep; struct irep *irep;
/* create irep */ /* create irep */
irep = (struct irep *)pic_obj_alloc(pic, sizeof(struct irep), PIC_TYPE_IREP); irep = (struct irep *)pic_obj_alloc(pic, PIC_TYPE_IREP);
irep->varg = pic_sym_p(pic, cxt->rest); irep->varg = pic_sym_p(pic, cxt->rest);
irep->argc = pic_vec_len(pic, cxt->args) + 1; irep->argc = pic_vec_len(pic, cxt->args) + 1;
irep->localc = pic_vec_len(pic, cxt->locals); irep->localc = pic_vec_len(pic, cxt->locals);

49
lib/gc.c
View File

@ -439,15 +439,37 @@ gc_finalize_object(pic_state *pic, struct object *obj)
} }
} }
static void * static size_t
heap_alloc(pic_state *pic, size_t size) type2size(int type)
{
switch (type) {
case PIC_TYPE_VECTOR: return sizeof(struct vector);
case PIC_TYPE_BLOB: return sizeof(struct blob);
case PIC_TYPE_STRING: return sizeof(struct string);
case PIC_TYPE_DATA: return sizeof(struct data);
case PIC_TYPE_DICT: return sizeof(struct dict);
case PIC_TYPE_SYMBOL: return sizeof(struct symbol);
case PIC_TYPE_WEAK: return sizeof(struct weak);
case PIC_TYPE_IREP: return sizeof(struct irep);
case PIC_TYPE_PORT: return sizeof(struct port);
case PIC_TYPE_PAIR: return sizeof(struct pair);
case PIC_TYPE_FRAME: return sizeof(struct frame);
case PIC_TYPE_ERROR: return sizeof(struct error);
case PIC_TYPE_RECORD: return sizeof(struct record);
case PIC_TYPE_PROC_FUNC: return sizeof(struct proc);
case PIC_TYPE_PROC_IREP: return sizeof(struct proc);
default: PIC_UNREACHABLE();
}
}
static struct object *
obj_alloc(pic_state *pic, int type)
{ {
union header *p, *prevp; union header *p, *prevp;
struct object *obj;
size_t nunits; size_t nunits;
assert(size > 0); nunits = (type2size(type) + sizeof(union header) - 1) / sizeof(union header) + 1;
nunits = (size + sizeof(union header) - 1) / sizeof(union header) + 1;
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) {
@ -468,7 +490,9 @@ heap_alloc(pic_state *pic, size_t size)
} }
pic->heap->freep = prevp; pic->heap->freep = prevp;
return (void *)(p + 1); obj = (struct object *)(p + 1);
obj->u.basic.tt = type;
return obj;
} }
static void static void
@ -623,7 +647,7 @@ pic_gc(pic_state *pic)
} }
struct object * struct object *
pic_obj_alloc_unsafe(pic_state *pic, size_t size, int type) pic_obj_alloc_unsafe(pic_state *pic, int type)
{ {
struct object *obj; struct object *obj;
@ -631,28 +655,27 @@ pic_obj_alloc_unsafe(pic_state *pic, size_t size, int type)
pic_gc(pic); pic_gc(pic);
#endif #endif
obj = (struct object *)heap_alloc(pic, size); obj = obj_alloc(pic, type);
if (obj == NULL) { if (obj == NULL) {
pic_gc(pic); pic_gc(pic);
obj = (struct object *)heap_alloc(pic, size); obj = obj_alloc(pic, type);
if (obj == NULL) { if (obj == NULL) {
heap_morecore(pic); heap_morecore(pic);
obj = (struct object *)heap_alloc(pic, size); obj = obj_alloc(pic, type);
if (obj == NULL) if (obj == NULL)
pic_panic(pic, "GC memory exhausted"); pic_panic(pic, "GC memory exhausted");
} }
} }
obj->u.basic.tt = type;
return obj; return obj;
} }
struct object * struct object *
pic_obj_alloc(pic_state *pic, size_t size, int type) pic_obj_alloc(pic_state *pic, int type)
{ {
struct object *obj; struct object *obj;
obj = pic_obj_alloc_unsafe(pic, size, type); obj = pic_obj_alloc_unsafe(pic, type);
gc_protect(pic, obj); gc_protect(pic, obj);
return obj; return obj;

2
lib/object.h
View File

@ -242,7 +242,7 @@ DEFPTR(irep, struct irep)
#undef pic_data_p #undef pic_data_p
#undef pic_port_p #undef pic_port_p
struct object *pic_obj_alloc(pic_state *, size_t, int type); struct object *pic_obj_alloc(pic_state *, int type);
pic_value pic_make_proc_func(pic_state *, pic_func_t, int, pic_value *); pic_value pic_make_proc_func(pic_state *, pic_func_t, int, pic_value *);
pic_value pic_make_proc_irep(pic_state *, struct irep *, struct frame *); pic_value pic_make_proc_irep(pic_state *, struct irep *, struct frame *);

2
lib/pair.c
View File

@ -10,7 +10,7 @@ pic_cons(pic_state *pic, pic_value car, pic_value cdr)
{ {
struct pair *pair; struct pair *pair;
pair = (struct pair *)pic_obj_alloc(pic, sizeof(struct pair), PIC_TYPE_PAIR); pair = (struct pair *)pic_obj_alloc(pic, PIC_TYPE_PAIR);
pair->car = car; pair->car = car;
pair->cdr = cdr; pair->cdr = cdr;

2
lib/port.c
View File

@ -15,7 +15,7 @@ pic_funopen(pic_state *pic, void *cookie, const pic_port_type *type)
{ {
struct port *port; struct port *port;
port = (struct port *)pic_obj_alloc(pic, sizeof(struct port), PIC_TYPE_PORT); port = (struct port *)pic_obj_alloc(pic, PIC_TYPE_PORT);
port->file.cnt = 0; port->file.cnt = 0;
port->file.base = NULL; port->file.base = NULL;
port->file.flag = type->read ? FILE_READ : FILE_WRITE; port->file.flag = type->read ? FILE_READ : FILE_WRITE;

8
lib/proc.c
View File

@ -39,7 +39,7 @@ pic_make_proc_func(pic_state *pic, pic_func_t func, int n, pic_value *env)
if (n > 0) { if (n > 0) {
int i; int i;
fp = (struct frame *)pic_obj_alloc(pic, sizeof(struct frame), PIC_TYPE_FRAME); fp = (struct frame *)pic_obj_alloc(pic, PIC_TYPE_FRAME);
fp->storage = pic_malloc(pic, sizeof(pic_value) * n); fp->storage = pic_malloc(pic, sizeof(pic_value) * n);
fp->regc = n; fp->regc = n;
fp->regs = fp->storage; fp->regs = fp->storage;
@ -49,7 +49,7 @@ pic_make_proc_func(pic_state *pic, pic_func_t func, int n, pic_value *env)
} }
} }
proc = (struct proc *)pic_obj_alloc(pic, sizeof(struct proc), PIC_TYPE_PROC_FUNC); proc = (struct proc *)pic_obj_alloc(pic, PIC_TYPE_PROC_FUNC);
proc->u.func = func; proc->u.func = func;
proc->fp = fp; proc->fp = fp;
return obj_value(pic, proc); return obj_value(pic, proc);
@ -60,7 +60,7 @@ pic_make_proc_irep(pic_state *pic, struct irep *irep, struct frame *fp)
{ {
struct proc *proc; struct proc *proc;
proc = (struct proc *)pic_obj_alloc(pic, sizeof(struct proc), PIC_TYPE_PROC_IREP); proc = (struct proc *)pic_obj_alloc(pic, PIC_TYPE_PROC_IREP);
proc->u.irep = irep; proc->u.irep = irep;
proc->fp = fp; proc->fp = fp;
return obj_value(pic, proc); return obj_value(pic, proc);
@ -351,7 +351,7 @@ vm_push_cxt(pic_state *pic)
{ {
struct callinfo *ci = pic->ci; struct callinfo *ci = pic->ci;
ci->cxt = (struct frame *)pic_obj_alloc(pic, sizeof(struct frame), PIC_TYPE_FRAME); ci->cxt = (struct frame *)pic_obj_alloc(pic, PIC_TYPE_FRAME);
ci->cxt->storage = pic_malloc(pic, sizeof(pic_value) * ci->regc); ci->cxt->storage = pic_malloc(pic, sizeof(pic_value) * ci->regc);
ci->cxt->up = ci->up; ci->cxt->up = ci->up;
ci->cxt->regc = ci->regc; ci->cxt->regc = ci->regc;

2
lib/record.c
View File

@ -10,7 +10,7 @@ pic_make_record(pic_state *pic, pic_value type, pic_value datum)
{ {
struct record *rec; struct record *rec;
rec = (struct record *)pic_obj_alloc(pic, sizeof(struct record), PIC_TYPE_RECORD); rec = (struct record *)pic_obj_alloc(pic, PIC_TYPE_RECORD);
rec->type = sym_ptr(pic, type); rec->type = sym_ptr(pic, type);
rec->datum = datum; rec->datum = datum;

2
lib/string.c
View File

@ -117,7 +117,7 @@ make_str(pic_state *pic, struct rope *rope)
{ {
struct string *str; struct string *str;
str = (struct string *)pic_obj_alloc(pic, sizeof(struct string), PIC_TYPE_STRING); str = (struct string *)pic_obj_alloc(pic, PIC_TYPE_STRING);
str->rope = rope; /* delegate ownership */ str->rope = rope; /* delegate ownership */
return obj_value(pic, str); return obj_value(pic, str);

2
lib/symbol.c
View File

@ -29,7 +29,7 @@ pic_intern(pic_state *pic, pic_value str)
kh_val(h, it) = NULL; /* dummy */ kh_val(h, it) = NULL; /* dummy */
sym = (struct symbol *)pic_obj_alloc(pic, sizeof(struct symbol), PIC_TYPE_SYMBOL); sym = (struct symbol *)pic_obj_alloc(pic, PIC_TYPE_SYMBOL);
sym->str = str_ptr(pic, str); sym->str = str_ptr(pic, str);
kh_val(h, it) = sym; kh_val(h, it) = sym;

2
lib/vector.c
View File

@ -11,7 +11,7 @@ pic_make_vec(pic_state *pic, int len, pic_value *argv)
struct vector *vec; struct vector *vec;
int i; int i;
vec = (struct vector *)pic_obj_alloc(pic, sizeof(struct vector), PIC_TYPE_VECTOR); vec = (struct vector *)pic_obj_alloc(pic, PIC_TYPE_VECTOR);
vec->len = len; vec->len = len;
vec->data = (pic_value *)pic_malloc(pic, sizeof(pic_value) * len); vec->data = (pic_value *)pic_malloc(pic, sizeof(pic_value) * len);
if (argv == NULL) { if (argv == NULL) {

2
lib/weak.c
View File

@ -41,7 +41,7 @@ pic_make_weak(pic_state *pic)
{ {
struct weak *weak; struct weak *weak;
weak = (struct weak *)pic_obj_alloc(pic, sizeof(struct weak), PIC_TYPE_WEAK); weak = (struct weak *)pic_obj_alloc(pic, PIC_TYPE_WEAK);
weak->prev = NULL; weak->prev = NULL;
kh_init(weak, &weak->hash); kh_init(weak, &weak->hash);
return pic_lambda(pic, weak_call, 1, obj_value(pic, weak)); return pic_lambda(pic, weak_call, 1, obj_value(pic, weak));