summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-19 20:05:45 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-19 20:05:45 +0100
commitef6b7f718acaceba9408ad16d007cc4cb76e0a84 (patch)
treeac7d5b6778a2fcbc2ebc240dc1695d8a7fc719d7
parent827c2c26fc75c6c6686efbaca737d2736be5887e (diff)
downloadguile-ef6b7f718acaceba9408ad16d007cc4cb76e0a84.tar.gz
Internal RTL excision in vm.c
* libguile/vm.c (vm_boot_continuation, vm_boot_continuation_code): Rename from rtl_boot_continuation[_code]. (scm_bootstrap_vm): * libguile/vm-engine.c (rtl_vm_engine): Adapt.
-rw-r--r--libguile/vm-engine.c4
-rw-r--r--libguile/vm.c10
2 files changed, 7 insertions, 7 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 703fea392..b13fab0cc 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -470,9 +470,9 @@ RTL_VM_NAME (SCM vm, SCM program, SCM *argv, size_t nargs_)
continuation. */
base[0] = SCM_PACK (fp); /* dynamic link */
base[1] = SCM_PACK (ip); /* ra */
- base[2] = rtl_boot_continuation;
+ base[2] = vm_boot_continuation;
fp = &base[2];
- ip = (scm_t_uint32 *) rtl_boot_continuation_code;
+ ip = (scm_t_uint32 *) vm_boot_continuation_code;
/* MV-call frame, function & arguments */
base[3] = SCM_PACK (fp); /* dynamic link */
diff --git a/libguile/vm.c b/libguile/vm.c
index c4aa65e54..9b0e08003 100644
--- a/libguile/vm.c
+++ b/libguile/vm.c
@@ -592,14 +592,14 @@ vm_error_bad_wide_string_length (size_t len)
-static SCM rtl_boot_continuation;
+static SCM vm_boot_continuation;
static SCM vm_builtin_apply;
static SCM vm_builtin_values;
static SCM vm_builtin_abort_to_prompt;
static SCM vm_builtin_call_with_values;
static SCM vm_builtin_call_with_current_continuation;
-static const scm_t_uint32 rtl_boot_continuation_code[] = {
+static const scm_t_uint32 vm_boot_continuation_code[] = {
SCM_PACK_RTL_24 (scm_rtl_op_halt, 0)
};
@@ -1214,9 +1214,9 @@ scm_bootstrap_vm (void)
sym_regular = scm_from_latin1_symbol ("regular");
sym_debug = scm_from_latin1_symbol ("debug");
- rtl_boot_continuation = scm_i_make_program (rtl_boot_continuation_code);
- SCM_SET_CELL_WORD_0 (rtl_boot_continuation,
- (SCM_CELL_WORD_0 (rtl_boot_continuation)
+ vm_boot_continuation = scm_i_make_program (vm_boot_continuation_code);
+ SCM_SET_CELL_WORD_0 (vm_boot_continuation,
+ (SCM_CELL_WORD_0 (vm_boot_continuation)
| SCM_F_PROGRAM_IS_BOOT));
#define DEFINE_BUILTIN(builtin, BUILTIN, req, opt, rest) \