diff options
author | Andy Wingo <wingo@pobox.com> | 2013-06-28 19:47:03 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-06-28 19:52:09 +0200 |
commit | c32b7c4cef1c63a677a1c447a0386e90ab2ecd42 (patch) | |
tree | a1e1aad96639736f3e18c48a73a6f9d1fd24bacc /libguile/vm-i-system.c | |
parent | 5e0253f19ef146c46a08fead9d70866f4baa9ca1 (diff) | |
download | guile-c32b7c4cef1c63a677a1c447a0386e90ab2ecd42.tar.gz |
Remove with-fluids; replaced by with-fluid* and inlined push-fluid primops
* libguile/vm-i-system.c (push-fluid, pop-fluid):
* doc/ref/vm.texi (Dynamic Environment Instructions): Rename wind-fluids
to push-fluid, and unwind-fluids to pop-fluid. They now only work on
one fluid binding at a time.
* module/ice-9/boot-9.scm (with-fluid*): Implement in Scheme in terms of
primcalls to push-fluid and pop-fluid.
(custom-throw-handler, catch, with-throw-handler): Use with-fluid*
instead of with-fluids, as with-fluids is no longer available before
psyntax is loaded.
(with-fluids): Define in Scheme in terms of with-fluid*.
* libguile/fluids.c (scm_with_fluid): Rename from scm_with_fluids, and
don't expose to Scheme.
* libguile/eval.c (eval): Remove SCM_M_WITH_FLUIDS case.
* libguile/expand.c (expand_with_fluids): Remove with-fluids syntax.
(DYNLET): Remove, no longer defining dynlet in the %expanded-vtables.
* libguile/expand.h: Remove dynlet definitions.
* module/ice-9/eval.scm (primitive-eval): Remove with-fluids case.
* libguile/memoize.c (do_push_fluid, do_pop_fluid): New primitive
helpers, like wind and unwind.
(memoize): Memoize wind and unwind primcalls. Don't memoize dynlet to
with-fluids.
(scm_init_memoize): Initialize push_fluid and pop_fluid here.
* libguile/memoize.h (SCM_M_WITH_FLUIDS): Remove definition.
* module/ice-9/psyntax.scm (build-dynlet): Remove; this just supported
with-fluids, which is now defined in boot-9.
* module/ice-9/psyntax-pp.scm: Regenerate.
* doc/ref/compiler.texi (Tree-IL):
* module/language/tree-il.scm:
* module/language/tree-il/analyze.scm:
* module/language/tree-il/canonicalize.scm:
* module/language/tree-il/compile-glil.scm:
* module/language/tree-il/cse.scm:
* module/language/tree-il/debug.scm:
* module/language/tree-il/effects.scm: Remove <dynlet>. Add cases for
primcalls to push-fluid and pop-fluid in compile-glil.scm and
effects.scm.
* module/language/tree-il/peval.scm (peval): Factor out
with-temporaries; probably a bad idea, but works for now. Factor out
make-begin0 (a better idea). Inline primcalls to with-fluid*, and
remove dynlet cases.
* module/language/tree-il/primitives.scm (*interesting-primitive-names*):
Add with-fluid*.
Diffstat (limited to 'libguile/vm-i-system.c')
-rw-r--r-- | libguile/vm-i-system.c | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c index 9b24c9295..442350d40 100644 --- a/libguile/vm-i-system.c +++ b/libguile/vm-i-system.c @@ -1490,20 +1490,17 @@ VM_DEFINE_INSTRUCTION (90, unwind, "unwind", 0, 0, 0) NEXT; } -VM_DEFINE_INSTRUCTION (91, wind_fluids, "wind-fluids", 1, -1, 0) +VM_DEFINE_INSTRUCTION (91, push_fluid, "push-fluid", 0, 2, 0) { - unsigned n = FETCH (); - + SCM fluid, val; + POP2 (val, fluid); SYNC_REGISTER (); - sp -= 2 * n; - CHECK_UNDERFLOW (); - scm_dynstack_push_fluids (¤t_thread->dynstack, n, sp + 1, sp + 1 + n, + scm_dynstack_push_fluids (¤t_thread->dynstack, 1, &fluid, &val, current_thread->dynamic_state); - NULLSTACK (2 * n); NEXT; } -VM_DEFINE_INSTRUCTION (92, unwind_fluids, "unwind-fluids", 0, 0, 0) +VM_DEFINE_INSTRUCTION (92, pop_fluid, "pop-fluid", 0, 0, 0) { /* This function must not allocate. */ scm_dynstack_unwind_fluids (¤t_thread->dynstack, |