diff options
author | Andy Wingo <wingo@pobox.com> | 2017-11-14 10:41:24 +0100 |
---|---|---|
committer | Andy Wingo <wingo@pobox.com> | 2017-11-15 14:18:39 +0100 |
commit | 294dbaad35e139427ecbfffa7b02f0a2ee037b9b (patch) | |
tree | 33147ae03d436aab390dbb0314694f809c717a48 /libguile/vm-engine.c | |
parent | 4a0a930f1c6f3d34bbd5bd9877042de368b9c196 (diff) | |
download | guile-294dbaad35e139427ecbfffa7b02f0a2ee037b9b.tar.gz |
Add support for comparisons against integer immediates
* libguile/vm-engine.c (s64-imm=?, u64-imm<?, imm-u64<?, s64-imm<?)
(imm-s64<?): New instructions.
* libguile/instructions.c (FOR_EACH_INSTRUCTION_WORD_TYPE): Add new
X8_S12_Z12 word type used by the new S64/immediate instructions. A
Z12 is a 12-bit signed integer immediate.
* module/system/vm/assembler.scm: Export new instructions, and add
X8_S12_Z12 support. Also, add missing shufflers for X8_S12_C12.
* module/language/bytecode.scm (compute-instruction-arity):
* module/system/vm/disassembler.scm (unpack-s12, disassembler): Add
support for X8_S12_Z12.
* module/language/cps/types.scm (define-predicate-inferrer/param): New
helper.
(u64-=, u64-<, s64-<): Remove type checkers; this procedure does not
cause &type-check.
(u64-imm=?, s64-imm=?, u64-imm<?, imm-u64<?, s64-imm<?, imm-s64<?):
New type inferrers.
* module/language/cps/type-fold.scm (define-unary-branch-folder*): New
helper.
(u64-imm=?, s64-imm=?, u64-imm<?, imm-u64<?, s64-imm<?, imm-s64<?):
New branch folders.
* module/language/cps/reify-primitives.scm (reify-primitives): Reify
constants for new immediate branching primcalls if values out of
range.
* module/language/cps/effects-analysis.scm: Add support for new
primcalls.
* module/language/cps/compile-bytecode.scm (compile-function): Add
support for new primcalls and instructions. Compile u64-imm-= to
s64-imm=?.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r-- | libguile/vm-engine.c | 76 |
1 files changed, 71 insertions, 5 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c index a70f78a1c..e07bf46e5 100644 --- a/libguile/vm-engine.c +++ b/libguile/vm-engine.c @@ -4100,11 +4100,77 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp, NEXT (1); } - VM_DEFINE_OP (218, unused_218, NULL, NOP) - VM_DEFINE_OP (219, unused_219, NULL, NOP) - VM_DEFINE_OP (220, unused_220, NULL, NOP) - VM_DEFINE_OP (221, unused_221, NULL, NOP) - VM_DEFINE_OP (222, unused_222, NULL, NOP) + VM_DEFINE_OP (218, s64_imm_numerically_equal, "s64-imm=?", OP1 (X8_S12_Z12)) + { + scm_t_uint16 a; + scm_t_int64 x, y; + + a = (op >> 8) & 0xfff; + x = SP_REF_S64 (a); + + y = ((scm_t_int32) op) >> 20; /* Sign extension. */ + + vp->compare_result = x == y ? SCM_F_COMPARE_EQUAL : SCM_F_COMPARE_NONE; + + NEXT (1); + } + + VM_DEFINE_OP (219, u64_imm_less, "u64-imm<?", OP1 (X8_S12_C12)) + { + scm_t_uint16 a; + scm_t_uint64 x, y; + + UNPACK_12_12 (op, a, y); + x = SP_REF_U64 (a); + + vp->compare_result = x < y ? SCM_F_COMPARE_LESS_THAN : SCM_F_COMPARE_NONE; + + NEXT (1); + } + + VM_DEFINE_OP (220, imm_u64_less, "imm-u64<?", OP1 (X8_S12_C12)) + { + scm_t_uint16 a; + scm_t_uint64 x, y; + + UNPACK_12_12 (op, a, x); + y = SP_REF_U64 (a); + + vp->compare_result = x < y ? SCM_F_COMPARE_LESS_THAN : SCM_F_COMPARE_NONE; + + NEXT (1); + } + + VM_DEFINE_OP (221, s64_imm_less, "s64-imm<?", OP1 (X8_S12_Z12)) + { + scm_t_uint16 a; + scm_t_int64 x, y; + + a = (op >> 8) & 0xfff; + x = SP_REF_S64 (a); + + y = ((scm_t_int32) op) >> 20; /* Sign extension. */ + + vp->compare_result = x < y ? SCM_F_COMPARE_LESS_THAN : SCM_F_COMPARE_NONE; + + NEXT (1); + } + + VM_DEFINE_OP (222, imm_s64_less, "imm-s64<?", OP1 (X8_S12_Z12)) + { + scm_t_uint16 a; + scm_t_int64 x, y; + + a = (op >> 8) & 0xfff; + y = SP_REF_S64 (a); + + x = ((scm_t_int32) op) >> 20; /* Sign extension. */ + + vp->compare_result = x < y ? SCM_F_COMPARE_LESS_THAN : SCM_F_COMPARE_NONE; + + NEXT (1); + } + VM_DEFINE_OP (223, unused_223, NULL, NOP) VM_DEFINE_OP (224, unused_224, NULL, NOP) VM_DEFINE_OP (225, unused_225, NULL, NOP) |