summaryrefslogtreecommitdiff
path: root/libguile/vm-i-system.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-i-system.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-i-system.c')
-rw-r--r--libguile/vm-i-system.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/libguile/vm-i-system.c b/libguile/vm-i-system.c
index 442350d40..248db9af0 100644
--- a/libguile/vm-i-system.c
+++ b/libguile/vm-i-system.c
@@ -1495,16 +1495,16 @@ VM_DEFINE_INSTRUCTION (91, push_fluid, "push-fluid", 0, 2, 0)
SCM fluid, val;
POP2 (val, fluid);
SYNC_REGISTER ();
- scm_dynstack_push_fluids (&current_thread->dynstack, 1, &fluid, &val,
- current_thread->dynamic_state);
+ scm_dynstack_push_fluid (&current_thread->dynstack, fluid, val,
+ current_thread->dynamic_state);
NEXT;
}
VM_DEFINE_INSTRUCTION (92, pop_fluid, "pop-fluid", 0, 0, 0)
{
/* 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;
}