diff options
author | Andy Wingo <wingo@pobox.com> | 2009-12-03 11:03:39 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2009-12-03 11:03:39 +0100 |
commit | 14aa25e410d49586c8ff9b4a80d2b6046b769905 (patch) | |
tree | 89a58226d6c994a23498585bf79546b0b4e1fabd /libguile/vm-engine.c | |
parent | b2b554efd3fee1bd110cb286a1b185042db0a27f (diff) | |
download | guile-14aa25e410d49586c8ff9b4a80d2b6046b769905.tar.gz |
remove debug frames
* 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.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 21 |
1 files changed, 0 insertions, 21 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index 03993ec7e..2f3320c29 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -23,13 +23,11 @@ #define VM_USE_CLOCK 0 /* Bogoclock */ #define VM_CHECK_OBJECT 1 /* Check object table */ #define VM_CHECK_FREE_VARIABLES 1 /* Check free variable access */ -#define VM_PUSH_DEBUG_FRAMES 0 /* Push frames onto the evaluator debug stack */ #elif (VM_ENGINE == SCM_VM_DEBUG_ENGINE) #define VM_USE_HOOKS 1 #define VM_USE_CLOCK 1 #define VM_CHECK_OBJECT 1 #define VM_CHECK_FREE_VARIABLES 1 -#define VM_PUSH_DEBUG_FRAMES 1 #else #error unknown debug engine VM_ENGINE #endif @@ -66,12 +64,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) static void **jump_table = NULL; #endif -#if VM_PUSH_DEBUG_FRAMES - scm_t_debug_frame debug; - scm_t_debug_info debug_vect_body; - debug.status = SCM_VOIDFRAME; -#endif - #ifdef HAVE_LABELS_AS_VALUES if (SCM_UNLIKELY (!jump_table)) { @@ -95,15 +87,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) /* Boot program */ program = vm_make_boot_program (nargs); -#if VM_PUSH_DEBUG_FRAMES - debug.prev = scm_i_last_debug_frame (); - debug.status = SCM_APPLYFRAME; - debug.vect = &debug_vect_body; - debug.vect[0].a.proc = program; /* the boot program */ - debug.vect[0].a.args = SCM_EOL; - scm_i_set_last_debug_frame (&debug); -#endif - /* Initial frame */ CACHE_REGISTER (); PUSH ((SCM)fp); /* dynamic link */ @@ -147,9 +130,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) vm_done: SYNC_ALL (); -#if VM_PUSH_DEBUG_FRAMES - scm_i_set_last_debug_frame (debug.prev); -#endif return finish_args; /* Errors */ @@ -278,7 +258,6 @@ VM_NAME (struct scm_vm *vp, SCM program, SCM *argv, int nargs) #undef VM_USE_CLOCK #undef VM_CHECK_OBJECT #undef VM_CHECK_FREE_VARIABLE -#undef VM_PUSH_DEBUG_FRAMES /* Local Variables: |