summaryrefslogtreecommitdiff
path: root/libguile/vm-engine.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-06-28 20:01:35 +0200
committerAndy Wingo <wingo@pobox.com>2013-06-28 20:01:35 +0200
commit98eaef1b50db626c672646da58645c62407d0c1a (patch)
tree814a737a115dff5f6c5230b3b27d51c140d6b7ac /libguile/vm-engine.c
parentc32b7c4cef1c63a677a1c447a0386e90ab2ecd42 (diff)
downloadguile-98eaef1b50db626c672646da58645c62407d0c1a.tar.gz
Simplify dynstack API to only wind one fluid at a time
* libguile/dynstack.h (SCM_DYNSTACK_TYPE_WITH_FLUID): Rename from with-fluids. * libguile/dynstack.c (scm_dynstack_push_fluid): (scm_dynstack_unwind_fluid): Change API to only wind/unwind one fluid binding. (WITH_FLUID_WORDS): New define, always 2 words (fluid and value box). (WITH_FLUID_FLUID, WITH_FLUID_VALUE_BOX): New macros to get offsets of fluid and value box. (scm_dynstack_push_rewinder, scm_dynstack_push_unwinder): Use WINDER_WORDS. (scm_dynstack_push_dynwind): Use DYNWIND_WORDS. (scm_dynstack_wind_1): Update for scm_swap_fluid API change. * libguile/fluids.h: * libguile/fluids.c (scm_prepare_fluids): Remove; no longer needed. (scm_swap_fluid): Update to just swap one fluid binding. (scm_c_with_fluids, scm_c_with_fluid): Update to use scm_dynstack_push_fluid. * libguile/memoize.c (do_push_fluid, do_pop_fluid): Adapt to API change. * libguile/vm-engine.c (rtl_vm_engine): Change wind-fluids / unwind-fluids to push-fluid / pop-fluid, and actually enable. Woo! * libguile/vm-i-system.c (push-fluid, pop-fluid): Update to new API.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r--libguile/vm-engine.c29
1 files changed, 12 insertions, 17 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index d0708233b..8b11e7f24 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -2519,39 +2519,34 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
NEXT (1);
}
- /* wind-fluids fluid-base:24 _:8 n:24 value0:24 0:8 ...
+ /* push-fluid fluid:12 value:12
*
* Dynamically bind N fluids to values. The fluids are expected to be
* allocated in a continguous range on the stack, starting from
* FLUID-BASE. The values do not have this restriction.
*/
- VM_DEFINE_OP (69, wind_fluids, "wind-fluids", OP2 (U8_U24, X8_R24))
-#if 0
+ VM_DEFINE_OP (69, push_fluid, "push-fluid", OP1 (U8_U12_U12))
{
- scm_t_uint32 fluid_base, n;
+ scm_t_uint32 fluid, value;
- SCM_UNPACK_RTL_24 (op, fluid_base);
- SCM_UNPACK_RTL_24 (ip[1], n);
+ SCM_UNPACK_RTL_12_12 (op, fluid, value);
- scm_dynstack_push_fluids_shuffled (&current_thread->dynstack, n,
- &fp[fluid_base], fp, &ip[2],
- current_thread->dynamic_state);
- NEXT (n + 2);
+ scm_dynstack_push_fluid (&current_thread->dynstack,
+ fp[fluid], fp[value],
+ current_thread->dynamic_state);
+ NEXT (1);
}
-#else
- abort();
-#endif
- /* unwind-fluids _:24
+ /* pop-fluid _:24
*
* Leave the dynamic extent of a with-fluids expression, restoring the
* fluids to their previous values.
*/
- VM_DEFINE_OP (70, unwind_fluids, "unwind-fluids", OP1 (U8_X24))
+ VM_DEFINE_OP (70, pop_fluid, "pop-fluid", OP1 (U8_X24))
{
/* This function must not allocate. */
- scm_dynstack_unwind_fluids (&current_thread->dynstack,
- current_thread->dynamic_state);
+ scm_dynstack_unwind_fluid (&current_thread->dynstack,
+ current_thread->dynamic_state);
NEXT (1);
}