diff options
author | Andy Wingo <wingo@pobox.com> | 2013-05-23 14:52:29 +0200 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2013-05-31 09:48:16 -0400 |
commit | 510ca12687b2137031d537be7b99bcf6d5306e41 (patch) | |
tree | 4cff09d9338a7f81dcf3733fad6f65b14669b919 /libguile/programs.h | |
parent | 1701a68920cf1b83d320711a4d47806ba089c148 (diff) | |
download | guile-510ca12687b2137031d537be7b99bcf6d5306e41.tar.gz |
add new rtl vm
* libguile/vm-engine.c (rtl_vm_engine): Add new VM.
(vm_engine): Add support for calling RTL programs.
* libguile/tags.h (scm_tc7_rtl_program): New type for procedures that
run on the new VM.
* libguile/evalext.c (scm_self_evaluating_p):
* libguile/goops.c (scm_class_of):
* libguile/print.c (iprin1):
* libguile/procprop.c (scm_i_procedure_arity):
* libguile/procs.c (scm_procedure_p): Add hooks for the new tc7.
* libguile/programs.h:
* libguile/programs.c (scm_make_rtl_program, scm_i_rtl_program_print)
(scm_rtl_program_p, scm_rtl_program_code):
* module/system/vm/program.scm: Add constructors and accessors for the
new "RTL programs".
* libguile/vm.c (rtl_boot_continuation): Define a boot program.
(rtl_apply, rtl_values): New static RTL programs.
* libguile/frames.c (scm_frame_num_locals): Adapt for frames of RTL
programs.
* libguile/frames.h: Add description of RTL frames.
* libguile/Makefile.am: Add rules to generate vm-operations.h.
* .gitignore: Ignore vm-operations.h.
* module/system/vm/instruction.scm:
* libguile/instructions.c:
* libguile/instructions.h: Use vm-operations.h to define enumerated
values for the new RTL opcodes. Define some helper macros to pack and
unpack 32-bit instruction words.
(rtl-instruction-list): New function, exported by (system vm
instruction).
* libguile/objcodes.c: Wire up the bits needed to detect the new RTL
bytecode and load it, as appropriate.
Diffstat (limited to 'libguile/programs.h')
-rw-r--r-- | libguile/programs.h | 27 |
1 files changed, 26 insertions, 1 deletions
diff --git a/libguile/programs.h b/libguile/programs.h index d53fd8f84..732594cd2 100644 --- a/libguile/programs.h +++ b/libguile/programs.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc. +/* 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 @@ -23,6 +23,31 @@ #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 void scm_i_rtl_program_print (SCM program, SCM port, + scm_print_state *pstate); + +/* * Programs */ |