Fcalva/cyclone
1
0
Fork 0
mirror of https://github.com/justinethier/cyclone.git synced 2025-07-03 19:26:34 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Convert function calls

Browse source
This commit is contained in:
Justin Ethier 2021-02-21 11:34:50 -05:00
parent 93310be845
commit fd35f2e53e
2 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ffi.c
View file

@ -20,8 +20,10 @@ void *Cyc_init_thread(object thread_and_thunk, int argc, object *args);
* for the call and perform a minor GC to ensure any returned object * for the call and perform a minor GC to ensure any returned object
* is on the heap and safe to use. * is on the heap and safe to use.
*/ */
static void Cyc_return_from_scm_call(gc_thread_data *thd, int argc, object k, object result) static void Cyc_return_from_scm_call(void *data, object _, int argc, object *args)
{ {
gc_thread_data *thd = data;
object result = args[0];
// Cleaup thread object per Cyc_exit_thread // Cleaup thread object per Cyc_exit_thread
gc_remove_mutator(thd); gc_remove_mutator(thd);
ck_pr_cas_int((int *)&(thd->thread_state), CYC_THREAD_STATE_RUNNABLE, ck_pr_cas_int((int *)&(thd->thread_state), CYC_THREAD_STATE_RUNNABLE,
@ -39,8 +41,10 @@ static void Cyc_return_from_scm_call(gc_thread_data *thd, int argc, object k, ob
* We store results and longjmp back to where we started, at the * We store results and longjmp back to where we started, at the
* bottom of the trampoline (we only jump once). * bottom of the trampoline (we only jump once).
*/ */
static void Cyc_after_scm_call(gc_thread_data *thd, int argc, object k, object result) static void Cyc_after_scm_call(void *data, object _, int argc, object *args)
{ {
gc_thread_data *thd = data;
object result = args[0];
mclosure0(clo, Cyc_return_from_scm_call); mclosure0(clo, Cyc_return_from_scm_call);
object buf[1]; buf[0] = result; object buf[1]; buf[0] = result;
GC(thd, &clo, buf, 1); GC(thd, &clo, buf, 1);

13
mstreams.c
View file

@ -13,20 +13,21 @@
#include <errno.h> #include <errno.h>
/* These macros are hardcoded here to support functions in this module. */ /* These macros are hardcoded here to support functions in this module. */
#define closcall1(td, clo, a1) \ #define closcall1(td, clo, buf) \
if (obj_is_not_closure(clo)) { \ if (obj_is_not_closure(clo)) { \
Cyc_apply(td, 0, (closure)(a1), clo); \ Cyc_apply(td, clo, 1, buf ); \
} else { \ } else { \
((clo)->fn)(td, 1, clo, a1);\ ((clo)->fn)(td, clo, 1, buf); \
;\
} }
#define return_closcall1(td, clo, a1) { \ #define return_closcall1(td, clo,a1) { \
char top; \ char top; \
object buf[1]; buf[0] = a1;\
if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \ if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \
object buf[1]; buf[0] = a1;\
GC(td, clo, buf, 1); \ GC(td, clo, buf, 1); \
return; \ return; \
} else {\ } else {\
closcall1(td, (closure) (clo), a1); \ closcall1(td, (closure) (clo), buf); \
return;\ return;\
} \ } \
} }