mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
b7742c6b71
* 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.
144 lines
4.2 KiB
C
144 lines
4.2 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_DEBUG_H
|
||
#define SCM_DEBUG_H
|
||
|
||
/* Copyright (C) 1995,1996,1998,1999,2000,2001,2002,2004,2008,2009
|
||
* Free Software Foundation, Inc.
|
||
*
|
||
* This library is free software; you can redistribute it and/or
|
||
* modify it under the terms of the GNU Lesser General Public License
|
||
* 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
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
#include "libguile/options.h"
|
||
|
||
|
||
/*
|
||
* Here comes some definitions for the debugging machinery.
|
||
* It might seem strange to represent debug flags as ints,
|
||
* but consider that any particular piece of code is normally
|
||
* only interested in one flag at a time. This is then
|
||
* the most efficient representation.
|
||
*/
|
||
|
||
/* {Options}
|
||
*/
|
||
|
||
/* scm_debug_opts is defined in eval.c.
|
||
*/
|
||
|
||
|
||
|
||
/* {Evaluator}
|
||
*/
|
||
|
||
typedef union scm_t_debug_info
|
||
{
|
||
struct { SCM exp, env; } e;
|
||
struct { SCM proc, args; } a;
|
||
SCM id;
|
||
} scm_t_debug_info;
|
||
|
||
typedef struct scm_t_debug_frame
|
||
{
|
||
struct scm_t_debug_frame *prev;
|
||
long status;
|
||
scm_t_debug_info *vect;
|
||
scm_t_debug_info *info;
|
||
} scm_t_debug_frame;
|
||
|
||
#define SCM_EVALFRAME (0L << 11)
|
||
#define SCM_APPLYFRAME (1L << 11)
|
||
#define SCM_VOIDFRAME (3L << 11)
|
||
#define SCM_MACROEXPF (1L << 10)
|
||
#define SCM_TAILREC (1L << 9)
|
||
#define SCM_TRACED_FRAME (1L << 8)
|
||
#define SCM_ARGS_READY (1L << 7)
|
||
#define SCM_DOVERFLOW (1L << 6)
|
||
#define SCM_MAX_FRAME_SIZE 63
|
||
|
||
#define SCM_FRAMETYPE (3L << 11)
|
||
|
||
#define SCM_EVALFRAMEP(x) (((x).status & SCM_FRAMETYPE) == SCM_EVALFRAME)
|
||
#define SCM_APPLYFRAMEP(x) (((x).status & SCM_FRAMETYPE) == SCM_APPLYFRAME)
|
||
#define SCM_VOIDFRAMEP(x) (((x).status & SCM_FRAMETYPE) == SCM_VOIDFRAME)
|
||
#define SCM_OVERFLOWP(x) (((x).status & SCM_DOVERFLOW) != 0)
|
||
#define SCM_ARGS_READY_P(x) (((x).status & SCM_ARGS_READY) != 0)
|
||
#define SCM_TRACED_FRAME_P(x) (((x).status & SCM_TRACED_FRAME) != 0)
|
||
#define SCM_TAILRECP(x) (((x).status & SCM_TAILREC) != 0)
|
||
#define SCM_MACROEXPP(x) (((x).status & SCM_MACROEXPF) != 0)
|
||
#define SCM_SET_OVERFLOW(x) ((x).status |= SCM_DOVERFLOW)
|
||
#define SCM_SET_ARGSREADY(x) ((x).status |= SCM_ARGS_READY)
|
||
#define SCM_CLEAR_ARGSREADY(x) ((x).status &= ~SCM_ARGS_READY)
|
||
#define SCM_SET_TRACED_FRAME(x) ((x).status |= SCM_TRACED_FRAME)
|
||
#define SCM_CLEAR_TRACED_FRAME(x) ((x).status &= ~SCM_TRACED_FRAME)
|
||
#define SCM_SET_TAILREC(x) ((x).status |= SCM_TAILREC)
|
||
#define SCM_SET_MACROEXP(x) ((x).status |= SCM_MACROEXPF)
|
||
#define SCM_CLEAR_MACROEXP(x) ((x).status &= ~SCM_MACROEXPF)
|
||
|
||
/* {Debug Objects}
|
||
*/
|
||
|
||
SCM_API scm_t_bits scm_tc16_debugobj;
|
||
|
||
#define SCM_DEBUGOBJP(x) \
|
||
SCM_TYP16_PREDICATE (scm_tc16_debugobj, x)
|
||
#define SCM_DEBUGOBJ_FRAME(x) \
|
||
((scm_t_debug_frame *) SCM_CELL_WORD_1 (x))
|
||
#define SCM_SET_DEBUGOBJ_FRAME(x, f) SCM_SET_CELL_WORD_1 (x, f)
|
||
|
||
|
||
|
||
SCM_API SCM scm_debug_object_p (SCM obj);
|
||
SCM_API SCM scm_reverse_lookup (SCM env, SCM data);
|
||
SCM_API SCM scm_sys_start_stack (SCM info_id, SCM thunk);
|
||
SCM_API SCM scm_procedure_module (SCM proc);
|
||
SCM_API SCM scm_procedure_source (SCM proc);
|
||
SCM_API SCM scm_procedure_name (SCM proc);
|
||
SCM_API SCM scm_with_traps (SCM thunk);
|
||
SCM_API SCM scm_evaluator_traps (SCM setting);
|
||
SCM_API SCM scm_debug_options (SCM setting);
|
||
SCM_API SCM scm_make_debugobj (scm_t_debug_frame *debug);
|
||
|
||
SCM_INTERNAL SCM scm_i_unmemoize_expr (SCM memoized);
|
||
SCM_INTERNAL void scm_init_debug (void);
|
||
|
||
#ifdef GUILE_DEBUG
|
||
SCM_API SCM scm_debug_hang (SCM obj);
|
||
#endif /*GUILE_DEBUG*/
|
||
|
||
#if SCM_ENABLE_DEPRECATED == 1
|
||
|
||
#define CHECK_ENTRY scm_check_entry_p
|
||
#define CHECK_APPLY scm_check_apply_p
|
||
#define CHECK_EXIT scm_check_exit_p
|
||
|
||
/* Deprecated in guile 1.7.0 on 2004-03-29. */
|
||
#define SCM_DEBUGGINGP scm_debug_mode_p
|
||
#define scm_debug_mode scm_debug_mode_p
|
||
|
||
#endif
|
||
|
||
#endif /* SCM_DEBUG_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|