mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-23 04:50:28 +02:00
9ede013f68
* libguile/dynstack.h: * libguile/dynstack.c: New files, implementing the dynamic stack as a true stack instead of a linked list. This lowers the cost of dynwinds: frames, winders, prompts, with-fluids, and dynamic-wind. For the most part, we allocate these items directly on the stack. * libguile/dynwinds.h: * libguile/dynwinds.c: Adapt all manipulators of the wind stack to use interfaces from dynstack.c. Remove heap-allocated winder and frame object types. (scm_dowinds, scm_i_dowinds): Remove these. The first was exported, but it was not a public interface. * libguile/continuations.c: * libguile/continuations.h (scm_t_contregs): Continuation objects reference scm_t_dynstack* values now. Adapt to the new interfaces. * libguile/control.c: * libguile/control.h: There is no longer a scm_tc7_prompt kind of object that can be allocated on the heap. Instead, the prompt flags, key, and registers are pushed on the dynwind stack. (The registers are still on the heap.) Also, since the vm_cont will reference the dynwinds, make the partial continuation stub take just one extra arg, instead of storing the intwinds separately in the object table. * libguile/fluids.c: * libguile/fluids.h: No more with-fluids objects; instead, the fluids go on the dynstack. The values still have to be on the heap, though. (scm_prepare_fluids, scm_swap_fluids): New internal functions, replacing scm_i_make_with_fluids and scm_i_swap_with_fluids. * libguile/print.c: Remove prompt and with-fluids printers. * libguile/tags.h: Revert prompt and with-fluids tc7 values to what they were before they were allocated. * libguile/vm-i-system.c (partial_cont_call): Just pop the vmcont, the intwinds will not be passed as a second arg. Rewind the dynamic stack from within the VM, so that any rewinder sees valid prompt entries. (call_cc, tail_call_cc): Adapt to pass the dynstack to scm_i_vm_capture_stack. (prompt, wind, unwind, wind_fluids, unwind_fluids): Adapt to the new interfaces. * libguile/vm.h (scm_i_capture_current_stack): Rename from scm_i_vm_capture_continuation. (scm_i_vm_capture_stack): Take a dynstack as an argument. * libguile/vm.c (vm_reinstate_partial_continuation): Don't wind here, as that could result in winders seeing invalid prompts. * libguile/eval.c: * libguile/root.c: * libguile/stacks.c: * libguile/threads.c: * libguile/threads.h: * libguile/throw.c: Adapt other users of dynwinds to use the dynstack.
127 lines
4.3 KiB
C
127 lines
4.3 KiB
C
/* Copyright (C) 2001, 2009, 2010, 2011, 2012 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
|
|
* as published by the Free Software Foundation; either version 3 of
|
|
* the License, or (at your option) any later version.
|
|
*
|
|
* This library is distributed in the hope that it will be useful, but
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
* Lesser General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
* License along with this library; if not, write to the Free Software
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
* 02110-1301 USA
|
|
*/
|
|
|
|
#ifndef _SCM_VM_H_
|
|
#define _SCM_VM_H_
|
|
|
|
#include <libguile.h>
|
|
#include <libguile/programs.h>
|
|
|
|
enum {
|
|
SCM_VM_APPLY_HOOK,
|
|
SCM_VM_PUSH_CONTINUATION_HOOK,
|
|
SCM_VM_POP_CONTINUATION_HOOK,
|
|
SCM_VM_NEXT_HOOK,
|
|
SCM_VM_ABORT_CONTINUATION_HOOK,
|
|
SCM_VM_RESTORE_CONTINUATION_HOOK,
|
|
SCM_VM_NUM_HOOKS,
|
|
};
|
|
|
|
struct scm_vm;
|
|
|
|
typedef SCM (*scm_t_vm_engine) (SCM vm, SCM program, SCM *argv, int nargs);
|
|
|
|
#define SCM_VM_REGULAR_ENGINE 0
|
|
#define SCM_VM_DEBUG_ENGINE 1
|
|
#define SCM_VM_NUM_ENGINES 2
|
|
|
|
struct scm_vm {
|
|
scm_t_uint8 *ip; /* instruction pointer */
|
|
SCM *sp; /* stack pointer */
|
|
SCM *fp; /* frame pointer */
|
|
size_t stack_size; /* stack size */
|
|
SCM *stack_base; /* stack base address */
|
|
SCM *stack_limit; /* stack limit address */
|
|
int engine; /* which vm engine we're using */
|
|
SCM hooks[SCM_VM_NUM_HOOKS]; /* hooks */
|
|
int trace_level; /* traces enabled if trace_level > 0 */
|
|
scm_t_int64 cookie; /* used to detect unrewindable continuations */
|
|
};
|
|
|
|
SCM_API SCM scm_the_vm_fluid;
|
|
|
|
#define SCM_VM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_vm))
|
|
#define SCM_VM_DATA(vm) ((struct scm_vm *) SCM_CELL_WORD_1 (vm))
|
|
#define SCM_VALIDATE_VM(pos,x) SCM_MAKE_VALIDATE (pos, x, VM_P)
|
|
|
|
SCM_API SCM scm_the_vm (void);
|
|
SCM_API SCM scm_make_vm (void);
|
|
|
|
SCM_API SCM scm_the_vm (void);
|
|
SCM_API SCM scm_call_with_vm (SCM vm, SCM proc, SCM args);
|
|
|
|
SCM_API SCM scm_vm_p (SCM obj);
|
|
SCM_API SCM scm_vm_ip (SCM vm);
|
|
SCM_API SCM scm_vm_sp (SCM vm);
|
|
SCM_API SCM scm_vm_fp (SCM vm);
|
|
SCM_API SCM scm_vm_apply_hook (SCM vm);
|
|
SCM_API SCM scm_vm_push_continuation_hook (SCM vm);
|
|
SCM_API SCM scm_vm_pop_continuation_hook (SCM vm);
|
|
SCM_API SCM scm_vm_abort_continuation_hook (SCM vm);
|
|
SCM_API SCM scm_vm_restore_continuation_hook (SCM vm);
|
|
SCM_API SCM scm_vm_next_hook (SCM vm);
|
|
SCM_API SCM scm_vm_trace_level (SCM vm);
|
|
SCM_API SCM scm_set_vm_trace_level_x (SCM vm, SCM level);
|
|
SCM_API SCM scm_vm_engine (SCM vm);
|
|
SCM_API SCM scm_set_vm_engine_x (SCM vm, SCM engine);
|
|
SCM_API SCM scm_set_default_vm_engine_x (SCM engine);
|
|
SCM_API void scm_c_set_vm_engine_x (SCM vm, int engine);
|
|
SCM_API void scm_c_set_default_vm_engine_x (int engine);
|
|
|
|
#define SCM_F_VM_CONT_PARTIAL 0x1
|
|
#define SCM_F_VM_CONT_REWINDABLE 0x2
|
|
|
|
struct scm_vm_cont {
|
|
SCM *sp;
|
|
SCM *fp;
|
|
scm_t_uint8 *ra, *mvra;
|
|
scm_t_ptrdiff stack_size;
|
|
SCM *stack_base;
|
|
scm_t_ptrdiff reloc;
|
|
scm_t_dynstack *dynstack;
|
|
scm_t_uint32 flags;
|
|
};
|
|
|
|
#define SCM_VM_CONT_P(OBJ) (SCM_HAS_TYP7 (OBJ, scm_tc7_vm_cont))
|
|
#define SCM_VM_CONT_DATA(CONT) ((struct scm_vm_cont *) SCM_CELL_WORD_1 (CONT))
|
|
#define SCM_VM_CONT_PARTIAL_P(CONT) (SCM_VM_CONT_DATA (CONT)->flags & SCM_F_VM_CONT_PARTIAL)
|
|
#define SCM_VM_CONT_REWINDABLE_P(CONT) (SCM_VM_CONT_DATA (CONT)->flags & SCM_F_VM_CONT_REWINDABLE)
|
|
|
|
SCM_API SCM scm_load_compiled_with_vm (SCM file);
|
|
|
|
SCM_INTERNAL SCM scm_c_vm_run (SCM vm, SCM program, SCM *argv, int nargs);
|
|
|
|
SCM_INTERNAL void scm_i_vm_print (SCM x, SCM port,
|
|
scm_print_state *pstate);
|
|
SCM_INTERNAL SCM scm_i_capture_current_stack (void);
|
|
SCM_INTERNAL SCM scm_i_vm_capture_stack (SCM *stack_base, SCM *fp, SCM *sp,
|
|
scm_t_uint8 *ra, scm_t_uint8 *mvra,
|
|
scm_t_dynstack *dynstack,
|
|
scm_t_uint32 flags);
|
|
SCM_INTERNAL void scm_i_vm_cont_print (SCM x, SCM port,
|
|
scm_print_state *pstate);
|
|
SCM_INTERNAL void scm_bootstrap_vm (void);
|
|
SCM_INTERNAL void scm_init_vm (void);
|
|
|
|
#endif /* _SCM_VM_H_ */
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|