summaryrefslogtreecommitdiff
path: root/libguile/vm-engine.c
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2018-01-22 07:49:19 +0100
committerAndy Wingo <wingo@pobox.com>2018-01-22 07:51:36 +0100
commitb09bbfe3c082548347125c0da52104c5bb8049e3 (patch)
tree2af169fce06684ad9d056ae0acd4c964c3dbefa2 /libguile/vm-engine.c
parentfcea9eeabd6adf144f7b6d8d7aa78e7ae42f9912 (diff)
downloadguile-b09bbfe3c082548347125c0da52104c5bb8049e3.tar.gz
Remove free-ref, free-set!
* libguile/vm-engine.c (free-ref, free-set!): Remove ops. * module/language/cps/effects-analysis.scm: * module/system/vm/assembler.scm: * module/system/vm/disassembler.scm (code-annotation): * module/language/cps/compile-bytecode.scm (compile-function): Remove support for free-ref / free-set!.
Diffstat (limited to 'libguile/vm-engine.c')
-rw-r--r--libguile/vm-engine.c33
1 files changed, 4 insertions, 29 deletions
diff --git a/libguile/vm-engine.c b/libguile/vm-engine.c
index 61fb38967..63f4b895e 100644
--- a/libguile/vm-engine.c
+++ b/libguile/vm-engine.c
@@ -322,8 +322,6 @@
VM_VALIDATE (x, SCM_CHARP, proc, char)
#define VM_VALIDATE_STRING(obj, proc) \
VM_VALIDATE (obj, scm_is_string, proc, string)
-#define VM_VALIDATE_VARIABLE(obj, proc) \
- VM_VALIDATE (obj, SCM_VARIABLEP, proc, variable)
#define VM_VALIDATE_INDEX(u64, size, proc) \
VM_ASSERT (u64 < size, vm_error_out_of_range_uint64 (proc, u64))
@@ -1536,34 +1534,11 @@ VM_NAME (scm_i_thread *thread, struct scm_vm *vp,
NEXT (3);
}
- /* free-ref dst:12 src:12 _:8 idx:24
- *
- * Load free variable IDX from the closure SRC into local slot DST.
- */
- VM_DEFINE_OP (55, free_ref, "free-ref", OP2 (X8_S12_S12, X8_C24) | OP_DST)
+ VM_DEFINE_OP (55, unused_55, NULL, NOP)
+ VM_DEFINE_OP (56, unused_56, NULL, NOP)
{
- scm_t_uint16 dst, src;
- scm_t_uint32 idx;
- UNPACK_12_12 (op, dst, src);
- UNPACK_24 (ip[1], idx);
- /* CHECK_FREE_VARIABLE (src); */
- SP_SET (dst, SCM_PROGRAM_FREE_VARIABLE_REF (SP_REF (src), idx));
- NEXT (2);
- }
-
- /* free-set! dst:12 src:12 _:8 idx:24
- *
- * Set free variable IDX from the closure DST to SRC.
- */
- VM_DEFINE_OP (56, free_set, "free-set!", OP2 (X8_S12_S12, X8_C24))
- {
- scm_t_uint16 dst, src;
- scm_t_uint32 idx;
- UNPACK_12_12 (op, dst, src);
- UNPACK_24 (ip[1], idx);
- /* CHECK_FREE_VARIABLE (src); */
- SCM_PROGRAM_FREE_VARIABLE_SET (SP_REF (dst), idx, SP_REF (src));
- NEXT (2);
+ vm_error_bad_instruction (op);
+ abort (); /* never reached */
}