summaryrefslogtreecommitdiff
path: root/libguile/memoize.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2016-12-05 22:48:49 +0100
committerAndy Wingo <wingo@pobox.com>2016-12-05 22:57:29 +0100
commit7184c176b40db274a92ae14eed1f7d71a0c26e8b (patch)
treedd42a2d278fed8aed8af812fdc377599d09e6328 /libguile/memoize.c
parentaa84489d18320df086e08554554d6f3b92c45893 (diff)
downloadguile-7184c176b40db274a92ae14eed1f7d71a0c26e8b.tar.gz
with-dynamic-state compiler and VM support
* libguile/dynstack.h (SCM_DYNSTACK_TYPE_DYNAMIC_STATE): * libguile/dynstack.c (DYNAMIC_STATE_WORDS, DYNAMIC_STATE_STATE_BOX): (scm_dynstack_push_dynamic_state): (scm_dynstack_unwind_dynamic_state): New definitions. (scm_dynstack_unwind_1, scm_dynstack_wind_1): Add with-dynamic-state cases. * libguile/memoize.c (push_dynamic_state, pop_dynamic_state) (do_push_dynamic_state, do_pop_dynamic_state): New definitions. (memoize, scm_init_memoize): Handle push-dynamic-state and pop-dynamic-state. * libguile/vm-engine.c (push-dynamic-state, pop-dynamic-state): New opcodes. * module/ice-9/boot-9.scm (with-dynamic-state): New definition in Scheme so that the push-dynamic-state and pop-dynamic-state always run in the VM. * module/language/cps/compile-bytecode.scm (compile-function): * module/language/cps/effects-analysis.scm: * module/language/cps/types.scm: * module/language/tree-il/effects.scm (make-effects-analyzer): * module/language/tree-il/peval.scm (peval): * module/language/tree-il/primitives.scm (*interesting-primitive-names*): * module/system/vm/assembler.scm: Add support for with-dynamic-state to the compiler. * test-suite/tests/fluids.test ("dynamic states"): Add basic tests. * doc/ref/vm.texi (Dynamic Environment Instructions): Update.
Diffstat (limited to 'libguile/memoize.c')
-rw-r--r--libguile/memoize.c32
1 files changed, 32 insertions, 0 deletions
diff --git a/libguile/memoize.c b/libguile/memoize.c
index 1267d4771..58abeb110 100644
--- a/libguile/memoize.c
+++ b/libguile/memoize.c
@@ -68,6 +68,8 @@ static SCM wind;
static SCM unwind;
static SCM push_fluid;
static SCM pop_fluid;
+static SCM push_dynamic_state;
+static SCM pop_dynamic_state;
static SCM
do_wind (SCM in, SCM out)
@@ -100,6 +102,24 @@ do_pop_fluid (void)
return SCM_UNSPECIFIED;
}
+static SCM
+do_push_dynamic_state (SCM state)
+{
+ scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+ scm_dynstack_push_dynamic_state (&thread->dynstack, state,
+ thread->dynamic_state);
+ return SCM_UNSPECIFIED;
+}
+
+static SCM
+do_pop_dynamic_state (void)
+{
+ scm_i_thread *thread = SCM_I_CURRENT_THREAD;
+ scm_dynstack_unwind_dynamic_state (&thread->dynstack,
+ thread->dynamic_state);
+ return SCM_UNSPECIFIED;
+}
+
@@ -482,6 +502,14 @@ memoize (SCM exp, SCM env)
else if (nargs == 0
&& scm_is_eq (name, scm_from_latin1_symbol ("pop-fluid")))
return MAKMEMO_CALL (MAKMEMO_QUOTE (pop_fluid), SCM_EOL);
+ else if (nargs == 1
+ && scm_is_eq (name,
+ scm_from_latin1_symbol ("push-dynamic-state")))
+ return MAKMEMO_CALL (MAKMEMO_QUOTE (push_dynamic_state), args);
+ else if (nargs == 0
+ && scm_is_eq (name,
+ scm_from_latin1_symbol ("pop-dynamic-state")))
+ return MAKMEMO_CALL (MAKMEMO_QUOTE (pop_dynamic_state), SCM_EOL);
else if (scm_is_eq (scm_current_module (), scm_the_root_module ()))
return MAKMEMO_CALL (maybe_makmemo_capture_module
(MAKMEMO_BOX_REF
@@ -869,6 +897,10 @@ scm_init_memoize ()
unwind = scm_c_make_gsubr ("unwind", 0, 0, 0, do_unwind);
push_fluid = scm_c_make_gsubr ("push-fluid", 2, 0, 0, do_push_fluid);
pop_fluid = scm_c_make_gsubr ("pop-fluid", 0, 0, 0, do_pop_fluid);
+ push_dynamic_state = scm_c_make_gsubr ("push-dynamic_state", 1, 0, 0,
+ do_push_dynamic_state);
+ pop_dynamic_state = scm_c_make_gsubr ("pop-dynamic_state", 0, 0, 0,
+ do_pop_dynamic_state);
list_of_guile = scm_list_1 (scm_from_latin1_symbol ("guile"));
}