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

WIP, changing CPS calling conventions

Browse source
This commit is contained in:
Justin Ethier 2021-02-15 22:47:33 -05:00
parent 496387293f
commit 2de1eb9e7f
2 changed files with 33 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
include/cyclone/runtime.h
View file

@ -776,7 +776,7 @@ extern object Cyc_glo_call_cc;
* @brief Raise and handle Scheme exceptions * @brief Raise and handle Scheme exceptions
*/ */
/**@{*/ /**@{*/
object Cyc_default_exception_handler(void *data, int argc, closure _, object err); object Cyc_default_exception_handler(void *data, object _, int argc, object *args);
object Cyc_current_exception_handler(void *data); object Cyc_current_exception_handler(void *data);
void Cyc_rt_raise(void *data, object err); void Cyc_rt_raise(void *data, object err);

59
runtime.c
View file

@ -128,59 +128,61 @@ void hrt_log_delta(const char *label, long long tstamp)
#endif #endif
/* 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;\
} \ } \
} }
#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 NULL; \ return NULL; \
} else {\ } else {\
closcall1(td, (closure) (clo), a1); \ closcall1(td, (closure) (clo), buf); \
return NULL;\ return NULL;\
} \ } \
} }
#define closcall2(td, clo, a1, a2) \ #define closcall2(td, clo, buf) \
if (obj_is_not_closure(clo)) { \ if (obj_is_not_closure(clo)) { \
Cyc_apply(td, 1, (closure)(a1), clo,a2); \ Cyc_apply(td, clo, 2, buf ); \
} else { \ } else { \
((clo)->fn)(td, 2, clo, a1, a2);\ ((clo)->fn)(td, clo, 2, buf); \
;\
} }
#define return_closcall2(td, clo, a1, a2) { \ #define return_closcall2(td, clo,a1,a2) { \
char top; \ char top; \
object buf[2]; buf[0] = a1;buf[1] = a2;\
if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \ if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \
object buf[2]; buf[0] = a1;buf[1] = a2;\
GC(td, clo, buf, 2); \ GC(td, clo, buf, 2); \
return; \ return; \
} else {\ } else {\
closcall2(td, (closure) (clo), a1, a2); \ closcall2(td, (closure) (clo), buf); \
return;\ return;\
} \ } \
} }
#define _return_closcall2(td, clo, a1, a2) { \ #define _return_closcall2(td, clo,a1,a2) { \
char top; \ char top; \
object buf[2]; buf[0] = a1;buf[1] = a2;\
if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \ if (stack_overflow(&top, (((gc_thread_data *)data)->stack_limit))) { \
object buf[2]; buf[0] = a1;buf[1] = a2;\
GC(td, clo, buf, 2); \ GC(td, clo, buf, 2); \
return NULL; \ return NULL; \
} else {\ } else {\
closcall2(td, (closure) (clo), a1, a2); \ closcall2(td, (closure) (clo), buf); \
return NULL;\ return NULL;\
} \ } \
} }
@ -352,11 +354,14 @@ object Cyc_global_set(void *thd, object identifier, object * glo, object value)
return value; return value;
} }
static void Cyc_global_set_cps_gc_return(void *data, int argc, object cont, object glo_obj, object val, object next) static void Cyc_global_set_cps_gc_return(void *data, object cont, int argc, object *args) //object glo_obj, object val, object next)
{ {
object glo_obj = args[0];
object val = args[1];
object next = args[2];
object *glo = (object *)glo_obj; object *glo = (object *)glo_obj;
*(glo) = val; *(glo) = val;
closcall1(data, (closure)next, val); closcall1(data, next, val);
} }
object Cyc_global_set_cps(void *thd, object cont, object identifier, object * glo, object value) object Cyc_global_set_cps(void *thd, object cont, object identifier, object * glo, object value)
@ -661,13 +666,13 @@ object Cyc_glo_eval_from_c = NULL;
/** /**
* @brief The default exception handler * @brief The default exception handler
* @param data Thread data object * @param data Thread data object
* @return argc Unused, just here to maintain calling convention * @param _ Unused, just here to maintain calling convention
* @return _ Unused, just here to maintain calling convention * @param argc Unused, just here to maintain calling convention
* @return err Object containing data for the error * @param args Argument buffer, index 0 is object containing data for the error
*/ */
object Cyc_default_exception_handler(void *data, int argc, closure _, object Cyc_default_exception_handler(void *data, object _, int argc, object *args)
object err)
{ {
object err = args[0];
int is_msg = 1; int is_msg = 1;
fprintf(stderr, "Error: "); fprintf(stderr, "Error: ");
@ -5344,8 +5349,8 @@ void _Cyc_91current_91exception_91handler(void *data, object cont, object args)
void _Cyc_91default_91exception_91handler(void *data, object cont, object args) void _Cyc_91default_91exception_91handler(void *data, object cont, object args)
{ {
// TODO: this is a quick-and-dirty implementation, may be a better way to write this object buf[1] = {car(args)};
Cyc_default_exception_handler(data, 1, args, car(args)); Cyc_default_exception_handler(data, args, 1, buf);
} }
void _string_91cmp(void *data, object cont, object args) void _string_91cmp(void *data, object cont, object args)