mirror/guile
mirror/guile
1
Fork 0
mirror of https://git.savannah.gnu.org/git/guile.git synced 2025-04-30 20:00:19 +02:00
Code Activity

inline symbol? and vector? to opcodes, and a psyntax inlining tweak

Browse source 
* 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 2010-10-08 11:30:17 +02:00
parent 1ecf39a6a7
commit cf45ff030c
6 changed files with 186 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libguile/_scm.h
View file

@ -183,7 +183,7 @@
/* Major and minor versions must be single characters. */ /* Major and minor versions must be single characters. */
#define SCM_OBJCODE_MAJOR_VERSION 0 #define SCM_OBJCODE_MAJOR_VERSION 0
#define SCM_OBJCODE_MINOR_VERSION R #define SCM_OBJCODE_MINOR_VERSION S
#define SCM_OBJCODE_MAJOR_VERSION_STRING \ #define SCM_OBJCODE_MAJOR_VERSION_STRING \
SCM_CPP_STRINGIFY(SCM_OBJCODE_MAJOR_VERSION) SCM_CPP_STRINGIFY(SCM_OBJCODE_MAJOR_VERSION)
#define SCM_OBJCODE_MINOR_VERSION_STRING \ #define SCM_OBJCODE_MINOR_VERSION_STRING \

152
libguile/vm-i-scheme.c
View file

@ -99,12 +99,24 @@ VM_DEFINE_FUNCTION (137, listp, "list?", 1)
RETURN (scm_from_bool (scm_ilength (x) >= 0)); RETURN (scm_from_bool (scm_ilength (x) >= 0));
} }
VM_DEFINE_FUNCTION (138, symbolp, "symbol?", 1)
{
ARGS1 (x);
RETURN (scm_from_bool (scm_is_symbol (x)));
}
VM_DEFINE_FUNCTION (139, vectorp, "vector?", 1)
{
ARGS1 (x);
RETURN (scm_from_bool (SCM_I_IS_VECTOR (x)));
}
/* /*
* Basic data * Basic data
*/ */
VM_DEFINE_FUNCTION (138, cons, "cons", 2) VM_DEFINE_FUNCTION (140, cons, "cons", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
CONS (x, x, y); CONS (x, x, y);
@ -118,21 +130,21 @@ VM_DEFINE_FUNCTION (138, cons, "cons", 2)
goto vm_error_not_a_pair; \ goto vm_error_not_a_pair; \
} }
VM_DEFINE_FUNCTION (139, car, "car", 1) VM_DEFINE_FUNCTION (141, car, "car", 1)
{ {
ARGS1 (x); ARGS1 (x);
VM_VALIDATE_CONS (x, "car"); VM_VALIDATE_CONS (x, "car");
RETURN (SCM_CAR (x)); RETURN (SCM_CAR (x));
} }
VM_DEFINE_FUNCTION (140, cdr, "cdr", 1) VM_DEFINE_FUNCTION (142, cdr, "cdr", 1)
{ {
ARGS1 (x); ARGS1 (x);
VM_VALIDATE_CONS (x, "cdr"); VM_VALIDATE_CONS (x, "cdr");
RETURN (SCM_CDR (x)); RETURN (SCM_CDR (x));
} }
VM_DEFINE_INSTRUCTION (141, set_car, "set-car!", 0, 2, 0) VM_DEFINE_INSTRUCTION (143, set_car, "set-car!", 0, 2, 0)
{ {
SCM x, y; SCM x, y;
POP (y); POP (y);
@ -142,7 +154,7 @@ VM_DEFINE_INSTRUCTION (141, set_car, "set-car!", 0, 2, 0)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (142, set_cdr, "set-cdr!", 0, 2, 0) VM_DEFINE_INSTRUCTION (144, set_cdr, "set-cdr!", 0, 2, 0)
{ {
SCM x, y; SCM x, y;
POP (y); POP (y);
@ -167,27 +179,27 @@ VM_DEFINE_INSTRUCTION (142, set_cdr, "set-cdr!", 0, 2, 0)
RETURN (srel (x, y)); \ RETURN (srel (x, y)); \
} }
VM_DEFINE_FUNCTION (143, ee, "ee?", 2) VM_DEFINE_FUNCTION (145, ee, "ee?", 2)
{ {
REL (==, scm_num_eq_p); REL (==, scm_num_eq_p);
} }
VM_DEFINE_FUNCTION (144, lt, "lt?", 2) VM_DEFINE_FUNCTION (146, lt, "lt?", 2)
{ {
REL (<, scm_less_p); REL (<, scm_less_p);
} }
VM_DEFINE_FUNCTION (145, le, "le?", 2) VM_DEFINE_FUNCTION (147, le, "le?", 2)
{ {
REL (<=, scm_leq_p); REL (<=, scm_leq_p);
} }
VM_DEFINE_FUNCTION (146, gt, "gt?", 2) VM_DEFINE_FUNCTION (148, gt, "gt?", 2)
{ {
REL (>, scm_gr_p); REL (>, scm_gr_p);
} }
VM_DEFINE_FUNCTION (147, ge, "ge?", 2) VM_DEFINE_FUNCTION (149, ge, "ge?", 2)
{ {
REL (>=, scm_geq_p); REL (>=, scm_geq_p);
} }
@ -211,12 +223,12 @@ VM_DEFINE_FUNCTION (147, ge, "ge?", 2)
RETURN (SFUNC (x, y)); \ RETURN (SFUNC (x, y)); \
} }
VM_DEFINE_FUNCTION (148, add, "add", 2) VM_DEFINE_FUNCTION (150, add, "add", 2)
{ {
FUNC2 (+, scm_sum); FUNC2 (+, scm_sum);
} }
VM_DEFINE_FUNCTION (149, add1, "add1", 1) VM_DEFINE_FUNCTION (151, add1, "add1", 1)
{ {
ARGS1 (x); ARGS1 (x);
if (SCM_I_INUMP (x)) if (SCM_I_INUMP (x))
@ -229,12 +241,12 @@ VM_DEFINE_FUNCTION (149, add1, "add1", 1)
RETURN (scm_sum (x, SCM_I_MAKINUM (1))); RETURN (scm_sum (x, SCM_I_MAKINUM (1)));
} }
VM_DEFINE_FUNCTION (150, sub, "sub", 2) VM_DEFINE_FUNCTION (152, sub, "sub", 2)
{ {
FUNC2 (-, scm_difference); FUNC2 (-, scm_difference);
} }
VM_DEFINE_FUNCTION (151, sub1, "sub1", 1) VM_DEFINE_FUNCTION (153, sub1, "sub1", 1)
{ {
ARGS1 (x); ARGS1 (x);
if (SCM_I_INUMP (x)) if (SCM_I_INUMP (x))
@ -247,42 +259,42 @@ VM_DEFINE_FUNCTION (151, sub1, "sub1", 1)
RETURN (scm_difference (x, SCM_I_MAKINUM (1))); RETURN (scm_difference (x, SCM_I_MAKINUM (1)));
} }
VM_DEFINE_FUNCTION (152, mul, "mul", 2) VM_DEFINE_FUNCTION (154, mul, "mul", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
SYNC_REGISTER (); SYNC_REGISTER ();
RETURN (scm_product (x, y)); RETURN (scm_product (x, y));
} }
VM_DEFINE_FUNCTION (153, div, "div", 2) VM_DEFINE_FUNCTION (155, div, "div", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
SYNC_REGISTER (); SYNC_REGISTER ();
RETURN (scm_divide (x, y)); RETURN (scm_divide (x, y));
} }
VM_DEFINE_FUNCTION (154, quo, "quo", 2) VM_DEFINE_FUNCTION (156, quo, "quo", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
SYNC_REGISTER (); SYNC_REGISTER ();
RETURN (scm_quotient (x, y)); RETURN (scm_quotient (x, y));
} }
VM_DEFINE_FUNCTION (155, rem, "rem", 2) VM_DEFINE_FUNCTION (157, rem, "rem", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
SYNC_REGISTER (); SYNC_REGISTER ();
RETURN (scm_remainder (x, y)); RETURN (scm_remainder (x, y));
} }
VM_DEFINE_FUNCTION (156, mod, "mod", 2) VM_DEFINE_FUNCTION (158, mod, "mod", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
SYNC_REGISTER (); SYNC_REGISTER ();
RETURN (scm_modulo (x, y)); RETURN (scm_modulo (x, y));
} }
VM_DEFINE_FUNCTION (157, ash, "ash", 2) VM_DEFINE_FUNCTION (159, ash, "ash", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
if (SCM_I_INUMP (x) && SCM_I_INUMP (y)) if (SCM_I_INUMP (x) && SCM_I_INUMP (y))
@ -311,7 +323,7 @@ VM_DEFINE_FUNCTION (157, ash, "ash", 2)
RETURN (scm_ash (x, y)); RETURN (scm_ash (x, y));
} }
VM_DEFINE_FUNCTION (158, logand, "logand", 2) VM_DEFINE_FUNCTION (160, logand, "logand", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
if (SCM_I_INUMP (x) && SCM_I_INUMP (y)) if (SCM_I_INUMP (x) && SCM_I_INUMP (y))
@ -320,7 +332,7 @@ VM_DEFINE_FUNCTION (158, logand, "logand", 2)
RETURN (scm_logand (x, y)); RETURN (scm_logand (x, y));
} }
VM_DEFINE_FUNCTION (159, logior, "logior", 2) VM_DEFINE_FUNCTION (161, logior, "logior", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
if (SCM_I_INUMP (x) && SCM_I_INUMP (y)) if (SCM_I_INUMP (x) && SCM_I_INUMP (y))
@ -329,7 +341,7 @@ VM_DEFINE_FUNCTION (159, logior, "logior", 2)
RETURN (scm_logior (x, y)); RETURN (scm_logior (x, y));
} }
VM_DEFINE_FUNCTION (160, logxor, "logxor", 2) VM_DEFINE_FUNCTION (162, logxor, "logxor", 2)
{ {
ARGS2 (x, y); ARGS2 (x, y);
if (SCM_I_INUMP (x) && SCM_I_INUMP (y)) if (SCM_I_INUMP (x) && SCM_I_INUMP (y))
@ -343,7 +355,7 @@ VM_DEFINE_FUNCTION (160, logxor, "logxor", 2)
* Vectors and arrays * Vectors and arrays
*/ */
VM_DEFINE_FUNCTION (161, vector_ref, "vector-ref", 2) VM_DEFINE_FUNCTION (163, vector_ref, "vector-ref", 2)
{ {
long i = 0; long i = 0;
ARGS2 (vect, idx); ARGS2 (vect, idx);
@ -359,7 +371,7 @@ VM_DEFINE_FUNCTION (161, vector_ref, "vector-ref", 2)
} }
} }
VM_DEFINE_INSTRUCTION (162, vector_set, "vector-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (164, vector_set, "vector-set", 0, 3, 0)
{ {
long i = 0; long i = 0;
SCM vect, idx, val; SCM vect, idx, val;
@ -377,7 +389,7 @@ VM_DEFINE_INSTRUCTION (162, vector_set, "vector-set", 0, 3, 0)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (163, make_array, "make-array", 3, -1, 1) VM_DEFINE_INSTRUCTION (165, make_array, "make-array", 3, -1, 1)
{ {
scm_t_uint32 len; scm_t_uint32 len;
SCM shape, ret; SCM shape, ret;
@ -406,20 +418,20 @@ VM_DEFINE_INSTRUCTION (163, make_array, "make-array", 3, -1, 1)
goto vm_error_not_a_struct; \ goto vm_error_not_a_struct; \
} }
VM_DEFINE_FUNCTION (164, struct_p, "struct?", 1) VM_DEFINE_FUNCTION (166, struct_p, "struct?", 1)
{ {
ARGS1 (obj); ARGS1 (obj);
RETURN (scm_from_bool (SCM_STRUCTP (obj))); RETURN (scm_from_bool (SCM_STRUCTP (obj)));
} }
VM_DEFINE_FUNCTION (165, struct_vtable, "struct-vtable", 1) VM_DEFINE_FUNCTION (167, struct_vtable, "struct-vtable", 1)
{ {
ARGS1 (obj); ARGS1 (obj);
VM_VALIDATE_STRUCT (obj, "struct_vtable"); VM_VALIDATE_STRUCT (obj, "struct_vtable");
RETURN (SCM_STRUCT_VTABLE (obj)); RETURN (SCM_STRUCT_VTABLE (obj));
} }
VM_DEFINE_INSTRUCTION (166, make_struct, "make-struct", 2, -1, 1) VM_DEFINE_INSTRUCTION (168, make_struct, "make-struct", 2, -1, 1)
{ {
unsigned h = FETCH (); unsigned h = FETCH ();
unsigned l = FETCH (); unsigned l = FETCH ();
@ -452,7 +464,7 @@ VM_DEFINE_INSTRUCTION (166, make_struct, "make-struct", 2, -1, 1)
NEXT; NEXT;
} }
VM_DEFINE_FUNCTION (167, struct_ref, "struct-ref", 2) VM_DEFINE_FUNCTION (169, struct_ref, "struct-ref", 2)
{ {
ARGS2 (obj, pos); ARGS2 (obj, pos);
@ -479,7 +491,7 @@ VM_DEFINE_FUNCTION (167, struct_ref, "struct-ref", 2)
RETURN (scm_struct_ref (obj, pos)); RETURN (scm_struct_ref (obj, pos));
} }
VM_DEFINE_FUNCTION (168, struct_set, "struct-set", 3) VM_DEFINE_FUNCTION (170, struct_set, "struct-set", 3)
{ {
ARGS3 (obj, pos, val); ARGS3 (obj, pos, val);
@ -512,7 +524,7 @@ VM_DEFINE_FUNCTION (168, struct_set, "struct-set", 3)
/* /*
* GOOPS support * GOOPS support
*/ */
VM_DEFINE_FUNCTION (169, class_of, "class-of", 1) VM_DEFINE_FUNCTION (171, class_of, "class-of", 1)
{ {
ARGS1 (obj); ARGS1 (obj);
if (SCM_INSTANCEP (obj)) if (SCM_INSTANCEP (obj))
@ -521,7 +533,7 @@ VM_DEFINE_FUNCTION (169, class_of, "class-of", 1)
RETURN (scm_class_of (obj)); RETURN (scm_class_of (obj));
} }
VM_DEFINE_FUNCTION (170, slot_ref, "slot-ref", 2) VM_DEFINE_FUNCTION (172, slot_ref, "slot-ref", 2)
{ {
size_t slot; size_t slot;
ARGS2 (instance, idx); ARGS2 (instance, idx);
@ -529,7 +541,7 @@ VM_DEFINE_FUNCTION (170, slot_ref, "slot-ref", 2)
RETURN (SCM_PACK (SCM_STRUCT_DATA (instance) [slot])); RETURN (SCM_PACK (SCM_STRUCT_DATA (instance) [slot]));
} }
VM_DEFINE_INSTRUCTION (171, slot_set, "slot-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (173, slot_set, "slot-set", 0, 3, 0)
{ {
SCM instance, idx, val; SCM instance, idx, val;
size_t slot; size_t slot;
@ -574,21 +586,21 @@ VM_DEFINE_INSTRUCTION (171, slot_set, "slot-set", 0, 3, 0)
#define ALIGNED_P(ptr, type) \ #define ALIGNED_P(ptr, type) \
((scm_t_uintptr) (ptr) % alignof (type) == 0) ((scm_t_uintptr) (ptr) % alignof (type) == 0)
VM_DEFINE_FUNCTION (172, bv_u16_ref, "bv-u16-ref", 3) VM_DEFINE_FUNCTION (174, bv_u16_ref, "bv-u16-ref", 3)
BV_REF_WITH_ENDIANNESS (u16, u16) BV_REF_WITH_ENDIANNESS (u16, u16)
VM_DEFINE_FUNCTION (173, bv_s16_ref, "bv-s16-ref", 3) VM_DEFINE_FUNCTION (175, bv_s16_ref, "bv-s16-ref", 3)
BV_REF_WITH_ENDIANNESS (s16, s16) BV_REF_WITH_ENDIANNESS (s16, s16)
VM_DEFINE_FUNCTION (174, bv_u32_ref, "bv-u32-ref", 3) VM_DEFINE_FUNCTION (176, bv_u32_ref, "bv-u32-ref", 3)
BV_REF_WITH_ENDIANNESS (u32, u32) BV_REF_WITH_ENDIANNESS (u32, u32)
VM_DEFINE_FUNCTION (175, bv_s32_ref, "bv-s32-ref", 3) VM_DEFINE_FUNCTION (177, bv_s32_ref, "bv-s32-ref", 3)
BV_REF_WITH_ENDIANNESS (s32, s32) BV_REF_WITH_ENDIANNESS (s32, s32)
VM_DEFINE_FUNCTION (176, bv_u64_ref, "bv-u64-ref", 3) VM_DEFINE_FUNCTION (178, bv_u64_ref, "bv-u64-ref", 3)
BV_REF_WITH_ENDIANNESS (u64, u64) BV_REF_WITH_ENDIANNESS (u64, u64)
VM_DEFINE_FUNCTION (177, bv_s64_ref, "bv-s64-ref", 3) VM_DEFINE_FUNCTION (179, bv_s64_ref, "bv-s64-ref", 3)
BV_REF_WITH_ENDIANNESS (s64, s64) BV_REF_WITH_ENDIANNESS (s64, s64)
VM_DEFINE_FUNCTION (178, bv_f32_ref, "bv-f32-ref", 3) VM_DEFINE_FUNCTION (180, bv_f32_ref, "bv-f32-ref", 3)
BV_REF_WITH_ENDIANNESS (f32, ieee_single) BV_REF_WITH_ENDIANNESS (f32, ieee_single)
VM_DEFINE_FUNCTION (179, bv_f64_ref, "bv-f64-ref", 3) VM_DEFINE_FUNCTION (181, bv_f64_ref, "bv-f64-ref", 3)
BV_REF_WITH_ENDIANNESS (f64, ieee_double) BV_REF_WITH_ENDIANNESS (f64, ieee_double)
#undef BV_REF_WITH_ENDIANNESS #undef BV_REF_WITH_ENDIANNESS
@ -666,33 +678,33 @@ BV_REF_WITH_ENDIANNESS (f64, ieee_double)
RETURN (scm_bytevector_ ## fn_stem ## _native_ref (bv, idx)); \ RETURN (scm_bytevector_ ## fn_stem ## _native_ref (bv, idx)); \
} }
VM_DEFINE_FUNCTION (180, bv_u8_ref, "bv-u8-ref", 2) VM_DEFINE_FUNCTION (182, bv_u8_ref, "bv-u8-ref", 2)
BV_FIXABLE_INT_REF (u8, u8, uint8, 1) BV_FIXABLE_INT_REF (u8, u8, uint8, 1)
VM_DEFINE_FUNCTION (181, bv_s8_ref, "bv-s8-ref", 2) VM_DEFINE_FUNCTION (183, bv_s8_ref, "bv-s8-ref", 2)
BV_FIXABLE_INT_REF (s8, s8, int8, 1) BV_FIXABLE_INT_REF (s8, s8, int8, 1)
VM_DEFINE_FUNCTION (182, bv_u16_native_ref, "bv-u16-native-ref", 2) VM_DEFINE_FUNCTION (184, bv_u16_native_ref, "bv-u16-native-ref", 2)
BV_FIXABLE_INT_REF (u16, u16_native, uint16, 2) BV_FIXABLE_INT_REF (u16, u16_native, uint16, 2)
VM_DEFINE_FUNCTION (183, bv_s16_native_ref, "bv-s16-native-ref", 2) VM_DEFINE_FUNCTION (185, bv_s16_native_ref, "bv-s16-native-ref", 2)
BV_FIXABLE_INT_REF (s16, s16_native, int16, 2) BV_FIXABLE_INT_REF (s16, s16_native, int16, 2)
VM_DEFINE_FUNCTION (184, bv_u32_native_ref, "bv-u32-native-ref", 2) VM_DEFINE_FUNCTION (186, bv_u32_native_ref, "bv-u32-native-ref", 2)
#if SIZEOF_VOID_P > 4 #if SIZEOF_VOID_P > 4
BV_FIXABLE_INT_REF (u32, u32_native, uint32, 4) BV_FIXABLE_INT_REF (u32, u32_native, uint32, 4)
#else #else
BV_INT_REF (u32, uint32, 4) BV_INT_REF (u32, uint32, 4)
#endif #endif
VM_DEFINE_FUNCTION (185, bv_s32_native_ref, "bv-s32-native-ref", 2) VM_DEFINE_FUNCTION (187, bv_s32_native_ref, "bv-s32-native-ref", 2)
#if SIZEOF_VOID_P > 4 #if SIZEOF_VOID_P > 4
BV_FIXABLE_INT_REF (s32, s32_native, int32, 4) BV_FIXABLE_INT_REF (s32, s32_native, int32, 4)
#else #else
BV_INT_REF (s32, int32, 4) BV_INT_REF (s32, int32, 4)
#endif #endif
VM_DEFINE_FUNCTION (186, bv_u64_native_ref, "bv-u64-native-ref", 2) VM_DEFINE_FUNCTION (188, bv_u64_native_ref, "bv-u64-native-ref", 2)
BV_INT_REF (u64, uint64, 8) BV_INT_REF (u64, uint64, 8)
VM_DEFINE_FUNCTION (187, bv_s64_native_ref, "bv-s64-native-ref", 2) VM_DEFINE_FUNCTION (189, bv_s64_native_ref, "bv-s64-native-ref", 2)
BV_INT_REF (s64, int64, 8) BV_INT_REF (s64, int64, 8)
VM_DEFINE_FUNCTION (188, bv_f32_native_ref, "bv-f32-native-ref", 2) VM_DEFINE_FUNCTION (190, bv_f32_native_ref, "bv-f32-native-ref", 2)
BV_FLOAT_REF (f32, ieee_single, float, 4) BV_FLOAT_REF (f32, ieee_single, float, 4)
VM_DEFINE_FUNCTION (189, bv_f64_native_ref, "bv-f64-native-ref", 2) VM_DEFINE_FUNCTION (191, bv_f64_native_ref, "bv-f64-native-ref", 2)
BV_FLOAT_REF (f64, ieee_double, double, 8) BV_FLOAT_REF (f64, ieee_double, double, 8)
#undef BV_FIXABLE_INT_REF #undef BV_FIXABLE_INT_REF
@ -714,21 +726,21 @@ BV_FLOAT_REF (f64, ieee_double, double, 8)
} \ } \
} }
VM_DEFINE_INSTRUCTION (190, bv_u16_set, "bv-u16-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (192, bv_u16_set, "bv-u16-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (u16, u16) BV_SET_WITH_ENDIANNESS (u16, u16)
VM_DEFINE_INSTRUCTION (191, bv_s16_set, "bv-s16-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (193, bv_s16_set, "bv-s16-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (s16, s16) BV_SET_WITH_ENDIANNESS (s16, s16)
VM_DEFINE_INSTRUCTION (192, bv_u32_set, "bv-u32-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (194, bv_u32_set, "bv-u32-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (u32, u32) BV_SET_WITH_ENDIANNESS (u32, u32)
VM_DEFINE_INSTRUCTION (193, bv_s32_set, "bv-s32-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (195, bv_s32_set, "bv-s32-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (s32, s32) BV_SET_WITH_ENDIANNESS (s32, s32)
VM_DEFINE_INSTRUCTION (194, bv_u64_set, "bv-u64-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (196, bv_u64_set, "bv-u64-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (u64, u64) BV_SET_WITH_ENDIANNESS (u64, u64)
VM_DEFINE_INSTRUCTION (195, bv_s64_set, "bv-s64-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (197, bv_s64_set, "bv-s64-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (s64, s64) BV_SET_WITH_ENDIANNESS (s64, s64)
VM_DEFINE_INSTRUCTION (196, bv_f32_set, "bv-f32-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (198, bv_f32_set, "bv-f32-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (f32, ieee_single) BV_SET_WITH_ENDIANNESS (f32, ieee_single)
VM_DEFINE_INSTRUCTION (197, bv_f64_set, "bv-f64-set", 0, 4, 0) VM_DEFINE_INSTRUCTION (199, bv_f64_set, "bv-f64-set", 0, 4, 0)
BV_SET_WITH_ENDIANNESS (f64, ieee_double) BV_SET_WITH_ENDIANNESS (f64, ieee_double)
#undef BV_SET_WITH_ENDIANNESS #undef BV_SET_WITH_ENDIANNESS
@ -799,33 +811,33 @@ BV_SET_WITH_ENDIANNESS (f64, ieee_double)
NEXT; \ NEXT; \
} }
VM_DEFINE_INSTRUCTION (198, bv_u8_set, "bv-u8-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (200, bv_u8_set, "bv-u8-set", 0, 3, 0)
BV_FIXABLE_INT_SET (u8, u8, uint8, 0, SCM_T_UINT8_MAX, 1) BV_FIXABLE_INT_SET (u8, u8, uint8, 0, SCM_T_UINT8_MAX, 1)
VM_DEFINE_INSTRUCTION (199, bv_s8_set, "bv-s8-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (201, bv_s8_set, "bv-s8-set", 0, 3, 0)
BV_FIXABLE_INT_SET (s8, s8, int8, SCM_T_INT8_MIN, SCM_T_INT8_MAX, 1) BV_FIXABLE_INT_SET (s8, s8, int8, SCM_T_INT8_MIN, SCM_T_INT8_MAX, 1)
VM_DEFINE_INSTRUCTION (200, bv_u16_native_set, "bv-u16-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (202, bv_u16_native_set, "bv-u16-native-set", 0, 3, 0)
BV_FIXABLE_INT_SET (u16, u16_native, uint16, 0, SCM_T_UINT16_MAX, 2) BV_FIXABLE_INT_SET (u16, u16_native, uint16, 0, SCM_T_UINT16_MAX, 2)
VM_DEFINE_INSTRUCTION (201, bv_s16_native_set, "bv-s16-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (203, bv_s16_native_set, "bv-s16-native-set", 0, 3, 0)
BV_FIXABLE_INT_SET (s16, s16_native, int16, SCM_T_INT16_MIN, SCM_T_INT16_MAX, 2) BV_FIXABLE_INT_SET (s16, s16_native, int16, SCM_T_INT16_MIN, SCM_T_INT16_MAX, 2)
VM_DEFINE_INSTRUCTION (202, bv_u32_native_set, "bv-u32-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (204, bv_u32_native_set, "bv-u32-native-set", 0, 3, 0)
#if SIZEOF_VOID_P > 4 #if SIZEOF_VOID_P > 4
BV_FIXABLE_INT_SET (u32, u32_native, uint32, 0, SCM_T_UINT32_MAX, 4) BV_FIXABLE_INT_SET (u32, u32_native, uint32, 0, SCM_T_UINT32_MAX, 4)
#else #else
BV_INT_SET (u32, uint32, 4) BV_INT_SET (u32, uint32, 4)
#endif #endif
VM_DEFINE_INSTRUCTION (203, bv_s32_native_set, "bv-s32-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (205, bv_s32_native_set, "bv-s32-native-set", 0, 3, 0)
#if SIZEOF_VOID_P > 4 #if SIZEOF_VOID_P > 4
BV_FIXABLE_INT_SET (s32, s32_native, int32, SCM_T_INT32_MIN, SCM_T_INT32_MAX, 4) BV_FIXABLE_INT_SET (s32, s32_native, int32, SCM_T_INT32_MIN, SCM_T_INT32_MAX, 4)
#else #else
BV_INT_SET (s32, int32, 4) BV_INT_SET (s32, int32, 4)
#endif #endif
VM_DEFINE_INSTRUCTION (204, bv_u64_native_set, "bv-u64-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (206, bv_u64_native_set, "bv-u64-native-set", 0, 3, 0)
BV_INT_SET (u64, uint64, 8) BV_INT_SET (u64, uint64, 8)
VM_DEFINE_INSTRUCTION (205, bv_s64_native_set, "bv-s64-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (207, bv_s64_native_set, "bv-s64-native-set", 0, 3, 0)
BV_INT_SET (s64, int64, 8) BV_INT_SET (s64, int64, 8)
VM_DEFINE_INSTRUCTION (206, bv_f32_native_set, "bv-f32-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (208, bv_f32_native_set, "bv-f32-native-set", 0, 3, 0)
BV_FLOAT_SET (f32, ieee_single, float, 4) BV_FLOAT_SET (f32, ieee_single, float, 4)
VM_DEFINE_INSTRUCTION (207, bv_f64_native_set, "bv-f64-native-set", 0, 3, 0) VM_DEFINE_INSTRUCTION (209, bv_f64_native_set, "bv-f64-native-set", 0, 3, 0)
BV_FLOAT_SET (f64, ieee_double, double, 8) BV_FLOAT_SET (f64, ieee_double, double, 8)
#undef BV_FIXABLE_INT_SET #undef BV_FIXABLE_INT_SET

184
libguile/vm-i-system.c
View file

@ -61,13 +61,13 @@ VM_DEFINE_INSTRUCTION (1, halt, "halt", 0, 0, 0)
goto vm_done; goto vm_done;
} }
VM_DEFINE_INSTRUCTION (3, drop, "drop", 0, 1, 0) VM_DEFINE_INSTRUCTION (2, drop, "drop", 0, 1, 0)
{ {
DROP (); DROP ();
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (4, dup, "dup", 0, 0, 1) VM_DEFINE_INSTRUCTION (3, dup, "dup", 0, 0, 1)
{ {
SCM x = *sp; SCM x = *sp;
PUSH (x); PUSH (x);
@ -79,55 +79,55 @@ VM_DEFINE_INSTRUCTION (4, dup, "dup", 0, 0, 1)
* Object creation * Object creation
*/ */
VM_DEFINE_INSTRUCTION (5, void, "void", 0, 0, 1) VM_DEFINE_INSTRUCTION (4, void, "void", 0, 0, 1)
{ {
PUSH (SCM_UNSPECIFIED); PUSH (SCM_UNSPECIFIED);
NEXT; 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); PUSH (SCM_BOOL_T);
NEXT; 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); PUSH (SCM_BOOL_F);
NEXT; 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); PUSH (SCM_ELISP_NIL);
NEXT; 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); PUSH (SCM_EOL);
NEXT; 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 ())); PUSH (SCM_I_MAKINUM ((signed char) FETCH ()));
NEXT; 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); PUSH (SCM_INUM0);
NEXT; 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)); PUSH (SCM_I_MAKINUM (1));
NEXT; 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 h = FETCH ();
int l = FETCH (); int l = FETCH ();
@ -135,7 +135,7 @@ VM_DEFINE_INSTRUCTION (13, make_int16, "make-int16", 2, 0, 1)
NEXT; 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; scm_t_uint64 v = 0;
v += FETCH (); v += FETCH ();
@ -150,7 +150,7 @@ VM_DEFINE_INSTRUCTION (14, make_int64, "make-int64", 8, 0, 1)
NEXT; 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; scm_t_uint64 v = 0;
v += FETCH (); v += FETCH ();
@ -165,7 +165,7 @@ VM_DEFINE_INSTRUCTION (15, make_uint64, "make-uint64", 8, 0, 1)
NEXT; 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; scm_t_uint8 v = 0;
v = FETCH (); v = FETCH ();
@ -177,7 +177,7 @@ VM_DEFINE_INSTRUCTION (16, make_char8, "make-char8", 1, 0, 1)
NEXT; 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; scm_t_wchar v = 0;
v += FETCH (); 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 h = FETCH ();
unsigned l = FETCH (); unsigned l = FETCH ();
@ -199,7 +199,7 @@ VM_DEFINE_INSTRUCTION (18, list, "list", 2, -1, 1)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (19, vector, "vector", 2, -1, 1) VM_DEFINE_INSTRUCTION (18, vector, "vector", 2, -1, 1)
{ {
unsigned h = FETCH (); unsigned h = FETCH ();
unsigned l = FETCH (); unsigned l = FETCH ();
@ -239,7 +239,7 @@ VM_DEFINE_INSTRUCTION (19, vector, "vector", 2, -1, 1)
/* ref */ /* 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 (); register unsigned objnum = FETCH ();
CHECK_OBJECT (objnum); 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... */ /* 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 (); unsigned int objnum = FETCH ();
objnum <<= 8; objnum <<= 8;
@ -258,14 +258,14 @@ VM_DEFINE_INSTRUCTION (21, long_object_ref, "long-object-ref", 2, 0, 1)
NEXT; 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 ())); PUSH (LOCAL_REF (FETCH ()));
ASSERT_BOUND (*sp); ASSERT_BOUND (*sp);
NEXT; 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 (); unsigned int i = FETCH ();
i <<= 8; i <<= 8;
@ -275,7 +275,7 @@ VM_DEFINE_INSTRUCTION (23, long_local_ref, "long-local-ref", 2, 0, 1)
NEXT; 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) if (LOCAL_REF (FETCH ()) == SCM_UNDEFINED)
PUSH (SCM_BOOL_F); PUSH (SCM_BOOL_F);
@ -284,7 +284,7 @@ VM_DEFINE_INSTRUCTION (24, local_bound, "local-bound?", 1, 0, 1)
NEXT; 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 (); unsigned int i = FETCH ();
i <<= 8; i <<= 8;
@ -296,7 +296,7 @@ VM_DEFINE_INSTRUCTION (25, long_local_bound, "long-local-bound?", 2, 0, 1)
NEXT; 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; SCM x = *sp;
@ -318,7 +318,7 @@ VM_DEFINE_INSTRUCTION (26, variable_ref, "variable-ref", 0, 1, 1)
NEXT; 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)) if (VARIABLE_BOUNDP (*sp))
*sp = SCM_BOOL_T; *sp = SCM_BOOL_T;
@ -327,7 +327,7 @@ VM_DEFINE_INSTRUCTION (27, variable_bound, "variable-bound?", 0, 1, 1)
NEXT; 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 (); unsigned objnum = FETCH ();
SCM what; SCM what;
@ -350,7 +350,7 @@ VM_DEFINE_INSTRUCTION (28, toplevel_ref, "toplevel-ref", 1, 0, 1)
NEXT; 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; SCM what;
unsigned int objnum = FETCH (); unsigned int objnum = FETCH ();
@ -377,14 +377,14 @@ VM_DEFINE_INSTRUCTION (29, long_toplevel_ref, "long-toplevel-ref", 2, 0, 1)
/* set */ /* 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); LOCAL_SET (FETCH (), *sp);
DROP (); DROP ();
NEXT; 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 (); unsigned int i = FETCH ();
i <<= 8; i <<= 8;
@ -394,14 +394,14 @@ VM_DEFINE_INSTRUCTION (31, long_local_set, "long-local-set", 2, 1, 0)
NEXT; 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]); VARIABLE_SET (sp[0], sp[-1]);
DROPN (2); DROPN (2);
NEXT; 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 (); unsigned objnum = FETCH ();
SCM what; SCM what;
@ -420,7 +420,7 @@ VM_DEFINE_INSTRUCTION (33, toplevel_set, "toplevel-set", 1, 1, 0)
NEXT; 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; SCM what;
unsigned int objnum = FETCH (); unsigned int objnum = FETCH ();
@ -468,7 +468,7 @@ VM_DEFINE_INSTRUCTION (34, long_toplevel_set, "long-toplevel-set", 2, 1, 0)
NEXT; \ NEXT; \
} }
VM_DEFINE_INSTRUCTION (35, br, "br", 3, 0, 0) VM_DEFINE_INSTRUCTION (34, br, "br", 3, 0, 0)
{ {
scm_t_int32 offset; scm_t_int32 offset;
FETCH_OFFSET (offset); FETCH_OFFSET (offset);
@ -478,34 +478,34 @@ VM_DEFINE_INSTRUCTION (35, br, "br", 3, 0, 0)
NEXT; 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)); 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)); 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? */ sp--; /* underflow? */
BR (scm_is_eq (sp[0], sp[1])); 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? */ sp--; /* underflow? */
BR (!scm_is_eq (sp[0], sp[1])); 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)); 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)); 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 * 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_ptrdiff n;
scm_t_int32 offset; scm_t_int32 offset;
@ -527,7 +527,7 @@ VM_DEFINE_INSTRUCTION (42, br_if_nargs_ne, "br-if-nargs-ne", 5, 0, 0)
NEXT; 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_ptrdiff n;
scm_t_int32 offset; scm_t_int32 offset;
@ -539,7 +539,7 @@ VM_DEFINE_INSTRUCTION (43, br_if_nargs_lt, "br-if-nargs-lt", 5, 0, 0)
NEXT; 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_ptrdiff n;
scm_t_int32 offset; scm_t_int32 offset;
@ -552,7 +552,7 @@ VM_DEFINE_INSTRUCTION (44, br_if_nargs_gt, "br-if-nargs-gt", 5, 0, 0)
NEXT; 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; scm_t_ptrdiff n;
n = FETCH () << 8; n = FETCH () << 8;
@ -562,7 +562,7 @@ VM_DEFINE_INSTRUCTION (45, assert_nargs_ee, "assert-nargs-ee", 2, 0, 0)
NEXT; 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; scm_t_ptrdiff n;
n = FETCH () << 8; n = FETCH () << 8;
@ -572,7 +572,7 @@ VM_DEFINE_INSTRUCTION (46, assert_nargs_ge, "assert-nargs-ge", 2, 0, 0)
NEXT; 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; scm_t_ptrdiff n;
n = FETCH () << 8; n = FETCH () << 8;
@ -582,7 +582,7 @@ VM_DEFINE_INSTRUCTION (47, bind_optionals, "bind-optionals", 2, -1, -1)
NEXT; 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 *walk;
scm_t_ptrdiff nreq, nreq_and_opt, ntotal; 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_ALLOW_OTHER_KEYS 1
#define F_REST 2 #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_uint16 idx;
scm_t_ptrdiff nkw; scm_t_ptrdiff nkw;
@ -678,7 +678,7 @@ VM_DEFINE_INSTRUCTION (49, bind_kwargs, "bind-kwargs", 5, 0, 0)
#undef F_REST #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_t_ptrdiff n;
SCM rest = SCM_EOL; SCM rest = SCM_EOL;
@ -691,7 +691,7 @@ VM_DEFINE_INSTRUCTION (50, push_rest, "push-rest", 2, -1, -1)
NEXT; 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_ptrdiff n;
scm_t_uint32 i; scm_t_uint32 i;
@ -707,7 +707,7 @@ VM_DEFINE_INSTRUCTION (51, bind_rest, "bind-rest", 4, -1, -1)
NEXT; 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 *old_sp;
scm_t_int32 n; scm_t_int32 n;
@ -728,7 +728,7 @@ VM_DEFINE_INSTRUCTION (52, reserve_locals, "reserve-locals", 2, -1, -1)
NEXT; 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 */ /* NB: if you change this, see frames.c:vm-frame-num-locals */
/* and frames.h, vm-engine.c, etc of course */ /* 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; NEXT;
} }
VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1) VM_DEFINE_INSTRUCTION (53, call, "call", 1, -1, 1)
{ {
nargs = FETCH (); nargs = FETCH ();
@ -777,7 +777,7 @@ VM_DEFINE_INSTRUCTION (54, call, "call", 1, -1, 1)
NEXT; 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 (); 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 pointer, ret;
SCM (*subr)(); 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 smob, ret;
SCM (*subr)(); 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; SCM foreign, ret;
nargs = FETCH (); 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; SCM contregs;
POP (contregs); POP (contregs);
@ -988,7 +988,7 @@ VM_DEFINE_INSTRUCTION (89, continuation_call, "continuation-call", 0, -1, 0)
abort (); 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; SCM vmcont, intwinds, prevwinds;
POP (intwinds); POP (intwinds);
@ -1016,7 +1016,7 @@ VM_DEFINE_INSTRUCTION (94, partial_cont_call, "partial-cont-call", 0, -1, 0)
NEXT; 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; SCM x;
POP (x); POP (x);
@ -1025,7 +1025,7 @@ VM_DEFINE_INSTRUCTION (59, tail_call_nargs, "tail-call/nargs", 0, 0, 1)
goto vm_tail_call; 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; SCM x;
POP (x); POP (x);
@ -1034,7 +1034,7 @@ VM_DEFINE_INSTRUCTION (60, call_nargs, "call/nargs", 0, 0, 1)
goto vm_call; 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_int32 offset;
scm_t_uint8 *mvra; scm_t_uint8 *mvra;
@ -1078,7 +1078,7 @@ VM_DEFINE_INSTRUCTION (61, mv_call, "mv-call", 4, -1, 1)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (62, apply, "apply", 1, -1, 1) VM_DEFINE_INSTRUCTION (63, apply, "apply", 1, -1, 1)
{ {
int len; int len;
SCM ls; SCM ls;
@ -1100,7 +1100,7 @@ VM_DEFINE_INSTRUCTION (62, apply, "apply", 1, -1, 1)
goto vm_call; 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; int len;
SCM ls; SCM ls;
@ -1122,7 +1122,7 @@ VM_DEFINE_INSTRUCTION (63, tail_apply, "tail-apply", 1, -1, 1)
goto vm_tail_call; 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; int first;
SCM proc, vm_cont, cont; 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; int first;
SCM proc, vm_cont, cont; 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: vm_return:
POP_CONTINUATION_HOOK (1); POP_CONTINUATION_HOOK (1);
@ -1233,7 +1233,7 @@ VM_DEFINE_INSTRUCTION (66, return, "return", 0, 1, 1)
NEXT; 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 /* 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. */ 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; 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; SCM l;
@ -1312,7 +1312,7 @@ VM_DEFINE_INSTRUCTION (68, return_values_star, "return/values*", 1, -1, -1)
goto vm_return_values; 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; SCM n;
POP (n); POP (n);
@ -1321,7 +1321,7 @@ VM_DEFINE_INSTRUCTION (88, return_nvalues, "return/nvalues", 0, 1, -1)
goto vm_return_values; 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; SCM x;
int nbinds, rest; int nbinds, rest;
@ -1344,7 +1344,7 @@ VM_DEFINE_INSTRUCTION (69, truncate_values, "truncate-values", 2, -1, -1)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (70, box, "box", 1, 1, 0) VM_DEFINE_INSTRUCTION (72, box, "box", 1, 1, 0)
{ {
SCM val; SCM val;
POP (val); POP (val);
@ -1358,7 +1358,7 @@ VM_DEFINE_INSTRUCTION (70, box, "box", 1, 1, 0)
(set! a (lambda () (b ...))) (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 (); SYNC_BEFORE_GC ();
LOCAL_SET (FETCH (), LOCAL_SET (FETCH (),
@ -1366,7 +1366,7 @@ VM_DEFINE_INSTRUCTION (71, empty_box, "empty-box", 1, 0, 0)
NEXT; 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 ()); SCM v = LOCAL_REF (FETCH ());
ASSERT_BOUND_VARIABLE (v); ASSERT_BOUND_VARIABLE (v);
@ -1374,7 +1374,7 @@ VM_DEFINE_INSTRUCTION (72, local_boxed_ref, "local-boxed-ref", 1, 0, 1)
NEXT; 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; SCM v, val;
v = LOCAL_REF (FETCH ()); v = LOCAL_REF (FETCH ());
@ -1384,7 +1384,7 @@ VM_DEFINE_INSTRUCTION (73, local_boxed_set, "local-boxed-set", 1, 1, 0)
NEXT; 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 (); 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 */ /* 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 v;
scm_t_uint8 idx = FETCH (); scm_t_uint8 idx = FETCH ();
@ -1406,7 +1406,7 @@ VM_DEFINE_INSTRUCTION (75, free_boxed_ref, "free-boxed-ref", 1, 0, 1)
NEXT; 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 v, val;
scm_t_uint8 idx = FETCH (); scm_t_uint8 idx = FETCH ();
@ -1418,7 +1418,7 @@ VM_DEFINE_INSTRUCTION (76, free_boxed_set, "free-boxed-set", 1, 1, 0)
NEXT; 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; size_t n, len;
SCM closure; SCM closure;
@ -1437,7 +1437,7 @@ VM_DEFINE_INSTRUCTION (77, make_closure, "make-closure", 2, -1, 1)
NEXT; 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 (); SYNC_BEFORE_GC ();
/* fixme underflow */ /* fixme underflow */
@ -1445,7 +1445,7 @@ VM_DEFINE_INSTRUCTION (78, make_variable, "make-variable", 0, 0, 1)
NEXT; 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; SCM x;
unsigned int i = FETCH (); unsigned int i = FETCH ();
@ -1462,7 +1462,7 @@ VM_DEFINE_INSTRUCTION (79, fix_closure, "fix-closure", 2, -1, 0)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (80, define, "define", 0, 0, 2) VM_DEFINE_INSTRUCTION (82, define, "define", 0, 0, 2)
{ {
SCM sym, val; SCM sym, val;
POP (sym); POP (sym);
@ -1474,7 +1474,7 @@ VM_DEFINE_INSTRUCTION (80, define, "define", 0, 0, 2)
NEXT; 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 (); CHECK_UNDERFLOW ();
SYNC_REGISTER (); SYNC_REGISTER ();
@ -1482,7 +1482,7 @@ VM_DEFINE_INSTRUCTION (81, make_keyword, "make-keyword", 0, 1, 1)
NEXT; 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 (); CHECK_UNDERFLOW ();
SYNC_REGISTER (); SYNC_REGISTER ();
@ -1490,7 +1490,7 @@ VM_DEFINE_INSTRUCTION (82, make_symbol, "make-symbol", 0, 1, 1)
NEXT; 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_int32 offset;
scm_t_uint8 escape_only_p; scm_t_uint8 escape_only_p;
@ -1528,7 +1528,7 @@ VM_DEFINE_INSTRUCTION (83, prompt, "prompt", 4, 2, 0)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (85, wind, "wind", 0, 2, 0) VM_DEFINE_INSTRUCTION (86, wind, "wind", 0, 2, 0)
{ {
SCM wind, unwind; SCM wind, unwind;
POP (unwind); POP (unwind);
@ -1551,7 +1551,7 @@ VM_DEFINE_INSTRUCTION (85, wind, "wind", 0, 2, 0)
NEXT; NEXT;
} }
VM_DEFINE_INSTRUCTION (86, abort, "abort", 1, -1, -1) VM_DEFINE_INSTRUCTION (87, abort, "abort", 1, -1, -1)
{ {
unsigned n = FETCH (); unsigned n = FETCH ();
SYNC_REGISTER (); SYNC_REGISTER ();
@ -1562,7 +1562,7 @@ VM_DEFINE_INSTRUCTION (86, abort, "abort", 1, -1, -1)
abort (); 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 /* A normal exit from the dynamic extent of an expression. Pop the top entry
off of the dynamic stack. */ off of the dynamic stack. */
@ -1570,7 +1570,7 @@ VM_DEFINE_INSTRUCTION (87, unwind, "unwind", 0, 0, 0)
NEXT; 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 (); unsigned n = FETCH ();
SCM wf; SCM wf;
@ -1585,7 +1585,7 @@ VM_DEFINE_INSTRUCTION (90, wind_fluids, "wind-fluids", 1, -1, 0)
NEXT; 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; SCM wf;
wf = scm_car (scm_i_dynwinds ()); wf = scm_car (scm_i_dynwinds ());
@ -1594,7 +1594,7 @@ VM_DEFINE_INSTRUCTION (91, unwind_fluids, "unwind-fluids", 0, 0, 0)
NEXT; 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; size_t num;
SCM fluids; SCM fluids;
@ -1614,7 +1614,7 @@ VM_DEFINE_INSTRUCTION (92, fluid_ref, "fluid-ref", 0, 1, 1)
NEXT; 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; size_t num;
SCM val, fluid, fluids; SCM val, fluid, fluids;
@ -1635,7 +1635,7 @@ VM_DEFINE_INSTRUCTION (93, fluid_set, "fluid-set", 0, 2, 0)
NEXT; 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_t_ptrdiff n;
SCM *old_sp; SCM *old_sp;

8
module/ice-9/psyntax.scm
View file

@ -554,8 +554,12 @@
((_ type value) (cons type value)) ((_ type value) (cons type value))
((_ 'type) '(type)) ((_ 'type) '(type))
((_ type) (cons type '())))) ((_ type) (cons type '()))))
(define binding-type car) (define-syntax binding-type
(define binding-value cdr) (syntax-rules ()
((_ x) (car x))))
(define-syntax binding-value
(syntax-rules ()
((_ x) (cdr x))))
(define-syntax null-env (identifier-syntax '())) (define-syntax null-env (identifier-syntax '()))

2
module/language/tree-il/compile-glil.scm
View file

@ -105,6 +105,8 @@
((set-cdr! . 2) . set-cdr!) ((set-cdr! . 2) . set-cdr!)
((null? . 1) . null?) ((null? . 1) . null?)
((list? . 1) . list?) ((list? . 1) . list?)
((symbol? . 1) . symbol?)
((vector? . 1) . vector?)
(list . list) (list . list)
(vector . vector) (vector . vector)
((class-of . 1) . class-of) ((class-of . 1) . class-of)

6
module/language/tree-il/primitives.scm
View file

@ -43,7 +43,7 @@
+ * - / 1- 1+ quotient remainder modulo + * - / 1- 1+ quotient remainder modulo
ash logand logior logxor ash logand logior logxor
not not
pair? null? list? acons cons cons* pair? null? list? symbol? vector? acons cons cons*
list vector list vector
@ -112,7 +112,7 @@
= < > <= >= zero? = < > <= >= zero?
+ * - / 1- 1+ quotient remainder modulo + * - / 1- 1+ quotient remainder modulo
not not
pair? null? list? acons cons cons* pair? null? list? symbol? vector? acons cons cons*
list vector list vector
car cdr car cdr
caar cadr cdar cddr caar cadr cdar cddr
@ -137,7 +137,7 @@
'(values '(values
eq? eqv? equal? eq? eqv? equal?
not not
pair? null? list? acons cons cons* pair? null? list? symbol? vector? acons cons cons*
list vector list vector
struct?)) struct?))