mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-05-02 04:40:29 +02:00
6f16379e9a
* libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump.
* libguile/programs.h (SCM_PROGRAM_FREE_VARIABLES)
(SCM_PROGRAM_FREE_VARIABLE_REF, SCM_PROGRAM_FREE_VARIABLE_SET)
(SCM_PROGRAM_NUM_FREE_VARIABLES):
* libguile/programs.c (scm_make_program, scm_program_num_free_variables)
(scm_program_free_variable_ref, scm_program_free_variable_set_x):
Allocate free variables inline with programs, instead of being in a
vect. Should improve locality, and require fewer local variables in
the VM.
* libguile/vm-engine.c (vm_engine): Remove free_vars and free_vars_count
variables.
* libguile/vm-engine.h (CACHE_PROGRAM): No need to muck with free_vars
and free_vars_count.
(CHECK_FREE_VARIABLE): Update for inline free vars.
* libguile/vm-i-system.c (FREE_VARIABLE_REF): Update for inline free
vars.
(make-closure, fix-closure): Take the closure vals as separate stack
args, and copy or fix them inline into the appropriate closure.
* module/language/objcode/spec.scm (program-free-variables): Define a
local version of this removed function.
* module/language/tree-il/compile-glil.scm (flatten): Adjust to not make
a vector when making closures.
* module/system/vm/program.scm: Export program-num-free-variables,
program-free-variable-ref, program-free-variable-set!, and remove
program-free-variables.
* test-suite/tests/tree-il.test ("lambda"): Update to not make vectors
when making closures.
78 lines
3.2 KiB
C
78 lines
3.2 KiB
C
/* Copyright (C) 2001, 2009, 2010 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>
|
|
|
|
/*
|
|
* Programs
|
|
*/
|
|
|
|
#define SCM_F_PROGRAM_IS_BOOT 0x100
|
|
#define SCM_F_PROGRAM_IS_PRIMITIVE 0x100
|
|
#define SCM_F_PROGRAM_IS_PRIMITIVE_GENERIC 0x200
|
|
|
|
#define SCM_PROGRAM_P(x) (!SCM_IMP (x) && SCM_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)
|
|
|
|
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_API SCM scm_program_arities (SCM program);
|
|
SCM_API SCM scm_program_properties (SCM program);
|
|
SCM_API SCM scm_program_name (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_API SCM scm_c_program_source (SCM program, size_t ip);
|
|
|
|
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:
|
|
*/
|