mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
Adapt VM stack to grow downward. This will make native compilation look more like the VM code, as we will be able to use native CALL instructions, taking proper advantage of the return address buffer. * libguile/continuations.c (scm_i_continuation_to_frame): Record offsets from stack top. * libguile/control.c (scm_i_prompt_pop_abort_args_x): Adapt for reversed order of arguments, and instead of relying on the abort to push on the number of arguments, make the caller save the stack depth, which allows us to compute the number of arguments ourselves. (reify_partial_continuation, scm_c_abort): Adapt to reversed stack order. * libguile/dynstack.c (scm_dynstack_wind_prompt): Since we wind the stack in a downward direction, subtract the reloc instead of adding it. * libguile/dynstack.h (SCM_F_DYNSTACK_PROMPT_ESCAPE_ONLY): Remove flag; instead rely on prompt-establishing code to save the stack depth. * libguile/eval.c (eval): Remove extraneous "volatile" declarations for variables that are not re-set between the setjmp and any longjmp. Adapt to save stack depth before instating the prompt. * libguile/foreign.c (scm_i_foreign_call): Adapt to receive arguments in reverse order. * libguile/frames.c (frame_stack_top, scm_i_frame_stack_top): Adapt to compute stack top instead of stack bottom. (scm_c_frame_closure): Adapt to stack growth change. (scm_frame_num_locals, scm_frame_local_ref, scm_frame_set_x): Use union data type to access stack. (RELOC): Reformat. (scm_c_frame_previous): Adapt to stack growth change. * libguile/frames.h: Adapt stack diagram to indicate that the stack grows up. (union scm_vm_stack_element): New data type used to access items on the stack. (SCM_FRAME_PREVIOUS_SP) (SCM_FRAME_RETURN_ADDRESS, SCM_FRAME_SET_RETURN_ADDRESS) (SCM_FRAME_DYNAMIC_LINK, SCM_FRAME_SET_DYNAMIC_LINK) (SCM_FRAME_LOCAL, SCM_FRAME_NUM_LOCALS): Adapt to stack representation change. (SCM_FRAME_SLOT): New helper. (SCM_VM_FRAME_FP, SCM_VM_FRAME_SP): Adapt to stack growth change. * libguile/stacks.c (scm_make_stack): Record offsets from top of stack. * libguile/throw.c (catch): Adapt to scm_i_prompt_pop_abort_args_x change. * libguile/vm-engine.c (ALLOC_FRAME, RESET_FRAME): (FRAME_LOCALS_COUNT_FROM): Adapt to stack growth change. (LOCAL_ADDRESS): Use SCM_FRAME_SLOT to get the address as the proper data type. (RETURN_ONE_VALUE, RETURN_VALUE_LIST): Adapt to stack growth change. (apply): Shuffling up the SMOB apply args can cause the stack to expand, so use ALLOC_FRAME instead of RESET_FRAME. (vm_engine): Adapt for stack growth change. * libguile/vm.c (vm_increase_sp, vm_push_sp, vm_restore_sp): Adapt to stack representation change. (scm_i_vm_cont_to_frame): Adapt to take offsets from the top. (scm_i_vm_capture_stack): Adapt to capture from the top. (vm_return_to_continuation_inner): Adapt for data type changes. (vm_return_to_continuation): Likewise, and instead of looping, just splat the saved arguments on with memcpy. (vm_dispatch_hook): Adapt to receive arguments in the reverse order. Adapt callers. (vm_abort): There is never a tail argument. Adapt to stack representation change. (vm_reinstate_partial_continuation) (vm_reinstate_partial_continuation_inner): Adapt to stack growth change. (allocate_stack, free_stack): Adapt to data type change. (expand_stack): Don't try to mremap(), as you can't grow a mapping from the bottom. Without knowing that there's a free mapping space right below the old stack, which there usually isn't on Linux, we have to copy. We can't use MAP_GROWSDOWN because Linux is buggy. (make_vm): Adapt to stack representation changes. (return_unused_stack_to_os): Round down instead of up, as the stack grows down. (scm_i_vm_mark_stack): Adapt to walk up the stack. (scm_i_vm_free_stack): Adapt to scm_vm changes. (vm_expand_stack_inner, reset_stack_limit, vm_expand_stack): Adapt to the stack growing down. (scm_call_n): Adapt to the stack growing down. Don't allow argv to point into the stack. * libguile/vm.h (struct scm_vm, struct scm_vm_cont): Adapt to hold the stack top and bottom.
397 lines
9.7 KiB
C
397 lines
9.7 KiB
C
/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013, 2014, 2015 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 "vm.h"
|
||
|
||
SCM
|
||
scm_c_make_frame (enum scm_vm_frame_kind kind, const struct scm_frame *frame)
|
||
{
|
||
struct scm_frame *p = scm_gc_malloc (sizeof (struct scm_frame),
|
||
"vmframe");
|
||
p->stack_holder = frame->stack_holder;
|
||
p->fp_offset = frame->fp_offset;
|
||
p->sp_offset = frame->sp_offset;
|
||
p->ip = frame->ip;
|
||
return scm_cell (scm_tc7_frame | (kind << 8), (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);
|
||
}
|
||
|
||
static union scm_vm_stack_element*
|
||
frame_stack_top (enum scm_vm_frame_kind kind, const struct scm_frame *frame)
|
||
{
|
||
switch (kind)
|
||
{
|
||
case SCM_VM_FRAME_KIND_CONT:
|
||
{
|
||
struct scm_vm_cont *cont = frame->stack_holder;
|
||
return cont->stack_bottom + cont->stack_size;
|
||
}
|
||
|
||
case SCM_VM_FRAME_KIND_VM:
|
||
return ((struct scm_vm *) frame->stack_holder)->stack_top;
|
||
|
||
default:
|
||
abort ();
|
||
}
|
||
}
|
||
|
||
static scm_t_ptrdiff
|
||
frame_offset (enum scm_vm_frame_kind kind, const struct scm_frame *frame)
|
||
{
|
||
switch (kind)
|
||
{
|
||
case SCM_VM_FRAME_KIND_CONT:
|
||
return ((struct scm_vm_cont *) frame->stack_holder)->reloc;
|
||
|
||
case SCM_VM_FRAME_KIND_VM:
|
||
return 0;
|
||
|
||
default:
|
||
abort ();
|
||
}
|
||
}
|
||
|
||
union scm_vm_stack_element*
|
||
scm_i_frame_stack_top (SCM frame)
|
||
#define FUNC_NAME "frame-stack-top"
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return frame_stack_top (SCM_VM_FRAME_KIND (frame),
|
||
SCM_VM_FRAME_DATA (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
scm_t_ptrdiff
|
||
scm_i_frame_offset (SCM frame)
|
||
#define FUNC_NAME "frame-offset"
|
||
{
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return frame_offset (SCM_VM_FRAME_KIND (frame),
|
||
SCM_VM_FRAME_DATA (frame));
|
||
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
/* 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
|
||
|
||
/* Retrieve the local in slot 0, which may or may not actually be a
|
||
procedure, and may or may not actually be the procedure being
|
||
applied. If you want the procedure, look it up from the IP. */
|
||
SCM
|
||
scm_c_frame_closure (enum scm_vm_frame_kind kind, const struct scm_frame *frame)
|
||
{
|
||
union scm_vm_stack_element *fp, *sp;
|
||
|
||
fp = frame_stack_top (kind, frame) - frame->fp_offset;
|
||
sp = frame_stack_top (kind, frame) - frame->sp_offset;
|
||
|
||
if (SCM_FRAME_NUM_LOCALS (fp, sp) > 0)
|
||
return SCM_FRAME_LOCAL (fp, 0);
|
||
|
||
return SCM_BOOL_F;
|
||
}
|
||
|
||
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);
|
||
|
||
/* FIXME: Retrieve procedure from address? */
|
||
return scm_c_frame_closure (SCM_VM_FRAME_KIND (frame),
|
||
SCM_VM_FRAME_DATA (frame));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
static SCM frame_arguments_var;
|
||
|
||
static void
|
||
init_frame_arguments_var (void)
|
||
{
|
||
frame_arguments_var
|
||
= scm_c_private_lookup ("system vm frame", "frame-arguments");
|
||
}
|
||
|
||
SCM_DEFINE (scm_frame_arguments, "frame-arguments", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_arguments
|
||
{
|
||
static scm_i_pthread_once_t once = SCM_I_PTHREAD_ONCE_INIT;
|
||
scm_i_pthread_once (&once, init_frame_arguments_var);
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return scm_call_1 (scm_variable_ref (frame_arguments_var), frame);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
static SCM frame_call_representation_var;
|
||
|
||
static void
|
||
init_frame_call_representation_var (void)
|
||
{
|
||
frame_call_representation_var
|
||
= scm_c_private_lookup ("system vm frame", "frame-call-representation");
|
||
}
|
||
|
||
SCM scm_frame_call_representation (SCM frame)
|
||
#define FUNC_NAME "frame-call-representation"
|
||
{
|
||
static scm_i_pthread_once_t once = SCM_I_PTHREAD_ONCE_INIT;
|
||
scm_i_pthread_once (&once, init_frame_call_representation_var);
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
return scm_call_1 (scm_variable_ref (frame_call_representation_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
|
||
{
|
||
union scm_vm_stack_element *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
|
||
{
|
||
union scm_vm_stack_element *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
|
||
{
|
||
union scm_vm_stack_element *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_ptrdiff_t (SCM_VM_FRAME_FP_OFFSET (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_ptrdiff_t (SCM_VM_FRAME_SP_OFFSET (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
|
||
|
||
#define RELOC(kind, frame, val) ((val) + frame_offset (kind, frame))
|
||
|
||
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 (SCM_VM_FRAME_KIND (frame), SCM_VM_FRAME_DATA (frame),
|
||
SCM_FRAME_DYNAMIC_LINK (SCM_VM_FRAME_FP (frame))));
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
int
|
||
scm_c_frame_previous (enum scm_vm_frame_kind kind, struct scm_frame *frame)
|
||
{
|
||
union scm_vm_stack_element *this_fp, *new_fp, *new_sp;
|
||
union scm_vm_stack_element *stack_top = frame_stack_top (kind, frame);
|
||
|
||
again:
|
||
this_fp = stack_top - frame->fp_offset;
|
||
|
||
if (this_fp == stack_top)
|
||
return 0;
|
||
|
||
new_fp = SCM_FRAME_DYNAMIC_LINK (this_fp);
|
||
|
||
if (!new_fp)
|
||
return 0;
|
||
|
||
new_fp = RELOC (kind, frame, new_fp);
|
||
|
||
if (new_fp > stack_top)
|
||
return 0;
|
||
|
||
new_sp = SCM_FRAME_PREVIOUS_SP (this_fp);
|
||
frame->fp_offset = stack_top - new_fp;
|
||
frame->sp_offset = stack_top - new_sp;
|
||
frame->ip = SCM_FRAME_RETURN_ADDRESS (this_fp);
|
||
|
||
{
|
||
SCM proc = scm_c_frame_closure (kind, frame);
|
||
if (SCM_PROGRAM_P (proc) && SCM_PROGRAM_IS_BOOT (proc))
|
||
goto again;
|
||
}
|
||
|
||
return 1;
|
||
}
|
||
|
||
SCM_DEFINE (scm_frame_previous, "frame-previous", 1, 0, 0,
|
||
(SCM frame),
|
||
"")
|
||
#define FUNC_NAME s_scm_frame_previous
|
||
{
|
||
enum scm_vm_frame_kind kind;
|
||
struct scm_frame tmp;
|
||
|
||
SCM_VALIDATE_VM_FRAME (1, frame);
|
||
|
||
kind = SCM_VM_FRAME_KIND (frame);
|
||
memcpy (&tmp, SCM_VM_FRAME_DATA (frame), sizeof tmp);
|
||
|
||
if (!scm_c_frame_previous (SCM_VM_FRAME_KIND (frame), &tmp))
|
||
return SCM_BOOL_F;
|
||
|
||
return scm_c_make_frame (kind, &tmp);
|
||
}
|
||
#undef FUNC_NAME
|
||
|
||
|
||
void
|
||
scm_init_frames (void)
|
||
{
|
||
#ifndef SCM_MAGIC_SNARFER
|
||
#include "libguile/frames.x"
|
||
#endif
|
||
}
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|