diff options
Diffstat (limited to 'libguile/stacks.c')
-rw-r--r-- | libguile/stacks.c | 208 |
1 files changed, 110 insertions, 98 deletions
diff --git a/libguile/stacks.c b/libguile/stacks.c index 37a9161cd..7531908f2 100644 --- a/libguile/stacks.c +++ b/libguile/stacks.c @@ -1,5 +1,5 @@ /* A stack holds a frame chain - * Copyright (C) 1996,1997,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012 Free Software Foundation + * Copyright (C) 1996,1997,2000,2001, 2006, 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014 Free Software Foundation * * This library is free software; you can redistribute it and/or * modify it under the terms of the GNU Lesser General Public License @@ -65,11 +65,12 @@ static SCM scm_sys_stacks; /* Count number of debug info frames on a stack, beginning with FRAME. */ static long -stack_depth (SCM frame) +stack_depth (enum scm_vm_frame_kind kind, const struct scm_frame *frame) { - long n = 0; - /* count frames, skipping boot frames */ - for (; scm_is_true (frame); frame = scm_frame_previous (frame)) + struct scm_frame tmp; + long n = 1; + memcpy (&tmp, frame, sizeof tmp); + while (scm_c_frame_previous (kind, &tmp)) ++n; return n; } @@ -95,102 +96,101 @@ stack_depth (SCM frame) * encountered. */ -static SCM +static scm_t_ptrdiff find_prompt (SCM key) { - SCM winds; - for (winds = scm_i_dynwinds (); scm_is_pair (winds); winds = scm_cdr (winds)) - { - SCM elt = scm_car (winds); - if (SCM_PROMPT_P (elt) && scm_is_eq (SCM_PROMPT_TAG (elt), key)) - return elt; - } - scm_misc_error ("make-stack", "Prompt tag not found while narrowing stack", - scm_list_1 (key)); - return SCM_BOOL_F; /* not reached */ + scm_t_ptrdiff fp_offset; + + if (!scm_dynstack_find_prompt (&SCM_I_CURRENT_THREAD->dynstack, key, + NULL, &fp_offset, NULL, NULL, NULL)) + scm_misc_error ("make-stack", "Prompt tag not found while narrowing stack", + scm_list_1 (key)); + + return fp_offset; } -static void -narrow_stack (SCM stack, long inner, SCM inner_key, long outer, SCM outer_key) +static long +narrow_stack (long len, enum scm_vm_frame_kind kind, struct scm_frame *frame, + SCM inner_cut, SCM outer_cut) { - unsigned long int len; - SCM frame; - - len = SCM_STACK_LENGTH (stack); - frame = SCM_STACK_FRAME (stack); - /* Cut inner part. */ - if (scm_is_true (scm_procedure_p (inner_key))) + if (scm_is_true (scm_procedure_p (inner_cut))) { /* Cut until the given procedure is seen. */ - for (; inner && len ; --inner) + for (; len ;) { - SCM proc = scm_frame_procedure (frame); + SCM proc = scm_c_frame_closure (kind, frame); len--; - frame = scm_frame_previous (frame); - if (scm_is_eq (proc, inner_key)) + scm_c_frame_previous (kind, frame); + if (scm_is_eq (proc, inner_cut)) break; } } - else if (scm_is_symbol (inner_key)) - { - /* Cut until the given prompt tag is seen. FIXME, assumes prompt tags are - symbols. */ - SCM prompt = find_prompt (inner_key); - for (; len; len--, frame = scm_frame_previous (frame)) - if (SCM_PROMPT_REGISTERS (prompt)->fp - == SCM_VM_FRAME_FP (frame) - SCM_VM_FRAME_OFFSET (frame)) - break; - } - else + else if (scm_is_integer (inner_cut)) { /* Cut specified number of frames. */ + long inner = scm_to_int (inner_cut); + for (; inner && len; --inner) { len--; - frame = scm_frame_previous (frame); + scm_c_frame_previous (kind, frame); } } - - SCM_SET_STACK_LENGTH (stack, len); - SCM_SET_STACK_FRAME (stack, frame); + else + { + /* Cut until the given prompt tag is seen. */ + scm_t_ptrdiff fp_offset = find_prompt (inner_cut); + for (; len; len--, scm_c_frame_previous (kind, frame)) + if (fp_offset == frame->fp_offset) + break; + } /* Cut outer part. */ - if (scm_is_true (scm_procedure_p (outer_key))) + if (scm_is_true (scm_procedure_p (outer_cut))) { + long i, new_len; + struct scm_frame tmp; + + memcpy (&tmp, frame, sizeof tmp); + /* Cut until the given procedure is seen. */ - for (; outer && len ; --outer) - { - frame = scm_stack_ref (stack, scm_from_long (len - 1)); - len--; - if (scm_is_eq (scm_frame_procedure (frame), outer_key)) - break; - } - } - else if (scm_is_symbol (outer_key)) - { - /* Cut until the given prompt tag is seen. FIXME, assumes prompt tags are - symbols. */ - SCM prompt = find_prompt (outer_key); - while (len) - { - frame = scm_stack_ref (stack, scm_from_long (len - 1)); - len--; - if (SCM_PROMPT_REGISTERS (prompt)->fp - == SCM_VM_FRAME_FP (frame) - SCM_VM_FRAME_OFFSET (frame)) - break; - } + for (new_len = i = 0; i < len; i++, scm_c_frame_previous (kind, &tmp)) + if (scm_is_eq (scm_c_frame_closure (kind, &tmp), outer_cut)) + new_len = i; + + len = new_len; } - else + else if (scm_is_integer (outer_cut)) { /* Cut specified number of frames. */ + long outer = scm_to_int (outer_cut); + if (outer < len) len -= outer; else len = 0; } + else + { + /* Cut until the given prompt tag is seen. */ + long i; + struct scm_frame tmp; + scm_t_ptrdiff fp_offset = find_prompt (outer_cut); + + memcpy (&tmp, frame, sizeof tmp); - SCM_SET_STACK_LENGTH (stack, len); + for (i = 0; i < len; i++, scm_c_frame_previous (kind, &tmp)) + if (tmp.fp_offset == fp_offset) + break; + + if (i < len) + len = i; + else + len = 0; + } + + return len; } @@ -246,9 +246,9 @@ SCM_DEFINE (scm_make_stack, "make-stack", 1, 0, 1, #define FUNC_NAME s_scm_make_stack { long n; - SCM frame; - SCM stack; SCM inner_cut, outer_cut; + enum scm_vm_frame_kind kind; + struct scm_frame frame; /* Extract a pointer to the innermost frame of whatever object scm_make_stack was given. */ @@ -257,45 +257,53 @@ SCM_DEFINE (scm_make_stack, "make-stack", 1, 0, 1, SCM cont; struct scm_vm_cont *c; - cont = scm_i_vm_capture_continuation (scm_the_vm ()); + cont = scm_i_capture_current_stack (); c = SCM_VM_CONT_DATA (cont); - frame = scm_c_make_frame (cont, c->fp + c->reloc, - c->sp + c->reloc, c->ra, - c->reloc); + kind = SCM_VM_FRAME_KIND_CONT; + frame.stack_holder = c; + frame.fp_offset = (c->fp + c->reloc) - c->stack_base; + frame.sp_offset = (c->sp + c->reloc) - c->stack_base; + frame.ip = c->ra; } else if (SCM_VM_FRAME_P (obj)) - frame = obj; + { + kind = SCM_VM_FRAME_KIND (obj); + memcpy (&frame, SCM_VM_FRAME_DATA (obj), sizeof frame); + } else if (SCM_CONTINUATIONP (obj)) /* FIXME: Narrowing to prompt tags should narrow with respect to the prompts that were in place when the continuation was captured. */ - frame = scm_i_continuation_to_frame (obj); + { + kind = SCM_VM_FRAME_KIND_CONT; + if (!scm_i_continuation_to_frame (obj, &frame)) + return SCM_BOOL_F; + } + else if (SCM_PROGRAM_P (obj) && SCM_PROGRAM_IS_PARTIAL_CONTINUATION (obj)) + { + kind = SCM_VM_FRAME_KIND_CONT; + if (!scm_i_vm_cont_to_frame (SCM_PROGRAM_FREE_VARIABLE_REF (obj, 0), + &frame)) + return SCM_BOOL_F; + } else { SCM_WRONG_TYPE_ARG (SCM_ARG1, obj); /* not reached */ } - /* FIXME: is this even possible? */ - if (scm_is_true (frame) - && SCM_PROGRAM_P (scm_frame_procedure (frame)) - && SCM_PROGRAM_IS_BOOT (scm_frame_procedure (frame))) - frame = scm_frame_previous (frame); - - if (scm_is_false (frame)) + /* Skip initial boot frame, if any. This is possible if the frame + originates from a captured continuation. */ + if (SCM_PROGRAM_P (scm_c_frame_closure (kind, &frame)) + && SCM_PROGRAM_IS_BOOT (scm_c_frame_closure (kind, &frame)) + && !scm_c_frame_previous (kind, &frame)) return SCM_BOOL_F; /* Count number of frames. Also get stack id tag and check whether there are more stackframes than we want to record (SCM_BACKTRACE_MAXDEPTH). */ - n = stack_depth (frame); + n = stack_depth (kind, &frame); - /* Make the stack object. */ - stack = scm_make_struct (scm_stack_type, SCM_INUM0, SCM_EOL); - SCM_SET_STACK_LENGTH (stack, n); - SCM_SET_STACK_ID (stack, scm_stack_id (obj)); - SCM_SET_STACK_FRAME (stack, frame); - /* Narrow the stack according to the arguments given to scm_make_stack. */ SCM_VALIDATE_REST_ARGUMENT (args); while (n > 0 && !scm_is_null (args)) @@ -312,17 +320,18 @@ SCM_DEFINE (scm_make_stack, "make-stack", 1, 0, 1, args = SCM_CDR (args); } - narrow_stack (stack, - scm_is_integer (inner_cut) ? scm_to_int (inner_cut) : n, - scm_is_integer (inner_cut) ? SCM_BOOL_T : inner_cut, - scm_is_integer (outer_cut) ? scm_to_int (outer_cut) : n, - scm_is_integer (outer_cut) ? SCM_BOOL_T : outer_cut); - - n = SCM_STACK_LENGTH (stack); + n = narrow_stack (n, kind, &frame, inner_cut, outer_cut); } if (n > 0) - return stack; + { + /* Make the stack object. */ + SCM stack = scm_make_struct (scm_stack_type, SCM_INUM0, SCM_EOL); + SCM_SET_STACK_LENGTH (stack, n); + SCM_SET_STACK_ID (stack, scm_stack_id (obj)); + SCM_SET_STACK_FRAME (stack, scm_c_make_frame (kind, &frame)); + return stack; + } else return SCM_BOOL_F; } @@ -345,6 +354,9 @@ SCM_DEFINE (scm_stack_id, "stack-id", 1, 0, 0, else if (SCM_CONTINUATIONP (stack)) /* FIXME: implement me */ return SCM_BOOL_F; + else if (SCM_PROGRAM_P (stack) && SCM_PROGRAM_IS_PARTIAL_CONTINUATION (stack)) + /* FIXME: implement me */ + return SCM_BOOL_F; else { SCM_WRONG_TYPE_ARG (SCM_ARG1, stack); |