Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-16 17:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Stub for vector heap alloc

Browse source
This commit is contained in:
Justin Ethier 2016-04-11 22:57:39 -04:00
parent b18aadb229
commit 4457cd24c0
1 changed files with 32 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
runtime.c
View file

@ -1436,7 +1436,7 @@ object Cyc_command_line_arguments(void *data, object cont) {
object Cyc_make_vector(void *data, object cont, int argc, object len, ...) { object Cyc_make_vector(void *data, object cont, int argc, object len, ...) {
object v = nil; object v = nil;
object fill = boolean_f; object fill = boolean_f;
int i; int i, ulen;
va_list ap; va_list ap;
va_start(ap, len); va_start(ap, len);
if (argc > 1) { if (argc > 1) {
@ -1444,11 +1444,15 @@ object Cyc_make_vector(void *data, object cont, int argc, object len, ...) {
} }
va_end(ap); va_end(ap);
Cyc_check_num(data, len); Cyc_check_num(data, len);
ulen = unbox_number(len);
// TODO: if vector is too big, would need to alloc directly on the heap
// if (ulen < 10000) {
v = alloca(sizeof(vector_type)); v = alloca(sizeof(vector_type));
((vector)v)->hdr.mark = gc_color_red; ((vector)v)->hdr.mark = gc_color_red;
((vector)v)->hdr.grayed = 0; ((vector)v)->hdr.grayed = 0;
((vector)v)->tag = vector_tag; ((vector)v)->tag = vector_tag;
((vector)v)->num_elt = unbox_number(len); ((vector)v)->num_elt = ulen;
((vector)v)->elts = ((vector)v)->elts =
(((vector)v)->num_elt > 0) ? (((vector)v)->num_elt > 0) ?
(object *)alloca(sizeof(object) * ((vector)v)->num_elt) : (object *)alloca(sizeof(object) * ((vector)v)->num_elt) :
@ -1456,6 +1460,21 @@ object Cyc_make_vector(void *data, object cont, int argc, object len, ...) {
for (i = 0; i < ((vector)v)->num_elt; i++) { for (i = 0; i < ((vector)v)->num_elt; i++) {
((vector)v)->elts[i] = fill; ((vector)v)->elts[i] = fill;
} }
// } else {
// // Experimenting with heap allocation if vector is too large
// int heap_grown;
// vector_type *vt = gc_alloc(Cyc_heap,
// sizeof(vector_type) + sizeof(object) * ulen,
// boolean_f, (gc_thread_data *)data, &heap_grown);
// mark(vt) = ((gc_thread_data *)data)->gc_alloc_color;
// type_of(vt) = vector_tag;
// vt->num_elt = ulen;
// vt->elts = (object *)((char *)vt) + sizeof(vector_type);
// for (i = 0; i < ulen; i++) {
// vt->elts[i] = fill;
// }
// v = vt;
// }
return_closcall1(data, cont, v); return_closcall1(data, cont, v);
} }