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

Handle receiving a primitive as the next function after GC

Browse source
This commit is contained in:
Justin Ethier 2015-04-17 21:54:06 -04:00
parent 36bf695eb1
commit e44ece1986
2 changed files with 30 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cyclone.h
View file

@ -10,7 +10,7 @@
#define CYCLONE_H #define CYCLONE_H
/* Debug GC flag */ /* Debug GC flag */
#define DEBUG_GC 1 #define DEBUG_GC 0
/* Show diagnostic information for the GC when program terminate */ /* Show diagnostic information for the GC when program terminate */
#define DEBUG_SHOW_DIAG 0 #define DEBUG_SHOW_DIAG 0

30
runtime.h
View file

@ -1359,6 +1359,29 @@ static void Cyc_apply(int argc, closure cont, object prim, ...){
} }
// END apply // END apply
/* Extract args from given array, assuming cont is the first arg in buf */
static void Cyc_apply_from_buf(int argc, object prim, object *buf) {
list args;
object cont;
int i;
if (argc == 0) {
printf("Internal error in Cyc_apply_from_buf, argc is 0\n");
exit(1);
}
args = alloca(sizeof(cons_type) * (argc - 1));
cont = buf[0];
for (i = 1; i < argc; i++) {
args[i - 1].tag = cons_tag;
args[i - 1].cons_car = buf[i];
args[i - 1].cons_cdr = (i == (argc-1)) ? nil : &args[i];
}
apply(cont, prim, (object)&args[0]);
}
static char *transport(x, gcgen) char *x; int gcgen; static char *transport(x, gcgen) char *x; int gcgen;
/* Transport one object. WARNING: x cannot be nil!!! */ /* Transport one object. WARNING: x cannot be nil!!! */
{ {
@ -1797,7 +1820,12 @@ static void main_main (stack_size,heap_size,stack_base)
// } // }
// do_dispatch(gc_num_ans, fn, gc_cont, gc_ans); // do_dispatch(gc_num_ans, fn, gc_cont, gc_ans);
// } // }
do_dispatch(gc_num_ans, ((closure)gc_cont)->fn, gc_cont, gc_ans); if (type_of(gc_cont) == cons_tag || prim(gc_cont)) {
printf("DEBUG, prim found after GC\n");
Cyc_apply_from_buf(gc_num_ans, gc_cont, gc_ans);
} else {
do_dispatch(gc_num_ans, ((closure)gc_cont)->fn, gc_cont, gc_ans);
}
/* */ /* */
printf("main: your setjmp and/or longjmp are broken.\n"); exit(0);}} printf("main: your setjmp and/or longjmp are broken.\n"); exit(0);}}