-/* Copyright (C) 2012 Free Software Foundation, Inc.
+/* Copyright (C) 2012, 2013 Free Software Foundation, Inc.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public License
#define PROMPT_WORDS 5
#define PROMPT_KEY(top) (SCM_PACK ((top)[0]))
-#define PROMPT_FP(top) ((SCM *) ((top)[1]))
-#define PROMPT_SP(top) ((SCM *) ((top)[2]))
-#define PROMPT_IP(top) ((scm_t_uint8 *) ((top)[3]))
+#define PROMPT_FP(top) ((scm_t_ptrdiff) ((top)[1]))
+#define PROMPT_SP(top) ((scm_t_ptrdiff) ((top)[2]))
+#define PROMPT_IP(top) ((scm_t_uint32 *) ((top)[3]))
#define PROMPT_JMPBUF(top) ((scm_i_jmp_buf *) ((top)[4]))
#define WINDER_WORDS 2
#define DYNWIND_ENTER(top) (SCM_PACK ((top)[0]))
#define DYNWIND_LEAVE(top) (SCM_PACK ((top)[1]))
-#define WITH_FLUIDS_FLUIDS(top) ((SCM*)((top) + 1))
-#define WITH_FLUIDS_VALUES(top) ((SCM*)((top)[0]))
+#define WITH_FLUID_WORDS 2
+#define WITH_FLUID_FLUID(top) (SCM_PACK ((top)[0]))
+#define WITH_FLUID_VALUE_BOX(top) (SCM_PACK ((top)[1]))
\f
dst[i] = src[i];
}
-static void
-copy_scm (SCM *dst, SCM *src, size_t n)
-{
- size_t i;
-
- for (i = 0; i < n; i++)
- dst[i] = src[i];
-}
-
static void
clear_scm_t_bits (scm_t_bits *items, size_t n)
{
{
scm_t_bits *words;
- words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_REWINDER, flags, 2);
+ words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_REWINDER, flags,
+ WINDER_WORDS);
words[0] = (scm_t_bits) proc;
words[1] = (scm_t_bits) data;
}
{
scm_t_bits *words;
- words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_UNWINDER, flags, 2);
+ words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_UNWINDER, flags,
+ WINDER_WORDS);
words[0] = (scm_t_bits) proc;
words[1] = (scm_t_bits) data;
}
-/* The fluids are stored on the stack. However, the values have to be
- stored on the heap, so that all continuations that capture this
- dynamic scope capture the same bindings. */
+/* The fluid is stored on the stack, but the value has to be stored on the heap,
+ so that all continuations that capture this dynamic scope capture the same
+ binding. */
void
-scm_dynstack_push_fluids (scm_t_dynstack *dynstack, size_t n,
- SCM *fluids, SCM *values, SCM dynamic_state)
+scm_dynstack_push_fluid (scm_t_dynstack *dynstack, SCM fluid, SCM value,
+ SCM dynamic_state)
{
scm_t_bits *words;
- SCM *heap_values;
+ SCM value_box;
+
+ if (SCM_UNLIKELY (!SCM_FLUID_P (fluid)))
+ scm_wrong_type_arg ("with-fluid*", 0, fluid);
- n = scm_prepare_fluids (n, fluids, values);
- heap_values = scm_gc_malloc (n * sizeof (scm_t_bits), "with-fluids");
- copy_scm (heap_values, values, n);
+ value_box = scm_make_variable (value);
- words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_WITH_FLUIDS,
- 0, n + 1);
- words[0] = (scm_t_bits) heap_values;
- copy_scm (WITH_FLUIDS_FLUIDS (words), fluids, n);
+ words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_WITH_FLUID, 0,
+ WITH_FLUID_WORDS);
+ words[0] = SCM_UNPACK (fluid);
+ words[1] = SCM_UNPACK (value_box);
/* Go ahead and swap them. */
- scm_swap_fluids (n, WITH_FLUIDS_FLUIDS (words), WITH_FLUIDS_VALUES (words),
- dynamic_state);
+ scm_swap_fluid (fluid, value_box, dynamic_state);
}
void
scm_dynstack_push_prompt (scm_t_dynstack *dynstack,
scm_t_dynstack_prompt_flags flags,
SCM key,
- SCM *fp, SCM *sp, scm_t_uint8 *ip,
- scm_i_jmp_buf *registers)
+ scm_t_ptrdiff fp_offset, scm_t_ptrdiff sp_offset,
+ scm_t_uint32 *ip, scm_i_jmp_buf *registers)
{
scm_t_bits *words;
words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_PROMPT, flags,
PROMPT_WORDS);
words[0] = SCM_UNPACK (key);
- words[1] = (scm_t_bits) fp;
- words[2] = (scm_t_bits) sp;
+ words[1] = (scm_t_bits) fp_offset;
+ words[2] = (scm_t_bits) sp_offset;
words[3] = (scm_t_bits) ip;
words[4] = (scm_t_bits) registers;
}
{
scm_t_bits *words;
- words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_DYNWIND, 0, 2);
+ words = push_dynstack_entry (dynstack, SCM_DYNSTACK_TYPE_DYNWIND, 0,
+ DYNWIND_WORDS);
words[0] = SCM_UNPACK (enter);
words[1] = SCM_UNPACK (leave);
}
WINDER_PROC (item) (WINDER_DATA (item));
break;
- case SCM_DYNSTACK_TYPE_WITH_FLUIDS:
- scm_swap_fluids (len - 1, WITH_FLUIDS_FLUIDS (item),
- WITH_FLUIDS_VALUES (item),
- SCM_I_CURRENT_THREAD->dynamic_state);
+ case SCM_DYNSTACK_TYPE_WITH_FLUID:
+ scm_swap_fluid (WITH_FLUID_FLUID (item),
+ WITH_FLUID_VALUE_BOX (item),
+ SCM_I_CURRENT_THREAD->dynamic_state);
break;
case SCM_DYNSTACK_TYPE_PROMPT:
scm_t_bits tag;
scm_t_bits *words;
scm_t_dynstack_item_type type;
- size_t len;
tag = dynstack_pop (dynstack, &words);
type = SCM_DYNSTACK_TAG_TYPE (tag);
- len = SCM_DYNSTACK_TAG_LEN (tag);
switch (type)
{
clear_scm_t_bits (words, WINDER_WORDS);
break;
- case SCM_DYNSTACK_TYPE_WITH_FLUIDS:
- scm_swap_fluids (len - 1, WITH_FLUIDS_FLUIDS (words),
- WITH_FLUIDS_VALUES (words),
- SCM_I_CURRENT_THREAD->dynamic_state);
- clear_scm_t_bits (words, len);
+ case SCM_DYNSTACK_TYPE_WITH_FLUID:
+ scm_swap_fluid (WITH_FLUID_FLUID (words),
+ WITH_FLUID_VALUE_BOX (words),
+ SCM_I_CURRENT_THREAD->dynamic_state);
+ clear_scm_t_bits (words, WITH_FLUID_WORDS);
break;
case SCM_DYNSTACK_TYPE_PROMPT:
scm_t_bits*
scm_dynstack_find_prompt (scm_t_dynstack *dynstack, SCM key,
scm_t_dynstack_prompt_flags *flags,
- SCM **fp, SCM **sp, scm_t_uint8 **ip,
- scm_i_jmp_buf **registers)
+ scm_t_ptrdiff *fp_offset, scm_t_ptrdiff *sp_offset,
+ scm_t_uint32 **ip, scm_i_jmp_buf **registers)
{
scm_t_bits *walk;
{
if (flags)
*flags = SCM_DYNSTACK_TAG_FLAGS (tag);
- if (fp)
- *fp = PROMPT_FP (walk);
- if (sp)
- *sp = PROMPT_SP (walk);
+ if (fp_offset)
+ *fp_offset = PROMPT_FP (walk);
+ if (sp_offset)
+ *sp_offset = PROMPT_SP (walk);
if (ip)
*ip = PROMPT_IP (walk);
if (registers)
/* This function must not allocate. */
void
-scm_dynstack_unwind_fluids (scm_t_dynstack *dynstack, SCM dynamic_state)
+scm_dynstack_unwind_fluid (scm_t_dynstack *dynstack, SCM dynamic_state)
{
scm_t_bits tag, *words;
size_t len;
tag = dynstack_pop (dynstack, &words);
len = SCM_DYNSTACK_TAG_LEN (tag);
- assert (SCM_DYNSTACK_TAG_TYPE (tag) == SCM_DYNSTACK_TYPE_WITH_FLUIDS);
- assert (len >= 1);
+ assert (SCM_DYNSTACK_TAG_TYPE (tag) == SCM_DYNSTACK_TYPE_WITH_FLUID);
+ assert (len == WITH_FLUID_WORDS);
- scm_swap_fluids (len - 1, WITH_FLUIDS_FLUIDS (words),
- WITH_FLUIDS_VALUES (words), dynamic_state);
+ scm_swap_fluid (WITH_FLUID_FLUID (words), WITH_FLUID_VALUE_BOX (words),
+ dynamic_state);
clear_scm_t_bits (words, len);
}
HCoop / bpt / guile.git / blobdiff