mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-02 04:40:29 +02:00
14aa25e410
* libguile/debug.h (scm_t_debug_frame): Remove this type, as it was
internal to the old evaluator.
(SCM_EVALFRAME, SCM_APPLYFRAME, SCM_VOIDFRAME, SCM_MACROEXPF)
(SCM_TAILREC, SCM_TRACED_FRAME, SCM_ARGS_READY, SCM_DOVERFLOW)
(SCM_MAX_FRAME_SIZE, SCM_FRAMETYPE)
(SCM_EVALFRAMEP, SCM_APPLYFRAMEP, SCM_VOIDFRAMEP, SCM_MACROEXPFP)
(SCM_TAILRECP, SCM_TRACED_FRAME_P, SCM_ARGS_READY_P, SCM_OVERFLOWP)
(SCM_SET_MACROEXP, SCM_SET_TAILREC, SCM_SET_TRACED_FRAME)
(SCM_SET_ARGSREADY, SCM_SET_OVERFLOW)
(SCM_CLEAR_MACROEXP, SCM_CLEAR_TRACED_FRAME, SCM_CLEAR_ARGSREADY):
Remove macro accessors to scm_t_debug_frame.
(SCM_DEBUGOBJP, SCM_DEBUGOBJ_FRAME, SCM_SET_DEBUGOBJ_FRAME):
(scm_debug_object_p, scm_make_debugobj): Remove debugobj accessors.
(scm_i_unmemoize_expr): Remove unused declaration.
* libguile/debug.c (scm_debug_options): No more max limit on frame
sizes.
(scm_start_stack): Just call out to scm_vm_call_with_new_stack.
(scm_debug_object_p, scm_make_debugobj, scm_init_debug): No more
debugobj smob type.
* libguile/deprecated.h:
* libguile/deprecated.c (scm_i_deprecated_last_debug_frame)
(scm_last_debug_frame): Remove deprecated debug-frame bits.
* libguile/stacks.c (scm_make_stack): Rework this function and its
dependents to only walk VM frames.
(scm_stack_id): Call out to the holder of the VM frame in question,
which should be a VM or a VM continuation, for the stack ID. Currently
this bit is stubbed out.
(scm_last_stack_frame): Removed. It seems this is mainly useful for a
debugger, and we need to rewrite the debugger to work on the Scheme
level.
* test-suite/tests/continuations.test ("continuations"): Remove test for
last-stack-frame.
* libguile/continuations.h (struct scm_t_contregs):
* libguile/continuations.c (scm_make_continuation):
(copy_stack_and_call, scm_i_with_continuation_barrier): No need to
save and restore debug frames.
* libguile/threads.h (scm_i_thread): Don't track debug frames.
(scm_i_last_debug_frame, scm_i_set_last_debug_frame): Remove macro
accessors.
* libguile/threads.c (guilify_self_1): Don't track debug frames.
* libguile/throw.c: No need to track debug frames in a jmpbuf.
* libguile/vm-engine.c (vm_engine, VM_PUSH_DEBUG_FRAMES): Don't push
debug frames.
* libguile/vm.h:
* libguile/vm.c (scm_vm_call_with_new_stack): New function. Currently
stubbed out though.
117 lines
3.7 KiB
C
117 lines
3.7 KiB
C
/* Copyright (C) 2001, 2009 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) (struct scm_vm *vp, 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 */
|
|
unsigned long time; /* time spent */
|
|
unsigned long clock; /* bogos clock */
|
|
SCM trace_frame; /* a frame being traced */
|
|
};
|
|
|
|
SCM_API SCM scm_the_vm_fluid;
|
|
|
|
#define SCM_VM_P(x) SCM_SMOB_PREDICATE (scm_tc16_vm, x)
|
|
#define SCM_VM_DATA(vm) ((struct scm_vm *) SCM_SMOB_DATA (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_stats (SCM vm);
|
|
SCM_API SCM scm_vm_trace_frame (SCM vm);
|
|
|
|
struct scm_vm_cont {
|
|
scm_t_uint8 *ip;
|
|
SCM *sp;
|
|
SCM *fp;
|
|
scm_t_ptrdiff stack_size;
|
|
SCM *stack_base;
|
|
scm_t_ptrdiff reloc;
|
|
};
|
|
|
|
SCM_API scm_t_bits scm_tc16_vm_cont;
|
|
#define SCM_VM_CONT_P(OBJ) SCM_SMOB_PREDICATE (scm_tc16_vm_cont, OBJ)
|
|
#define SCM_VM_CONT_DATA(CONT) ((struct scm_vm_cont *) SCM_CELL_WORD_1 (CONT))
|
|
|
|
SCM_API SCM scm_vm_capture_continuations (void);
|
|
SCM_API void scm_vm_reinstate_continuations (SCM conts);
|
|
|
|
SCM_API SCM scm_load_compiled_with_vm (SCM file);
|
|
|
|
SCM_INTERNAL void scm_init_vm (void);
|
|
|
|
#endif /* _SCM_VM_H_ */
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|