mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* libguile/eval.c: So, ladies & gents, a new evaluator. It's similar to the old one, in that we memoize and then evaluate, but in this incarnation, memoization of an expression happens before evaluation, not lazily as the expression is evaluated. This makes the evaluation itself much cleaner, in addition to being threadsafe. In addition, since this C evaluator will in the future just serve to bootstrap the Scheme evaluator, we don't have to pay much concern for debugging conveniences. So the environment is just a list of values, and the memoizer pre-computes where it's going to find each individual value in the environment. Interface changes are commented below, with eval.h. (scm_evaluator_traps): No need to reset the debug mode after rnning te traps thing. But really, the whole traps system needs some love. * libguile/memoize.h: * libguile/memoize.c: New memoizer, which runs before evaluation, checking all syntax before evaluation begins. Significantly, no debugging information is left for lexical variables, which is not so great for interactive debugging; perhaps we should change this to have a var list in the future as per the classic interpreters. But it's quite fast, and the resulting code is quite good. Also note that it doesn't produce ilocs, memoized code is a smob whose type is in the first word of the smob itself. * libguile/eval.h (scm_sym_and, scm_sym_begin, scm_sym_case) (scm_sym_cond, scm_sym_define, scm_sym_do, scm_sym_if, scm_sym_lambda) (scm_sym_let, scm_sym_letstar, scm_sym_letrec, scm_sym_quote) (scm_sym_quasiquote, scm_sym_unquote, scm_sym_uq_splicing, scm_sym_at) (scm_sym_atat, scm_sym_atapply, scm_sym_atcall_cc) (scm_sym_at_call_with_values, scm_sym_delay, scm_sym_eval_when) (scm_sym_arrow, scm_sym_else, scm_sym_apply, scm_sym_set_x) (scm_sym_args): Remove public declaration of these symbols. (scm_ilookup, scm_lookupcar, scm_eval_car, scm_eval_body) (scm_eval_args, scm_i_eval_x, scm_i_eval): Remove public declaration of these functions. (scm_ceval, scm_deval, scm_ceval_ptr): Remove declarations of these deprecated functions. (scm_i_print_iloc, scm_i_print_isym, scm_i_unmemocopy_expr) (scm_i_unmemocopy_body): Remove declarations of these internal functions. (scm_primitive_eval_x, scm_eval_x): Redefine as macros for their less destructive siblings. * libguile/Makefile.am: Add memoize.[ch] to the build. * libguile/debug.h (scm_debug_mode_p, scm_check_entry_p) (scm_check_apply_p, scm_check_exit_p, scm_check_memoize_p) (scm_debug_eframe_size): Remove these vars that were tied to the old evaluator's execution model. (SCM_RESET_DEBUG_MODE): Remove, no more need for this. (SCM_MEMOIZEDP, SCM_MEMOIZED_EXP, SCM_MEMOIZED_ENV): Remove macros referring to old memoized code representation. (scm_local_eval, scm_procedure_environment, scm_memoized_environment) (scm_make_memoized, scm_memoized_p): Remove functions operating on old memoized code representation. (scm_memcons, scm_mem_to_proc, scm_proc_to_mem): Remove debug-only code for old evaluator. * libguile/debug.c: Remove code to correspond with debug.h removals. (scm_debug_options): No need to set the debug mode or frame limit here, as we don't have C stack limits any more. Perhaps this is a bug, but as long as we can compile eval.scm, we should be fine. * libguile/init.c (scm_i_init_guile): Init memoize.c. * libguile/modules.c (scm_top_level_env, scm_env_top_level) (scm_env_module, scm_system_module_env_p): Remove these functions. * libguile/print.c (iprin1): No more need to handle isyms. Adapt to new form of interpreted procedures. * libguile/procprop.c (scm_i_procedure_arity): Adapt to new form of interpreted procedures. * libguile/procs.c (scm_thunk_p): Adapt to new form of interpreted procedures. * libguile/procs.h (SCM_CLOSURE_FORMALS): Removed, this exists no more. (SCM_CLOSURE_NUM_REQUIRED_ARGS, SCM_CLOSURE_HAS_REST_ARGS): New accessors. * libguile/srcprop.c (scm_source_properties, scm_source_property) (scm_set_source_property_x): Remove special cases for memoized code. * libguile/stacks.c (read_frame): Remove a source-property case for interpreted code. (NEXT_FRAME): Remove a case that I don't fully understand, that seems to be designed to skip over apply frames. Will be obsolete in the futures. (read_frames): Default source value for interpreted frames to #f. (narrow_stack): Don't pay attention to the system_module thing. * libguile/tags.h: Remove isyms and ilocs. Whee! * libguile/validate.h (SCM_VALIDATE_MEMOIZED): Fix to use the new MEMOIZED_P formulation. * module/ice-9/psyntax-pp.scm (do, quasiquote, case): Adapt for these no longer being primitive macros. * module/ice-9/boot-9.scm: Whitespace change, but just a poke to force a rebuild due to and/or/cond/... not being primitives any more. * module/ice-9/deprecated.scm (unmemoize-expr): Deprecate, it's unmemoize-expression now. * test-suite/tests/eval.test ("define set procedure-name"): XFAIL a couple of tests here; I don't know what to do about them. I reckon the expander should ensure that defined values are named. * test-suite/tests/chars.test ("basic char handling"): Fix expected exception when trying to apply a char.
352 lines
8.4 KiB
C
352 lines
8.4 KiB
C
/* Debugging extensions for Guile
|
||
* Copyright (C) 1995,1996,1997,1998,1999,2000,2001, 2002, 2003, 2006, 2008, 2009 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
|
||
* 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
|
||
*/
|
||
|
||
|
||
#ifdef HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#ifdef HAVE_GETRLIMIT
|
||
#include <sys/time.h>
|
||
#include <sys/resource.h>
|
||
#endif
|
||
|
||
#include "libguile/_scm.h"
|
||
#include "libguile/async.h"
|
||
#include "libguile/eval.h"
|
||
#include "libguile/list.h"
|
||
#include "libguile/stackchk.h"
|
||
#include "libguile/throw.h"
|
||
#include "libguile/macros.h"
|
||
#include "libguile/smob.h"
|
||
#include "libguile/procprop.h"
|
||
#include "libguile/srcprop.h"
|
||
#include "libguile/alist.h"
|
||
#include "libguile/continuations.h"
|
||
#include "libguile/strports.h"
|
||
#include "libguile/read.h"
|
||
#include "libguile/feature.h"
|
||
#include "libguile/dynwind.h"
|
||
#include "libguile/modules.h"
|
||
#include "libguile/ports.h"
|
||
#include "libguile/root.h"
|
||
#include "libguile/fluids.h"
|
||
#include "libguile/programs.h"
|
||
#include "libguile/memoize.h"
|
||
|
||
#include "libguile/validate.h"
|
||
#include "libguile/debug.h"
|
||
|
||
#include "libguile/private-options.h"
|
||
|
||
|
||
|
||
/* {Run time control of the debugging evaluator}
|
||
*/
|
||
|
||
SCM_DEFINE (scm_debug_options, "debug-options-interface", 0, 1, 0,
|
||
(SCM setting),
|
||
"Option interface for the debug options. Instead of using\n"
|
||
"this procedure directly, use the procedures @code{debug-enable},\n"
|
||
"@code{debug-disable}, @code{debug-set!} and @code{debug-options}.")
|
||
#define FUNC_NAME s_scm_debug_options
|
||
{
|
||
SCM ans;
|
||
|
||
scm_dynwind_begin (0);
|
||
scm_dynwind_critical_section (SCM_BOOL_F);
|
||
|
||
ans = scm_options (setting, scm_debug_opts, FUNC_NAME);
|
||
if (!(1 <= SCM_N_FRAMES && SCM_N_FRAMES <= SCM_MAX_FRAME_SIZE))
|
||
{
|
||
scm_options (ans, scm_debug_opts, FUNC_NAME);
|
||
SCM_OUT_OF_RANGE (1, setting);
|
||
}
|
||
#ifdef STACK_CHECKING
|
||
scm_stack_checking_enabled_p = SCM_STACK_CHECKING_P;
|
||
#endif
|
||
|
||
scm_dynwind_end ();
|
||
return ans;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
static void
|
||
with_traps_before (void *data)
|
||
{
|
||
int *trap_flag = data;
|
||
*trap_flag = SCM_TRAPS_P;
|
||
SCM_TRAPS_P = 1;
|
||
}
|
||
|
||
static void
|
||
with_traps_after (void *data)
|
||
{
|
||
int *trap_flag = data;
|
||
SCM_TRAPS_P = *trap_flag;
|
||
}
|
||
|
||
static SCM
|
||
with_traps_inner (void *data)
|
||
{
|
||
SCM thunk = SCM_PACK ((scm_t_bits) data);
|
||
return scm_call_0 (thunk);
|
||
}
|
||
|
||
SCM_DEFINE (scm_with_traps, "with-traps", 1, 0, 0,
|
||
(SCM thunk),
|
||
"Call @var{thunk} with traps enabled.")
|
||
#define FUNC_NAME s_scm_with_traps
|
||
{
|
||
int trap_flag;
|
||
SCM_VALIDATE_THUNK (1, thunk);
|
||
return scm_internal_dynamic_wind (with_traps_before,
|
||
with_traps_inner,
|
||
with_traps_after,
|
||
(void *) SCM_UNPACK (thunk),
|
||
&trap_flag);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM_SYMBOL (scm_sym_procname, "procname");
|
||
SCM_SYMBOL (scm_sym_dots, "...");
|
||
SCM_SYMBOL (scm_sym_source, "source");
|
||
|
||
SCM_DEFINE (scm_procedure_name, "procedure-name", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return the name of the procedure @var{proc}")
|
||
#define FUNC_NAME s_scm_procedure_name
|
||
{
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
switch (SCM_TYP7 (proc)) {
|
||
case scm_tcs_subrs:
|
||
return SCM_SUBR_NAME (proc);
|
||
default:
|
||
{
|
||
SCM name = scm_procedure_property (proc, scm_sym_name);
|
||
#if 0
|
||
/* Source property scm_sym_procname not implemented yet... */
|
||
SCM name = scm_source_property (SCM_CAR (SCM_CLOSURE_BODY (proc)), scm_sym_procname);
|
||
if (scm_is_false (name))
|
||
name = scm_procedure_property (proc, scm_sym_name);
|
||
#endif
|
||
if (scm_is_false (name) && SCM_CLOSUREP (proc))
|
||
name = scm_reverse_lookup (SCM_ENV (proc), proc);
|
||
if (scm_is_false (name) && SCM_PROGRAM_P (proc))
|
||
name = scm_program_name (proc);
|
||
return name;
|
||
}
|
||
}
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_procedure_source, "procedure-source", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return the source of the procedure @var{proc}.")
|
||
#define FUNC_NAME s_scm_procedure_source
|
||
{
|
||
SCM src;
|
||
SCM_VALIDATE_PROC (1, proc);
|
||
|
||
do
|
||
{
|
||
src = scm_procedure_property (proc, scm_sym_source);
|
||
if (scm_is_true (src))
|
||
return src;
|
||
|
||
switch (SCM_TYP7 (proc)) {
|
||
case scm_tcs_struct:
|
||
if (!SCM_STRUCT_APPLICABLE_P (proc)
|
||
|| SCM_IMP (SCM_STRUCT_PROCEDURE (proc)))
|
||
break;
|
||
proc = SCM_STRUCT_PROCEDURE (proc);
|
||
continue;
|
||
case scm_tc7_pws:
|
||
proc = SCM_PROCEDURE (proc);
|
||
continue;
|
||
default:
|
||
break;
|
||
}
|
||
}
|
||
while (0);
|
||
|
||
return SCM_BOOL_F;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_procedure_module, "procedure-module", 1, 0, 0,
|
||
(SCM proc),
|
||
"Return the module that was current when @var{proc} was defined.")
|
||
#define FUNC_NAME s_scm_procedure_module
|
||
{
|
||
SCM_VALIDATE_PROC (SCM_ARG1, proc);
|
||
|
||
if (scm_is_true (scm_program_p (proc)))
|
||
return scm_program_module (proc);
|
||
else if (SCM_CLOSUREP (proc))
|
||
{
|
||
SCM env = SCM_ENV (proc);
|
||
while (scm_is_pair (env))
|
||
env = scm_cdr (env);
|
||
return env;
|
||
}
|
||
else
|
||
return SCM_BOOL_F;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
|
||
|
||
#if 0
|
||
SCM_REGISTER_PROC (s_reverse_lookup, "reverse-lookup", 2, 0, 0, scm_reverse_lookup);
|
||
#endif
|
||
|
||
SCM
|
||
scm_reverse_lookup (SCM env, SCM data)
|
||
{
|
||
while (scm_is_pair (env) && scm_is_pair (SCM_CAR (env)))
|
||
{
|
||
SCM names = SCM_CAAR (env);
|
||
SCM values = SCM_CDAR (env);
|
||
while (scm_is_pair (names))
|
||
{
|
||
if (scm_is_eq (SCM_CAR (values), data))
|
||
return SCM_CAR (names);
|
||
names = SCM_CDR (names);
|
||
values = SCM_CDR (values);
|
||
}
|
||
if (!scm_is_null (names) && scm_is_eq (values, data))
|
||
return names;
|
||
env = SCM_CDR (env);
|
||
}
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
SCM_DEFINE (scm_sys_start_stack, "%start-stack", 2, 0, 0,
|
||
(SCM id, SCM thunk),
|
||
"Call @var{thunk} on an evaluator stack tagged with @var{id}.")
|
||
#define FUNC_NAME s_scm_sys_start_stack
|
||
{
|
||
SCM answer;
|
||
scm_t_debug_frame vframe;
|
||
scm_t_debug_info vframe_vect_body;
|
||
vframe.prev = scm_i_last_debug_frame ();
|
||
vframe.status = SCM_VOIDFRAME;
|
||
vframe.vect = &vframe_vect_body;
|
||
vframe.vect[0].id = id;
|
||
scm_i_set_last_debug_frame (&vframe);
|
||
answer = scm_call_0 (thunk);
|
||
scm_i_set_last_debug_frame (vframe.prev);
|
||
return answer;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
/* {Debug Objects}
|
||
*
|
||
* The debugging evaluator throws these on frame traps.
|
||
*/
|
||
|
||
scm_t_bits scm_tc16_debugobj;
|
||
|
||
static int
|
||
debugobj_print (SCM obj, SCM port, scm_print_state *pstate SCM_UNUSED)
|
||
{
|
||
scm_puts ("#<debug-object ", port);
|
||
scm_intprint ((long) SCM_DEBUGOBJ_FRAME (obj), 16, port);
|
||
scm_putc ('>', port);
|
||
return 1;
|
||
}
|
||
|
||
SCM_DEFINE (scm_debug_object_p, "debug-object?", 1, 0, 0,
|
||
(SCM obj),
|
||
"Return @code{#t} if @var{obj} is a debug object.")
|
||
#define FUNC_NAME s_scm_debug_object_p
|
||
{
|
||
return scm_from_bool(SCM_DEBUGOBJP (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
SCM
|
||
scm_make_debugobj (scm_t_debug_frame *frame)
|
||
{
|
||
return scm_cell (scm_tc16_debugobj, (scm_t_bits) frame);
|
||
}
|
||
|
||
|
||
|
||
/* Undocumented debugging procedure */
|
||
#ifdef GUILE_DEBUG
|
||
SCM_DEFINE (scm_debug_hang, "debug-hang", 0, 1, 0,
|
||
(SCM obj),
|
||
"Go into an endless loop, which can be only terminated with\n"
|
||
"a debugger.")
|
||
#define FUNC_NAME s_scm_debug_hang
|
||
{
|
||
int go = 0;
|
||
while (!go) ;
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
#undef FUNC_NAME
|
||
#endif
|
||
|
||
static void
|
||
init_stack_limit (void)
|
||
{
|
||
#ifdef HAVE_GETRLIMIT
|
||
struct rlimit lim;
|
||
if (getrlimit (RLIMIT_STACK, &lim) == 0)
|
||
{
|
||
rlim_t bytes = lim.rlim_cur;
|
||
|
||
/* set our internal stack limit to 80% of the rlimit. */
|
||
if (bytes == RLIM_INFINITY)
|
||
bytes = lim.rlim_max;
|
||
|
||
if (bytes != RLIM_INFINITY)
|
||
SCM_STACK_LIMIT = bytes * 8 / 10 / sizeof (scm_t_bits);
|
||
}
|
||
errno = 0;
|
||
#endif
|
||
}
|
||
|
||
|
||
|
||
void
|
||
scm_init_debug ()
|
||
{
|
||
init_stack_limit ();
|
||
scm_init_opts (scm_debug_options, scm_debug_opts);
|
||
|
||
scm_tc16_debugobj = scm_make_smob_type ("debug-object", 0);
|
||
scm_set_smob_print (scm_tc16_debugobj, debugobj_print);
|
||
|
||
scm_add_feature ("debug-extensions");
|
||
|
||
#include "libguile/debug.x"
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|