From 3fe96dd8088957a09cfd15747ae646595934f83a Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Tue, 19 Nov 2013 20:31:21 +0100 Subject: scm_rtl_op_* -> scm_op_* * libguile/instructions.h (scm_opcode): Rename from scm_rtl_opcode. Rename opcodes from scm_rtl_op_* to scm_op_*. * libguile/continuations.c: * libguile/control.c: * libguile/foreign.c: * libguile/gsubr.c: * libguile/instructions.c: * libguile/vm.c: Adapt. --- libguile/vm.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) (limited to 'libguile/vm.c') diff --git a/libguile/vm.c b/libguile/vm.c index 9b0e08003..12bf03250 100644 --- a/libguile/vm.c +++ b/libguile/vm.c @@ -600,37 +600,37 @@ static SCM vm_builtin_call_with_values; static SCM vm_builtin_call_with_current_continuation; static const scm_t_uint32 vm_boot_continuation_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_halt, 0) + SCM_PACK_RTL_24 (scm_op_halt, 0) }; static const scm_t_uint32 vm_builtin_apply_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_assert_nargs_ge, 3), - SCM_PACK_RTL_24 (scm_rtl_op_tail_apply, 0), /* proc in r1, args from r2 */ + SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, 3), + SCM_PACK_RTL_24 (scm_op_tail_apply, 0), /* proc in r1, args from r2 */ }; static const scm_t_uint32 vm_builtin_values_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_return_values, 0) /* vals from r1 */ + SCM_PACK_RTL_24 (scm_op_return_values, 0) /* vals from r1 */ }; static const scm_t_uint32 vm_builtin_abort_to_prompt_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_assert_nargs_ge, 2), - SCM_PACK_RTL_24 (scm_rtl_op_abort, 0), /* tag in r1, vals from r2 */ + SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, 2), + SCM_PACK_RTL_24 (scm_op_abort, 0), /* tag in r1, vals from r2 */ /* FIXME: Partial continuation should capture caller regs. */ - SCM_PACK_RTL_24 (scm_rtl_op_return_values, 0) /* vals from r1 */ + SCM_PACK_RTL_24 (scm_op_return_values, 0) /* vals from r1 */ }; static const scm_t_uint32 vm_builtin_call_with_values_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_assert_nargs_ee, 3), - SCM_PACK_RTL_24 (scm_rtl_op_alloc_frame, 7), - SCM_PACK_RTL_12_12 (scm_rtl_op_mov, 6, 1), - SCM_PACK_RTL_24 (scm_rtl_op_call, 6), SCM_PACK_RTL_24 (0, 1), - SCM_PACK_RTL_12_12 (scm_rtl_op_mov, 0, 2), - SCM_PACK_RTL_24 (scm_rtl_op_tail_call_shuffle, 7) + SCM_PACK_RTL_24 (scm_op_assert_nargs_ee, 3), + SCM_PACK_RTL_24 (scm_op_alloc_frame, 7), + SCM_PACK_RTL_12_12 (scm_op_mov, 6, 1), + SCM_PACK_RTL_24 (scm_op_call, 6), SCM_PACK_RTL_24 (0, 1), + SCM_PACK_RTL_12_12 (scm_op_mov, 0, 2), + SCM_PACK_RTL_24 (scm_op_tail_call_shuffle, 7) }; static const scm_t_uint32 vm_builtin_call_with_current_continuation_code[] = { - SCM_PACK_RTL_24 (scm_rtl_op_assert_nargs_ee, 2), - SCM_PACK_RTL_24 (scm_rtl_op_call_cc, 0) + SCM_PACK_RTL_24 (scm_op_assert_nargs_ee, 2), + SCM_PACK_RTL_24 (scm_op_call_cc, 0) }; -- cgit v1.2.3