mirror of
https://git.savannah.gnu.org/git/guile.git
synced 2025-04-30 11:50:28 +02:00
inline symbol? and vector? to opcodes, and a psyntax inlining tweak
* libguile/vm-i-scheme.c (symbol?, vector?): New instructions. Renumbered the rest. * libguile/vm-i-system.c: Renumber instructions. * libguile/_scm.h (SCM_OBJCODE_MINOR_VERSION): Bump. * module/ice-9/psyntax.scm (binding-type, binding-value): Define using macros so that we inline to car and cdr opcodes. Oh, for an inliner :) * module/language/tree-il/compile-glil.scm (*primcall-ops*) * module/language/tree-il/primitives.scm (*interesting-primitive-names*, *effect-free-primitives*) (*effect+exception-free-primitives*): Add symbol? and vector? inlines.
This commit is contained in:
Andy Wingo
parent
1ecf39a6a7
commit
cf45ff030c
6 changed files with 186 additions and 168 deletions
|
|
@ -61,13 +61,13 @@ VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0)
|
|||
goto vm_done;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (3, drop, "drop", 0, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (2, drop, "drop", 0, 1, 0)
|
||||
{
|
||||
DROP ();
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (4, dup, "dup", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (3, dup, "dup", 0, 0, 1)
|
||||
{
|
||||
SCM x = *sp;
|
||||
PUSH (x);
|
||||
|
|
@ -79,55 +79,55 @@ VM_DEFINE_INSTRUCTION (4, dup, "dup", 0, 0, 1)
|
|||
* Object creation
|
||||
*/
|
||||
|
||||
VM_DEFINE_INSTRUCTION (5, void, "void", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (4, void, "void", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_UNSPECIFIED);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (6, make_true, "make-true", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (5, make_true, "make-true", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_BOOL_T);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (7, make_false, "make-false", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (6, make_false, "make-false", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_BOOL_F);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (8, make_nil, "make-nil", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (7, make_nil, "make-nil", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_ELISP_NIL);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (9, make_eol, "make-eol", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (8, make_eol, "make-eol", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_EOL);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (10, make_int8, "make-int8", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (9, make_int8, "make-int8", 1, 0, 1)
|
||||
{
|
||||
PUSH (SCM_I_MAKINUM ((signed char) FETCH ()));
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (11, make_int8_0, "make-int8:0", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (10, make_int8_0, "make-int8:0", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_INUM0);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (12, make_int8_1, "make-int8:1", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (11, make_int8_1, "make-int8:1", 0, 0, 1)
|
||||
{
|
||||
PUSH (SCM_I_MAKINUM (1));
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (13, make_int16, "make-int16", 2, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (12, make_int16, "make-int16", 2, 0, 1)
|
||||
{
|
||||
int h = FETCH ();
|
||||
int l = FETCH ();
|
||||
|
|
@ -135,7 +135,7 @@ VM_DEFINE_INSTRUCTION (13, make_int16, "make-int16", 2, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (14, make_int64, "make-int64", 8, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (13, make_int64, "make-int64", 8, 0, 1)
|
||||
{
|
||||
scm_t_uint64 v = 0;
|
||||
v += FETCH ();
|
||||
|
|
@ -150,7 +150,7 @@ VM_DEFINE_INSTRUCTION (14, make_int64, "make-int64", 8, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (15, make_uint64, "make-uint64", 8, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (14, make_uint64, "make-uint64", 8, 0, 1)
|
||||
{
|
||||
scm_t_uint64 v = 0;
|
||||
v += FETCH ();
|
||||
|
|
@ -165,7 +165,7 @@ VM_DEFINE_INSTRUCTION (15, make_uint64, "make-uint64", 8, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (16, make_char8, "make-char8", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (15, make_char8, "make-char8", 1, 0, 1)
|
||||
{
|
||||
scm_t_uint8 v = 0;
|
||||
v = FETCH ();
|
||||
|
|
@ -177,7 +177,7 @@ VM_DEFINE_INSTRUCTION (16, make_char8, "make-char8", 1, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (17, make_char32, "make-char32", 4, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (16, make_char32, "make-char32", 4, 0, 1)
|
||||
{
|
||||
scm_t_wchar v = 0;
|
||||
v += FETCH ();
|
||||
|
|
@ -190,7 +190,7 @@ VM_DEFINE_INSTRUCTION (17, make_char32, "make-char32", 4, 0, 1)
|
|||
|
||||
|
||||
|
||||
VM_DEFINE_INSTRUCTION (18, list, "list", 2, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (17, list, "list", 2, -1, 1)
|
||||
{
|
||||
unsigned h = FETCH ();
|
||||
unsigned l = FETCH ();
|
||||
|
|
@ -199,7 +199,7 @@ VM_DEFINE_INSTRUCTION (18, list, "list", 2, -1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (19, vector, "vector", 2, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (18, vector, "vector", 2, -1, 1)
|
||||
{
|
||||
unsigned h = FETCH ();
|
||||
unsigned l = FETCH ();
|
||||
|
|
@ -239,7 +239,7 @@ VM_DEFINE_INSTRUCTION (19, vector, "vector", 2, -1, 1)
|
|||
|
||||
/* ref */
|
||||
|
||||
VM_DEFINE_INSTRUCTION (20, object_ref, "object-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (19, object_ref, "object-ref", 1, 0, 1)
|
||||
{
|
||||
register unsigned objnum = FETCH ();
|
||||
CHECK_OBJECT (objnum);
|
||||
|
|
@ -248,7 +248,7 @@ VM_DEFINE_INSTRUCTION (20, object_ref, "object-ref", 1, 0, 1)
|
|||
}
|
||||
|
||||
/* FIXME: necessary? elt 255 of the vector could be a vector... */
|
||||
VM_DEFINE_INSTRUCTION (21, long_object_ref, "long-object-ref", 2, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (20, long_object_ref, "long-object-ref", 2, 0, 1)
|
||||
{
|
||||
unsigned int objnum = FETCH ();
|
||||
objnum <<= 8;
|
||||
|
|
@ -258,14 +258,14 @@ VM_DEFINE_INSTRUCTION (21, long_object_ref, "long-object-ref", 2, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (22, local_ref, "local-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (21, local_ref, "local-ref", 1, 0, 1)
|
||||
{
|
||||
PUSH (LOCAL_REF (FETCH ()));
|
||||
ASSERT_BOUND (*sp);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (23, long_local_ref, "long-local-ref", 2, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (22, long_local_ref, "long-local-ref", 2, 0, 1)
|
||||
{
|
||||
unsigned int i = FETCH ();
|
||||
i <<= 8;
|
||||
|
|
@ -275,7 +275,7 @@ VM_DEFINE_INSTRUCTION (23, long_local_ref, "long-local-ref", 2, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (24, local_bound, "local-bound?", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (23, local_bound, "local-bound?", 1, 0, 1)
|
||||
{
|
||||
if (LOCAL_REF (FETCH ()) == SCM_UNDEFINED)
|
||||
PUSH (SCM_BOOL_F);
|
||||
|
|
@ -284,7 +284,7 @@ VM_DEFINE_INSTRUCTION (24, local_bound, "local-bound?", 1, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (25, long_local_bound, "long-local-bound?", 2, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (24, long_local_bound, "long-local-bound?", 2, 0, 1)
|
||||
{
|
||||
unsigned int i = FETCH ();
|
||||
i <<= 8;
|
||||
|
|
@ -296,7 +296,7 @@ VM_DEFINE_INSTRUCTION (25, long_local_bound, "long-local-bound?", 2, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (26, variable_ref, "variable-ref", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (25, variable_ref, "variable-ref", 0, 1, 1)
|
||||
{
|
||||
SCM x = *sp;
|
||||
|
||||
|
|
@ -318,7 +318,7 @@ VM_DEFINE_INSTRUCTION (26, variable_ref, "variable-ref", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (27, variable_bound, "variable-bound?", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (26, variable_bound, "variable-bound?", 0, 1, 1)
|
||||
{
|
||||
if (VARIABLE_BOUNDP (*sp))
|
||||
*sp = SCM_BOOL_T;
|
||||
|
|
@ -327,7 +327,7 @@ VM_DEFINE_INSTRUCTION (27, variable_bound, "variable-bound?", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (28, toplevel_ref, "toplevel-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (27, toplevel_ref, "toplevel-ref", 1, 0, 1)
|
||||
{
|
||||
unsigned objnum = FETCH ();
|
||||
SCM what;
|
||||
|
|
@ -350,7 +350,7 @@ VM_DEFINE_INSTRUCTION (28, toplevel_ref, "toplevel-ref", 1, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (29, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (28, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
|
||||
{
|
||||
SCM what;
|
||||
unsigned int objnum = FETCH ();
|
||||
|
|
@ -377,14 +377,14 @@ VM_DEFINE_INSTRUCTION (29, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
|
|||
|
||||
/* set */
|
||||
|
||||
VM_DEFINE_INSTRUCTION (30, local_set, "local-set", 1, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (29, local_set, "local-set", 1, 1, 0)
|
||||
{
|
||||
LOCAL_SET (FETCH (), *sp);
|
||||
DROP ();
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (31, long_local_set, "long-local-set", 2, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (30, long_local_set, "long-local-set", 2, 1, 0)
|
||||
{
|
||||
unsigned int i = FETCH ();
|
||||
i <<= 8;
|
||||
|
|
@ -394,14 +394,14 @@ VM_DEFINE_INSTRUCTION (31, long_local_set, "long-local-set", 2, 1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (32, variable_set, "variable-set", 0, 2, 0)
|
||||
VM_DEFINE_INSTRUCTION (31, variable_set, "variable-set", 0, 2, 0)
|
||||
{
|
||||
VARIABLE_SET (sp[0], sp[-1]);
|
||||
DROPN (2);
|
||||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (33, toplevel_set, "toplevel-set", 1, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (32, toplevel_set, "toplevel-set", 1, 1, 0)
|
||||
{
|
||||
unsigned objnum = FETCH ();
|
||||
SCM what;
|
||||
|
|
@ -420,7 +420,7 @@ VM_DEFINE_INSTRUCTION (33, toplevel_set, "toplevel-set", 1, 1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (34, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (33, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
|
||||
{
|
||||
SCM what;
|
||||
unsigned int objnum = FETCH ();
|
||||
|
|
@ -468,7 +468,7 @@ VM_DEFINE_INSTRUCTION (34, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
|
|||
NEXT; \
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (35, br, "br", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (34, br, "br", 3, 0, 0)
|
||||
{
|
||||
scm_t_int32 offset;
|
||||
FETCH_OFFSET (offset);
|
||||
|
|
@ -478,34 +478,34 @@ VM_DEFINE_INSTRUCTION (35, br, "br", 3, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (36, br_if, "br-if", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (35, br_if, "br-if", 3, 0, 0)
|
||||
{
|
||||
BR (scm_is_true (*sp));
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (37, br_if_not, "br-if-not", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (36, br_if_not, "br-if-not", 3, 0, 0)
|
||||
{
|
||||
BR (scm_is_false (*sp));
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (38, br_if_eq, "br-if-eq", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (37, br_if_eq, "br-if-eq", 3, 0, 0)
|
||||
{
|
||||
sp--; /* underflow? */
|
||||
BR (scm_is_eq (sp[0], sp[1]));
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (39, br_if_not_eq, "br-if-not-eq", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (38, br_if_not_eq, "br-if-not-eq", 3, 0, 0)
|
||||
{
|
||||
sp--; /* underflow? */
|
||||
BR (!scm_is_eq (sp[0], sp[1]));
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (40, br_if_null, "br-if-null", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (39, br_if_null, "br-if-null", 3, 0, 0)
|
||||
{
|
||||
BR (scm_is_null (*sp));
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (41, br_if_not_null, "br-if-not-null", 3, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (40, br_if_not_null, "br-if-not-null", 3, 0, 0)
|
||||
{
|
||||
BR (!scm_is_null (*sp));
|
||||
}
|
||||
|
|
@ -515,7 +515,7 @@ VM_DEFINE_INSTRUCTION (41, br_if_not_null, "br-if-not-null", 3, 0, 0)
|
|||
* Subprogram call
|
||||
*/
|
||||
|
||||
VM_DEFINE_INSTRUCTION (42, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (41, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
scm_t_int32 offset;
|
||||
|
|
@ -527,7 +527,7 @@ VM_DEFINE_INSTRUCTION (42, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (43, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (42, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
scm_t_int32 offset;
|
||||
|
|
@ -539,7 +539,7 @@ VM_DEFINE_INSTRUCTION (43, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (44, br_if_nargs_gt, "br-if-nargs-gt", 5, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (43, br_if_nargs_gt, "br-if-nargs-gt", 5, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
scm_t_int32 offset;
|
||||
|
|
@ -552,7 +552,7 @@ VM_DEFINE_INSTRUCTION (44, br_if_nargs_gt, "br-if-nargs-gt", 5, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (45, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (44, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
n = FETCH () << 8;
|
||||
|
|
@ -562,7 +562,7 @@ VM_DEFINE_INSTRUCTION (45, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (46, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (45, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
n = FETCH () << 8;
|
||||
|
|
@ -572,7 +572,7 @@ VM_DEFINE_INSTRUCTION (46, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (47, bind_optionals, "bind-optionals", 2, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (46, bind_optionals, "bind-optionals", 2, -1, -1)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
n = FETCH () << 8;
|
||||
|
|
@ -582,7 +582,7 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals, "bind-optionals", 2, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (48, bind_optionals_shuffle, "bind-optionals/shuffle", 6, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (47, bind_optionals_shuffle, "bind-optionals/shuffle", 6, -1, -1)
|
||||
{
|
||||
SCM *walk;
|
||||
scm_t_ptrdiff nreq, nreq_and_opt, ntotal;
|
||||
|
|
@ -625,7 +625,7 @@ VM_DEFINE_INSTRUCTION (48, bind_optionals_shuffle, "bind-optionals/shuffle", 6,
|
|||
#define F_ALLOW_OTHER_KEYS 1
|
||||
#define F_REST 2
|
||||
|
||||
VM_DEFINE_INSTRUCTION (49, bind_kwargs, "bind-kwargs", 5, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (48, bind_kwargs, "bind-kwargs", 5, 0, 0)
|
||||
{
|
||||
scm_t_uint16 idx;
|
||||
scm_t_ptrdiff nkw;
|
||||
|
|
@ -678,7 +678,7 @@ VM_DEFINE_INSTRUCTION (49, bind_kwargs, "bind-kwargs", 5, 0, 0)
|
|||
#undef F_REST
|
||||
|
||||
|
||||
VM_DEFINE_INSTRUCTION (50, push_rest, "push-rest", 2, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (49, push_rest, "push-rest", 2, -1, -1)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
SCM rest = SCM_EOL;
|
||||
|
|
@ -691,7 +691,7 @@ VM_DEFINE_INSTRUCTION (50, push_rest, "push-rest", 2, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (51, bind_rest, "bind-rest", 4, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (50, bind_rest, "bind-rest", 4, -1, -1)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
scm_t_uint32 i;
|
||||
|
|
@ -707,7 +707,7 @@ VM_DEFINE_INSTRUCTION (51, bind_rest, "bind-rest", 4, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (52, reserve_locals, "reserve-locals", 2, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (51, reserve_locals, "reserve-locals", 2, -1, -1)
|
||||
{
|
||||
SCM *old_sp;
|
||||
scm_t_int32 n;
|
||||
|
|
@ -728,7 +728,7 @@ VM_DEFINE_INSTRUCTION (52, reserve_locals, "reserve-locals", 2, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (53, new_frame, "new-frame", 0, 0, 3)
|
||||
VM_DEFINE_INSTRUCTION (52, new_frame, "new-frame", 0, 0, 3)
|
||||
{
|
||||
/* NB: if you change this, see frames.c:vm-frame-num-locals */
|
||||
/* and frames.h, vm-engine.c, etc of course */
|
||||
|
|
@ -738,7 +738,7 @@ VM_DEFINE_INSTRUCTION (53, new_frame, "new-frame", 0, 0, 3)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (53, call, "call", 1, -1, 1)
|
||||
{
|
||||
nargs = FETCH ();
|
||||
|
||||
|
|
@ -777,7 +777,7 @@ VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (55, tail_call, "tail-call", 1, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (54, tail_call, "tail-call", 1, -1, 1)
|
||||
{
|
||||
nargs = FETCH ();
|
||||
|
||||
|
|
@ -828,7 +828,7 @@ VM_DEFINE_INSTRUCTION (55, tail_call, "tail-call", 1, -1, 1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (56, subr_call, "subr-call", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (55, subr_call, "subr-call", 1, -1, -1)
|
||||
{
|
||||
SCM pointer, ret;
|
||||
SCM (*subr)();
|
||||
|
|
@ -897,7 +897,7 @@ VM_DEFINE_INSTRUCTION (56, subr_call, "subr-call", 1, -1, -1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (57, smob_call, "smob-call", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (56, smob_call, "smob-call", 1, -1, -1)
|
||||
{
|
||||
SCM smob, ret;
|
||||
SCM (*subr)();
|
||||
|
|
@ -944,7 +944,7 @@ VM_DEFINE_INSTRUCTION (57, smob_call, "smob-call", 1, -1, -1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (58, foreign_call, "foreign-call", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (57, foreign_call, "foreign-call", 1, -1, -1)
|
||||
{
|
||||
SCM foreign, ret;
|
||||
nargs = FETCH ();
|
||||
|
|
@ -972,7 +972,7 @@ VM_DEFINE_INSTRUCTION (58, foreign_call, "foreign-call", 1, -1, -1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (89, continuation_call, "continuation-call", 0, -1, 0)
|
||||
VM_DEFINE_INSTRUCTION (58, continuation_call, "continuation-call", 0, -1, 0)
|
||||
{
|
||||
SCM contregs;
|
||||
POP (contregs);
|
||||
|
|
@ -988,7 +988,7 @@ VM_DEFINE_INSTRUCTION (89, continuation_call, "continuation-call", 0, -1, 0)
|
|||
abort ();
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (94, partial_cont_call, "partial-cont-call", 0, -1, 0)
|
||||
VM_DEFINE_INSTRUCTION (59, partial_cont_call, "partial-cont-call", 0, -1, 0)
|
||||
{
|
||||
SCM vmcont, intwinds, prevwinds;
|
||||
POP (intwinds);
|
||||
|
|
@ -1016,7 +1016,7 @@ VM_DEFINE_INSTRUCTION (94, partial_cont_call, "partial-cont-call", 0, -1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (59, tail_call_nargs, "tail-call/nargs", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (60, tail_call_nargs, "tail-call/nargs", 0, 0, 1)
|
||||
{
|
||||
SCM x;
|
||||
POP (x);
|
||||
|
|
@ -1025,7 +1025,7 @@ VM_DEFINE_INSTRUCTION (59, tail_call_nargs, "tail-call/nargs", 0, 0, 1)
|
|||
goto vm_tail_call;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (60, call_nargs, "call/nargs", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (61, call_nargs, "call/nargs", 0, 0, 1)
|
||||
{
|
||||
SCM x;
|
||||
POP (x);
|
||||
|
|
@ -1034,7 +1034,7 @@ VM_DEFINE_INSTRUCTION (60, call_nargs, "call/nargs", 0, 0, 1)
|
|||
goto vm_call;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (61, mv_call, "mv-call", 4, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (62, mv_call, "mv-call", 4, -1, 1)
|
||||
{
|
||||
scm_t_int32 offset;
|
||||
scm_t_uint8 *mvra;
|
||||
|
|
@ -1078,7 +1078,7 @@ VM_DEFINE_INSTRUCTION (61, mv_call, "mv-call", 4, -1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (62, apply, "apply", 1, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (63, apply, "apply", 1, -1, 1)
|
||||
{
|
||||
int len;
|
||||
SCM ls;
|
||||
|
|
@ -1100,7 +1100,7 @@ VM_DEFINE_INSTRUCTION (62, apply, "apply", 1, -1, 1)
|
|||
goto vm_call;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (63, tail_apply, "tail-apply", 1, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (64, tail_apply, "tail-apply", 1, -1, 1)
|
||||
{
|
||||
int len;
|
||||
SCM ls;
|
||||
|
|
@ -1122,7 +1122,7 @@ VM_DEFINE_INSTRUCTION (63, tail_apply, "tail-apply", 1, -1, 1)
|
|||
goto vm_tail_call;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (64, call_cc, "call/cc", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (65, call_cc, "call/cc", 0, 1, 1)
|
||||
{
|
||||
int first;
|
||||
SCM proc, vm_cont, cont;
|
||||
|
|
@ -1157,7 +1157,7 @@ VM_DEFINE_INSTRUCTION (64, call_cc, "call/cc", 0, 1, 1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (65, tail_call_cc, "tail-call/cc", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (66, tail_call_cc, "tail-call/cc", 0, 1, 1)
|
||||
{
|
||||
int first;
|
||||
SCM proc, vm_cont, cont;
|
||||
|
|
@ -1197,7 +1197,7 @@ VM_DEFINE_INSTRUCTION (65, tail_call_cc, "tail-call/cc", 0, 1, 1)
|
|||
}
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (66, return, "return", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (67, return, "return", 0, 1, 1)
|
||||
{
|
||||
vm_return:
|
||||
POP_CONTINUATION_HOOK (1);
|
||||
|
|
@ -1233,7 +1233,7 @@ VM_DEFINE_INSTRUCTION (66, return, "return", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (67, return_values, "return/values", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (68, return_values, "return/values", 1, -1, -1)
|
||||
{
|
||||
/* nvalues declared at top level, because for some reason gcc seems to think
|
||||
that perhaps it might be used without declaration. Fooey to that, I say. */
|
||||
|
|
@ -1289,7 +1289,7 @@ VM_DEFINE_INSTRUCTION (67, return_values, "return/values", 1, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (68, return_values_star, "return/values*", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (69, return_values_star, "return/values*", 1, -1, -1)
|
||||
{
|
||||
SCM l;
|
||||
|
||||
|
|
@ -1312,7 +1312,7 @@ VM_DEFINE_INSTRUCTION (68, return_values_star, "return/values*", 1, -1, -1)
|
|||
goto vm_return_values;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (88, return_nvalues, "return/nvalues", 0, 1, -1)
|
||||
VM_DEFINE_INSTRUCTION (70, return_nvalues, "return/nvalues", 0, 1, -1)
|
||||
{
|
||||
SCM n;
|
||||
POP (n);
|
||||
|
|
@ -1321,7 +1321,7 @@ VM_DEFINE_INSTRUCTION (88, return_nvalues, "return/nvalues", 0, 1, -1)
|
|||
goto vm_return_values;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (69, truncate_values, "truncate-values", 2, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (71, truncate_values, "truncate-values", 2, -1, -1)
|
||||
{
|
||||
SCM x;
|
||||
int nbinds, rest;
|
||||
|
|
@ -1344,7 +1344,7 @@ VM_DEFINE_INSTRUCTION (69, truncate_values, "truncate-values", 2, -1, -1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (70, box, "box", 1, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (72, box, "box", 1, 1, 0)
|
||||
{
|
||||
SCM val;
|
||||
POP (val);
|
||||
|
|
@ -1358,7 +1358,7 @@ VM_DEFINE_INSTRUCTION (70, box, "box", 1, 1, 0)
|
|||
(set! a (lambda () (b ...)))
|
||||
...)
|
||||
*/
|
||||
VM_DEFINE_INSTRUCTION (71, empty_box, "empty-box", 1, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (73, empty_box, "empty-box", 1, 0, 0)
|
||||
{
|
||||
SYNC_BEFORE_GC ();
|
||||
LOCAL_SET (FETCH (),
|
||||
|
|
@ -1366,7 +1366,7 @@ VM_DEFINE_INSTRUCTION (71, empty_box, "empty-box", 1, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (72, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (74, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
|
||||
{
|
||||
SCM v = LOCAL_REF (FETCH ());
|
||||
ASSERT_BOUND_VARIABLE (v);
|
||||
|
|
@ -1374,7 +1374,7 @@ VM_DEFINE_INSTRUCTION (72, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (73, local_boxed_set, "local-boxed-set", 1, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (75, local_boxed_set, "local-boxed-set", 1, 1, 0)
|
||||
{
|
||||
SCM v, val;
|
||||
v = LOCAL_REF (FETCH ());
|
||||
|
|
@ -1384,7 +1384,7 @@ VM_DEFINE_INSTRUCTION (73, local_boxed_set, "local-boxed-set", 1, 1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (74, free_ref, "free-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (76, free_ref, "free-ref", 1, 0, 1)
|
||||
{
|
||||
scm_t_uint8 idx = FETCH ();
|
||||
|
||||
|
|
@ -1395,7 +1395,7 @@ VM_DEFINE_INSTRUCTION (74, free_ref, "free-ref", 1, 0, 1)
|
|||
|
||||
/* no free-set -- if a var is assigned, it should be in a box */
|
||||
|
||||
VM_DEFINE_INSTRUCTION (75, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (77, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
|
||||
{
|
||||
SCM v;
|
||||
scm_t_uint8 idx = FETCH ();
|
||||
|
|
@ -1406,7 +1406,7 @@ VM_DEFINE_INSTRUCTION (75, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (76, free_boxed_set, "free-boxed-set", 1, 1, 0)
|
||||
VM_DEFINE_INSTRUCTION (78, free_boxed_set, "free-boxed-set", 1, 1, 0)
|
||||
{
|
||||
SCM v, val;
|
||||
scm_t_uint8 idx = FETCH ();
|
||||
|
|
@ -1418,7 +1418,7 @@ VM_DEFINE_INSTRUCTION (76, free_boxed_set, "free-boxed-set", 1, 1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (77, make_closure, "make-closure", 2, -1, 1)
|
||||
VM_DEFINE_INSTRUCTION (79, make_closure, "make-closure", 2, -1, 1)
|
||||
{
|
||||
size_t n, len;
|
||||
SCM closure;
|
||||
|
|
@ -1437,7 +1437,7 @@ VM_DEFINE_INSTRUCTION (77, make_closure, "make-closure", 2, -1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (78, make_variable, "make-variable", 0, 0, 1)
|
||||
VM_DEFINE_INSTRUCTION (80, make_variable, "make-variable", 0, 0, 1)
|
||||
{
|
||||
SYNC_BEFORE_GC ();
|
||||
/* fixme underflow */
|
||||
|
|
@ -1445,7 +1445,7 @@ VM_DEFINE_INSTRUCTION (78, make_variable, "make-variable", 0, 0, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (79, fix_closure, "fix-closure", 2, -1, 0)
|
||||
VM_DEFINE_INSTRUCTION (81, fix_closure, "fix-closure", 2, -1, 0)
|
||||
{
|
||||
SCM x;
|
||||
unsigned int i = FETCH ();
|
||||
|
|
@ -1462,7 +1462,7 @@ VM_DEFINE_INSTRUCTION (79, fix_closure, "fix-closure", 2, -1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (80, define, "define", 0, 0, 2)
|
||||
VM_DEFINE_INSTRUCTION (82, define, "define", 0, 0, 2)
|
||||
{
|
||||
SCM sym, val;
|
||||
POP (sym);
|
||||
|
|
@ -1474,7 +1474,7 @@ VM_DEFINE_INSTRUCTION (80, define, "define", 0, 0, 2)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (81, make_keyword, "make-keyword", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (83, make_keyword, "make-keyword", 0, 1, 1)
|
||||
{
|
||||
CHECK_UNDERFLOW ();
|
||||
SYNC_REGISTER ();
|
||||
|
|
@ -1482,7 +1482,7 @@ VM_DEFINE_INSTRUCTION (81, make_keyword, "make-keyword", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (82, make_symbol, "make-symbol", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (84, make_symbol, "make-symbol", 0, 1, 1)
|
||||
{
|
||||
CHECK_UNDERFLOW ();
|
||||
SYNC_REGISTER ();
|
||||
|
|
@ -1490,7 +1490,7 @@ VM_DEFINE_INSTRUCTION (82, make_symbol, "make-symbol", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 4, 2, 0)
|
||||
VM_DEFINE_INSTRUCTION (85, prompt, "prompt", 4, 2, 0)
|
||||
{
|
||||
scm_t_int32 offset;
|
||||
scm_t_uint8 escape_only_p;
|
||||
|
|
@ -1528,7 +1528,7 @@ VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 4, 2, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (85, wind, "wind", 0, 2, 0)
|
||||
VM_DEFINE_INSTRUCTION (86, wind, "wind", 0, 2, 0)
|
||||
{
|
||||
SCM wind, unwind;
|
||||
POP (unwind);
|
||||
|
|
@ -1551,7 +1551,7 @@ VM_DEFINE_INSTRUCTION (85, wind, "wind", 0, 2, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (86, abort, "abort", 1, -1, -1)
|
||||
VM_DEFINE_INSTRUCTION (87, abort, "abort", 1, -1, -1)
|
||||
{
|
||||
unsigned n = FETCH ();
|
||||
SYNC_REGISTER ();
|
||||
|
|
@ -1562,7 +1562,7 @@ VM_DEFINE_INSTRUCTION (86, abort, "abort", 1, -1, -1)
|
|||
abort ();
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (87, unwind, "unwind", 0, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (88, unwind, "unwind", 0, 0, 0)
|
||||
{
|
||||
/* A normal exit from the dynamic extent of an expression. Pop the top entry
|
||||
off of the dynamic stack. */
|
||||
|
|
@ -1570,7 +1570,7 @@ VM_DEFINE_INSTRUCTION (87, unwind, "unwind", 0, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (90, wind_fluids, "wind-fluids", 1, -1, 0)
|
||||
VM_DEFINE_INSTRUCTION (89, wind_fluids, "wind-fluids", 1, -1, 0)
|
||||
{
|
||||
unsigned n = FETCH ();
|
||||
SCM wf;
|
||||
|
|
@ -1585,7 +1585,7 @@ VM_DEFINE_INSTRUCTION (90, wind_fluids, "wind-fluids", 1, -1, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (91, unwind_fluids, "unwind-fluids", 0, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (90, unwind_fluids, "unwind-fluids", 0, 0, 0)
|
||||
{
|
||||
SCM wf;
|
||||
wf = scm_car (scm_i_dynwinds ());
|
||||
|
|
@ -1594,7 +1594,7 @@ VM_DEFINE_INSTRUCTION (91, unwind_fluids, "unwind-fluids", 0, 0, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (92, fluid_ref, "fluid-ref", 0, 1, 1)
|
||||
VM_DEFINE_INSTRUCTION (91, fluid_ref, "fluid-ref", 0, 1, 1)
|
||||
{
|
||||
size_t num;
|
||||
SCM fluids;
|
||||
|
|
@ -1614,7 +1614,7 @@ VM_DEFINE_INSTRUCTION (92, fluid_ref, "fluid-ref", 0, 1, 1)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (93, fluid_set, "fluid-set", 0, 2, 0)
|
||||
VM_DEFINE_INSTRUCTION (92, fluid_set, "fluid-set", 0, 2, 0)
|
||||
{
|
||||
size_t num;
|
||||
SCM val, fluid, fluids;
|
||||
|
|
@ -1635,7 +1635,7 @@ VM_DEFINE_INSTRUCTION (93, fluid_set, "fluid-set", 0, 2, 0)
|
|||
NEXT;
|
||||
}
|
||||
|
||||
VM_DEFINE_INSTRUCTION (95, assert_nargs_ee_locals, "assert-nargs-ee/locals", 1, 0, 0)
|
||||
VM_DEFINE_INSTRUCTION (93, assert_nargs_ee_locals, "assert-nargs-ee/locals", 1, 0, 0)
|
||||
{
|
||||
scm_t_ptrdiff n;
|
||||
SCM *old_sp;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue