mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 03:40:34 +02:00
8af3423efe
We need to be able to identify frames that are primitive applications without assuming that slot 0 in a frame is an SCM value and without assuming that value is the procedure being applied. * libguile/gsubr.c (scm_i_primitive_code_p): New helper. (scm_i_primitive_arity): Use the new helper. * libguile/gsubr.h: Declare the new helper. * libguile/programs.h: * libguile/programs.c (scm_program_code_p): New function, replacing scm_primitive_p. (scm_primitive_call_ip): Fix FUNC_NAME definition. * module/statprof.scm (sample-stack-procs, count-call): Identify primitive frames from the IP, not the frame-procedure. Avoids the assumption that slot 0 in a frame is a SCM value. (statprof-proc-call-data): Adapt to primitive-code? change. * module/system/vm/frame.scm (frame-call-representation): Identify primitive frames from the IP, not the closure. Still more work to do here to avoid assuming slot 0 is a procedure. * module/system/vm/program.scm: Export primitive-code? instead of primitive?. (program-arguments-alist, program-arguments-alists): Identify primitives from the code instead of the flags on the program. Not sure this is a great change, but it does avoid having to define a primitive? predicate in Scheme.
88 lines
3.4 KiB
C
88 lines
3.4 KiB
C
/* Copyright (C) 2001, 2009, 2010, 2011, 2012, 2013, 2014 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>
|
|
|
|
/*
|
|
* Programs
|
|
*/
|
|
|
|
#define SCM_PROGRAM_P(x) (SCM_HAS_TYP7 (x, scm_tc7_program))
|
|
#define SCM_PROGRAM_CODE(x) ((scm_t_uint32 *) SCM_CELL_WORD_1 (x))
|
|
#define SCM_PROGRAM_FREE_VARIABLES(x) (SCM_CELL_OBJECT_LOC (x, 2))
|
|
#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_VALIDATE_PROGRAM(p,x) SCM_MAKE_VALIDATE (p, x, PROGRAM_P)
|
|
|
|
#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_F_PROGRAM_IS_FOREIGN 0x2000
|
|
|
|
#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)
|
|
#define SCM_PROGRAM_IS_FOREIGN(x) (SCM_CELL_WORD_0 (x) & SCM_F_PROGRAM_IS_FOREIGN)
|
|
|
|
#ifdef BUILDING_LIBGUILE
|
|
static inline SCM
|
|
scm_i_make_program (const scm_t_uint32 *code)
|
|
{
|
|
return scm_cell (scm_tc7_program, (scm_t_bits)code);
|
|
}
|
|
#endif
|
|
|
|
SCM_INTERNAL SCM scm_program_p (SCM obj);
|
|
SCM_INTERNAL SCM scm_program_code (SCM program);
|
|
|
|
SCM_INTERNAL SCM scm_primitive_code_p (SCM code);
|
|
SCM_INTERNAL SCM scm_primitive_call_ip (SCM prim);
|
|
|
|
SCM_INTERNAL SCM scm_i_program_name (SCM program);
|
|
SCM_INTERNAL SCM scm_i_program_documentation (SCM program);
|
|
SCM_INTERNAL SCM scm_i_program_properties (SCM program);
|
|
|
|
SCM_INTERNAL SCM scm_find_source_for_addr (SCM ip);
|
|
|
|
SCM_INTERNAL SCM scm_program_address_range (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_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:
|
|
*/
|