summaryrefslogtreecommitdiff
path: root/libguile/frames.h
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-05-23 14:52:29 +0200
committerAndy Wingo <wingo@pobox.com>2013-05-31 09:48:16 -0400
commit510ca12687b2137031d537be7b99bcf6d5306e41 (patch)
tree4cff09d9338a7f81dcf3733fad6f65b14669b919 /libguile/frames.h
parent1701a68920cf1b83d320711a4d47806ba089c148 (diff)
downloadguile-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/frames.h')
-rw-r--r--libguile/frames.h33
1 files changed, 32 insertions, 1 deletions
diff --git a/libguile/frames.h b/libguile/frames.h
index 71d5b124d..9105311f1 100644
--- a/libguile/frames.h
+++ b/libguile/frames.h
@@ -1,4 +1,4 @@
-/* Copyright (C) 2001, 2009, 2010, 2011 Free Software Foundation, Inc.
+/* Copyright (C) 2001, 2009, 2010, 2011, 2012 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
@@ -100,6 +100,37 @@ struct scm_vm_frame
/*
+ * RTL frames
+ */
+
+/* The frame format for the new RTL programs is almost like that for the
+ stack-vm programs. They differ in their handling of MV returns,
+ however. For RTL, every call is an MV call: every call has an MVRA.
+ Unlike the stack-vm programs, the MVRA for RTL programs is computable
+ from the RA -- it's always one word (4 bytes) before the RA.
+
+ Until we completely migrate to the RTL VM, we will also write the
+ MVRA to the stack.
+
+ When an RTL program returns multiple values, it will shuffle them
+ down to start contiguously from slot 0, as for a tail call. This
+ means that when the caller goes to access them, there are 2 or 3
+ empty words between the top of the caller stack and the bottom of the
+ values, corresponding to the frame that was just popped.
+*/
+
+#define SCM_FRAME_RTL_RETURN_ADDRESS(fp) \
+ ((scm_t_uint32 *) SCM_FRAME_RETURN_ADDRESS (fp))
+#define SCM_FRAME_SET_RTL_RETURN_ADDRESS(fp, ip) \
+ SCM_FRAME_SET_RETURN_ADDRESS (fp, (scm_t_uint8 *) (ip))
+
+#define SCM_FRAME_RTL_MV_RETURN_ADDRESS(fp) \
+ ((scm_t_uint32 *) SCM_FRAME_MV_RETURN_ADDRESS (fp))
+#define SCM_FRAME_SET_RTL_MV_RETURN_ADDRESS(fp, ip) \
+ SCM_FRAME_SET_MV_RETURN_ADDRESS (fp, (scm_t_uint8 *) (ip))
+
+
+/*
* Heap frames
*/