mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
b1b942b74c
* doc/ref/vm.texi (Stack Layout): Update to remove references to the "heap link". * gdbinit: Update for "heap link" removal. * libguile/frames.c: * libguile/frames.h: Update macros and diagram for removal of "heap link". As part of this, we also remove "heap frames", replacing them with "vm frames", which are much like the interpreter's debug objects, but for VM stacks. That is to say, they don't actually hold the stack themselves, just the pointers into stack that's held by a continuation (either captured or current). * libguile/stacks.c (stack_depth, read_frames): Since a "stack" object is really a copy of information that comes from somewhere else, it makes sense to copy over info from the VM, just as `make-stack' does from the evaluator. The tricky bit is to figure out how to interleave VM and interpreter frames. We do that by starting in the interpreter, and whenever the current frame's procedure is actually a program, we switch to the VM stack, switching back when we reach a "bootstrap frame". The last bit is hacky, but it does work... (is_vm_bootstrap_frame): Hacky predicate to see if a VM frame is a bootstrap frame. (scm_make_stack): Accept a VM frame in addition to debug frames. Probably has some bugs in this case. But in the case that the arg is #t (a common case), do the right thing, capturing the top VM frame as well, and interleaving those frames appropriately on the stack. As an accident, we lost the ability to limit the number of frames in the backtrace. We could add that back, but personally I always want *all* frames in the trace... Narrowing still works fine, though there are some hiccups sometimes -- e.g. an outer cut to a procedure that does a tail-call in VM code will never find the cut, as it no longer exists in the continuation. * libguile/vm.h (struct scm_vm): So! Now that we have switched to save stacks in the normal make-stack, there's no more need for `this_frame' or `last_frame'. On the other hand, we can take this opportunity to fix tracing: when we're in a trace hook, we set `trace_frame' on the VM, so we know not to fire hooks when we're already in a hook. (struct scm_vm_cont): Expose this, as make-stack needs it to make VM frames from VM continuations. * libguile/vm.c (scm_vm_trace_frame): New function, gets the current trace frame. (vm_mark, make_vm): Hook up the trace frame. (vm_dispatch_hook): New hook dispatcher, with a dynwind so it does the right thing if the hook exits nonlocally. * libguile/vm-engine.c (vm_run): No more this_frame in the wind data. * libguile/vm-engine.h (RUN_HOOK): Run hooks through the dispatcher. (ALIGN_AS_NON_IMMEDIATE, POP_LIST_ON_STACK): Remove unused code. (NEW_FRAME): Adapt for no HL in the frame. * libguile/vm-i-system.c (goto/args, mv-call, return, return/values): Adapt for no HL in the frame. * module/system/vm/frame.scm: * module/system/vm/vm.scm: Beginnings of some reworkings, needs more thought.
146 lines
5.3 KiB
C
146 lines
5.3 KiB
C
/* Copyright (C) 2001 Free Software Foundation, Inc.
|
||
*
|
||
* This program is free software; you can redistribute it and/or modify
|
||
* it under the terms of the GNU General Public License as published by
|
||
* the Free Software Foundation; either version 2, or (at your option)
|
||
* any later version.
|
||
*
|
||
* This program 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 General Public License for more details.
|
||
*
|
||
* You should have received a copy of the GNU General Public License
|
||
* along with this software; see the file COPYING. If not, write to
|
||
* the Free Software Foundation, Inc., 59 Temple Place, Suite 330,
|
||
* Boston, MA 02111-1307 USA
|
||
*
|
||
* As a special exception, the Free Software Foundation gives permission
|
||
* for additional uses of the text contained in its release of GUILE.
|
||
*
|
||
* The exception is that, if you link the GUILE library with other files
|
||
* to produce an executable, this does not by itself cause the
|
||
* resulting executable to be covered by the GNU General Public License.
|
||
* Your use of that executable is in no way restricted on account of
|
||
* linking the GUILE library code into it.
|
||
*
|
||
* This exception does not however invalidate any other reasons why
|
||
* the executable file might be covered by the GNU General Public License.
|
||
*
|
||
* This exception applies only to the code released by the
|
||
* Free Software Foundation under the name GUILE. If you copy
|
||
* code from other Free Software Foundation releases into a copy of
|
||
* GUILE, as the General Public License permits, the exception does
|
||
* not apply to the code that you add in this way. To avoid misleading
|
||
* anyone as to the status of such modified files, you must delete
|
||
* this exception notice from them.
|
||
*
|
||
* If you write modifications of your own for GUILE, it is your choice
|
||
* whether to permit this exception to apply to your modifications.
|
||
* If you do not wish that, delete this exception notice. */
|
||
|
||
#ifndef _SCM_FRAMES_H_
|
||
#define _SCM_FRAMES_H_
|
||
|
||
#include <libguile.h>
|
||
#include "programs.h"
|
||
|
||
|
||
/*
|
||
* VM frames
|
||
*/
|
||
|
||
/* VM Frame Layout
|
||
---------------
|
||
|
||
| | <- fp + bp->nargs + bp->nlocs + 4
|
||
+------------------+ = SCM_FRAME_UPPER_ADDRESS (fp)
|
||
| Return address |
|
||
| MV return address|
|
||
| Dynamic link |
|
||
| External link | <- fp + bp->nargs + bp->nlocs
|
||
| Local variable 1 | = SCM_FRAME_DATA_ADDRESS (fp)
|
||
| Local variable 0 | <- fp + bp->nargs
|
||
| Argument 1 |
|
||
| Argument 0 | <- fp
|
||
| Program | <- fp - 1
|
||
+------------------+ = SCM_FRAME_LOWER_ADDRESS (fp)
|
||
| |
|
||
|
||
As can be inferred from this drawing, it is assumed that
|
||
`sizeof (SCM *) == sizeof (SCM)', since pointers (the `link' parts) are
|
||
assumed to be as long as SCM objects. */
|
||
|
||
#define SCM_FRAME_DATA_ADDRESS(fp) \
|
||
(fp + SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp))->nargs \
|
||
+ SCM_PROGRAM_DATA (SCM_FRAME_PROGRAM (fp))->nlocs)
|
||
#define SCM_FRAME_UPPER_ADDRESS(fp) (SCM_FRAME_DATA_ADDRESS (fp) + 4)
|
||
#define SCM_FRAME_LOWER_ADDRESS(fp) (fp - 1)
|
||
|
||
#define SCM_FRAME_BYTE_CAST(x) ((scm_byte_t *) SCM_UNPACK (x))
|
||
#define SCM_FRAME_STACK_CAST(x) ((SCM *) SCM_UNPACK (x))
|
||
|
||
#define SCM_FRAME_RETURN_ADDRESS(fp) \
|
||
(SCM_FRAME_BYTE_CAST (SCM_FRAME_DATA_ADDRESS (fp)[3]))
|
||
#define SCM_FRAME_MV_RETURN_ADDRESS(fp) \
|
||
(SCM_FRAME_BYTE_CAST (SCM_FRAME_DATA_ADDRESS (fp)[2]))
|
||
#define SCM_FRAME_DYNAMIC_LINK(fp) \
|
||
(SCM_FRAME_STACK_CAST (SCM_FRAME_DATA_ADDRESS (fp)[1]))
|
||
#define SCM_FRAME_SET_DYNAMIC_LINK(fp, dl) \
|
||
((SCM_FRAME_DATA_ADDRESS (fp)[1])) = (SCM)(dl);
|
||
#define SCM_FRAME_EXTERNAL_LINK(fp) (SCM_FRAME_DATA_ADDRESS (fp)[0])
|
||
#define SCM_FRAME_VARIABLE(fp,i) fp[i]
|
||
#define SCM_FRAME_PROGRAM(fp) fp[-1]
|
||
|
||
|
||
/*
|
||
* Heap frames
|
||
*/
|
||
|
||
extern scm_t_bits scm_tc16_vm_frame;
|
||
|
||
struct scm_vm_frame
|
||
{
|
||
SCM stack_holder;
|
||
SCM *fp;
|
||
SCM *sp;
|
||
scm_byte_t *ip;
|
||
scm_t_ptrdiff offset;
|
||
};
|
||
|
||
#define SCM_VM_FRAME_P(x) SCM_SMOB_PREDICATE (scm_tc16_vm_frame, x)
|
||
#define SCM_VM_FRAME_DATA(x) ((struct scm_vm_frame*)SCM_SMOB_DATA (x))
|
||
#define SCM_VM_FRAME_STACK_HOLDER(f) SCM_VM_FRAME_DATA(f)->stack_holder
|
||
#define SCM_VM_FRAME_FP(f) SCM_VM_FRAME_DATA(f)->fp
|
||
#define SCM_VM_FRAME_SP(f) SCM_VM_FRAME_DATA(f)->sp
|
||
#define SCM_VM_FRAME_IP(f) SCM_VM_FRAME_DATA(f)->ip
|
||
#define SCM_VM_FRAME_OFFSET(f) SCM_VM_FRAME_DATA(f)->offset
|
||
#define SCM_VALIDATE_VM_FRAME(p,x) SCM_MAKE_VALIDATE (p, x, VM_FRAME_P)
|
||
|
||
/* FIXME rename scm_byte_t */
|
||
extern SCM scm_c_make_vm_frame (SCM stack_holder, SCM *fp, SCM *sp,
|
||
scm_byte_t *ip, scm_t_ptrdiff offset);
|
||
extern SCM scm_vm_frame_p (SCM obj);
|
||
extern SCM scm_vm_frame_program (SCM frame);
|
||
extern SCM scm_vm_frame_arguments (SCM frame);
|
||
extern SCM scm_vm_frame_source (SCM frame);
|
||
extern SCM scm_vm_frame_local_ref (SCM frame, SCM index);
|
||
extern SCM scm_vm_frame_local_set_x (SCM frame, SCM index, SCM val);
|
||
extern SCM scm_vm_frame_return_address (SCM frame);
|
||
extern SCM scm_vm_frame_mv_return_address (SCM frame);
|
||
extern SCM scm_vm_frame_dynamic_link (SCM frame);
|
||
extern SCM scm_vm_frame_external_link (SCM frame);
|
||
extern SCM scm_vm_frame_stack (SCM frame);
|
||
|
||
extern SCM scm_c_vm_frame_prev (SCM frame);
|
||
|
||
extern void scm_bootstrap_frames (void);
|
||
extern void scm_init_frames (void);
|
||
|
||
#endif /* _SCM_FRAMES_H_ */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|