ref: 5666cf949d500e9832c6bd08c381497775eb253f
parent: c6cf65a38062ddc38a3703f2239f2bdb657d9011
author: Sigrid Solveig Haflínudóttir <sigrid@ftrv.se>
date: Sun Feb 9 23:24:00 EST 2025
l(v)argc -> (v)argc.l for consistency
binary files a/boot/flisp.boot.builtin b/boot/flisp.boot.builtin differ
--- a/src/compiler.lsp
+++ b/src/compiler.lsp
@@ -119,7 +119,7 @@
((number? nxt)
(case vi
((loadv.l loadg.l setg.l loada.l seta.l
- largc lvargc call.l tcall.l loadc.l box.l)
+ argc.l vargc.l call.l tcall.l loadc.l box.l)
(io-write bcode (int32 nxt))
(set! i (+ i 1)))
@@ -727,7 +727,7 @@
(if atail (- nargs) nargs))))
(emit-optional-arg-inits g env opta vars nreq))
- (cond ((> nargs 255) (emit g (if atail 'lvargc 'largc) nargs))
+ (cond ((> nargs 255) (emit g (if atail 'vargc.l 'argc.l) nargs))
(atail (emit g 'vargc nargs))
((not opta) (emit g 'argc nargs)))
@@ -803,7 +803,7 @@
(princ (number->string (+ (aref code i) (if (eq? inst 'aref) 3 0))))
(set! i (+ i 1)))
- ((loada.l seta.l loadc.l largc lvargc call.l tcall.l box.l)
+ ((loada.l seta.l loadc.l argc.l vargc.l call.l tcall.l box.l)
(print-inst inst i 4)
(princ (number->string (ref-int32-LE code i)))
(set! i (+ i 4)))
--- a/src/maxstack.inc
+++ b/src/maxstack.inc
@@ -44,7 +44,7 @@
case OP_LOADVL: case OP_LOADGL: case OP_LOADAL:
sp++; // fallthrough
- case OP_SETGL: case OP_SETAL: case OP_LARGC: case OP_BOXL:
+ case OP_SETGL: case OP_SETAL: case OP_ARGCL: case OP_BOXL:
SWAP_INT32(ip);
ip += 4;
break;
@@ -58,7 +58,7 @@
n = *ip++;
sp += n+2;
break;
- case OP_LVARGC:
+ case OP_VARGCL:
SWAP_INT32(ip);
n = GET_INT32(ip); ip += 4;
sp += n+2;
--- a/src/opcodes.h
+++ b/src/opcodes.h
@@ -78,8 +78,8 @@
OP_FOR,
OP_TAPPLY,
OP_SUB2,
- OP_LARGC,
- OP_LVARGC,
+ OP_ARGCL,
+ OP_VARGCL,
OP_CALLL,
OP_TCALLL,
OP_BRNEL,
--- a/src/vm.inc
+++ b/src/vm.inc
@@ -664,7 +664,7 @@
OP(OP_ARGC)
n = *ip++;
if(0){-OP(OP_LARGC)
+OP(OP_ARGCL)
n = GET_INT32(ip);
ip += 4;
}
@@ -821,7 +821,7 @@
OP(OP_VARGC)
i = *ip++;
if(0){-OP(OP_LVARGC)
+OP(OP_VARGCL)
i = GET_INT32(ip);
ip += 4;
}
--- a/tools/gen.lsp
+++ b/tools/gen.lsp
@@ -84,8 +84,8 @@
OP_FOR for 3 (λ (a b f) (for a b (λ (x) (f x)))) nil
OP_TAPPLY tapply nil nil nil
OP_SUB2 sub2 nil nil nil
- OP_LARGC largc nil nil nil
- OP_LVARGC lvargc nil nil nil
+ OP_ARGCL argc.l nil nil nil
+ OP_VARGCL vargc.l nil nil nil
OP_CALLL call.l nil nil nil
OP_TCALLL tcall.l nil nil nil
OP_BRNEL brne.l nil nil nil