diff options
| -rw-r--r-- | share/txr/stdlib/asm.tl | 12 | ||||
| -rw-r--r-- | vm.c | 12 |
2 files changed, 12 insertions, 12 deletions
diff --git a/share/txr/stdlib/asm.tl b/share/txr/stdlib/asm.tl index 0efcecb7..34eeed45 100644 --- a/share/txr/stdlib/asm.tl +++ b/share/txr/stdlib/asm.tl @@ -598,9 +598,9 @@ (defopcode op-getv getv auto (:method asm (me asm syntax) me.(chk-arg-count 2 syntax) - (tree-bind (reg name) asm.(parse-args me syntax '(ds r)) - asm.(put-insn me.code reg name))) - (:method dis (me asm reg name) + (tree-bind (reg name) asm.(parse-args me syntax '(d rs)) + asm.(put-insn me.code name reg))) + (:method dis (me asm name reg) ^(,me.symbol ,(operand-to-sym reg) ,(operand-to-sym name)))) (defopcode-derived op-getf getf auto op-getv) @@ -616,9 +616,9 @@ (defopcode op-setv setv auto (:method asm (me asm syntax) me.(chk-arg-count 2 syntax) - (tree-bind (reg name) asm.(parse-args me syntax '(rs r)) - asm.(put-insn me.code reg name))) - (:method dis (me asm reg name) + (tree-bind (reg name) asm.(parse-args me syntax '(r rs)) + asm.(put-insn me.code name reg))) + (:method dis (me asm name reg) ^(,me.symbol ,(operand-to-sym reg) ,(operand-to-sym name)))) (defopcode-derived op-setl1 setl1 auto op-setv) @@ -707,7 +707,7 @@ static val vm_get_binding(struct vm *vm, vm_word_t insn, val (*lookup_fn)(val env, val sym), val kind_str) { - val sym = vm_get(vm->dspl, vm_insn_operand(insn)); + val sym = vm_get(vm->dspl, vm_insn_extra(insn)); val binding = lookup_fn(nil, sym); if (nilp(binding)) @@ -721,7 +721,7 @@ static void vm_getsym(struct vm *vm, vm_word_t insn, val kind_str) { val binding = vm_get_binding(vm, insn, lookup_fn, kind_str); - int dst = vm_insn_extra(insn); + unsigned dst = vm_insn_operand(insn); vm_set(vm->dspl, dst, cdr(binding)); } @@ -730,7 +730,7 @@ static void vm_getbind(struct vm *vm, vm_word_t insn, val kind_str) { val binding = vm_get_binding(vm, insn, lookup_fn, kind_str); - int dst = vm_insn_extra(insn); + unsigned dst = vm_insn_operand(insn); vm_set(vm->dspl, dst, binding); } @@ -739,14 +739,14 @@ static void vm_setsym(struct vm *vm, vm_word_t insn, val kind_str) { val binding = vm_get_binding(vm, insn, lookup_fn, kind_str); - int src = vm_insn_extra(insn); + unsigned src = vm_insn_operand(insn); rplacd(binding, vm_get(vm->dspl, src)); } static void vm_bindv(struct vm *vm, vm_word_t insn) { - val sym = vm_get(vm->dspl, vm_insn_operand(insn)); - int src = vm_insn_extra(insn); + val sym = vm_get(vm->dspl, vm_insn_extra(insn)); + int src = vm_insn_operand(insn); if (nilp(dyn_env)) eval_error(vm->vd->bytecode, |