summaryrefslogtreecommitdiff
path: root/libguile/programs.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-10-18 10:03:26 +0200
committerAndy Wingo <wingo@pobox.com>2013-10-18 11:39:35 +0200
commit27337b6373954e1a975d97d0bf06b5c03d65b64d (patch)
tree33dba0fa3b9c0c7121e5c106556a6a6116efb37f /libguile/programs.c
parent9dff1df97f7021b1d2edd5dd73d1ca426def943b (diff)
downloadguile-27337b6373954e1a975d97d0bf06b5c03d65b64d.tar.gz
Subrs are RTL programs
* libguile/gsubr.c: Define RTL stubs instead of stack VM stubs. (SUBR_STUB_CODE, get_subr_stub_code): Adapt to return a uint32_t* pointer instead of a SCM value. (create_subr): Create RTL procedures instead of stack VM procedures. For RTL procedures, the function pointer, name, and generic address pointer go inline to the procedure, as free variables. (scm_i_primitive_arity, scm_i_primitive_call_ip): New helpers. (scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic) (scm_c_define_gsubr_with_generic): Adapt to create_gsubr being renamed to create_subr. Remove gsubr test code. * libguile/gsubr.h (SCM_PRIMITIVE_P, SCM_PRIMITIVE_GENERIC_P): Only RTL programs can be primitives now. (SCM_SUBRF, SCM_SUBR_NAME, SCM_SUBR_GENERIC): These fields are now in the RTL free variables, not the object table. * libguile/programs.c (scm_i_rtl_program_name): (scm_i_rtl_program_documentation): (scm_i_rtl_program_properties): (scm_i_rtl_program_minimum_arity): Implement these appropriately for primitives, which lack debugging information. (scm_primitive_p, scm_primitive_call_ip): New helpers. * libguile/snarf.h: Remove static allocation for subrs. Since there is nothing to allocate besides the program itself, which needs runtime relocation, static allocation is not a win. * system/vm/program.scm: Fix up various arity-related things for primitives, which don't use ELF arity info. * test-suite/tests/eval.test ("stack involving a primitive"): Add an XFAIL until we get just one VM.
Diffstat (limited to 'libguile/programs.c')
-rw-r--r--libguile/programs.c37
1 files changed, 37 insertions, 0 deletions
diff --git a/libguile/programs.c b/libguile/programs.c
index 5039d2a2b..c10dede10 100644
--- a/libguile/programs.c
+++ b/libguile/programs.c
@@ -116,6 +116,9 @@ scm_i_rtl_program_name (SCM program)
{
static SCM rtl_program_name = SCM_BOOL_F;
+ if (SCM_PRIMITIVE_P (program))
+ return SCM_SUBR_NAME (program);
+
if (scm_is_false (rtl_program_name) && scm_module_system_booted_p)
rtl_program_name =
scm_c_private_variable ("system vm program", "rtl-program-name");
@@ -128,6 +131,9 @@ scm_i_rtl_program_documentation (SCM program)
{
static SCM rtl_program_documentation = SCM_BOOL_F;
+ if (SCM_PRIMITIVE_P (program))
+ return SCM_BOOL_F;
+
if (scm_is_false (rtl_program_documentation) && scm_module_system_booted_p)
rtl_program_documentation =
scm_c_private_variable ("system vm program",
@@ -141,6 +147,14 @@ scm_i_rtl_program_properties (SCM program)
{
static SCM rtl_program_properties = SCM_BOOL_F;
+ if (SCM_PRIMITIVE_P (program))
+ {
+ SCM name = scm_i_rtl_program_name (program);
+ if (scm_is_false (name))
+ return SCM_EOL;
+ return scm_acons (scm_sym_name, name, SCM_EOL);
+ }
+
if (scm_is_false (rtl_program_properties) && scm_module_system_booted_p)
rtl_program_properties =
scm_c_private_variable ("system vm program", "rtl-program-properties");
@@ -219,6 +233,26 @@ SCM_DEFINE (scm_rtl_program_p, "rtl-program?", 1, 0, 0,
}
#undef FUNC_NAME
+SCM_DEFINE (scm_primitive_p, "primitive?", 1, 0, 0,
+ (SCM obj),
+ "")
+#define FUNC_NAME s_scm_primitive_p
+{
+ return scm_from_bool (SCM_PRIMITIVE_P (obj));
+}
+#undef FUNC_NAME
+
+SCM_DEFINE (scm_primitive_call_ip, "primitive-call-ip", 1, 0, 0,
+ (SCM prim),
+ "")
+#define FUNC_NAME s_scm_primitive_p
+{
+ SCM_MAKE_VALIDATE (1, prim, PRIMITIVE_P);
+
+ return scm_from_int (scm_i_primitive_call_ip (prim));
+}
+#undef FUNC_NAME
+
SCM_DEFINE (scm_program_base, "program-base", 1, 0, 0,
(SCM program),
"")
@@ -487,6 +521,9 @@ scm_i_rtl_program_minimum_arity (SCM program, int *req, int *opt, int *rest)
static SCM rtl_program_minimum_arity = SCM_BOOL_F;
SCM l;
+ if (SCM_PRIMITIVE_P (program))
+ return scm_i_primitive_arity (program, req, opt, rest);
+
if (scm_is_false (rtl_program_minimum_arity) && scm_module_system_booted_p)
rtl_program_minimum_arity =
scm_c_private_variable ("system vm program",