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.
79 lines
2.3 KiB
C
79 lines
2.3 KiB
C
/* classes: h_files */
|
||
|
||
#ifndef SCM_GSUBR_H
|
||
#define SCM_GSUBR_H
|
||
|
||
/* Copyright (C) 1995, 1996, 1998, 2000, 2001, 2006, 2008, 2009,
|
||
* 2010, 2011, 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
|
||
*/
|
||
|
||
|
||
|
||
#include "libguile/__scm.h"
|
||
|
||
|
||
|
||
|
||
|
||
/* Subrs
|
||
*/
|
||
|
||
/* Max number of args to the C procedure backing a gsubr */
|
||
#define SCM_GSUBR_MAX 10
|
||
|
||
#define SCM_PRIMITIVE_P(x) (SCM_RTL_PROGRAM_P (x) && SCM_PROGRAM_IS_PRIMITIVE (x))
|
||
|
||
#define SCM_PRIMITIVE_GENERIC_P(x) (SCM_RTL_PROGRAM_P (x) && SCM_PROGRAM_IS_PRIMITIVE_GENERIC (x))
|
||
|
||
#define SCM_SUBRF(x) \
|
||
((SCM (*) (void)) \
|
||
SCM_POINTER_VALUE (SCM_RTL_PROGRAM_FREE_VARIABLE_REF (x, 0)))
|
||
|
||
#define SCM_SUBR_NAME(x) (SCM_RTL_PROGRAM_FREE_VARIABLE_REF (x, 1))
|
||
|
||
#define SCM_SUBR_GENERIC(x) \
|
||
((SCM *) SCM_POINTER_VALUE (SCM_RTL_PROGRAM_FREE_VARIABLE_REF (x, 2)))
|
||
|
||
#define SCM_SET_SUBR_GENERIC(x, g) \
|
||
(*SCM_SUBR_GENERIC (x) = (g))
|
||
|
||
|
||
|
||
SCM_INTERNAL int scm_i_primitive_arity (SCM subr, int *req, int *opt, int *rest);
|
||
SCM_INTERNAL int scm_i_primitive_call_ip (SCM subr);
|
||
|
||
SCM_API SCM scm_c_make_gsubr (const char *name,
|
||
int req, int opt, int rst, scm_t_subr fcn);
|
||
SCM_API SCM scm_c_make_gsubr_with_generic (const char *name,
|
||
int req, int opt, int rst,
|
||
scm_t_subr fcn, SCM *gf);
|
||
SCM_API SCM scm_c_define_gsubr (const char *name,
|
||
int req, int opt, int rst, scm_t_subr fcn);
|
||
SCM_API SCM scm_c_define_gsubr_with_generic (const char *name,
|
||
int req, int opt, int rst,
|
||
scm_t_subr fcn, SCM *gf);
|
||
|
||
SCM_INTERNAL void scm_init_gsubr (void);
|
||
|
||
#endif /* SCM_GSUBR_H */
|
||
|
||
/*
|
||
Local Variables:
|
||
c-file-style: "gnu"
|
||
End:
|
||
*/
|