mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
27337b6373
* libguile/gsubr.c: Define RTL stubs instead of stack VM stubs.
(SUBR_STUB_CODE, get_subr_stub_code): Adapt to return a uint32_t*
pointer instead of a SCM value.
(create_subr): Create RTL procedures instead of stack VM procedures.
For RTL procedures, the function pointer, name, and generic address
pointer go inline to the procedure, as free variables.
(scm_i_primitive_arity, scm_i_primitive_call_ip): New helpers.
(scm_c_make_gsubr, scm_c_define_gsubr, scm_c_make_gsubr_with_generic)
(scm_c_define_gsubr_with_generic): Adapt to create_gsubr being renamed
to create_subr.
Remove gsubr test code.
* libguile/gsubr.h (SCM_PRIMITIVE_P, SCM_PRIMITIVE_GENERIC_P): Only RTL
programs can be primitives now.
(SCM_SUBRF, SCM_SUBR_NAME, SCM_SUBR_GENERIC): These fields are now in
the RTL free variables, not the object table.
* libguile/programs.c (scm_i_rtl_program_name):
(scm_i_rtl_program_documentation):
(scm_i_rtl_program_properties):
(scm_i_rtl_program_minimum_arity): Implement these appropriately for
primitives, which lack debugging information.
(scm_primitive_p, scm_primitive_call_ip): New helpers.
* libguile/snarf.h: Remove static allocation for subrs. Since there is
nothing to allocate besides the program itself, which needs runtime
relocation, static allocation is not a win.
* system/vm/program.scm: Fix up various arity-related things for
primitives, which don't use ELF arity info.
* test-suite/tests/eval.test ("stack involving a primitive"): Add an
XFAIL until we get just one VM.
108 lines
4.5 KiB
C
108 lines
4.5 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
|
|
*/
|
|
|
|
#ifndef _SCM_PROGRAMS_H_
|
|
#define _SCM_PROGRAMS_H_
|
|
|
|
#include <libguile.h>
|
|
#include <libguile/objcodes.h>
|
|
|
|
/*
|
|
* The new RTL programs.
|
|
*/
|
|
|
|
#define SCM_RTL_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_rtl_program))
|
|
#define SCM_RTL_PROGRAM_CODE(x) ((scm_t_uint32 *) SCM_CELL_WORD_1 (x))
|
|
#define SCM_RTL_PROGRAM_FREE_VARIABLES(x) (SCM_CELL_OBJECT_LOC (x, 2))
|
|
#define SCM_RTL_PROGRAM_FREE_VARIABLE_REF(x,i) (SCM_RTL_PROGRAM_FREE_VARIABLES (x)[i])
|
|
#define SCM_RTL_PROGRAM_FREE_VARIABLE_SET(x,i,v) (SCM_RTL_PROGRAM_FREE_VARIABLES (x)[i]=(v))
|
|
#define SCM_RTL_PROGRAM_NUM_FREE_VARIABLES(x) (SCM_CELL_WORD_0 (x) >> 16)
|
|
#define SCM_VALIDATE_RTL_PROGRAM(p,x) SCM_MAKE_VALIDATE (p, x, RTL_PROGRAM_P)
|
|
|
|
static inline SCM
|
|
scm_i_make_rtl_program (const scm_t_uint32 *code)
|
|
{
|
|
return scm_cell (scm_tc7_rtl_program, (scm_t_bits)code);
|
|
}
|
|
|
|
SCM_INTERNAL SCM scm_make_rtl_program (SCM bytevector, SCM byte_offset, SCM free_variables);
|
|
SCM_INTERNAL SCM scm_rtl_program_p (SCM obj);
|
|
SCM_INTERNAL SCM scm_rtl_program_code (SCM program);
|
|
|
|
SCM_INTERNAL SCM scm_primitive_p (SCM obj);
|
|
SCM_INTERNAL SCM scm_primitive_call_ip (SCM prim);
|
|
|
|
SCM_INTERNAL SCM scm_i_rtl_program_name (SCM program);
|
|
SCM_INTERNAL SCM scm_i_rtl_program_documentation (SCM program);
|
|
SCM_INTERNAL SCM scm_i_rtl_program_properties (SCM program);
|
|
|
|
/*
|
|
* Programs
|
|
*/
|
|
|
|
#define SCM_F_PROGRAM_IS_BOOT 0x100
|
|
#define SCM_F_PROGRAM_IS_PRIMITIVE 0x200
|
|
#define SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC 0x400
|
|
#define SCM_F_PROGRAM_IS_CONTINUATION 0x800
|
|
#define SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION 0x1000
|
|
|
|
#define SCM_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_program))
|
|
#define SCM_PROGRAM_OBJCODE(x) (SCM_CELL_OBJECT_1 (x))
|
|
#define SCM_PROGRAM_OBJTABLE(x) (SCM_CELL_OBJECT_2 (x))
|
|
#define SCM_PROGRAM_FREE_VARIABLES(x) (SCM_CELL_OBJECT_LOC (x, 3))
|
|
#define SCM_PROGRAM_FREE_VARIABLE_REF(x,i) (SCM_PROGRAM_FREE_VARIABLES (x)[i])
|
|
#define SCM_PROGRAM_FREE_VARIABLE_SET(x,i,v) (SCM_PROGRAM_FREE_VARIABLES (x)[i]=(v))
|
|
#define SCM_PROGRAM_NUM_FREE_VARIABLES(x) (SCM_CELL_WORD_0 (x) >> 16)
|
|
#define SCM_PROGRAM_DATA(x) (SCM_OBJCODE_DATA (SCM_PROGRAM_OBJCODE (x)))
|
|
#define SCM_VALIDATE_PROGRAM(p,x) SCM_MAKE_VALIDATE (p, x, PROGRAM_P)
|
|
#define SCM_PROGRAM_IS_BOOT(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_BOOT)
|
|
#define SCM_PROGRAM_IS_PRIMITIVE(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE)
|
|
#define SCM_PROGRAM_IS_PRIMITIVE_GENERIC(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC)
|
|
#define SCM_PROGRAM_IS_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_CONTINUATION)
|
|
#define SCM_PROGRAM_IS_PARTIAL_CONTINUATION(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_PARTIAL_CONTINUATION)
|
|
|
|
SCM_API SCM scm_make_program (SCM objcode, SCM objtable, SCM free_variables);
|
|
|
|
SCM_API SCM scm_program_p (SCM obj);
|
|
SCM_API SCM scm_program_base (SCM program);
|
|
SCM_API SCM scm_program_meta (SCM program);
|
|
SCM_API SCM scm_program_bindings (SCM program);
|
|
SCM_API SCM scm_program_sources (SCM program);
|
|
SCM_API SCM scm_program_source (SCM program, SCM ip, SCM sources);
|
|
SCM_API SCM scm_program_arities (SCM program);
|
|
SCM_API SCM scm_program_objects (SCM program);
|
|
SCM_API SCM scm_program_module (SCM program);
|
|
SCM_API SCM scm_program_num_free_variables (SCM program);
|
|
SCM_API SCM scm_program_free_variable_ref (SCM program, SCM i);
|
|
SCM_API SCM scm_program_free_variable_set_x (SCM program, SCM i, SCM x);
|
|
SCM_API SCM scm_program_objcode (SCM program);
|
|
|
|
SCM_INTERNAL SCM scm_i_program_properties (SCM program);
|
|
SCM_INTERNAL int scm_i_program_arity (SCM program, int *req, int *opt, int *rest);
|
|
SCM_INTERNAL void scm_i_program_print (SCM program, SCM port,
|
|
scm_print_state *pstate);
|
|
SCM_INTERNAL void scm_bootstrap_programs (void);
|
|
SCM_INTERNAL void scm_init_programs (void);
|
|
|
|
#endif /* _SCM_PROGRAMS_H_ */
|
|
|
|
/*
|
|
Local Variables:
|
|
c-file-style: "gnu"
|
|
End:
|
|
*/
|