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

Cleanup, convert CPS function sigs

Browse source
This commit is contained in:
Justin Ethier 2021-02-18 22:59:03 -05:00
parent 8ebee64dda
commit c839edb5e2
3 changed files with 18 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cyclone/runtime.h
View file

@ -180,8 +180,6 @@ void dispatch_apply_va(void *data, int argc, object clo, object cont, object fun
object apply_va(void *data, object cont, int argc, object func, ...);
void dispatch(void *data, int argc, function_type func, object clo, object cont,
object args);
void dispatch_va(void *data, int argc, function_type_va func, object clo,
object cont, object args);
void do_dispatch(void *data, int argc, function_type func, object clo,
object * buffer);

6
include/cyclone/types.h
View file

@ -663,10 +663,10 @@ typedef uint32_t char_type;
/**@{*/
/** Function type */
typedef void (*function_type) ();
typedef void (*function_type) (void *data, object clo, int argc, object *args);
/** Variable-argument function type */
typedef void (*function_type_va) (int, object, object, object, ...);
/** Primitive function */
typedef void (*primitive_function_type)(void *data, object cont, object args);
/** Non-CPS function type */
typedef object (*inline_function_type) ();

37
runtime.c
View file

@ -2045,8 +2045,12 @@ object Cyc_vector_set_unsafe(void *data, object v, object k, object obj)
// Prevent the possibility of a race condition by doing the actual mutation
// after all relevant objects have been relocated to the heap
static void Cyc_set_car_cps_gc_return(void *data, int argc, object cont, object l, object val, object next)
static void Cyc_set_car_cps_gc_return(void *data, object _, int argc, object *args)
{
object l = args[0];
object val = args[1];
object next = args[2];
car(l) = val;
closcall1(data, (closure)next, l);
}
@ -2074,8 +2078,12 @@ object Cyc_set_car_cps(void *data, object cont, object l, object val)
}
}
static void Cyc_set_cdr_cps_gc_return(void *data, int argc, object cont, object l, object val, object next)
static void Cyc_set_cdr_cps_gc_return(void *data, object _, int argc, object *args)
{
object l = args[0];
object val = args[1];
object next = args[2];
cdr(l) = val;
closcall1(data, (closure)next, l);
}
@ -2104,8 +2112,12 @@ object Cyc_set_cdr_cps(void *data, object cont, object l, object val)
}
}
static void Cyc_vector_set_cps_gc_return(void *data, int argc, object cont, object vec, object idx, object val, object next)
static void Cyc_vector_set_cps_gc_return(void *data, object _, int argc, object *args)
{
object vec = args[0];
object idx = args[1];
object val = args[2];
object next = args[3];
int i = obj_obj2int(idx);
((vector) vec)->elements[i] = val;
closcall1(data, (closure)next, vec);
@ -6097,25 +6109,6 @@ void dispatch(void *data, int argc, function_type func, object clo, object cont,
do_dispatch(data, argc, func, clo, b);
}
/**
* Same as above but for a varargs C function
*/
void dispatch_va(void *data, int argc, function_type_va func, object clo,
object cont, object args)
{
object b[argc + 1]; // OK to do this? Is this portable?
int i;
argc++;
b[0] = cont;
for (i = 1; i < argc; i++) {
b[i] = car(args);
args = cdr(args);
}
do_dispatch(data, argc, (function_type) func, clo, b);
}
static primitive_type Cyc_91global_91vars_primitive =
{ {0}, primitive_tag, "Cyc-global-vars", &_Cyc_91global_91vars };
static primitive_type Cyc_91get_91cvar_primitive =