mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-01 20:30:28 +02:00
aa3f69519f
* 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.
135 lines
4.6 KiB
C
135 lines
4.6 KiB
C
/* Copyright (C) 2001, 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
|
||
*/
|
||
|
||
#ifndef _SCM_FRAMES_H_
|
||
#define _SCM_FRAMES_H_
|
||
|
||
#include <libguile.h>
|
||
#include "programs.h"
|
||
|
||
|
||
/*
|
||
* VM frames
|
||
*/
|
||
|
||
/*
|
||
* It's a little confusing, but there are two representations of frames in this
|
||
* file: frame pointers and Scheme objects wrapping those frame pointers. The
|
||
* former uses the SCM_FRAME_... macro prefix, the latter SCM_VM_FRAME_..
|
||
* prefix.
|
||
*
|
||
* The confusing thing is that only Scheme frame objects have functions that use
|
||
* them, and they use the scm_frame_.. prefix. Hysterical raisins.
|
||
*/
|
||
|
||
/* VM Frame Layout
|
||
---------------
|
||
|
||
| ... |
|
||
| Intermed. val. 0 | <- fp + nargs + nlocs
|
||
+------------------+
|
||
| Local variable 1 |
|
||
| Local variable 0 | <- fp + nargs
|
||
| Argument 1 |
|
||
| Argument 0 | <- fp = SCM_FRAME_STACK_ADDRESS (fp)
|
||
| Program | <- fp - 1
|
||
+==================+
|
||
| Return address | <- SCM_FRAME_UPPER_ADDRESS (fp)
|
||
| MV return address|
|
||
| Dynamic link | <- fp - 4 = SCM_FRAME_DATA_ADDRESS (fp) = 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 - 4)
|
||
#define SCM_FRAME_STACK_ADDRESS(fp) (fp)
|
||
#define SCM_FRAME_UPPER_ADDRESS(fp) (fp - 2)
|
||
#define SCM_FRAME_LOWER_ADDRESS(fp) (fp - 4)
|
||
|
||
#define SCM_FRAME_BYTE_CAST(x) ((scm_t_uint8 *) 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)[2]))
|
||
#define SCM_FRAME_SET_RETURN_ADDRESS(fp, ra) \
|
||
((SCM_FRAME_DATA_ADDRESS (fp)[2])) = (SCM)(ra);
|
||
#define SCM_FRAME_MV_RETURN_ADDRESS(fp) \
|
||
(SCM_FRAME_BYTE_CAST (SCM_FRAME_DATA_ADDRESS (fp)[1]))
|
||
#define SCM_FRAME_SET_MV_RETURN_ADDRESS(fp, mvra) \
|
||
((SCM_FRAME_DATA_ADDRESS (fp)[1])) = (SCM)(mvra);
|
||
#define SCM_FRAME_DYNAMIC_LINK(fp) \
|
||
(SCM_FRAME_STACK_CAST (SCM_FRAME_DATA_ADDRESS (fp)[0]))
|
||
#define SCM_FRAME_SET_DYNAMIC_LINK(fp, dl) \
|
||
((SCM_FRAME_DATA_ADDRESS (fp)[0])) = (SCM)(dl);
|
||
#define SCM_FRAME_VARIABLE(fp,i) SCM_FRAME_STACK_ADDRESS (fp)[i]
|
||
#define SCM_FRAME_PROGRAM(fp) SCM_FRAME_STACK_ADDRESS (fp)[-1]
|
||
|
||
|
||
/*
|
||
* Heap frames
|
||
*/
|
||
|
||
SCM_API scm_t_bits scm_tc16_frame;
|
||
|
||
struct scm_frame
|
||
{
|
||
SCM stack_holder;
|
||
SCM *fp;
|
||
SCM *sp;
|
||
scm_t_uint8 *ip;
|
||
scm_t_ptrdiff offset;
|
||
};
|
||
|
||
#define SCM_VM_FRAME_P(x) SCM_SMOB_PREDICATE (scm_tc16_frame, x)
|
||
#define SCM_VM_FRAME_DATA(x) ((struct scm_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)
|
||
|
||
SCM_API SCM scm_c_make_frame (SCM stack_holder, SCM *fp, SCM *sp,
|
||
scm_t_uint8 *ip, scm_t_ptrdiff offset);
|
||
SCM_API SCM scm_frame_p (SCM obj);
|
||
SCM_API SCM scm_frame_procedure (SCM frame);
|
||
SCM_API SCM scm_frame_arguments (SCM frame);
|
||
SCM_API SCM scm_frame_source (SCM frame);
|
||
SCM_API SCM scm_frame_num_locals (SCM frame);
|
||
SCM_API SCM scm_frame_local_ref (SCM frame, SCM index);
|
||
SCM_API SCM scm_frame_local_set_x (SCM frame, SCM index, SCM val);
|
||
SCM_API SCM scm_frame_instruction_pointer (SCM frame);
|
||
SCM_API SCM scm_frame_return_address (SCM frame);
|
||
SCM_API SCM scm_frame_mv_return_address (SCM frame);
|
||
SCM_API SCM scm_frame_dynamic_link (SCM frame);
|
||
|
||
SCM_API SCM scm_c_frame_prev (SCM frame);
|
||
|
||
SCM_INTERNAL void scm_bootstrap_frames (void);
|
||
SCM_INTERNAL void scm_init_frames (void);
|
||
|
||
#endif /* _SCM_FRAMES_H_ */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|