mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
d8873dfe47
* libguile/vm.h (struct scm_vm_cont): Instead of saving the "IP", save "RA" and "MVRA". That is, save singly-valued and multiply-valued return addresses, so that we can return multiple values on the stack. (scm_i_vm_reinstate_continuation): Remove. * libguile/vm.c (vm_capture_continuation): Rename from capture_vm_cont, and change the prototype so we can capture the RA and MVRA, and so that tail calls to call/cc can capture a continuation without the call/cc application frame. (vm_return_to_continuation): Rename from reinstate_vm_cont, and take arguments to return to the continuation. Handles returning to single or multiple-value RA. (scm_i_vm_capture_continuation): Change to invoke vm_capture_continuation. Kept around for the benefit of make-stack. * libguile/vm-i-system.c (continuation-call): Handle reinstatement of the VM stack, with arguments. (call/cc, tail-call/cc): Adapt to new vm_capture_continuation prototype. tail-call/cc captures tail continuations. * libguile/stacks.c (scm_make_stack): Update for scm_vm_cont structure change. * libguile/continuations.h (struct scm_contregs): Remove throw_value member, which was used to return a value to a continuation. (scm_i_check_continuation): New internal function, checks that a continuation may be reinstated. (scm_i_reinstate_continuation): Replaces scm_i_continuation_call; just reinstates the C stack. (scm_i_contregs_vm, scm_i_contregs_vm_cont): New internal accessors. * libguile/continuations.c (scm_i_make_continuation): Return SCM_UNDEFINED if we are returning again. (grow_stack, copy_stack_and_call, scm_dynthrow): Remove extra arg, as vm opcodes handle value returns. (copy_stack): No need to instate VM continuation. (scm_i_reinstate_continuation): Adapt.
117 lines
3.8 KiB
C
117 lines
3.8 KiB
C
/* Copyright (C) 2001, 2009, 2010 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>
|
|
|
|
#define SCM_VM_BOOT_HOOK 0
|
|
#define SCM_VM_HALT_HOOK 1
|
|
#define SCM_VM_NEXT_HOOK 2
|
|
#define SCM_VM_BREAK_HOOK 3
|
|
#define SCM_VM_ENTER_HOOK 4
|
|
#define SCM_VM_APPLY_HOOK 5
|
|
#define SCM_VM_EXIT_HOOK 6
|
|
#define SCM_VM_RETURN_HOOK 7
|
|
#define SCM_VM_NUM_HOOKS 8
|
|
|
|
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 */
|
|
SCM options; /* options */
|
|
int trace_level; /* traces enabled if trace_level > 0 */
|
|
};
|
|
|
|
SCM_API SCM scm_the_vm_fluid;
|
|
|
|
#define SCM_VM_P(x) (SCM_NIMP (x) && SCM_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 ();
|
|
SCM_API SCM scm_make_vm (void);
|
|
SCM_API SCM scm_vm_apply (SCM vm, SCM program, SCM args);
|
|
SCM_API SCM scm_c_vm_run (SCM vm, SCM program, SCM *argv, int nargs);
|
|
SCM_API SCM scm_vm_call_with_new_stack (SCM vm, SCM thunk, SCM id);
|
|
SCM_API SCM scm_vm_option_ref (SCM vm, SCM key);
|
|
SCM_API SCM scm_vm_option_set_x (SCM vm, SCM key, SCM val);
|
|
|
|
SCM_API SCM scm_vm_version (void);
|
|
SCM_API SCM scm_the_vm (void);
|
|
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_boot_hook (SCM vm);
|
|
SCM_API SCM scm_vm_halt_hook (SCM vm);
|
|
SCM_API SCM scm_vm_next_hook (SCM vm);
|
|
SCM_API SCM scm_vm_break_hook (SCM vm);
|
|
SCM_API SCM scm_vm_enter_hook (SCM vm);
|
|
SCM_API SCM scm_vm_apply_hook (SCM vm);
|
|
SCM_API SCM scm_vm_exit_hook (SCM vm);
|
|
SCM_API SCM scm_vm_return_hook (SCM vm);
|
|
SCM_API SCM scm_vm_option (SCM vm, SCM key);
|
|
SCM_API SCM scm_set_vm_option_x (SCM vm, SCM key, SCM val);
|
|
SCM_API SCM scm_vm_trace_level (SCM vm);
|
|
SCM_API SCM scm_set_vm_trace_level_x (SCM vm, SCM level);
|
|
|
|
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;
|
|
};
|
|
|
|
#define SCM_VM_CONT_P(OBJ) (SCM_NIMP (OBJ) && SCM_TYP7 (OBJ) == scm_tc7_vm_cont)
|
|
#define SCM_VM_CONT_DATA(CONT) ((struct scm_vm_cont *) SCM_CELL_WORD_1 (CONT))
|
|
|
|
SCM_API SCM scm_load_compiled_with_vm (SCM file);
|
|
|
|
SCM_INTERNAL void scm_i_vm_print (SCM x, SCM port,
|
|
scm_print_state *pstate);
|
|
SCM_INTERNAL SCM scm_i_vm_capture_continuation (SCM vm);
|
|
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:
|
|
*/
|