mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
* libguile/frames.h: Change so that fp points at local 0 instead of local 1, and clean up a bit. (struct scm_vm_frame): Remove program, and rename stack to locals. (SCM_FRAME_DATA_ADDRESS): Remove; it was redundant with SCM_FRAME_LOWER_ADDRESS. (SCM_FRAME_STACK_ADDRESS): Remove; replace with the new SCM_FRAME_LOCALS_ADDRESS. (SCM_FRAME_UPPER_ADDRESS): Remove; unused. (SCM_FRAME_NUM_LOCALS, SCM_FRAME_PREVIOUS_SP): New defines. (SCM_FRAME_BYTE_CAST, SCM_FRAME_STACK_CAST): Remove; unused; (SCM_FRAME_LOCAL): New define, replaces SCM_FRAME_VARIABLE. (SCM_FRAME_PROGRAM): Add cautionary commentary. * libguile/frames.c: Adapt static asserts. (scm_frame_num_locals, scm_frame_local_ref, scm_frame_local_set_x): Adapt. This means that frame-local-ref 0 now returns the procedure. * libguile/vm-engine.c (ALLOC_FRAME, RESET_FRAME) (FRAME_LOCALS_COUNT, LOCAL_REF, LOCAL_SET, RETURN_VALUE_LIST): Adapt to change in fp. (LOCAL_ADDRESS): New helper. (POP_CONTINUATION_HOOK): Reimplement, taking the previous FP as an argument. (ABORT_CONTINUATION_HOOK): Reimplement, taking no arguments. (RETURN_ONE_VALUE): Reimplement. (RETURN_VALUE_LIST): Adapt to FP change. (halt, return-values, subr-call, foreign-call, prompt) (continuation-call, compose-continuation, call/cc, abort): Adapt to FP change, mostly via using LOCAL_ADDRESS, etc abstractions instead of using the raw frame pointer. * libguile/control.c (reify_partial_continuation): Update for fp change. * libguile/vm.c (vm_reinstate_partial_continuation): Adapt to removal of SCM_FRAME_UPPER_ADDRESS. * module/system/vm/frame.scm (frame-call-representation): Adapt to frame-local-ref change. * module/system/vm/trace.scm (print-return): Remove unused frame-num-locals call.
278 lines
6.9 KiB
C
278 lines
6.9 KiB
C
/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013 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
|
||
*/
|
||
|
||
#if HAVE_CONFIG_H
|
||
# include <config.h>
|
||
#endif
|
||
|
||
#include <stdlib.h>
|
||
#include <string.h>
|
||
#include "_scm.h"
|
||
#include "frames.h"
|
||
#include <verify.h>
|
||
|
||
/* Make sure assumptions on the layout of `struct scm_vm_frame' hold. */
|
||
verify (sizeof (SCM) == sizeof (SCM *));
|
||
verify (sizeof (struct scm_vm_frame) == 3 * sizeof (SCM));
|
||
verify (offsetof (struct scm_vm_frame, dynamic_link) == 0);
|
||
|
||
|
||
#define RELOC(frame, val) \
|
||
(((SCM *) (val)) + SCM_VM_FRAME_OFFSET (frame))
|
||
|
||
SCM
|
||
scm_c_make_frame (SCM stack_holder, SCM *fp, SCM *sp,
|
||
scm_t_uint8 *ip, scm_t_ptrdiff offset)
|
||
{
|
||
struct scm_frame *p = scm_gc_malloc (sizeof (struct scm_frame),
|
||
"vmframe");
|
||
p->stack_holder = stack_holder;
|
||
p->fp = fp;
|
||
p->sp = sp;
|
||
p->ip = ip;
|
||
p->offset = offset;
|
||
return scm_cell (scm_tc7_frame, (scm_t_bits)p);
|
||
}
|
||
|
||
void
|
||
scm_i_frame_print (SCM frame, SCM port, scm_print_state *pstate)
|
||
{
|
||
scm_puts_unlocked ("#<frame ", port);
|
||
scm_uintprint (SCM_UNPACK (frame), 16, port);
|
||
scm_putc_unlocked (' ', port);
|
||
scm_write (scm_frame_procedure (frame), port);
|
||
/* don't write args, they can get us into trouble. */
|
||
scm_puts_unlocked (">", port);
|
||
}
|
||
|
||
|
||
/* Scheme interface */
|
||
|
||
SCM_DEFINE (scm_frame_p, "frame?", 1, 0, 0,
|
||
(SCM obj),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_p
|
||
{
|
||
return scm_from_bool (SCM_VM_FRAME_P (obj));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_procedure, "frame-procedure", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_procedure
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return SCM_FRAME_PROGRAM (SCM_VM_FRAME_FP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_arguments, "frame-arguments", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_arguments
|
||
{
|
||
static SCM var = SCM_BOOL_F;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
if (scm_is_false (var))
|
||
var = scm_c_module_lookup (scm_c_resolve_module ("system vm frame"),
|
||
"frame-arguments");
|
||
|
||
return scm_call_1 (SCM_VARIABLE_REF (var), frame);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_source, "frame-source", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_source
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return scm_find_source_for_addr (scm_frame_instruction_pointer (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_num_locals, "frame-num-locals", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_num_locals
|
||
{
|
||
SCM *fp, *sp;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
sp = SCM_VM_FRAME_SP (frame);
|
||
|
||
return scm_from_ptrdiff_t (SCM_FRAME_NUM_LOCALS (fp, sp));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_local_ref, "frame-local-ref", 2, 0, 0,
|
||
(SCM frame, SCM index),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_local_ref
|
||
{
|
||
SCM *fp, *sp;
|
||
unsigned int i;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
SCM_VALIDATE_UINT_COPY (2, index, i);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
sp = SCM_VM_FRAME_SP (frame);
|
||
|
||
if (i < SCM_FRAME_NUM_LOCALS (fp, sp))
|
||
return SCM_FRAME_LOCAL (fp, i);
|
||
|
||
SCM_OUT_OF_RANGE (SCM_ARG2, index);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
/* Need same not-yet-active frame logic here as in frame-num-locals */
|
||
SCM_DEFINE (scm_frame_local_set_x, "frame-local-set!", 3, 0, 0,
|
||
(SCM frame, SCM index, SCM val),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_local_set_x
|
||
{
|
||
SCM *fp, *sp;
|
||
unsigned int i;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
SCM_VALIDATE_UINT_COPY (2, index, i);
|
||
|
||
fp = SCM_VM_FRAME_FP (frame);
|
||
sp = SCM_VM_FRAME_SP (frame);
|
||
|
||
if (i < SCM_FRAME_NUM_LOCALS (fp, sp))
|
||
{
|
||
SCM_FRAME_LOCAL (fp, i) = val;
|
||
return SCM_UNSPECIFIED;
|
||
}
|
||
|
||
SCM_OUT_OF_RANGE (SCM_ARG2, index);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_address, "frame-address", 1, 0, 0,
|
||
(SCM frame),
|
||
"Return the frame pointer for @var{frame}.")
|
||
#define FUNC_NAME s_scm_frame_address
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_FP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_stack_pointer, "frame-stack-pointer", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_stack_pointer
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_SP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_instruction_pointer, "frame-instruction-pointer", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_instruction_pointer
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return scm_from_uintptr_t ((scm_t_uintptr) SCM_VM_FRAME_IP (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_return_address, "frame-return-address", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_return_address
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
return scm_from_uintptr_t ((scm_t_uintptr) (SCM_FRAME_RETURN_ADDRESS
|
||
(SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_dynamic_link, "frame-dynamic-link", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_dynamic_link
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
/* fixme: munge fp if holder is a continuation */
|
||
return scm_from_uintptr_t
|
||
((scm_t_uintptr)
|
||
RELOC (frame,
|
||
SCM_FRAME_DYNAMIC_LINK (SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
SCM_DEFINE (scm_frame_previous, "frame-previous", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_previous
|
||
{
|
||
SCM *this_fp, *new_fp, *new_sp;
|
||
SCM proc;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
again:
|
||
this_fp = SCM_VM_FRAME_FP (frame);
|
||
new_fp = SCM_FRAME_DYNAMIC_LINK (this_fp);
|
||
if (new_fp)
|
||
{
|
||
new_fp = RELOC (frame, new_fp);
|
||
new_sp = SCM_FRAME_PREVIOUS_SP (this_fp);
|
||
frame = scm_c_make_frame (SCM_VM_FRAME_STACK_HOLDER (frame),
|
||
new_fp, new_sp,
|
||
SCM_FRAME_RETURN_ADDRESS (this_fp),
|
||
SCM_VM_FRAME_OFFSET (frame));
|
||
proc = scm_frame_procedure (frame);
|
||
|
||
if (SCM_RTL_PROGRAM_P (proc) && SCM_PROGRAM_IS_BOOT (proc))
|
||
goto again;
|
||
else
|
||
return frame;
|
||
}
|
||
else
|
||
return SCM_BOOL_F;
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
void
|
||
scm_init_frames (void)
|
||
{
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "libguile/frames.x"
|
||
#endif
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|