summaryrefslogtreecommitdiff
path: root/libguile/vm.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2013-11-19 21:04:24 +0100
committerAndy Wingo <wingo@pobox.com>2013-11-19 21:04:24 +0100
commit095100bbdbfc79ccba39fa68b75d8530361299d3 (patch)
tree6ae826998b83a734eece5827fe3781e685e0cbd6 /libguile/vm.c
parent3fe96dd8088957a09cfd15747ae646595934f83a (diff)
downloadguile-095100bbdbfc79ccba39fa68b75d8530361299d3.tar.gz
Change SCM_PACK_RTL macros to SCM_PACK_OP / SCM_PACK_OP_ARG
* libguile/instructions.h: Guard in BUILDING_LIBGUILE. (SCM_PACK_OP_24): (SCM_PACK_OP_8_8_8): (SCM_PACK_OP_8_16): (SCM_PACK_OP_16_8): (SCM_PACK_OP_12_12): Rename from SCM_PACK_RTL_*, and splice in the opcode. (SCM_PACK_OP_ARG_8_24): New helper. * libguile/vm.c: * libguile/gsubr.c: * libguile/foreign.c: * libguile/control.c: * libguile/continuations.c: Adapt.
Diffstat (limited to 'libguile/vm.c')
-rw-r--r--libguile/vm.c30
1 files changed, 15 insertions, 15 deletions
diff --git a/libguile/vm.c b/libguile/vm.c
index 12bf03250..8e8436dbc 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_op_halt, 0)
+ SCM_PACK_OP_24 (halt, 0)
};
static const scm_t_uint32 vm_builtin_apply_code[] = {
- 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 */
+ SCM_PACK_OP_24 (assert_nargs_ge, 3),
+ SCM_PACK_OP_24 (tail_apply, 0), /* proc in r1, args from r2 */
};
static const scm_t_uint32 vm_builtin_values_code[] = {
- SCM_PACK_RTL_24 (scm_op_return_values, 0) /* vals from r1 */
+ SCM_PACK_OP_24 (return_values, 0) /* vals from r1 */
};
static const scm_t_uint32 vm_builtin_abort_to_prompt_code[] = {
- SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, 2),
- SCM_PACK_RTL_24 (scm_op_abort, 0), /* tag in r1, vals from r2 */
+ SCM_PACK_OP_24 (assert_nargs_ge, 2),
+ SCM_PACK_OP_24 (abort, 0), /* tag in r1, vals from r2 */
/* FIXME: Partial continuation should capture caller regs. */
- SCM_PACK_RTL_24 (scm_op_return_values, 0) /* vals from r1 */
+ SCM_PACK_OP_24 (return_values, 0) /* vals from r1 */
};
static const scm_t_uint32 vm_builtin_call_with_values_code[] = {
- 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)
+ SCM_PACK_OP_24 (assert_nargs_ee, 3),
+ SCM_PACK_OP_24 (alloc_frame, 7),
+ SCM_PACK_OP_12_12 (mov, 6, 1),
+ SCM_PACK_OP_24 (call, 6), SCM_PACK_OP_ARG_8_24 (0, 1),
+ SCM_PACK_OP_12_12 (mov, 0, 2),
+ SCM_PACK_OP_24 (tail_call_shuffle, 7)
};
static const scm_t_uint32 vm_builtin_call_with_current_continuation_code[] = {
- SCM_PACK_RTL_24 (scm_op_assert_nargs_ee, 2),
- SCM_PACK_RTL_24 (scm_op_call_cc, 0)
+ SCM_PACK_OP_24 (assert_nargs_ee, 2),
+ SCM_PACK_OP_24 (call_cc, 0)
};