diff options
| author | Andy Wingo <wingo@pobox.com> | 2013-11-19 21:04:24 +0100 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2013-11-19 21:04:24 +0100 |
| commit | 095100bbdbfc79ccba39fa68b75d8530361299d3 (patch) | |
| tree | 6ae826998b83a734eece5827fe3781e685e0cbd6 /libguile/gsubr.c | |
| parent | 3fe96dd8088957a09cfd15747ae646595934f83a (diff) | |
| download | guile-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/gsubr.c')
| -rw-r--r-- | libguile/gsubr.c | 38 |
1 files changed, 19 insertions, 19 deletions
diff --git a/libguile/gsubr.c b/libguile/gsubr.c index 1969dbfd0..c6fce363d 100644 --- a/libguile/gsubr.c +++ b/libguile/gsubr.c @@ -75,45 +75,45 @@ /* A: req; B: opt; C: rest */ #define A(nreq) \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_ee, nreq + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (assert_nargs_ee, nreq + 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0, \ 0 #define B(nopt) \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_le, nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_alloc_frame, nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (assert_nargs_le, nopt + 1), \ + SCM_PACK_OP_24 (alloc_frame, nopt + 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0 #define C() \ - SCM_PACK_RTL_24 (scm_op_bind_rest, 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (bind_rest, 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0, \ 0 #define AB(nreq, nopt) \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, nreq + 1), \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_le, nreq + nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_alloc_frame, nreq + nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0) + SCM_PACK_OP_24 (assert_nargs_ge, nreq + 1), \ + SCM_PACK_OP_24 (assert_nargs_le, nreq + nopt + 1), \ + SCM_PACK_OP_24 (alloc_frame, nreq + nopt + 1), \ + SCM_PACK_OP_24 (subr_call, 0) #define AC(nreq) \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, nreq + 1), \ - SCM_PACK_RTL_24 (scm_op_bind_rest, nreq + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (assert_nargs_ge, nreq + 1), \ + SCM_PACK_OP_24 (bind_rest, nreq + 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0 #define BC(nopt) \ - SCM_PACK_RTL_24 (scm_op_bind_rest, nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (bind_rest, nopt + 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0, \ 0 #define ABC(nreq, nopt) \ - SCM_PACK_RTL_24 (scm_op_assert_nargs_ge, nreq + 1), \ - SCM_PACK_RTL_24 (scm_op_bind_rest, nreq + nopt + 1), \ - SCM_PACK_RTL_24 (scm_op_subr_call, 0), \ + SCM_PACK_OP_24 (assert_nargs_ge, nreq + 1), \ + SCM_PACK_OP_24 (bind_rest, nreq + nopt + 1), \ + SCM_PACK_OP_24 (subr_call, 0), \ 0 |