1996-10-14 03:24:16 +00:00
|
|
|
|
/* Printing of backtraces and error messages
|
2011-02-09 23:13:53 +01:00
|
|
|
|
* Copyright (C) 1996,1997,1998,1999,2000,2001, 2003, 2004, 2006, 2009, 2010, 2011 Free Software Foundation
|
1996-10-14 03:24:16 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* This library is free software; you can redistribute it and/or
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* 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.
|
1996-10-14 03:24:16 +00:00
|
|
|
|
*
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* This library is distributed in the hope that it will be useful, but
|
|
|
|
|
|
* WITHOUT ANY WARRANTY; without even the implied warranty of
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
|
|
|
|
* Lesser General Public License for more details.
|
1996-10-14 03:24:16 +00:00
|
|
|
|
*
|
2003-04-05 19:15:35 +00:00
|
|
|
|
* You should have received a copy of the GNU Lesser General Public
|
|
|
|
|
|
* License along with this library; if not, write to the Free Software
|
2009-06-17 00:22:09 +01:00
|
|
|
|
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
|
|
|
|
|
|
* 02110-1301 USA
|
2003-04-05 19:15:35 +00:00
|
|
|
|
*/
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2008-09-13 15:35:27 +02:00
|
|
|
|
#ifdef HAVE_CONFIG_H
|
2003-03-25 23:52:40 +00:00
|
|
|
|
# include <config.h>
|
|
|
|
|
|
#endif
|
1999-12-12 02:36:16 +00:00
|
|
|
|
|
2001-07-03 15:27:56 +00:00
|
|
|
|
#include <stdio.h>
|
1999-09-12 02:23:39 +00:00
|
|
|
|
#include <ctype.h>
|
|
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/_scm.h"
|
1999-09-22 04:36:56 +00:00
|
|
|
|
|
1999-09-15 15:22:07 +00:00
|
|
|
|
#ifdef HAVE_UNISTD_H
|
|
|
|
|
|
#include <unistd.h>
|
|
|
|
|
|
#endif
|
2001-06-26 17:53:09 +00:00
|
|
|
|
#ifdef HAVE_IO_H
|
|
|
|
|
|
#include <io.h>
|
|
|
|
|
|
#endif
|
1999-09-15 15:22:07 +00:00
|
|
|
|
|
2010-07-15 12:11:34 +02:00
|
|
|
|
#include "libguile/deprecation.h"
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/stacks.h"
|
|
|
|
|
|
#include "libguile/srcprop.h"
|
|
|
|
|
|
#include "libguile/struct.h"
|
|
|
|
|
|
#include "libguile/strports.h"
|
|
|
|
|
|
#include "libguile/throw.h"
|
|
|
|
|
|
#include "libguile/fluids.h"
|
|
|
|
|
|
#include "libguile/ports.h"
|
|
|
|
|
|
#include "libguile/strings.h"
|
2003-05-12 20:46:52 +00:00
|
|
|
|
#include "libguile/dynwind.h"
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
#include "libguile/frames.h"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/validate.h"
|
|
|
|
|
|
#include "libguile/backtrace.h"
|
2001-05-25 00:19:36 +00:00
|
|
|
|
#include "libguile/filesys.h"
|
* backtrace.c, debug.c, debug.h, deprecation.c, eq.c, eval.c
eval.h, gsubr.c, init.c, macros.c, print.c, print.h, read.c,
read.h, stacks.c, symbols.c, throw.c: use private-options.h
* private-options.h: new file: contain hardcoded option
definitions.
2007-01-22 15:14:40 +00:00
|
|
|
|
#include "libguile/private-options.h"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* {Error reporting and backtraces}
|
|
|
|
|
|
*
|
|
|
|
|
|
* Note that these functions shouldn't generate errors themselves.
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
2011-02-11 13:13:26 +01:00
|
|
|
|
static SCM
|
|
|
|
|
|
boot_print_exception (SCM port, SCM frame, SCM key, SCM args)
|
|
|
|
|
|
#define FUNC_NAME "boot-print-exception"
|
|
|
|
|
|
{
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("Throw to key ", port);
|
2011-02-11 13:13:26 +01:00
|
|
|
|
scm_write (key, port);
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked (" with args ", port);
|
2011-02-11 13:13:26 +01:00
|
|
|
|
scm_write (args, port);
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
SCM
|
|
|
|
|
|
scm_print_exception (SCM port, SCM frame, SCM key, SCM args)
|
|
|
|
|
|
#define FUNC_NAME "print-exception"
|
|
|
|
|
|
{
|
|
|
|
|
|
static SCM print_exception = SCM_BOOL_F;
|
|
|
|
|
|
|
|
|
|
|
|
SCM_VALIDATE_OPOUTPORT (1, port);
|
|
|
|
|
|
if (scm_is_true (frame))
|
|
|
|
|
|
SCM_VALIDATE_FRAME (2, frame);
|
|
|
|
|
|
SCM_VALIDATE_SYMBOL (3, key);
|
|
|
|
|
|
SCM_VALIDATE_LIST (4, args);
|
|
|
|
|
|
|
|
|
|
|
|
if (scm_is_false (print_exception))
|
2011-02-11 15:21:58 +01:00
|
|
|
|
print_exception =
|
|
|
|
|
|
scm_module_variable (scm_the_root_module (),
|
|
|
|
|
|
scm_from_latin1_symbol ("print-exception"));
|
2011-02-11 13:13:26 +01:00
|
|
|
|
|
|
|
|
|
|
return scm_call_4 (scm_variable_ref (print_exception),
|
|
|
|
|
|
port, frame, key, args);
|
|
|
|
|
|
}
|
|
|
|
|
|
#undef FUNC_NAME
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
2003-05-12 20:46:52 +00:00
|
|
|
|
/* Print parameters for error messages. */
|
|
|
|
|
|
|
|
|
|
|
|
#define DISPLAY_ERROR_MESSAGE_MAX_LEVEL 7
|
|
|
|
|
|
#define DISPLAY_ERROR_MESSAGE_MAX_LENGTH 10
|
|
|
|
|
|
|
|
|
|
|
|
/* Print parameters for failing expressions in error messages.
|
|
|
|
|
|
* (See also `print_params' below for backtrace print parameters.)
|
|
|
|
|
|
*/
|
|
|
|
|
|
|
|
|
|
|
|
#define DISPLAY_EXPRESSION_MAX_LEVEL 2
|
|
|
|
|
|
#define DISPLAY_EXPRESSION_MAX_LENGTH 3
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
#undef SCM_ASSERT
|
|
|
|
|
|
#define SCM_ASSERT(_cond, _arg, _pos, _subr) \
|
|
|
|
|
|
if (!(_cond)) \
|
|
|
|
|
|
return SCM_BOOL_F;
|
|
|
|
|
|
|
2011-02-11 13:13:26 +01:00
|
|
|
|
|
1996-12-10 01:41:37 +00:00
|
|
|
|
void
|
1999-12-12 20:35:02 +00:00
|
|
|
|
scm_display_error_message (SCM message, SCM args, SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2011-02-11 15:03:38 +01:00
|
|
|
|
scm_print_exception (port, SCM_BOOL_F, scm_misc_error_key,
|
|
|
|
|
|
scm_list_3 (SCM_BOOL_F, message, args));
|
1997-09-24 20:18:54 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
2001-01-24 15:58:46 +00:00
|
|
|
|
|
|
|
|
|
|
/* The function scm_i_display_error prints out a detailed error message. This
|
|
|
|
|
|
* function will be called directly within libguile to signal error messages.
|
|
|
|
|
|
* No parameter checks will be performed by scm_i_display_error. Thus, User
|
|
|
|
|
|
* code should rather use the function scm_display_error.
|
|
|
|
|
|
*/
|
|
|
|
|
|
void
|
2010-07-15 12:11:34 +02:00
|
|
|
|
scm_i_display_error (SCM frame, SCM port, SCM subr, SCM message, SCM args, SCM rest)
|
1997-09-24 20:18:54 +00:00
|
|
|
|
{
|
2011-02-11 15:03:38 +01:00
|
|
|
|
scm_print_exception (port, frame, scm_misc_error_key,
|
|
|
|
|
|
scm_list_3 (subr, message, args));
|
2001-01-24 15:58:46 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
SCM_DEFINE (scm_display_error, "display-error", 6, 0, 0,
|
2010-07-15 12:11:34 +02:00
|
|
|
|
(SCM frame, SCM port, SCM subr, SCM message, SCM args, SCM rest),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Display an error message to the output port @var{port}.\n"
|
2010-07-15 12:11:34 +02:00
|
|
|
|
"@var{frame} is the frame in which the error occurred, @var{subr} is\n"
|
2002-03-15 10:37:40 +00:00
|
|
|
|
"the name of the procedure in which the error occurred and\n"
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"@var{message} is the actual error message, which may contain\n"
|
|
|
|
|
|
"formatting instructions. These will format the arguments in\n"
|
|
|
|
|
|
"the list @var{args} accordingly. @var{rest} is currently\n"
|
|
|
|
|
|
"ignored.")
|
2001-01-24 15:58:46 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_error
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM_VALIDATE_OUTPUT_PORT (2, port);
|
|
|
|
|
|
|
2012-01-08 16:37:22 +01:00
|
|
|
|
#if SCM_ENABLE_DEPRECATED
|
|
|
|
|
|
if (SCM_STACKP (frame))
|
|
|
|
|
|
{
|
|
|
|
|
|
scm_c_issue_deprecation_warning
|
|
|
|
|
|
("Passing a stack as the first argument to `scm_display_error' is "
|
|
|
|
|
|
"deprecated. Pass a frame instead.");
|
|
|
|
|
|
if (SCM_STACK_LENGTH (frame))
|
|
|
|
|
|
frame = scm_stack_ref (frame, SCM_INUM0);
|
|
|
|
|
|
else
|
|
|
|
|
|
frame = SCM_BOOL_F;
|
|
|
|
|
|
}
|
|
|
|
|
|
#endif
|
|
|
|
|
|
|
2010-07-15 12:11:34 +02:00
|
|
|
|
scm_i_display_error (frame, port, subr, message, args, rest);
|
2001-01-24 15:58:46 +00:00
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2001-01-24 15:58:46 +00:00
|
|
|
|
|
1999-09-12 02:23:39 +00:00
|
|
|
|
typedef struct {
|
|
|
|
|
|
int level;
|
|
|
|
|
|
int length;
|
|
|
|
|
|
} print_params_t;
|
|
|
|
|
|
|
|
|
|
|
|
static int n_print_params = 9;
|
|
|
|
|
|
static print_params_t default_print_params[] = {
|
|
|
|
|
|
{ 4, 9 }, { 4, 3 },
|
|
|
|
|
|
{ 3, 4 }, { 3, 3 },
|
|
|
|
|
|
{ 2, 4 }, { 2, 3 },
|
|
|
|
|
|
{ 1, 4 }, { 1, 3 }, { 1, 2 }
|
|
|
|
|
|
};
|
|
|
|
|
|
static print_params_t *print_params = default_print_params;
|
|
|
|
|
|
|
|
|
|
|
|
#ifdef GUILE_DEBUG
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_set_print_params_x, "set-print-params!", 1, 0, 0,
|
1999-12-14 17:08:25 +00:00
|
|
|
|
(SCM params),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Set the print parameters to the values from @var{params}.\n"
|
|
|
|
|
|
"@var{params} must be a list of two-element lists which must\n"
|
|
|
|
|
|
"hold two integer values.")
|
1999-12-14 17:41:59 +00:00
|
|
|
|
#define FUNC_NAME s_scm_set_print_params_x
|
1999-09-12 02:23:39 +00:00
|
|
|
|
{
|
2000-01-18 18:24:57 +00:00
|
|
|
|
int i;
|
|
|
|
|
|
int n;
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM ls;
|
|
|
|
|
|
print_params_t *new_params;
|
2000-01-18 18:24:57 +00:00
|
|
|
|
|
|
|
|
|
|
SCM_VALIDATE_NONEMPTYLIST_COPYLEN (2, params, n);
|
2002-01-22 23:31:39 +00:00
|
|
|
|
for (ls = params; !SCM_NULL_OR_NIL_P (ls); ls = SCM_CDR (ls))
|
1999-09-12 02:23:39 +00:00
|
|
|
|
SCM_ASSERT (scm_ilength (SCM_CAR (params)) == 2
|
2004-07-23 15:43:02 +00:00
|
|
|
|
&& scm_is_unsigned_integer (SCM_CAAR (ls), 0, INT_MAX)
|
|
|
|
|
|
&& scm_is_unsigned_integer (SCM_CADAR (ls), 0, INT_MAX),
|
1999-09-12 02:23:39 +00:00
|
|
|
|
params,
|
|
|
|
|
|
SCM_ARG2,
|
1999-12-14 17:41:59 +00:00
|
|
|
|
s_scm_set_print_params_x);
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
new_params = scm_malloc (n * sizeof (print_params_t));
|
1999-09-12 02:23:39 +00:00
|
|
|
|
if (print_params != default_print_params)
|
* gc.h, gc.c (scm_gc_sweep): Issue deprecation warning when
non-zero is returned from a port or smob free function.
(scm_malloc, scm_realloc, scm_strndup, scm_strdup,
scm_gc_register_collectable_memory,
scm_gc_unregister_collectable_memory, scm_gc_malloc,
scm_gc_realloc, scm_gc_free, scm_gc_strndup, scm_gc_strdup): New.
* backtrace.c, continuations.c, convert.i.c, coop-threads.c,
debug-malloc.c, dynl.c, environments.c, environments.h,
extensions.c, filesys.c, fports.c, gc.c, gc.h, gh_data.c, goops.c,
guardians.c, hooks.c, init.c, keywords.c, load.c, numbers.c,
ports.c, posix.c, procs.c, rdelim.c, regex-posix.c, root.c,
smob.c, stime.c, strings.c, struct.c, struct.h, symbols.c, unif.c,
vectors.c, weaks.c: Use scm_gc_malloc/scm_malloc and
scm_gc_free/free instead of scm_must_malloc and scm_must_free, as
appropriate. Return zero from smob and port free functions.
* debug-malloc.c (scm_malloc_reregister): Handle "old == NULL".
* fports.c (scm_setvbuf): Reset read buffer to saved values when
it is pointing to the putback buffer.
2002-02-11 18:06:50 +00:00
|
|
|
|
free (print_params);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
print_params = new_params;
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
print_params[i].level = scm_to_int (SCM_CAAR (params));
|
|
|
|
|
|
print_params[i].length = scm_to_int (SCM_CADAR (params));
|
1999-09-12 02:23:39 +00:00
|
|
|
|
params = SCM_CDR (params);
|
|
|
|
|
|
}
|
|
|
|
|
|
n_print_params = n;
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1999-09-12 02:23:39 +00:00
|
|
|
|
#endif
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
static void
|
1999-12-12 02:36:16 +00:00
|
|
|
|
indent (int n, SCM port)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
int i;
|
|
|
|
|
|
for (i = 0; i < n; ++i)
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_putc_unlocked (' ', port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
2002-07-20 14:08:34 +00:00
|
|
|
|
display_frame_expr (char *hdr, SCM exp, char *tlr, int indentation, SCM sport, SCM port, scm_print_state *pstate)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1999-09-12 02:23:39 +00:00
|
|
|
|
int i = 0, n;
|
2011-11-07 18:58:01 +01:00
|
|
|
|
scm_t_ptob_descriptor *ptob = SCM_PORT_DESCRIPTOR (sport);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
do
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
1999-09-12 02:23:39 +00:00
|
|
|
|
pstate->length = print_params[i].length;
|
|
|
|
|
|
ptob->seek (sport, 0, SEEK_SET);
|
2004-09-22 17:41:37 +00:00
|
|
|
|
if (scm_is_pair (exp))
|
1999-09-12 02:23:39 +00:00
|
|
|
|
{
|
|
|
|
|
|
pstate->level = print_params[i].level - 1;
|
|
|
|
|
|
scm_iprlist (hdr, exp, tlr[0], sport, pstate);
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked (&tlr[1], sport);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
pstate->level = print_params[i].level;
|
|
|
|
|
|
scm_iprin1 (exp, sport, pstate);
|
|
|
|
|
|
}
|
|
|
|
|
|
ptob->flush (sport);
|
|
|
|
|
|
n = ptob->seek (sport, 0, SEEK_CUR);
|
|
|
|
|
|
++i;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
1999-09-12 02:23:39 +00:00
|
|
|
|
while (indentation + n > SCM_BACKTRACE_WIDTH && i < n_print_params);
|
|
|
|
|
|
ptob->truncate (sport, n);
|
|
|
|
|
|
|
2004-09-29 17:40:11 +00:00
|
|
|
|
scm_display (scm_strport_to_string (sport), port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1997-03-07 21:42:32 +00:00
|
|
|
|
static void
|
2002-07-20 14:08:34 +00:00
|
|
|
|
display_application (SCM frame, int indentation, SCM sport, SCM port, scm_print_state *pstate)
|
1997-03-07 21:42:32 +00:00
|
|
|
|
{
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
SCM proc = scm_frame_procedure (frame);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
SCM name = (scm_is_true (scm_procedure_p (proc))
|
1997-03-07 21:42:32 +00:00
|
|
|
|
? scm_procedure_name (proc)
|
|
|
|
|
|
: SCM_BOOL_F);
|
|
|
|
|
|
display_frame_expr ("[",
|
2004-07-06 10:59:25 +00:00
|
|
|
|
scm_cons (scm_is_true (name) ? name : proc,
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
scm_frame_arguments (frame)),
|
|
|
|
|
|
"]",
|
1997-03-07 21:42:32 +00:00
|
|
|
|
indentation,
|
|
|
|
|
|
sport,
|
|
|
|
|
|
port,
|
|
|
|
|
|
pstate);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2000-01-05 19:25:37 +00:00
|
|
|
|
SCM_DEFINE (scm_display_application, "display-application", 1, 2, 0,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
(SCM frame, SCM port, SCM indent),
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"Display a procedure application @var{frame} to the output port\n"
|
|
|
|
|
|
"@var{port}. @var{indent} specifies the indentation of the\n"
|
|
|
|
|
|
"output.")
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_application
|
1997-03-07 21:42:32 +00:00
|
|
|
|
{
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_FRAME (1, frame);
|
1997-03-07 21:42:32 +00:00
|
|
|
|
if (SCM_UNBNDP (port))
|
2005-03-02 20:42:01 +00:00
|
|
|
|
port = scm_current_output_port ();
|
1999-09-12 02:23:39 +00:00
|
|
|
|
else
|
2002-07-20 14:08:34 +00:00
|
|
|
|
SCM_VALIDATE_OPOUTPORT (2, port);
|
1999-09-12 02:23:39 +00:00
|
|
|
|
if (SCM_UNBNDP (indent))
|
|
|
|
|
|
indent = SCM_INUM0;
|
|
|
|
|
|
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
/* Display an application. */
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM sport, print_state;
|
|
|
|
|
|
scm_print_state *pstate;
|
1997-03-07 21:42:32 +00:00
|
|
|
|
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
/* Create a string port used for adaptation of printing parameters. */
|
2011-03-06 11:42:37 +01:00
|
|
|
|
sport = scm_mkstrport (SCM_INUM0, SCM_BOOL_F,
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
SCM_OPN | SCM_WRTNG,
|
|
|
|
|
|
FUNC_NAME);
|
|
|
|
|
|
|
|
|
|
|
|
/* Create a print state for printing of frames. */
|
|
|
|
|
|
print_state = scm_make_print_state ();
|
|
|
|
|
|
pstate = SCM_PRINT_STATE (print_state);
|
|
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
pstate->fancyp = 1;
|
1997-03-07 21:42:32 +00:00
|
|
|
|
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
display_application (frame, scm_to_int (indent), sport, port, pstate);
|
|
|
|
|
|
return SCM_BOOL_T;
|
|
|
|
|
|
}
|
1997-03-07 21:42:32 +00:00
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-03-07 21:42:32 +00:00
|
|
|
|
|
2001-05-25 00:19:36 +00:00
|
|
|
|
SCM_SYMBOL (sym_base, "base");
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
display_backtrace_get_file_line (SCM frame, SCM *file, SCM *line)
|
|
|
|
|
|
{
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
SCM source = scm_frame_source (frame);
|
2008-12-26 16:35:43 +01:00
|
|
|
|
*file = *line = SCM_BOOL_F;
|
2009-11-27 17:35:37 +01:00
|
|
|
|
if (scm_is_pair (source)
|
|
|
|
|
|
&& scm_is_pair (scm_cdr (source))
|
|
|
|
|
|
&& scm_is_pair (scm_cddr (source))
|
|
|
|
|
|
&& !scm_is_pair (scm_cdddr (source)))
|
2008-12-26 16:35:43 +01:00
|
|
|
|
{
|
propagate much more source info through compilation
* module/language/ghil/compile-glil.scm (codegen): Record source location
for offset 0 into a lambda, if we can.
* module/language/scheme/compile-ghil.scm (translate-1)
(define-scheme-translator): In the retrans procedures, propagate the
location information from the enclosing expression if the subexpression
has no location information. Gives source information to many more
expressions.
(location): Just propagate the source properties as they are, the
glil->assembly compiler will interpret them.
* module/language/glil.scm (<glil>): Change glil-source to take "props"
and not "loc", as it's the source properties that we're interested in.
* module/language/glil/compile-assembly.scm (limn-sources): New function,
takes a list of addr-source property pairs and "compresses" them for
serialization to disk.
(glil->assembly): Limn the sources before writing them to disk. Avoid
non-tail recursion when determining total byte length of code.
* module/system/vm/program.scm (source:file, source:line, source:column):
Update for new source representation.
(program-source): Export.
(write-program): Nicer pretty-printing of anonymous procedures.
* libguile/backtrace.c (display_backtrace_get_file_line): Update for the
new VM source representation.
* libguile/programs.h:
* libguile/programs.c (scm_program_sources): Update for the new
serialized source representation, where the filename is not in the
stream unless it changes.
(scm_program_source): New exported function, looks up the source for a
given ip offset.
(scm_c_program_source): Update to return the last source information
that was <= the given IP, because we only serialize source info when it
changes.
2009-02-10 11:53:23 +01:00
|
|
|
|
/* (addr . (filename . (line . column))), from vm compilation */
|
|
|
|
|
|
*file = scm_cadr (source);
|
|
|
|
|
|
*line = scm_caddr (source);
|
2008-12-26 16:35:43 +01:00
|
|
|
|
}
|
2001-05-25 00:19:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
display_backtrace_file (frame, last_file, port, pstate)
|
|
|
|
|
|
SCM frame;
|
|
|
|
|
|
SCM *last_file;
|
|
|
|
|
|
SCM port;
|
|
|
|
|
|
scm_print_state *pstate;
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM file, line;
|
|
|
|
|
|
|
|
|
|
|
|
display_backtrace_get_file_line (frame, &file, &line);
|
|
|
|
|
|
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
if (scm_is_true (scm_equal_p (file, *last_file)))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
return;
|
|
|
|
|
|
|
|
|
|
|
|
*last_file = file;
|
|
|
|
|
|
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("In ", port);
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (file))
|
|
|
|
|
|
if (scm_is_false (line))
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("unknown file", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
else
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("current input", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
pstate->writingp = 0;
|
|
|
|
|
|
scm_iprin1 (file, port, pstate);
|
|
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
}
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked (":\n", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void
|
|
|
|
|
|
display_backtrace_file_and_line (SCM frame, SCM port, scm_print_state *pstate)
|
|
|
|
|
|
{
|
|
|
|
|
|
SCM file, line;
|
|
|
|
|
|
|
|
|
|
|
|
display_backtrace_get_file_line (frame, &file, &line);
|
|
|
|
|
|
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (scm_is_eq (SCM_PACK (SCM_SHOW_FILE_NAME), sym_base))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (file))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
{
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (line))
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_putc_unlocked ('?', port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
else
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("<stdin>", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
pstate -> writingp = 0;
|
2001-10-13 15:41:40 +00:00
|
|
|
|
#ifdef HAVE_POSIX
|
2004-08-10 13:31:22 +00:00
|
|
|
|
scm_iprin1 ((scm_is_string (file)?
|
|
|
|
|
|
scm_basename (file, SCM_UNDEFINED) : file),
|
2001-05-25 00:19:36 +00:00
|
|
|
|
port, pstate);
|
2001-10-13 15:41:40 +00:00
|
|
|
|
#else
|
|
|
|
|
|
scm_iprin1 (file, port, pstate);
|
|
|
|
|
|
#endif
|
2001-05-25 00:19:36 +00:00
|
|
|
|
pstate -> writingp = 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_putc_unlocked (':', port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
}
|
2004-07-06 10:59:25 +00:00
|
|
|
|
else if (scm_is_true (line))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
{
|
|
|
|
|
|
int i, j=0;
|
2004-07-23 15:43:02 +00:00
|
|
|
|
for (i = scm_to_int (line)+1; i > 0; i = i/10, j++)
|
2001-05-25 00:19:36 +00:00
|
|
|
|
;
|
|
|
|
|
|
indent (4-j, port);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_false (line))
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked (" ?", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
else
|
2004-07-23 15:43:02 +00:00
|
|
|
|
scm_intprint (scm_to_int (line) + 1, 10, port);
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked (": ", port);
|
2001-05-25 00:19:36 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
static void
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
display_frame (SCM frame, int n, int nfield, int indentation,
|
|
|
|
|
|
SCM sport, SCM port, scm_print_state *pstate)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
int i, j;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2001-05-25 00:19:36 +00:00
|
|
|
|
/* display file name and line number */
|
2004-07-06 10:59:25 +00:00
|
|
|
|
if (scm_is_true (SCM_PACK (SCM_SHOW_FILE_NAME)))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
display_backtrace_file_and_line (frame, port, pstate);
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
/* Check size of frame number. */
|
|
|
|
|
|
for (i = 0, j = n; j > 0; ++i) j /= 10;
|
|
|
|
|
|
|
|
|
|
|
|
/* Number indentation. */
|
|
|
|
|
|
indent (nfield - (i ? i : 1), port);
|
|
|
|
|
|
|
|
|
|
|
|
/* Frame number. */
|
2004-07-08 15:58:11 +00:00
|
|
|
|
scm_iprin1 (scm_from_int (n), port, pstate);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Indentation. */
|
|
|
|
|
|
indent (indentation, port);
|
|
|
|
|
|
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
/* Display an application. */
|
|
|
|
|
|
display_application (frame, nfield + 1 + indentation, sport, port, pstate);
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_putc_unlocked ('\n', port);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
|
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
struct display_backtrace_args {
|
|
|
|
|
|
SCM stack;
|
|
|
|
|
|
SCM port;
|
|
|
|
|
|
SCM first;
|
|
|
|
|
|
SCM depth;
|
2004-09-23 17:51:53 +00:00
|
|
|
|
SCM highlight_objects;
|
1997-09-24 20:18:54 +00:00
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
|
|
static SCM
|
2001-06-23 15:25:57 +00:00
|
|
|
|
display_backtrace_body (struct display_backtrace_args *a)
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#define FUNC_NAME "display_backtrace_body"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
|
|
|
|
|
int n_frames, beg, end, n, i, j;
|
2011-03-17 11:42:50 +01:00
|
|
|
|
int nfield, indentation;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
SCM frame, sport, print_state;
|
2001-05-25 00:19:36 +00:00
|
|
|
|
SCM last_file;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
scm_print_state *pstate;
|
|
|
|
|
|
|
* filesys.c (scm_close, set_element, get_element, scm_chown,
scm_chmod, scm_stat, scm_truncate_file, scm_fcntl, scm_fsync): Use
SCM_COERCE_OUTPORT to cope with the printstate/port magic.
* ports.c (scm_port_revealed, scm_set_port_revealed_x,
scm_close_port, scm_port_line, scm_set_port_line_x,
scm_port_column, scm_set_port_column_x, scm_port_filename,
scm_set_port_filename_x, scm_port_mode,
scm_close_all_ports_except, scm_set_current_output_port,
scm_set_current_error_port): Likewise
* ioext.c (scm_redirect_port, scm_dup_to_fdes, scm_freopen,
scm_ftell, scm_fileno, scm_isatty_p, scm_primitive_move_to_fdes):
Likewise
* posix.c (scm_ttyname, scm_tcgetpgrp, scm_tcsetpgrp): Likewise
* backtrace.c (display_backtrace_body): Likewise
* fports (scm_setvbuf): Likewise
* socket.c (scm_getsockopt, scm_setsockopt, scm_shutdown,
scm_connect, scm_bind, scm_listen, scm_accept, scm_getsockname,
scm_getpeername, scm_send, scm_sendto): Likewise
* unif.c (scm_uniform_array_write): Likewise
1997-10-25 21:54:12 +00:00
|
|
|
|
a->port = SCM_COERCE_OUTPORT (a->port);
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
/* Argument checking and extraction. */
|
2001-06-23 15:25:57 +00:00
|
|
|
|
SCM_VALIDATE_STACK (1, a->stack);
|
|
|
|
|
|
SCM_VALIDATE_OPOUTPORT (2, a->port);
|
2004-07-23 15:43:02 +00:00
|
|
|
|
n_frames = scm_to_int (scm_stack_length (a->stack));
|
|
|
|
|
|
n = scm_is_integer (a->depth) ? scm_to_int (a->depth) : SCM_BACKTRACE_DEPTH;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
if (SCM_BACKWARDS_P)
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
beg = scm_is_integer (a->first) ? scm_to_int (a->first) : 0;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
end = beg + n - 1;
|
|
|
|
|
|
if (end >= n_frames)
|
|
|
|
|
|
end = n_frames - 1;
|
|
|
|
|
|
n = end - beg + 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
if (scm_is_integer (a->first))
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
2004-07-23 15:43:02 +00:00
|
|
|
|
beg = scm_to_int (a->first);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
end = beg - n + 1;
|
|
|
|
|
|
if (end < 0)
|
|
|
|
|
|
end = 0;
|
|
|
|
|
|
}
|
|
|
|
|
|
else
|
|
|
|
|
|
{
|
|
|
|
|
|
beg = n - 1;
|
|
|
|
|
|
end = 0;
|
|
|
|
|
|
if (beg >= n_frames)
|
|
|
|
|
|
beg = n_frames - 1;
|
|
|
|
|
|
}
|
|
|
|
|
|
n = beg - end + 1;
|
|
|
|
|
|
}
|
1997-09-24 20:18:54 +00:00
|
|
|
|
SCM_ASSERT (beg >= 0 && beg < n_frames, a->first, SCM_ARG3, s_display_backtrace);
|
|
|
|
|
|
SCM_ASSERT (n > 0, a->depth, SCM_ARG4, s_display_backtrace);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Create a string port used for adaptation of printing parameters. */
|
2011-03-06 11:42:37 +01:00
|
|
|
|
sport = scm_mkstrport (SCM_INUM0, SCM_BOOL_F,
|
1996-10-14 03:24:16 +00:00
|
|
|
|
SCM_OPN | SCM_WRTNG,
|
1999-12-12 02:36:16 +00:00
|
|
|
|
FUNC_NAME);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Create a print state for printing of frames. */
|
|
|
|
|
|
print_state = scm_make_print_state ();
|
|
|
|
|
|
pstate = SCM_PRINT_STATE (print_state);
|
|
|
|
|
|
pstate->writingp = 1;
|
|
|
|
|
|
pstate->fancyp = 1;
|
2004-09-23 17:51:53 +00:00
|
|
|
|
pstate->highlight_objects = a->highlight_objects;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
/* Determine size of frame number field. */
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
j = end;
|
1996-10-14 03:24:16 +00:00
|
|
|
|
for (i = 0; j > 0; ++i) j /= 10;
|
|
|
|
|
|
nfield = i ? i : 1;
|
|
|
|
|
|
|
|
|
|
|
|
/* Print frames. */
|
|
|
|
|
|
indentation = 1;
|
2001-05-25 00:19:36 +00:00
|
|
|
|
last_file = SCM_UNDEFINED;
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
if (SCM_BACKWARDS_P)
|
|
|
|
|
|
end++;
|
|
|
|
|
|
else
|
|
|
|
|
|
end--;
|
|
|
|
|
|
for (i = beg; i != end; SCM_BACKWARDS_P ? ++i : --i)
|
1996-10-14 03:24:16 +00:00
|
|
|
|
{
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
frame = scm_stack_ref (a->stack, scm_from_int (i));
|
2004-07-27 15:41:49 +00:00
|
|
|
|
if (!scm_is_eq (SCM_PACK (SCM_SHOW_FILE_NAME), sym_base))
|
2001-05-25 00:19:36 +00:00
|
|
|
|
display_backtrace_file (frame, &last_file, a->port, pstate);
|
replace frame implementation with VM frames
* libguile/stacks.h: Rework so that a stack doesn't copy information out
of VM frames, it just holds onto a VM frame, along with the stack id
and length. VM frames are now the only representation of frames in
Guile.
(scm_t_info_frame, SCM_FRAME_N_SLOTS, SCM_FRAME_REF, SCM_FRAME_NUMBER)
(SCM_FRAME_FLAGS, SCM_FRAME_SOURCE, SCM_FRAME_PROC, SCM_FRAME_ARGS)
(SCM_FRAME_PREV, SCM_FRAME_NEXT)
(SCM_FRAMEF_VOID, SCM_FRAMEF_REAL, SCM_FRAMEF_PROC)
(SCM_FRAMEF_EVAL_ARGS, SCM_FRAMEF_OVERFLOW)
(SCM_FRAME_VOID_P, SCM_FRAME_REAL_P, SCM_FRAME_PROC_P)
(SCM_FRAME_EVAL_ARGS_P, SCM_FRAME_OVERFLOW_P): Remove these macros
corresponding to the old frame implementation.
(scm_frame_p scm_frame_source, scm_frame_procedure)
(scm_frame_arguments): These definitions are now in frames.h.
(scm_last_stack_frame): Remove declaration of previously-removed
constructor. Probably should re-instate it though.
(scm_frame_number, scm_frame_previous, scm_frame_next)
(scm_frame_real_p, scm_frame_procedure_p, scm_frame_evaluating_args_p)
(scm_frame_overflow_p) : Remove these procedures corresponding to the
old stack implementation.
* libguile/stacks.c: Update for new frames implementation.
* libguile/frames.h:
* libguile/frames.c: Rename functions operating on VM frames to have a
scm_frame prefix, not scm_vm_frame -- because they really are the only
frames we have. Rename corresponding Scheme functions too, from
vm-frame-foo to frame-foo.
* libguile/deprecated.h: Remove scm_stack and scm_info_frame data types.
* libguile/vm.c (vm_dispatch_hook): Adapt to scm_c_make_frame name
change.
* module/system/vm/frame.scm: No need to export functions provided
frames.c now, as we load those procedures into the default environment
now. Rename functions, and remove a couple of outdated, unused
functions. The bottom half of this file is still bitrotten, though.
* libguile/backtrace.c: Rework to operate on the new frame
representation. Also fix a bug displaying file names for compiled
procedures.
* libguile/init.c: Load the VM much earlier, just because we can. Also
it allows us to have frames.[ch] loaded in time for stacks to be
initialized, so that scm_frame_arguments can do the right thing.
2009-12-03 13:09:58 +01:00
|
|
|
|
display_frame (frame, i, nfield, indentation, sport, a->port, pstate);
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
1997-09-24 20:18:54 +00:00
|
|
|
|
|
2001-03-31 21:19:50 +00:00
|
|
|
|
scm_remember_upto_here_1 (print_state);
|
|
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-09-24 20:18:54 +00:00
|
|
|
|
|
2011-02-11 15:03:38 +01:00
|
|
|
|
static SCM
|
|
|
|
|
|
error_during_backtrace (void *data, SCM tag, SCM throw_args)
|
|
|
|
|
|
{
|
2011-10-24 17:58:22 +02:00
|
|
|
|
SCM port = SCM_PACK_POINTER (data);
|
2011-02-11 15:03:38 +01:00
|
|
|
|
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("Exception thrown while printing backtrace:\n", port);
|
2011-02-11 15:03:38 +01:00
|
|
|
|
scm_print_exception (port, SCM_BOOL_F, tag, throw_args);
|
|
|
|
|
|
|
|
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
2004-11-02 22:49:14 +00:00
|
|
|
|
SCM_DEFINE (scm_display_backtrace_with_highlights, "display-backtrace", 2, 3, 0,
|
2004-09-23 17:51:53 +00:00
|
|
|
|
(SCM stack, SCM port, SCM first, SCM depth, SCM highlights),
|
2006-08-28 22:17:26 +00:00
|
|
|
|
"Display a backtrace to the output port @var{port}. @var{stack}\n"
|
2001-02-16 15:21:21 +00:00
|
|
|
|
"is the stack to take the backtrace from, @var{first} specifies\n"
|
2006-08-28 22:17:26 +00:00
|
|
|
|
"where in the stack to start and @var{depth} how many frames\n"
|
|
|
|
|
|
"to display. @var{first} and @var{depth} can be @code{#f},\n"
|
2004-09-23 18:42:59 +00:00
|
|
|
|
"which means that default values will be used.\n"
|
2006-08-28 22:17:26 +00:00
|
|
|
|
"If @var{highlights} is given it should be a list; the elements\n"
|
|
|
|
|
|
"of this list will be highlighted wherever they appear in the\n"
|
|
|
|
|
|
"backtrace.")
|
2004-09-23 17:51:53 +00:00
|
|
|
|
#define FUNC_NAME s_scm_display_backtrace_with_highlights
|
1997-09-24 20:18:54 +00:00
|
|
|
|
{
|
1998-07-12 13:22:51 +00:00
|
|
|
|
struct display_backtrace_args a;
|
|
|
|
|
|
a.stack = stack;
|
|
|
|
|
|
a.port = port;
|
|
|
|
|
|
a.first = first;
|
|
|
|
|
|
a.depth = depth;
|
2004-09-23 17:51:53 +00:00
|
|
|
|
if (SCM_UNBNDP (highlights))
|
|
|
|
|
|
a.highlight_objects = SCM_EOL;
|
|
|
|
|
|
else
|
|
|
|
|
|
a.highlight_objects = highlights;
|
2011-02-11 15:03:38 +01:00
|
|
|
|
|
1997-09-24 20:18:54 +00:00
|
|
|
|
scm_internal_catch (SCM_BOOL_T,
|
2001-06-14 19:50:43 +00:00
|
|
|
|
(scm_t_catch_body) display_backtrace_body, &a,
|
2011-10-24 17:58:22 +02:00
|
|
|
|
(scm_t_catch_handler) error_during_backtrace, SCM_UNPACK_POINTER (port));
|
2011-02-11 15:03:38 +01:00
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
2004-09-23 17:51:53 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_display_backtrace (SCM stack, SCM port, SCM first, SCM depth)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_display_backtrace_with_highlights (stack, port, first, depth,
|
|
|
|
|
|
SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
2001-05-15 14:57:22 +00:00
|
|
|
|
SCM_VARIABLE (scm_has_shown_backtrace_hint_p_var, "has-shown-backtrace-hint?");
|
1997-02-10 01:01:54 +00:00
|
|
|
|
|
2004-09-23 17:51:53 +00:00
|
|
|
|
SCM_DEFINE (scm_backtrace_with_highlights, "backtrace", 0, 1, 0,
|
|
|
|
|
|
(SCM highlights),
|
2010-06-19 13:43:33 +02:00
|
|
|
|
"Display a backtrace of the current stack to the current\n"
|
|
|
|
|
|
"output port. If @var{highlights} is given, it should be\n"
|
|
|
|
|
|
"a list; the elements of this list will be highlighted\n"
|
|
|
|
|
|
"wherever they appear in the backtrace.")
|
2004-09-23 17:51:53 +00:00
|
|
|
|
#define FUNC_NAME s_scm_backtrace_with_highlights
|
1997-02-10 01:01:54 +00:00
|
|
|
|
{
|
2005-03-02 20:42:01 +00:00
|
|
|
|
SCM port = scm_current_output_port ();
|
2010-06-19 13:43:33 +02:00
|
|
|
|
SCM stack = scm_make_stack (SCM_BOOL_T, SCM_EOL);
|
|
|
|
|
|
|
2004-09-23 17:51:53 +00:00
|
|
|
|
if (SCM_UNBNDP (highlights))
|
|
|
|
|
|
highlights = SCM_EOL;
|
|
|
|
|
|
|
2010-06-19 13:43:33 +02:00
|
|
|
|
scm_newline (port);
|
2011-11-08 00:36:48 +01:00
|
|
|
|
scm_puts_unlocked ("Backtrace:\n", port);
|
2010-06-19 13:43:33 +02:00
|
|
|
|
scm_display_backtrace_with_highlights (stack, port, SCM_BOOL_F, SCM_BOOL_F,
|
|
|
|
|
|
highlights);
|
|
|
|
|
|
scm_newline (port);
|
|
|
|
|
|
|
1997-02-10 01:01:54 +00:00
|
|
|
|
return SCM_UNSPECIFIED;
|
|
|
|
|
|
}
|
1999-12-12 02:36:16 +00:00
|
|
|
|
#undef FUNC_NAME
|
1997-02-10 01:01:54 +00:00
|
|
|
|
|
2004-09-23 17:51:53 +00:00
|
|
|
|
SCM
|
|
|
|
|
|
scm_backtrace (void)
|
|
|
|
|
|
{
|
|
|
|
|
|
return scm_backtrace_with_highlights (SCM_EOL);
|
|
|
|
|
|
}
|
|
|
|
|
|
|
1996-10-14 03:24:16 +00:00
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
void
|
|
|
|
|
|
scm_init_backtrace ()
|
|
|
|
|
|
{
|
2011-02-11 13:13:26 +01:00
|
|
|
|
scm_c_define_gsubr ("print-exception", 4, 0, 0, boot_print_exception);
|
2000-04-21 14:16:44 +00:00
|
|
|
|
#include "libguile/backtrace.x"
|
1996-10-14 03:24:16 +00:00
|
|
|
|
}
|
2000-03-19 19:01:16 +00:00
|
|
|
|
|
|
|
|
|
|
/*
|
|
|
|
|
|
Local Variables:
|
|
|
|
|
|
c-file-style: "gnu"
|
|
|
|
|
|
End:
|
|
|
|
|
|
*/
|