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/continuations.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/continuations.c')
-rw-r--r-- | libguile/continuations.c | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/libguile/continuations.c b/libguile/continuations.c index a0e2f6d4f..7013e3d66 100644 --- a/libguile/continuations.c +++ b/libguile/continuations.c @@ -1,4 +1,4 @@ -/* Copyright (C) 1995,1996,1998,2000,2001,2004, 2006, 2008 Free Software Foundation, Inc. +/* Copyright (C) 1995,1996,1998,2000,2001,2004, 2006, 2008, 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 @@ -84,7 +84,6 @@ scm_make_continuation (int *first) continuation->dynenv = scm_i_dynwinds (); continuation->throw_value = SCM_EOL; continuation->root = thread->continuation_root; - continuation->dframe = scm_i_last_debug_frame (); src = thread->continuation_base; #if ! SCM_STACK_GROWS_UP src -= stack_size; @@ -190,8 +189,6 @@ copy_stack_and_call (scm_t_contregs *continuation, SCM val, data.dst = dst; scm_i_dowinds (continuation->dynenv, delta, copy_stack, &data); - scm_i_set_last_debug_frame (continuation->dframe); - continuation->throw_value = val; SCM_I_LONGJMP (continuation->jmpbuf, 1); } @@ -276,17 +273,14 @@ scm_i_with_continuation_barrier (scm_t_catch_body body, scm_i_thread *thread = SCM_I_CURRENT_THREAD; SCM old_controot; SCM_STACKITEM *old_contbase; - scm_t_debug_frame *old_lastframe; SCM result; /* Establish a fresh continuation root. */ old_controot = thread->continuation_root; old_contbase = thread->continuation_base; - old_lastframe = thread->last_debug_frame; thread->continuation_root = scm_cons (thread->handle, old_controot); thread->continuation_base = &stack_item; - thread->last_debug_frame = NULL; /* Call FUNC inside a catch all. This is now guaranteed to return directly and exactly once. @@ -298,7 +292,6 @@ scm_i_with_continuation_barrier (scm_t_catch_body body, /* Return to old continuation root. */ - thread->last_debug_frame = old_lastframe; thread->continuation_base = old_contbase; thread->continuation_root = old_controot; |