diff --git a/femtolisp/compiler.lsp b/femtolisp/compiler.lsp index 44dde00..58e2320 100644 --- a/femtolisp/compiler.lsp +++ b/femtolisp/compiler.lsp @@ -141,13 +141,13 @@ (set! nxt (if (< i n) (aref v i) #f)) (cond ((memq vi '(:jmp :brf :brt)) (put! fixup-to-label (sizeof bcode) nxt) - (io.write bcode ((if long? uint32 uint16) 0)) + (io.write bcode ((if long? int32 int16) 0)) (set! i (+ i 1))) ((number? nxt) (case vi ((:loadv.l :loadg.l :setg.l :loada.l :seta.l :largc :lvargc) - (io.write bcode (uint32 nxt)) + (io.write bcode (int32 nxt)) (set! i (+ i 1))) ((:loadc :setc) ; 2 uint8 args @@ -156,10 +156,10 @@ (io.write bcode (uint8 (aref v i))) (set! i (+ i 1))) - ((:loadc.l :setc.l) ; 2 uint32 args - (io.write bcode (uint32 nxt)) + ((:loadc.l :setc.l) ; 2 int32 args + (io.write bcode (int32 nxt)) (set! i (+ i 1)) - (io.write bcode (uint32 (aref v i))) + (io.write bcode (int32 (aref v i))) (set! i (+ i 1))) (else @@ -171,8 +171,9 @@ (table.foreach (lambda (addr labl) (begin (io.seek bcode addr) - (io.write bcode ((if long? uint32 uint16) - (get label-to-loc labl))))) + (io.write bcode ((if long? int32 int16) + (- (get label-to-loc labl) + addr))))) fixup-to-label) (io.tostring! bcode)))) @@ -348,9 +349,22 @@ (emit g :copyenv) (emit g (if tail? :tcall :call) (+ 1 nargs))))) -(define (builtin->instruction b) - (let ((sym (intern (string #\: b)))) - (and (has? Instructions sym) sym))) +(define builtin->instruction + (let ((b2i (table number? :number? cons :cons + fixnum? :fixnum? equal? :equal? + eq? :eq? symbol? :symbol? + div0 :div0 builtin? :builtin? + aset! :aset! - :- boolean? :boolean? not :not + apply :apply atom? :atom? + set-cdr! :set-cdr! / :/ + function? :function? vector :vector + list :list bound? :bound? + < :< * :* cdr :cdr null? :null? + + :+ eqv? :eqv? compare :compare aref :aref + set-car! :set-car! car :car + pair? :pair? = := vector? :vector?))) + (lambda (b) + (get b2i b #f)))) (define (compile-call g env tail? x) (let ((head (car x))) @@ -448,15 +462,15 @@ (define (compile-thunk expr) (compile `(lambda () ,expr))) -(define (ref-uint32-LE a i) - (+ (ash (aref a (+ i 0)) 0) - (ash (aref a (+ i 1)) 8) - (ash (aref a (+ i 2)) 16) - (ash (aref a (+ i 3)) 24))) +(define (ref-int32-LE a i) + (int32 (+ (ash (aref a (+ i 0)) 0) + (ash (aref a (+ i 1)) 8) + (ash (aref a (+ i 2)) 16) + (ash (aref a (+ i 3)) 24)))) -(define (ref-uint16-LE a i) - (+ (ash (aref a (+ i 0)) 0) - (ash (aref a (+ i 1)) 8))) +(define (ref-int16-LE a i) + (int16 (+ (ash (aref a (+ i 0)) 0) + (ash (aref a (+ i 1)) 8)))) (define (hex5 n) (string.lpad (number->string n 16) 5 #\0)) @@ -489,7 +503,7 @@ (set! i (+ i 1)) (case inst ((:loadv.l :loadg.l :setg.l) - (print-val (aref vals (ref-uint32-LE code i))) + (print-val (aref vals (ref-int32-LE code i))) (set! i (+ i 4))) ((:loadv :loadg :setg) @@ -502,7 +516,7 @@ (set! i (+ i 1))) ((:loada.l :seta.l :largc :lvargc) - (princ (number->string (ref-uint32-LE code i))) + (princ (number->string (ref-int32-LE code i))) (set! i (+ i 4))) ((:loadc :setc) @@ -512,17 +526,17 @@ (set! i (+ i 1))) ((:loadc.l :setc.l) - (princ (number->string (ref-uint32-LE code i)) " ") + (princ (number->string (ref-int32-LE code i)) " ") (set! i (+ i 4)) - (princ (number->string (ref-uint32-LE code i))) + (princ (number->string (ref-int32-LE code i))) (set! i (+ i 4))) ((:jmp :brf :brt) - (princ "@" (hex5 (ref-uint16-LE code i))) + (princ "@" (hex5 (+ i (ref-int16-LE code i)))) (set! i (+ i 2))) ((:jmp.l :brf.l :brt.l) - (princ "@" (hex5 (ref-uint32-LE code i))) + (princ "@" (hex5 (+ i (ref-int32-LE code i)))) (set! i (+ i 4))) (else #f))))))) diff --git a/femtolisp/flisp.boot b/femtolisp/flisp.boot index 20a2d2d..8c741fb 100644 --- a/femtolisp/flisp.boot +++ b/femtolisp/flisp.boot @@ -5,13 +5,13 @@ vector.map vector->list #function("r1c0e1~31_u43;" [#function("va~c0qw2\x7f;" [#function("r1i10\x80~z[\x81Ko01;" [])]) length]) untrace -#function("r1c0e1~31u42;" [#function("ve0~316G0e1\x80e2~31b2[42;^;" [traced? set-top-level-value! function:vals]) top-level-value]) +#function("r1c0e1~31u42;" [#function("ve0~316@0e1\x80e2~31b2[42;^;" [traced? set-top-level-value! function:vals]) top-level-value]) traced? #function("r1e0~31e0\x8031>;" [function:code] #0=[#function("s0e0c1~K312c2~x2;" [println x #.apply] #0#) ()]) trace -#function("r1c0e1~31u322c2;" [#function("vc0e130u42;" [#function("ve0\x8031@6i0e1i10e2c3~c4c5c6c7i10L2~L3L2c8c7\x80L2~L3L3L33142;^;" [traced? set-top-level-value! eval lambda begin println cons quote apply]) gensym]) top-level-value ok]) +#function("r1c0e1~31u322c2;" [#function("vc0e130u42;" [#function("ve0\x8031@6a0e1i10e2c3~c4c5c6c7i10L2~L3L2c8c7\x80L2~L3L3L33142;^;" [traced? set-top-level-value! eval lambda begin println cons quote apply]) gensym]) top-level-value ok]) to-proper -#function("r1~A690~;~?6B0~L1;~Me0~N31K;" [to-proper]) +#function("r1~A640~;~?660~L1;~Me0~N31K;" [to-proper]) table.values #function("r1e0c1q_~43;" [table.foldl #function("r3\x7fg2K;" [])]) table.pairs @@ -27,51 +27,51 @@ table.clone symbol-syntax #function("r1e0e1~^43;" [get *syntax-environment*]) string.trim -#function("r3c0^^u43;" [#function("vc0qm02c1qm12c2e3\x8031u42;" [#function("r4g2g3X16H02e0\x7fe1~g232326Z0\x80~\x7fe2~g232g344;g2;" [string.find string.char string.inc]) #function("r3e0g2`3216O02e1\x7fe2~e3~g23232326_0\x81~\x7fe3~g23243;g2;" [> string.find string.char string.dec]) #function("ve0i10\x80i10i11`~34\x81i10i12~3343;" [string.sub]) length])]) +#function("r3c0^^u43;" [#function("vc0qm02c1qm12c2e3\x8031u42;" [#function("r4g2g3X16?02e0\x7fe1~g232326A0\x80~\x7fe2~g232g344;g2;" [string.find string.char string.inc]) #function("r3e0g2`3216D02e1\x7fe2~e3~g23232326?0\x81~\x7fe3~g23243;g2;" [> string.find string.char string.dec]) #function("ve0i10\x80i10i11`~34\x81i10i12~3343;" [string.sub]) length])]) string.tail #function("r2e0~e1~`\x7f3342;" [string.sub string.inc]) string.rpad #function("r3e0~e1g2\x7fe2~31z3242;" [string string.rep string.count]) string.rep -#function("r2\x7fb4X6g0e0\x7f`326E0c1;\x7faW6Q0e2~41;\x7fb2W6_0e2~~42;e2~~~43;e3\x7f316}0e2~e4~\x7faz3242;e4e2~~32\x7fb2U242;" [<= "" string odd? string.rep]) +#function("r2\x7fb4X6`0e0\x7f`32650c1;\x7faW680e2~41;\x7fb2W690e2~~42;e2~~~43;e3\x7f316@0e2~e4~\x7faz3242;e4e2~~32\x7fb2U242;" [<= "" string odd? string.rep]) string.map -#function("r2c0e130e2\x7f31u43;" [#function("vc0`u322e1~41;" [#function("v^~\x81X6Y02e0\x80i10e1i11~3231322e2i11~32m0520;" [io.putc string.char string.inc]) io.tostring!]) buffer length]) +#function("r2c0e130e2\x7f31u43;" [#function("vc0`u322e1~41;" [#function("v^~\x81X6S02e0\x80i10e1i11~3231322e2i11~32m05\x0b/;" [io.putc string.char string.inc]) io.tostring!]) buffer length]) string.lpad #function("r3e0e1g2\x7fe2~31z32~42;" [string string.rep string.count]) string.join -#function("r2~A6:0c0;c1e230u42;" ["" #function("ve0~\x80M322e1c2q\x80N322e3~41;" [io.write for-each #function("r1e0\x80i11322e0\x80~42;" [io.write]) io.tostring!]) buffer]) +#function("r2~A650c0;c1e230u42;" ["" #function("ve0~\x80M322e1c2q\x80N322e3~41;" [io.write for-each #function("r1e0\x80i11322e0\x80~42;" [io.write]) io.tostring!]) buffer]) simple-sort -#function("r1~A17<02~NA6A0~;c0~Mu42;" [#function("vc0e1c2q\x80N32u42;" [#function("ve0e1~M31\x80L1e1~N3143;" [nconc simple-sort]) separate #function("r1~\x80X;" [])])]) +#function("r1~A17602~NA640~;c0~Mu42;" [#function("vc0e1c2q\x80N32u42;" [#function("ve0e1~M31\x80L1e1~N3143;" [nconc simple-sort]) separate #function("r1~\x80X;" [])])]) set-syntax! #function("r2e0e1~\x7f43;" [put! *syntax-environment*]) separate -#function("r2\x80~\x7f__44;" [] #0=[#function("r4\x7fA6=0g2g3K;~\x7fM316S0\x80~\x7fN\x7fMg2Kg344;\x80~\x7fNg2\x7fMg3K44;" [] #0#) ()]) +#function("r2\x80~\x7f__44;" [] #0=[#function("r4\x7fA680g2g3K;~\x7fM316@0\x80~\x7fN\x7fMg2Kg344;\x80~\x7fNg2\x7fMg3K44;" [] #0#) ()]) self-evaluating? -#function("r1~?16<02~C@17Y02e0~3116Y02~C16Y02~e1~31<;" [constant? top-level-value]) +#function("r1~?16602~C@17K02e0~3116A02~C16:02~e1~31<;" [constant? top-level-value]) reverse! -#function("r1c0_u42;" [#function("v^\x80F6H02\x80N\x80~\x80m02P2o005202~;" [])]) +#function("r1c0_u42;" [#function("v^\x80F6C02\x80N\x80~\x80m02P2o005\x1c/2~;" [])]) reverse #function("r1e0e1_~43;" [foldl cons]) revappend #function("r2e0e1~31\x7f42;" [nconc reverse]) repl -#function("r0c0^^u43;" [#function("vc0qm02c1qm12\x7f302e240;" [#function("r0e0c1312e2e3312c4c5qc6qtu42;" [princ "> " io.flush *output-stream* #function("ve0e131@16G02c2e3~31u42;" [io.eof? *input-stream* #function("ve0~312~k12];" [print that]) load-process]) #function("r0e040;" [read]) #function("r1e0e1312e2~41;" [io.discardbuffer *input-stream* raise])]) #function("r0c0qc1qt6E0e2302\x8140;^;" [#function("r0\x803016>02e040;" [newline]) #function("r1e0~41;" [print-exception]) newline]) newline])]) +#function("r0c0^^u43;" [#function("vc0qm02c1qm12\x7f302e240;" [#function("r0e0c1312e2e3312c4c5qc6qtu42;" [princ "> " io.flush *output-stream* #function("ve0e131@16=02c2e3~31u42;" [io.eof? *input-stream* #function("ve0~312~k12];" [print that]) load-process]) #function("r0e040;" [read]) #function("r1e0e1312e2~41;" [io.discardbuffer *input-stream* raise])]) #function("r0c0qc1qt6;0e2302\x8140;^;" [#function("r0\x803016702e040;" [newline]) #function("r1e0~41;" [print-exception]) newline]) newline])]) remainder #function("r2~~\x7fV\x7fT2z;" []) -ref-uint32-LE -#function("r2e0~\x7f`y[`32e0~\x7fay[b832e0~\x7fb2y[b@32e0~\x7fb3y[bH32R4;" [ash]) -ref-uint16-LE -#function("r2e0~\x7f`y[`32e0~\x7fay[b832y;" [ash]) +ref-int32-LE +#function("r2e0e1~\x7f`y[`32e1~\x7fay[b832e1~\x7fb2y[b@32e1~\x7fb3y[bH32R441;" [int32 ash]) +ref-int16-LE +#function("r2e0e1~\x7f`y[`32e1~\x7fay[b832y41;" [int16 ash]) random -#function("r1e0~316D0e1e230~42;e330~T2;" [integer? mod rand rand.double]) +#function("r1e0~316<0e1e230~42;e330~T2;" [integer? mod rand rand.double]) quote-value -#function("r1e0~316<0~;c1~L2;" [self-evaluating? quote]) +#function("r1e0~31640~;c1~L2;" [self-evaluating? quote]) println #function("s0e0~Q2e1302;" [print newline]) print-to-string #function("r1c0e130u42;" [#function("ve0~\x80322e1~41;" [io.print io.tostring!]) buffer]) print-exception -#function("r1c0^^u43;" [#function("vc0qm02c1qm12\x80F16U02\x80Mc2<16U02e3\x80b4326w0~c4e5\x8031c6e7\x8031c8352\x7fe9\x8031315\x170\x80F16\x8b02\x80Mc:<16\x8b02\x80NF6\x9d0~c;e5\x8031c<335\x170\x80F16\xa902\x80Mc=<6\xba0~c>312~\x80NQ25\x170\x80F16\xc602\x80Mc?<6\xe00e@e7\x8031312~cAe5\x8031325\x170eB\x803116\xf102e3\x80b2326\x0d0\x7f\x80M312~cC312cDe5\x8031u325\x170~cE312\x7f\x80312~eF312];" [#function("s0e0e1~x3;" [io.princ *error-stream*]) #function("s0e0e1~x3;" [io.print *error-stream*]) type-error length= "type-error: " cadr ": expected " caddr ", got " cadddr unbound-error "unbound-error: eval: variable " " has no value" error "error: " load-error print-exception "in file " list? ": " #function("ve0~3117=02~C6D0\x805E0\x81~41;" [string?]) "*** Unhandled exception: " *linefeed*])]) +#function("r1c0^^u43;" [#function("vc0qm02c1qm12\x80F16D02\x80Mc2<16:02e3\x80b4326Q0~c4e5\x8031c6e7\x8031c8352\x7fe9\x8031315\xd20\x80F16@02\x80Mc:<16602\x80NF6A0~c;e5\x8031c<335\xac0\x80F16802\x80Mc=<6@0~c>312~\x80NQ25\x8f0\x80F16802\x80Mc?<6I0e@e7\x8031312~cAe5\x8031325i0eB\x803116:02e3\x80b2326K0\x7f\x80M312~cC312cDe5\x8031u325<0~cE312\x7f\x80312~eF312];" [#function("s0e0e1~x3;" [io.princ *error-stream*]) #function("s0e0e1~x3;" [io.print *error-stream*]) type-error length= "type-error: " cadr ": expected " caddr ", got " cadddr unbound-error "unbound-error: eval: variable " " has no value" error "error: " load-error print-exception "in file " list? ": " #function("ve0~3117502~C660\x80530\x81~41;" [string?]) "*** Unhandled exception: " *linefeed*])]) print #function("s0e0e1~x3;" [io.print *output-stream*]) princ @@ -85,7 +85,7 @@ nreconc newline #function("r0e0e1312];" [princ *linefeed*]) nestlist -#function("r3e0g2`326>0_;\x7fe1~~\x7f31g2az33K;" [<= nestlist]) +#function("r3e0g2`32640_;\x7fe1~~\x7f31g2az33K;" [<= nestlist]) negative? #function("r1~`X;" []) mod0 @@ -93,57 +93,57 @@ mod0 mod #function("r2~e0~\x7f32\x7fT2z;" [div]) memv -#function("r2\x7f?690^;\x7fM~=6B0\x7f;e0~\x7fN42;" [memv]) +#function("r2\x7f?640^;\x7fM~=640\x7f;e0~\x7fN42;" [memv]) member -#function("r2\x7f?690^;\x7fM~>6B0\x7f;e0~\x7fN42;" [member]) +#function("r2\x7f?640^;\x7fM~>640\x7f;e0~\x7fN42;" [member]) mark-label #function("r2e0~e1\x7f43;" [emit :label]) mapcar -#function("s1\x80~\x7f42;" [] #0=[#function("r2\x7fA6;0~40;\x7fM?6D0\x7fM;~e0e1\x7f32Q2\x80~e0e2\x7f3232K;" [map car cdr] #0#) ()]) +#function("s1\x80~\x7f42;" [] #0=[#function("r2\x7fA660~40;\x7fM?650\x7fM;~e0e1\x7f32Q2\x80~e0e2\x7f3232K;" [map car cdr] #0#) ()]) map-int -#function("r2e0\x7f`326=0_;c1~`31_K_u43;" [<= #function("v~m12a\x81azc0qw2~;" [#function("r1\x81i10~31_KP2\x81No01;" [])])]) +#function("r2e0\x7f`32640_;c1~`31_K_u43;" [<= #function("v~m12a\x81azc0qw2~;" [#function("r1\x81i10~31_KP2\x81No01;" [])])]) map! -#function("r2\x7f^\x7fF6I02\x7f~\x7fM31O2\x7fNm15402;" []) +#function("r2\x7f^\x7fF6B02\x7f~\x7fM31O2\x7fNm15\x1d/2;" []) map -#function("r2c0__L1u43;" [#function("v\x7fm02^\x81F6Q02\x7f\x80\x81M31_KPNm12\x81No015602~N;" [])]) +#function("r2c0_L1u42;" [#function("v~^\x81F6H02~\x80\x81M31_KPNm02\x81No015\x17/2N;" [])]) make-system-image -#function("r1c0e1~e2e3e434c5e6u44;" [#function("v^k02c1c2qu42;" [*print-pretty* #function("vc0qc1qt~302;" [#function("r0e0c1qe2e3e430313142;" [for-each #function("r1~E16h02e0~31@16h02e1~31G@16h02e2~i1132@16h02e3e1~3131@6\x950e4i10~322e5i10c6322e4i10e1~31322e5i10c642;^;" [constant? top-level-value memq iostream? io.print io.write "\n"]) reverse! simple-sort environment]) #function("r1\x80302e0~41;" [raise])]) #function("r0e0\x80312i02k1;" [io.close *print-pretty*])]) file :write :create :truncate (*linefeed* *directory-separator* *argv* that *print-pretty* *print-width* *print-readably*) *print-pretty*]) +#function("r1c0e1~e2e3e434c5e6u44;" [#function("v^k02c1c2qu42;" [*print-pretty* #function("vc0qc1qt~302;" [#function("r0e0c1qe2e3e430313142;" [for-each #function("r1~E16b02e0~31@16W02e1~31G@16K02e2~i1132@16=02e3e1~3131@6\\0e4i10~322e5i10c6322e4i10e1~31322e5i10c642;^;" [constant? top-level-value memq iostream? io.print io.write "\n"]) reverse! simple-sort environment]) #function("r1\x80302e0~41;" [raise])]) #function("r0e0\x80312i02k1;" [io.close *print-pretty*])]) file :write :create :truncate (*linefeed* *directory-separator* *argv* that *print-pretty* *print-width* *print-readably*) *print-pretty*]) make-label #function("r1e040;" [gensym]) make-code-emitter #function("r0_e030`Z3;" [table]) macroexpand-1 -#function("r1~?690~;c0e1~31u42;" [#function("v~6;0~\x80Nx2;\x80;" []) macrocall?]) +#function("r1~?640~;c0e1~31u42;" [#function("v~680~\x80Nx2;\x80;" []) macrocall?]) macroexpand -#function("r1c0^^u43;" [#function("vc0qm02c1qm12\x7f\x80_42;" [#function("r2c0e1~31F6Y0e2~31F6Q0c3e1~31K5V0e4~315Z0^u42;" [#function("vc0e1~31i11~\x8132u43;" [#function("ve0c1e2i1031~A6E0\x7f5T0c1~\x7fL3e3c4q~32Ke5i103144;" [list* lambda cadr map #function("r1^;" []) lastcdr]) get-defined-vars]) cddr cdddr begin caddr]) #function("r2~?690~;c0e1~M\x7f32u42;" [#function("v~6I0i11e0~31\x80NQ2e1~3142;c2e3\x8031u42;" [cadr caddr #function("v~6E0i21~i10NQ2i1142;i10Mc0<6S0i10;i10Mc1<6i0i20i10i1142;i10Mc2<6\x980c3e4i1031e5c1L1_L1e6e7i10313133L1u43;e8c9qi1042;" [quote lambda let-syntax #function("vi31\x7fe0e1c2q~32i213242;" [nconc map #function("r1~Mi41e0~31i3132i31L3;" [cadr])]) cadr nconc copy-list cddr map #function("r1i31~i2142;" [])]) macrocall?]) assq])])]) +#function("r1c0^^u43;" [#function("vc0qm02c1qm12\x7f\x80_42;" [#function("r2c0e1~31F6N0e2~31F6=0c3e1~31K570e4~31530^u42;" [#function("vc0e1~31i11~\x8132u43;" [#function("ve0c1e2i1031~A660\x7f5A0c1~\x7fL3e3c4q~32Ke5i103144;" [list* lambda cadr map #function("r1^;" []) lastcdr]) get-defined-vars]) cddr cdddr begin caddr]) #function("r2~?640~;c0e1~M\x7f32u42;" [#function("v~6F0i11e0~31\x80NQ2e1~3142;c2e3\x8031u42;" [cadr caddr #function("v~6B0i21~i10NQ2i1142;i10Mc0<660i10;i10Mc1<6>0i20i10i1142;i10Mc2<6W0c3e4i1031e5c1L1_L1e6e7i10313133L1u43;e8c9qi1042;" [quote lambda let-syntax #function("vi31\x7fe0e1c2q~32i213242;" [nconc map #function("r1~Mi41e0~31i3132i31L3;" [cadr])]) cadr nconc copy-list cddr map #function("r1i31~i2142;" [])]) macrocall?]) assq])])]) macrocall? -#function("r1~MC16C02e0e1~M^43;" [get *syntax-environment*]) +#function("r1~MC16<02e0e1~M^43;" [get *syntax-environment*]) lookup-sym -#function("r4\x7fA6:0c0;c1\x7fMu42;" [(global) #function("vc0e1\x80~`33u42;" [#function("v~6J0i136A0c0~L2;c1i12~L3;e2i10i11Ni1317]02\x80A6f0i125k0i12ay^44;" [arg closed lookup-sym]) index-of])]) +#function("r4\x7fA650c0;c1\x7fMu42;" [(global) #function("vc0e1\x80~`33u42;" [#function("v~6G0i13680c0~L2;c1i12~L3;e2i10i11Ni1317502\x80A680i12570i12ay^44;" [arg closed lookup-sym]) index-of])]) load-process #function("r1e0~41;" [eval]) load -#function("r1c0e1~e232u42;" [#function("vc0qc1qt;" [#function("r0c0^u32^^^43;" [#function("vc0qm0;" [#function("r3e0i1031@6N0\x80e1i1031~e2\x7f3143;e3i10312e2\x7f41;" [io.eof? read load-process io.close])])]) #function("r1e0\x80312e1c2i10~L341;" [io.close raise load-error])]) file :read]) +#function("r1c0e1~e232u42;" [#function("vc0qc1qt;" [#function("r0c0^u32^^^43;" [#function("vc0qm0;" [#function("r3e0i1031@6C0\x80e1i1031~e2\x7f3143;e3i10312e2\x7f41;" [io.eof? read load-process io.close])])]) #function("r1e0\x80312e1c2i10~L341;" [io.close raise load-error])]) file :read]) list? -#function("r1~A17F02~F16F02e0~N41;" [list?]) +#function("r1~A17@02~F16902e0~N41;" [list?]) list-tail -#function("r2e0\x7f`326=0~;e1~N\x7faz42;" [<= list-tail]) +#function("r2e0\x7f`32640~;e1~N\x7faz42;" [<= list-tail]) list-ref #function("r2e0~\x7f32M;" [list-tail]) list-partition -#function("r2c0^u42;" [#function("vc0qm02e1\x81`326G0e2c341;e4~\x80\x81`__3541;" [#function("r5~?6N0e0g2`326K0e1g331g4K;g4;e2g2\x7f326i0\x80~\x7f`_e1g331g4K45;\x80~N\x7fag2y~Mg3Kg445;" [> reverse! >=]) <= error "list-partition: invalid count" reverse!])]) +#function("r2c0^u42;" [#function("vc0qm02e1\x81`32690e2c341;e4~\x80\x81`__3541;" [#function("r5~?6I0e0g2`326<0e1g331g4K;g4;e2g2\x7f326C0\x80~\x7f`_e1g331g4K45;\x80~N\x7fag2y~Mg3Kg445;" [> reverse! >=]) <= error "list-partition: invalid count" reverse!])]) list-head -#function("r2e0\x7f`326=0_;~Me1~N\x7faz32K;" [<= list-head]) +#function("r2e0\x7f`32640_;~Me1~N\x7faz32K;" [<= list-head]) list->vector #function("r1e0~x2;" [vector]) length> -#function("r2\x7f`X6:0~;\x7f`W6I0~F16H02~;~?6R0\x7f`X;e0~N\x7faz42;" [length>]) +#function("r2\x7f`X640~;\x7f`W6;0~F16402~;~?660\x7f`X;e0~N\x7faz42;" [length>]) length= -#function("r2\x7f`X6:0^;\x7f`W6C0~?;~?6L0\x7f`W;e0~N\x7faz42;" [length=]) +#function("r2\x7f`X640^;\x7f`W650~?;~?660\x7f`W;e0~N\x7faz42;" [length=]) lastcdr -#function("r1~?690~;e0~31N;" [last-pair]) +#function("r1~?640~;e0~31N;" [last-pair]) last-pair -#function("r1~N?6:0~;e0~N41;" [last-pair]) +#function("r1~N?640~;e0~N41;" [last-pair]) just-compile-args #function("r3e0c1q\x7f42;" [for-each #function("r1e0\x80i02^~44;" [compile-in])]) iota @@ -151,7 +151,7 @@ iota io.readline #function("r1e0~c142;" [io.readuntil #\x000a]) index-of -#function("r3\x7fA690^;~\x7fM<6C0g2;e0~\x7fNg2ay43;" [index-of]) +#function("r3\x7fA640^;~\x7fM<650g2;e0~\x7fNg2ay43;" [index-of]) in-env? #function("r2e0c1q\x7f42;" [any #function("r1e0\x80~42;" [memq])]) identity @@ -159,21 +159,21 @@ identity hex5 #function("r1e0e1~b@32b5c243;" [string.lpad number->string #\0]) get-defined-vars -#function("r1e0\x80~3141;" [delete-duplicates] #0=[#function("r1~?690_;~Mc0<16F02~NF6\x840e1~31C16[02e1~31L117\x8302e1~31F16}02e2~31C16}02e2~31L117\x8302_;~Mc3<6\x980e4e5\x80~N32x2;_;" [define cadr caadr begin append map] #0#) ()]) +#function("r1e0\x80~3141;" [delete-duplicates] #0=[#function("r1~?640_;~Mc0<16602~NF6m0e1~31C16:02e1~31L117V02e1~31F16E02e2~31C16:02e2~31L117402_;~Mc3<6>0e4e5\x80~N32x2;_;" [define cadr caadr begin append map] #0#) ()]) for-each -#function("r2\x7fF6E0~\x7fM312e0~\x7fN42;];" [for-each]) +#function("r2\x7fF6@0~\x7fM312e0~\x7fN42;];" [for-each]) foldr -#function("r3g2A6:0\x7f;~g2Me0~\x7fg2N3342;" [foldr]) +#function("r3g2A640\x7f;~g2Me0~\x7fg2N3342;" [foldr]) foldl -#function("r3g2A6:0\x7f;e0~~g2M\x7f32g2N43;" [foldl]) +#function("r3g2A640\x7f;e0~~g2M\x7f32g2N43;" [foldl]) fits-i8 -#function("r1~I16L02e0~b\xb03216L02e1~b\xaf42;" [>= <=]) +#function("r1~I16F02e0~b\xb03216:02e1~b\xaf42;" [>= <=]) filter -#function("r2\x80~\x7f_43;" [] #0=[#function("r3\x7fA6:0g2;~\x7fM316N0\x80~\x7fN\x7fMg2K43;\x80~\x7fNg243;" [] #0#) ()]) +#function("r2\x80~\x7f_43;" [] #0=[#function("r3\x7fA650g2;~\x7fM316>0\x80~\x7fN\x7fMg2K43;\x80~\x7fNg243;" [] #0#) ()]) expand #function("r1e0~41;" [macroexpand]) every -#function("r2\x7f?17J02~\x7fM3116J02e0~\x7fN42;" [every]) +#function("r2\x7f?17D02~\x7fM3116:02e0~\x7fN42;" [every]) even? #function("r1e0~a32`W;" [logand]) eval @@ -181,21 +181,21 @@ eval error #function("s0e0c1~K41;" [raise error]) encode-byte-code -#function("r1c0e1~31u42;" [#function("vc0e1~31u42;" [#function("vc0e1e2~31b3e2~31b2VT2yc332u42;" [#function("vc0e1\x8031`e230e230e330^^u48;" [#function("v^\x7f~X6\xea02i10\x7f[m52g5e0<6f0e1g2i10\x7fay[e2g431332\x7fb2ym15\xe70e3g4e4e5e6\x806~0c7g5u325\x800g53231322\x7faym12\x7f~X6\x9b0i10\x7f[5\x9c0^m62e8g5c9326\xd60e1g3e2g431g6332e3g4\x806\xc60e:5\xc80e;`31322\x7faym15\xe70g6D6\xe60cqg3322e?g441;" [:label put! sizeof io.write byte get Instructions #function("v~e0<6;0e1;~e2<6E0e3;~e4<6O0e5;i05;" [:jmp :jmp.l :brt :brt.l :brf :brf.l]) memq (:jmp :brf :brt) uint32 uint16 #function("ve0~c1326Q0e2i04e3i0631322\x81ayo01;e0~c4326\x890e2i04e5i0631322\x81ayo012e2i04e5i20\x81[31322\x81ayo01;e0~c6326\xc10e2i04e3i0631322\x81ayo012e2i04e3i20\x81[31322\x81ayo01;e2i04e5i0631322\x81ayo01;" [memq (:loadv.l :loadg.l :setg.l :loada.l :seta.l :largc :lvargc) io.write uint32 (:loadc :setc) uint8 (:loadc.l :setc.l)]) table.foreach #function("r2e0i04~322e1i04i106K0e25M0e3e4i02\x7f323142;" [io.seek io.write uint32 uint16 get]) io.tostring!]) length table buffer]) >= length 65536]) list->vector]) reverse!]) +#function("r1c0e1~31u42;" [#function("vc0e1~31u42;" [#function("vc0e1e2~31b3e2~31b2VT2yc332u42;" [#function("vc0e1\x8031`e230e230e330^^u48;" [#function("v^\x7f~X6\xe402i10\x7f[m52g5e0<6O0e1g2i10\x7fay[e2g431332\x7fb2ym15\xb30e3g4e4e5e6\x806<0c7g5u32540g53231322\x7faym12\x7f~X6:0i10\x7f[530^m62e8g5c9326^0e1g3e2g431g6332e3g4\x80670e:540e;`31322\x7faym15C0g6D6<0cqg3322e?g441;" [:label put! sizeof io.write byte get Instructions #function("v~e0<650e1;~e2<650e3;~e4<650e5;i05;" [:jmp :jmp.l :brt :brt.l :brf :brf.l]) memq (:jmp :brf :brt) int32 int16 #function("ve0~c1326H0e2i04e3i0631322\x81ayo01;e0~c4326`0e2i04e5i0631322\x81ayo012e2i04e5i20\x81[31322\x81ayo01;e0~c6326`0e2i04e3i0631322\x81ayo012e2i04e3i20\x81[31322\x81ayo01;e2i04e5i0631322\x81ayo01;" [memq (:loadv.l :loadg.l :setg.l :loada.l :seta.l :largc :lvargc) io.write int32 (:loadc :setc) uint8 (:loadc.l :setc.l)]) table.foreach #function("r2e0i04~322e1i04i10670e2540e3e4i02\x7f32~z3142;" [io.seek io.write int32 int16 get]) io.tostring!]) length table buffer]) >= length 65536]) list->vector]) reverse!]) emit -#function("s2g2A6C0~`\x7f~`[K\\5\xec0e0\x7fc1326\\0e2~g2M32L1m25]0^2c3e4\x7fc532u322c6e4\x7fc732u322\x7fe8<6\xa90g2c9>6\x920e:m12_m25\xa60g2c;>6\xa50e>6\xc50e?m12_m25\xd90g2c@>6\xd80eAm12_m25\xd90^5\xdd0^2~`eB\x7fg2K~`[32\\2~;" [memq (:loadv :loadg :setg) bcode:indexfor #function("v~16A02e0i02Mc1326M0e2~31o01;^;" [> 255 cadr]) assq ((:loadv :loadv.l) (:loadg :loadg.l) (:setg :setg.l) (:loada :loada.l) (:seta :seta.l)) #function("v~16S02e0i02Mc13217S02e0e2i0231c1326_0e2~31o01;^;" [> 255 cadr]) ((:loadc :loadc.l) (:setc :setc.l)) :loada (0) :loada0 (1) :loada1 :loadc (0 0) :loadc00 (0 1) :loadc01 nreconc]) +#function("s2g2A6=0~`\x7f~`[K\\5\xdb0e0\x7fc1326A0e2~g2M32L1m2530^2c3e4\x7fc532u322c6e4\x7fc732u322\x7fe8<6\\0g2c9>6=0e:m12_m25F0g2c;>6=0e>6=0e?m12_m25F0g2c@>6=0eAm12_m2530^530^2~`eB\x7fg2K~`[32\\2~;" [memq (:loadv :loadg :setg) bcode:indexfor #function("v~16=02e0i02Mc1326;0e2~31o01;^;" [> 255 cadr]) assq ((:loadv :loadv.l) (:loadg :loadg.l) (:setg :setg.l) (:loada :loada.l) (:seta :seta.l)) #function("v~16O02e0i02Mc13217@02e0e2i0231c1326;0e2~31o01;^;" [> 255 cadr]) ((:loadc :loadc.l) (:setc :setc.l)) :loada (0) :loada0 (1) :loada1 :loadc (0 0) :loadc00 (0 1) :loadc01 nreconc]) div -#function("r2~\x7fV~`X16M02\x7f`X16F02a17M02b/17S02`y;" []) +#function("r2~\x7fV~`X16C02\x7f`X16402a17502b/17402`y;" []) display #function("r1e0~312];" [princ]) disassemble -#function("s1\x7fA6H0e0~`322e1302];5I0^2c2\x7fMe3~31e4~31u44;" [disassemble newline #function("vc0^u42;" [#function("vc0qm02c1`e2\x8131u43;" [#function("r1~J16<02~G@6Q0e0c1312e2~i10ay42;e3~41;" [princ "\n" disassemble print]) #function("v^~\x7fX6K02c0e1c2q^e333u32520;" [#function("ve0\x80`326A0e1305B0^2`i20azc2qw2e3e4\x8031c5e6e7~31a32c8342\x80ayo002c9~u42;" [> newline #function("r1e0c141;" [princ "\t"]) princ hex5 ": " string.tail string "\t" #function("ve0~c1326Y0i20i32e2i31i1032[312i10b4yo10;e0~c3326}0i20i32i31i10[[312i10ayo10;e0~c4326\xa00e5e6i31i10[31312i10ayo10;e0~c7326\xc70e5e6e2i31i103231312i10b4yo10;e0~c8326\x050e5e6i31i10[31c9322i10ayo102e5e6i31i10[31312i10ayo10;e0~c:326K1e5e6e2i31i103231c9322i10b4yo102e5e6e2i31i103231312i10b4yo10;e0~c;326t1e5ci31i103231322i10b2yo10;e0~c?326\x9d1e5cstring (:loada.l :seta.l :largc :lvargc) (:loadc :setc) " " (:loadc.l :setc.l) (:jmp :brf :brt) "@" hex5 ref-uint16-LE (:jmp.l :brf.l :brt.l)])]) table.foldl #function("r3g217F02\x7fi21\x80[<16F02~;" []) Instructions]) length])]) function:code function:vals]) +#function("s1\x7fA6C0e0~`322e1302];530^2c2\x7fMe3~31e4~31u44;" [disassemble newline #function("vc0^u42;" [#function("vc0qm02c1`e2\x8131u43;" [#function("r1~J16602~G@6D0e0c1312e2~i10ay42;e3~41;" [princ "\n" disassemble print]) #function("v^~\x7fX6E02c0e1c2q^e333u325\x19/;" [#function("ve0\x80`32690e130530^2`i20azc2qw2e3e4\x8031c5e6e7~31a32c8342\x80ayo002c9~u42;" [> newline #function("r1e0c141;" [princ "\t"]) princ hex5 ": " string.tail string "\t" #function("ve0~c1326P0i20i32e2i31i1032[312i10b4yo10;e0~c3326L0i20i32i31i10[[312i10ayo10;e0~c4326K0e5e6i31i10[31312i10ayo10;e0~c7326O0e5e6e2i31i103231312i10b4yo10;e0~c8326f0e5e6i31i10[31c9322i10ayo102e5e6i31i10[31312i10ayo10;e0~c:326n0e5e6e2i31i103231c9322i10b4yo102e5e6e2i31i103231312i10b4yo10;e0~c;326U0e5ci31i1032y31322i10b2yo10;e0~c?326U0e5cstring (:loada.l :seta.l :largc :lvargc) (:loadc :setc) " " (:loadc.l :setc.l) (:jmp :brf :brt) "@" hex5 ref-int16-LE (:jmp.l :brf.l :brt.l)])]) table.foldl #function("r3g217@02\x7fi21\x80[<16402~;" []) Instructions]) length])]) function:code function:vals]) delete-duplicates -#function("r1~?690~;c0~M~Nu43;" [#function("ve0~\x7f326@0e1\x7f41;~e1\x7f31K;" [member delete-duplicates])]) +#function("r1~?640~;c0~M~Nu43;" [#function("ve0~\x7f32680e1\x7f41;~e1\x7f31K;" [member delete-duplicates])]) count -#function("r2c0^u42;" [#function("vc0qm02~\x80\x81`43;" [#function("r3\x7fA6:0g2;\x80~\x7fN~\x7fM316M0g2ay5O0g243;" [])])]) +#function("r2c0^u42;" [#function("vc0qm02~\x80\x81`43;" [#function("r3\x7fA650g2;\x80~\x7fN~\x7fM31690g2ay540g243;" [])])]) copy-tree -#function("r1~?690~;e0~M31e0~N31K;" [copy-tree]) +#function("r1~?640~;e0~M31e0~N31K;" [copy-tree]) const-to-idx-vec #function("r1c0e1e2~3131u42;" [#function("ve0c1qe2\x8031322~;" [table.foreach #function("r2\x80\x7f~\\;" []) bcode:ctable]) vector.alloc bcode:nconst]) compile-while @@ -203,31 +203,31 @@ compile-while compile-thunk #function("r1e0c1_~L341;" [compile lambda]) compile-sym -#function("r4c0e1g2\x7f`]34u42;" [#function("vc0~Mu42;" [#function("v~c0<6J0e1i10i13`[e2\x803143;~c3<6h0e1i10i13a[e2\x8031e4\x803144;e1i10i13b2[i1243;" [arg emit cadr closed caddr])]) lookup-sym]) +#function("r4c0e1g2\x7f`]34u42;" [#function("vc0~Mu42;" [#function("v~c0<6D0e1i10i13`[e2\x803143;~c3<6I0e1i10i13a[e2\x8031e4\x803144;e1i10i13b2[i1243;" [arg emit cadr closed caddr])]) lookup-sym]) compile-short-circuit -#function("r6g3?6C0e0~\x7fg2g444;g3N?6V0e0~\x7fg2g3M44;c1e2~31u42;" [compile-in #function("ve0\x80\x81^i03M342e1\x80e2322e1\x80i05~332e1\x80e3322e4\x80\x81i02i03Ni04i05362e5\x80~42;" [compile-in emit :dup :pop compile-short-circuit mark-label]) make-label]) +#function("r6g3?6=0e0~\x7fg2g444;g3N?6>0e0~\x7fg2g3M44;c1e2~31u42;" [compile-in #function("ve0\x80\x81^i03M342e1\x80e2322e1\x80i05~332e1\x80e3322e4\x80\x81i02i03Ni04i05362e5\x80~42;" [compile-in emit :dup :pop compile-short-circuit mark-label]) make-label]) compile-prog1 -#function("r3e0~\x7f^e1g231342e2g231F6`0e3~\x7f^e2g231342e4~e542;^;" [compile-in cadr cddr compile-begin emit :pop]) +#function("r3e0~\x7f^e1g231342e2g231F6H0e3~\x7f^e2g231342e4~e542;^;" [compile-in cadr cddr compile-begin emit :pop]) compile-or #function("r4e0~\x7fg2g3^e146;" [compile-short-circuit :brt]) compile-let -#function("r4c0g3Mg3Nu43;" [#function("ve0\x7fe1e2~3131326F0^5Q0e3e4c5~32312e6\x80e7e8\x81~]33332c9e:\x80\x81\x7f33u42;" [length= length cadr error string "apply: incorrect number of arguments to " emit :loadv compile-f #function("ve0i10e1322e0i10i126K0e25M0e3a~y43;" [emit :copyenv :tcall :call]) compile-arglist])]) +#function("r4c0g3Mg3Nu43;" [#function("ve0\x7fe1e2~313132660^5=0e3e4c5~32312e6\x80e7e8\x81~]33332c9e:\x80\x81\x7f33u42;" [length= length cadr error string "apply: incorrect number of arguments to " emit :loadv compile-f #function("ve0i10e1322e0i10i12670e2540e3a~y43;" [emit :copyenv :tcall :call]) compile-arglist])]) compile-in -#function("r4g3C6C0e0~\x7fg3c144;g3?6\xb10g3`<6X0e2~e342;g3a<6g0e2~e442;g3]<6v0e2~e542;g3^<6\x850e2~e642;g3_<6\x940e2~e742;e8g3316\xa70e2~e9g343;e2~e:g343;c;g3Mu42;" [compile-sym [:loada :loadc :loadg] emit :load0 :load1 :loadt :loadf :loadnil fits-i8 :loadi8 :loadv #function("v~c0<6G0e1\x80e2e3i033143;~c4<6[0e5\x80\x81i02i0344;~c6<6p0e7\x80\x81i02i03N44;~c8<6\x810e9\x80\x81i0343;~c:<6\xa00e1\x80e2e;\x81i0332332e1\x80e<42;~c=<6\xb50e>\x80\x81i02i03N44;~c?<6\xca0e@\x80\x81i02i03N44;~cA<6\xe90eB\x80\x81e3i0331c6eCi0331K44;~cD<6\x0c0eE\x80\x81e3i0331eFi0331eGi033145;~cH<6*0eI\x80\x81]e3i0331342e1\x80eJ42;~cK<6P1eI\x80\x81^eFi0331342eL\x80\x81e3i0331cM44;~cN<6\x9b1eI\x80\x81^c:_e3i0331L3342eOeFi0331316}1^5\x831ePcQ312eI\x80\x81^eFi0331342e1\x80eR42;eS\x80\x81i02i0344;" [quote emit :loadv cadr if compile-if begin compile-begin prog1 compile-prog1 lambda compile-f :closure and compile-and or compile-or while compile-while cddr for compile-for caddr cadddr return compile-in :ret set! compile-sym [:seta :setc :setg] trycatch 1arg-lambda? error "trycatch: second form must be a 1-argument lambda" :trycatch compile-app])]) +#function("r4g3C6=0e0~\x7fg3c144;g3?6\x9a0g3`<6:0e2~e342;g3a<6:0e2~e442;g3]<6:0e2~e542;g3^<6:0e2~e642;g3_<6:0e2~e742;e8g3316<0e2~e9g343;e2~e:g343;c;g3Mu42;" [compile-sym [:loada :loadc :loadg] emit :load0 :load1 :loadt :loadf :loadnil fits-i8 :loadi8 :loadv #function("v~c0<6A0e1\x80e2e3i033143;~c4<6?0e5\x80\x81i02i0344;~c6<6@0e7\x80\x81i02i03N44;~c8<6<0e9\x80\x81i0343;~c:<6J0e1\x80e2e;\x81i0332332e1\x80e<42;~c=<6@0e>\x80\x81i02i03N44;~c?<6@0e@\x80\x81i02i03N44;~cA<6J0eB\x80\x81e3i0331c6eCi0331K44;~cD<6N0eE\x80\x81e3i0331eFi0331eGi033145;~cH<6I0eI\x80\x81]e3i0331342e1\x80eJ42;~cK<6Q0eI\x80\x81^eFi0331342eL\x80\x81e3i0331cM44;~cN<6v0eI\x80\x81^c:_e3i0331L3342eOeFi033131660^580ePcQ312eI\x80\x81^eFi0331342e1\x80eR42;eS\x80\x81i02i0344;" [quote emit :loadv cadr if compile-if begin compile-begin prog1 compile-prog1 lambda compile-f :closure and compile-and or compile-or while compile-while cddr for compile-for caddr cadddr return compile-in :ret set! compile-sym [:seta :setc :setg] trycatch 1arg-lambda? error "trycatch: second form must be a 1-argument lambda" :trycatch compile-app])]) compile-if -#function("r4c0e1~31e1~31e2g331e3g331e4g331F6]0e5g3315^0^u46;" [#function("vg2]<6D0e0\x80\x81i02g344;g2^<6W0e0\x80\x81i02g444;e0\x80\x81^g2342e1\x80e2~332e0\x80\x81i02g3342i026\x860e1\x80e3325\x8e0e1\x80e4\x7f332e5\x80~322e0\x80\x81i02g4342e5\x80\x7f42;" [compile-in emit :brf :ret :jmp mark-label]) make-label cadr caddr cdddr cadddr]) +#function("r4c0e1~31e1~31e2g331e3g331e4g331F6;0e5g331530^u46;" [#function("vg2]<6>0e0\x80\x81i02g344;g2^<6>0e0\x80\x81i02g444;e0\x80\x81^g2342e1\x80e2~332e0\x80\x81i02g3342i026<0e1\x80e3325:0e1\x80e4\x7f332e5\x80~322e0\x80\x81i02g4342e5\x80\x7f42;" [compile-in emit :brf :ret :jmp mark-label]) make-label cadr caddr cdddr cadddr]) compile-for -#function("r5e0g4316a0e1~\x7f^g2342e1~\x7f^g3342e1~\x7f^g4342e2~e342;e4c541;" [1arg-lambda? compile-in emit :for error "for: third form must be a 1-argument lambda"]) +#function("r5e0g4316X0e1~\x7f^g2342e1~\x7f^g3342e1~\x7f^g4342e2~e342;e4c541;" [1arg-lambda? compile-in emit :for error "for: third form must be a 1-argument lambda"]) compile-f -#function("s2c0e130e2\x7f31u43;" [#function("vi02A@6C0e0~e1325\x970e2\x7fe3326j0e0~e4\x7f31A6^0e55`0e6e7\x7f31335\x970e4\x7f31A6\x820e0~e8e7\x7f31335\x970e0~e9\x7f?6\x900`5\x950e7\x7f31332e:~e;\x7f31\x80K]e<\x8131342e0~e=322e>e?e@~3131eA~3142;" [emit :let length> MAX_ARGS lastcdr :largc :lvargc length :argc :vargc compile-in to-proper caddr :ret function encode-byte-code bcode:code const-to-idx-vec]) make-code-emitter cadr]) +#function("s2c0e130e2\x7f31u43;" [#function("vi02A@6<0e0~e1325\x860e2\x7fe3326O0e0~e4\x7f31A670e5540e6e7\x7f31335_0e4\x7f31A6A0e0~e8e7\x7f31335G0e0~e9\x7f?660`570e7\x7f31332e:~e;\x7f31\x80K]e<\x8131342e0~e=322e>e?e@~3131eA~3142;" [emit :let length> MAX_ARGS lastcdr :largc :lvargc length :argc :vargc compile-in to-proper caddr :ret function encode-byte-code bcode:code const-to-idx-vec]) make-code-emitter cadr]) compile-call -#function("r4c0g3Mu42;" [#function("vc0~C16]02e1~\x8132@16]02~E16]02e2~3116]02e3~31G6h0e3~315i0~u42;" [#function("vc0~G16?02e1~31u42;" [#function("v~@6E0e0i20i21^\x80345F0^2c1e2i20i21i23N33u42;" [compile-in #function("v\x806C0c0e1e2\x80^33u42;e3i30i326S0e45U0e5~43;" [#function("v~16A02e0i43N~32@6O0e1i20~325P0^2c2i10u42;" [length= argc-error #function("v~e0<6X0i10`W6J0e1i50e242;e1i50i20i1043;~e3<6\x920i10`W6q0e1i50e442;i10b2W6\x840e1i50e542;e1i50i20i1043;~e6<6\xdd0i10`W6\xaa0e7i30a42;i10aW6\xbc0e1i50e842;i10b2W6\xcf0e1i50e942;e1i50i20i1043;~e:<6\x040i10`W6\xf60e1i50e;42;e1i50i20i1043;~e<<6*0i10`W6\x1c0e7i30a42;e1i50i20i1043;~e=<6S1i10`W6E1e1i50e>c?43;e1i50i20i1043;~e@<6\x851i10b2X6m1e7i30b242;e1i50i526}1eA5\x7f1e@i1043;e1i50i2042;" [:list emit :loadnil :+ :load0 :add2 :- argc-error :neg :sub2 :* :load1 :/ :vector :loadv [] :apply :tapply])]) get arg-counts emit :tcall :call]) compile-arglist]) builtin->instruction]) in-env? constant? top-level-value])]) +#function("r4c0g3Mu42;" [#function("vc0~C16V02e1~\x8132@16J02~E16C02e2~3116902e3~31G6:0e3~31530~u42;" [#function("vc0~G16802e1~31u42;" [#function("v~@6A0e0i20i21^\x8034530^2c1e2i20i21i23N33u42;" [compile-in #function("v\x806@0c0e1e2\x80^33u42;e3i30i32670e4540e5~43;" [#function("v~16=02e0i43N~32@6=0e1i20~32530^2c2i10u42;" [length= argc-error #function("v~e0<6R0i10`W6<0e1i50e242;e1i50i20i1043;~e3<6e0i10`W6<0e1i50e442;i10b2W6<0e1i50e542;e1i50i20i1043;~e6<6v0i10`W6;0e7i30a42;i10aW6<0e1i50e842;i10b2W6<0e1i50e942;e1i50i20i1043;~e:<6R0i10`W6<0e1i50e;42;e1i50i20i1043;~e<<6Q0i10`W6;0e7i30a42;e1i50i20i1043;~e=<6T0i10`W6>0e1i50e>c?43;e1i50i20i1043;~e@<6]0i10b2X6<0e7i30b242;e1i50i52670eA540e@i1043;e1i50i2042;" [:list emit :loadnil :+ :load0 :add2 :- argc-error :neg :sub2 :* :load1 :/ :vector :loadv [] :apply :tapply])]) get arg-counts emit :tcall :call]) compile-arglist]) builtin->instruction]) in-env? constant? top-level-value])]) compile-begin -#function("r4g3?6B0e0~\x7fg2^44;g3N?6U0e0~\x7fg2g3M44;e0~\x7f^g3M342e1~e2322e3~\x7fg2g3N44;" [compile-in emit :pop compile-begin]) +#function("r4g3?6<0e0~\x7fg2^44;g3N?6>0e0~\x7fg2g3M44;e0~\x7f^g3M342e1~e2322e3~\x7fg2g3N44;" [compile-in emit :pop compile-begin]) compile-arglist -#function("r3c0e1g2e232u42;" [#function("v~6a0e0\x80e1i02e232\x81332c3e4e5c6qe7~e23232Ku322e2ay;e0\x80i02\x81332e8i0241;" [just-compile-args list-head MAX_ARGS #function("ve0i10i11^~44;" [compile-in]) nconc map #function("r1e0~K;" [list]) list-partition length]) length> MAX_ARGS]) +#function("r3c0e1g2e232u42;" [#function("v~6^0e0\x80e1i02e232\x81332c3e4e5c6qe7~e23232Ku322e2ay;e0\x80i02\x81332e8i0241;" [just-compile-args list-head MAX_ARGS #function("ve0i10i11^~44;" [compile-in]) nconc map #function("r1e0~K;" [list]) list-partition length]) length> MAX_ARGS]) compile-app -#function("r4c0g3Mu42;" [#function("v~F16\\02~Mc0<16\\02e1e2~313116\\02e3e2~31e432@6l0e5\x80\x81i02i0344;e6\x80\x81i02i0344;" [lambda list? cadr length> MAX_ARGS compile-let compile-call])]) +#function("r4c0g3Mu42;" [#function("v~F16W02~Mc0<16M02e1e2~313116?02e3e2~31e432@6?0e5\x80\x81i02i0344;e6\x80\x81i02i0344;" [lambda list? cadr length> MAX_ARGS compile-let compile-call])]) compile-and #function("r4e0~\x7fg2g3]e146;" [compile-short-circuit :brf]) compile @@ -261,55 +261,53 @@ caadr caaar #function("r1~MMM;" []) builtin->instruction -#function("r1c0e1e2c3~3231u42;" [#function("ve0e1~3216>02~;" [has? Instructions]) intern string #\:]) +#function("r1e0\x80~^43;" [get] [#table(#.number? :number? #.cons :cons #.fixnum? :fixnum? #.equal? :equal? #.eq? :eq? #.symbol? :symbol? #.div0 :div0 #.builtin? :builtin? #.aset! :aset! #.- :- #.boolean? :boolean? #.not :not #.apply :apply #.atom? :atom? #.set-cdr! :set-cdr! #./ :/ #.function? :function? #.vector :vector #.list :list #.bound? :bound? #.< :< #.* :* #.cdr :cdr #.null? :null? #.+ :+ #.eqv? :eqv? #.compare :compare #.aref :aref #.set-car! :set-car! #.car :car #.pair? :pair? #.= := #.vector? :vector?) ()]) bq-process -#function("r1c0^u42;" [#function("vc0qm02e1\x80316U0\x80H6S0c2e3e4\x803131u42;\x80;\x80?6`0c5\x80L2;\x80Mc6<6v0e3e3e7\x80313141;\x80Mc8<6\x840e7\x8041;e9~\x8032@6\xa00c:e;\x8031e\x80_u43;" [#function("r1~F16H02~Mc0<17H02~Mc1<17Q02~c2<;" [*comma-at* *comma-dot* *comma*]) self-evaluating? #function("v~Mc0<6?0e1~NK;e2e1~L3;" [list vector apply]) bq-process vector->list quote backquote cadr *comma* any #function("v~A6;0c0\x7fK;e1c2\x7fKe3~31L142;" [list nconc list* bq-process]) lastcdr map bq-bracket1 #function("v^~F16?02~Mc0<@6U02e1~M31\x7fKm12~Nm05202c2~F6l0e3\x7fe4~31L1325\x850~A6y0e5\x7f315\x850e3\x7fe6~31L132u42;" [*comma* bq-bracket #function("v~NA6:0~M;c0~K;" [nconc]) nreconc cadr reverse! bq-process])])]) +#function("r1c0^u42;" [#function("vc0qm02e1\x80316H0\x80H6A0c2e3e4\x803131u42;\x80;\x80?680c5\x80L2;\x80Mc6<6@0e3e3e7\x80313141;\x80Mc8<680e7\x8041;e9~\x8032@6D0c:e;\x8031e\x80_u43;" [#function("r1~F16B02~Mc0<17802~Mc1<17702~c2<;" [*comma-at* *comma-dot* *comma*]) self-evaluating? #function("v~Mc0<680e1~NK;e2e1~L3;" [list vector apply]) bq-process vector->list quote backquote cadr *comma* any #function("v~A670c0\x7fK;e1c2\x7fKe3~31L142;" [list nconc list* bq-process]) lastcdr map bq-bracket1 #function("v^~F16902~Mc0<@6E02e1~M31\x7fKm12~Nm05\x0f/2c2~F6A0e3\x7fe4~31L1325K0~A6:0e5\x7f315>0e3\x7fe6~31L132u42;" [*comma* bq-bracket #function("v~NA650~M;c0~K;" [nconc]) nreconc cadr reverse! bq-process])])]) bq-bracket1 -#function("r1~F16>02~Mc0<6G0e1~41;e2~41;" [*comma* cadr bq-process]) +#function("r1~F16802~Mc0<680e1~41;e2~41;" [*comma* cadr bq-process]) bq-bracket -#function("r1~?6A0e0e1~31L2;~Mc2<6S0e0e3~31L2;~Mc4<6e0c5e3~31L2;~Mc6<6s0e3~41;e0e1~31L2;" [list bq-process *comma* cadr *comma-at* copy-list *comma-dot*]) +#function("r1~?6<0e0e1~31L2;~Mc2<6<0e0e3~31L2;~Mc4<6<0c5e3~31L2;~Mc6<680e3~41;e0e1~31L2;" [list bq-process *comma* cadr *comma-at* copy-list *comma-dot*]) bcode:nconst #function("r1~b2[;" []) bcode:indexfor -#function("r2c0e1~31e2~31u43;" [#function("ve0~\x81326A0e1~\x8142;e2~\x81\x7f332\x7f\x80b2\x7fay\\2;" [has? get put!]) bcode:ctable bcode:nconst]) +#function("r2c0e1~31e2~31u43;" [#function("ve0~\x8132690e1~\x8142;e2~\x81\x7f332\x7f\x80b2\x7fay\\2;" [has? get put!]) bcode:ctable bcode:nconst]) bcode:ctable #function("r1~a[;" []) bcode:code #function("r1~`[;" []) assv -#function("r2\x7f?690^;e0\x7f31~=6F0\x7fM;e1~\x7fN42;" [caar assv]) +#function("r2\x7f?640^;e0\x7f31~=650\x7fM;e1~\x7fN42;" [caar assv]) assoc -#function("r2\x7f?690^;e0\x7f31~>6F0\x7fM;e1~\x7fN42;" [caar assoc]) +#function("r2\x7f?640^;e0\x7f31~>650\x7fM;e1~\x7fN42;" [caar assoc]) array? -#function("r1~H17C02c0e1~31u42;" [#function("v~F16=02~Mc0<;" [array]) typeof]) +#function("r1~H17=02c0e1~31u42;" [#function("v~F16802~Mc0<;" [array]) typeof]) argc-error -#function("r2e0e1c2~c3\x7f\x7faW6G0c45I0c53541;" [error string "compile error: " " expects " " argument." " arguments."]) +#function("r2e0e1c2~c3\x7f\x7faW670c4540c53541;" [error string "compile error: " " expects " " argument." " arguments."]) arg-counts #table(:not 1 :set-cdr! 2 :cons 2 :number? 1 :equal? 2 :cdr 1 :vector? 1 :eqv? 2 := 2 :div0 2 :atom? 1 :aref 2 :compare 2 :< 2 :null? 1 :eq? 2 :car 1 :set-car! 2 :builtin? 1 :aset! 3 :bound? 1 :boolean? 1 :pair? 1 :symbol? 1 :fixnum? 1) -append -#function("s0~A690_;~NA6B0~M;e0~Me1~NQ242;" [copy-list append]) any -#function("r2\x7fF16J02~\x7fM3117J02e0~\x7fN42;" [any]) +#function("r2\x7fF16D02~\x7fM3117:02e0~\x7fN42;" [any]) abs -#function("r1~`X6;0~{;~;" []) +#function("r1~`X650~{;~;" []) __start -#function("r1e0302~NF6N0~Nk12e2e3~31315]0~k12e4e5312e6302e7`41;" [__init_globals *argv* __script cadr princ *banner* repl exit]) +#function("r1e0302~NF6C0~Nk12e2e3~31315A0~k12e4e5312e6302e7`41;" [__init_globals *argv* __script cadr princ *banner* repl exit]) __script #function("r1c0qc1qt;" [#function("r0e0\x8041;" [load]) #function("r1e0~312e1a41;" [print-exception exit])]) __init_globals -#function("r0e0c1<17K02e0c2<17K02e0c3<6Z0c4k52c6k75c0c8k52c9k72e:k;2ek?;" [*os-name* win32 win64 windows "\\" *directory-separator* "\r\n" *linefeed* "/" "\n" *stdout* *output-stream* *stdin* *input-stream* *stderr* *error-stream*]) +#function("r0e0c1<17B02e0c2<17802e0c3<6>0c4k52c6k75;0c8k52c9k72e:k;2ek?;" [*os-name* win32 win64 windows "\\" *directory-separator* "\r\n" *linefeed* "/" "\n" *stdout* *output-stream* *stdin* *input-stream* *stderr* *error-stream*]) MAX_ARGS 127 Instructions #table(:sub2 74 :nop 0 :set-cdr! 32 :/ 37 :setc 63 :tapply 72 :lvargc 77 :cons 27 :loada1 79 dummy_nil 84 :equal? 14 :cdr 30 :call 3 :eqv? 13 := 39 :setg.l 60 :list 28 :atom? 15 :aref 43 :load0 48 :let 70 dummy_t 82 :argc 66 :< 40 :null? 17 :loadg 53 :load1 49 :car 29 :brt.l 10 :vargc 67 :loada 55 :set-car! 31 :setg 59 :aset! 44 :loadc01 81 :bound? 21 :pair? 22 :symbol? 19 :fixnum? 25 :loadi8 50 :not 16 :* 36 :neg 75 :pop 2 :largc 76 :loadnil 47 :brf 6 :vector 42 :- 35 :loadv 51 :loada.l 56 :seta.l 62 :closure 65 :loadc00 80 :number? 20 dummy_f 83 :trycatch 68 :add2 73 :loadv.l 52 :vector? 24 :brf.l 9 :seta 61 :apply 33 :dup 1 :div0 38 :setc.l 64 :copyenv 69 :for 71 :loada0 78 :loadc 57 :loadc.l 58 :compare 41 :eq? 12 :function? 26 :+ 34 :jmp 5 :loadt 45 :brt 7 :builtin? 23 :loadg.l 54 :tcall 4 :ret 11 :boolean? 18 :loadf 46 :jmp.l 8) >= -#function("r2\x7f~X17=02~\x7fW;" []) +#function("r2\x7f~X17602~\x7fW;" []) > #function("r2\x7f~X;" []) <= -#function("r2~\x7fX17=02~\x7fW;" []) +#function("r2~\x7fX17602~\x7fW;" []) 1arg-lambda? -#function("r1~F16`02~Mc0<16`02~NF16`02e1~31F16`02e2e1~31a42;" [lambda cadr length=]) +#function("r1~F16Z02~Mc0<16P02~NF16H02e1~31F16=02e2e1~31a42;" [lambda cadr length=]) 1- #function("r1~az;" []) 1+ @@ -319,6 +317,6 @@ Instructions *whitespace* "\t\n\v\f\r \u0085  ᠎           \u2028\u2029  　" *syntax-environment* -#table(define #function("s1~C6?0c0~\x7fML3;c0~Mc1~N\x7fKKL3;" [set! lambda]) letrec #function("s1c0e1e2~32e3e1c4q~32\x7f32KKe1c5q~32K;" [lambda map car nconc #function("r1c0~K;" [set!]) #function("r1^;" [])]) backquote #function("r1e0~41;" [bq-process]) assert #function("r1c0~]c1c2c3~L2L2L2L4;" [if raise quote assert-failed]) label #function("r2c0~L1c1~\x7fL3L3^L2;" [lambda set!]) do #function("s2c0e130\x7fMe2e3~32e2e4~32e2c5q~32u46;" [#function("vc0~c1g2c2\x7fe3c4L1e5\x81N3132e3c4L1e5i0231e3~L1e5g43132L133L4L3L2L1e3~L1e5g33132L3;" [letrec lambda if nconc begin copy-list]) gensym map car cadr #function("r1e0~31F6A0e1~41;~M;" [cddr caddr])]) when #function("s1c0~c1\x7fK^L4;" [if begin]) unwind-protect #function("r2c0e130e130u43;" [#function("vc0\x7fc1_\x81L3L2L1c2c3\x80c1~L1c4\x7fL1c5~L2L3L3L3\x7fL1L3L3;" [let lambda prog1 trycatch begin raise]) gensym]) dotimes #function("s1c0~Me1~31u43;" [#function("vc0`c1\x7faL3e2c3L1~L1L1e4\x813133L4;" [for - nconc lambda copy-list]) cadr]) define-macro #function("s1c0c1~ML2c2~N\x7fKKL3;" [set-syntax! quote lambda]) unless #function("s1c0~^c1\x7fKL4;" [if begin]) let #function("s1c0^u42;" [#function("v\x80C6H0\x80m02\x81Mo002\x81No015I0^2c0c1e2c3q\x8032\x81KKe2c4q\x8032u43;" [#function("v\x806>0c0\x80~L35?0~\x7fK;" [label]) lambda map #function("r1~F6:0~M;~;" []) #function("r1~F6=0e0~41;^;" [cadr])])]) cond #function("s0c0^u42;" [#function("vc0qm02~\x8041;" [#function("r1~?690^;c0~Mu42;" [#function("v~Mc0<17?02~M]<6Q0~NA6K0~M;c1~NK;~NA6e0c2~Mi10\x80N31L3;c3~Mc1~NKi10\x80N31L4;" [else begin or if])])])]) throw #function("r2c0c1c2c3L2~\x7fL4L2;" [raise list quote thrown-value]) time #function("r1c0e130u42;" [#function("vc0~c1L1L2L1c2\x80c3c4c5c1L1~L3c6L4L3L3;" [let time.now prog1 princ "Elapsed time: " - " seconds\n"]) gensym]) let* #function("s1~?6J0e0c1L1_L1e2\x7f3133L1;e0c1L1e3~31L1L1e2~NF6w0e0c4L1~NL1e2\x7f3133L15x0\x7f3133e5~31L2;" [nconc lambda copy-list caar let* cadar]) case #function("s1c0^u42;" [#function("vc0qm02c1e230u42;" [#function("r2\x7fc0<6<0c0;\x7fA6C0^;\x7fC6S0c1~e2\x7f31L3;\x7f?6c0c3~e2\x7f31L3;\x7fNA6u0c3~e2\x7fM31L3;e4e5\x7f326\x8a0c6~c7\x7fL2L3;c8~c7\x7fL2L3;" [else eq? quote-value eqv? every symbol? memq quote memv]) #function("vc0~i10L2L1e1c2L1e3e4c5qi11323132L3;" [let nconc cond copy-list map #function("r1i10\x80~M32~NK;" [])]) gensym])]) catch #function("r2c0e130u42;" [#function("vc0\x81c1~L1c2c3c4~L2c5c6~L2c7c8L2L3c5c9~L2\x80L3L4c:~L2c;~L2L4L3L3;" [trycatch lambda if and pair? eq car quote thrown-value cadr caddr raise]) gensym])) +#table(define #function("s1~C6:0c0~\x7fML3;c0~Mc1~N\x7fKKL3;" [set! lambda]) letrec #function("s1c0e1e2~32e3e1c4q~32\x7f32KKe1c5q~32K;" [lambda map car nconc #function("r1c0~K;" [set!]) #function("r1^;" [])]) backquote #function("r1e0~41;" [bq-process]) assert #function("r1c0~]c1c2c3~L2L2L2L4;" [if raise quote assert-failed]) label #function("r2c0~L1c1~\x7fL3L3^L2;" [lambda set!]) do #function("s2c0e130\x7fMe2e3~32e2e4~32e2c5q~32u46;" [#function("vc0~c1g2c2\x7fe3c4L1e5\x81N3132e3c4L1e5i0231e3~L1e5g43132L133L4L3L2L1e3~L1e5g33132L3;" [letrec lambda if nconc begin copy-list]) gensym map car cadr #function("r1e0~31F680e1~41;~M;" [cddr caddr])]) when #function("s1c0~c1\x7fK^L4;" [if begin]) unwind-protect #function("r2c0e130e130u43;" [#function("vc0\x7fc1_\x81L3L2L1c2c3\x80c1~L1c4\x7fL1c5~L2L3L3L3\x7fL1L3L3;" [let lambda prog1 trycatch begin raise]) gensym]) dotimes #function("s1c0~Me1~31u43;" [#function("vc0`c1\x7faL3e2c3L1~L1L1e4\x813133L4;" [for - nconc lambda copy-list]) cadr]) define-macro #function("s1c0c1~ML2c2~N\x7fKKL3;" [set-syntax! quote lambda]) unless #function("s1c0~^c1\x7fKL4;" [if begin]) let #function("s1c0^u42;" [#function("v\x80C6D0\x80m02\x81Mo002\x81No01530^2c0c1e2c3q\x8032\x81KKe2c4q\x8032u43;" [#function("v\x806;0c0\x80~L3530~\x7fK;" [label]) lambda map #function("r1~F650~M;~;" []) #function("r1~F680e0~41;^;" [cadr])])]) cond #function("s0c0^u42;" [#function("vc0qm02~\x8041;" [#function("r1~?640^;c0~Mu42;" [#function("v~Mc0<17702~M]<6A0~NA650~M;c1~NK;~NA6@0c2~Mi10\x80N31L3;c3~Mc1~NKi10\x80N31L4;" [else begin or if])])])]) throw #function("r2c0c1c2c3L2~\x7fL4L2;" [raise list quote thrown-value]) time #function("r1c0e130u42;" [#function("vc0~c1L1L2L1c2\x80c3c4c5c1L1~L3c6L4L3L3;" [let time.now prog1 princ "Elapsed time: " - " seconds\n"]) gensym]) let* #function("s1~?6E0e0c1L1_L1e2\x7f3133L1;e0c1L1e3~31L1L1e2~NF6H0e0c4L1~NL1e2\x7f3133L1530\x7f3133e5~31L2;" [nconc lambda copy-list caar let* cadar]) case #function("s1c0^u42;" [#function("vc0qm02c1e230u42;" [#function("r2\x7fc0<650c0;\x7fA640^;\x7fC6=0c1~e2\x7f31L3;\x7f?6=0c3~e2\x7f31L3;\x7fNA6>0c3~e2\x7fM31L3;e4e5\x7f326=0c6~c7\x7fL2L3;c8~c7\x7fL2L3;" [else eq? quote-value eqv? every symbol? memq quote memv]) #function("vc0~i10L2L1e1c2L1e3e4c5qi11323132L3;" [let nconc cond copy-list map #function("r1i10\x80~M32~NK;" [])]) gensym])]) catch #function("r2c0e130u42;" [#function("vc0\x81c1~L1c2c3c4~L2c5c6~L2c7c8L2L3c5c9~L2\x80L3L4c:~L2c;~L2L4L3L3;" [trycatch lambda if and pair? eq car quote thrown-value cadr caddr raise]) gensym])) *banner* "; _\n; |_ _ _ |_ _ | . _ _\n; | (-||||_(_)|__|_)|_)\n;-------------------|----------------------------------------------------------\n\n" diff --git a/femtolisp/flisp.c b/femtolisp/flisp.c index 71ade84..9e1222c 100644 --- a/femtolisp/flisp.c +++ b/femtolisp/flisp.c @@ -567,6 +567,7 @@ void gc(int mustgrow) // apply function with n args on the stack static value_t _applyn(uint32_t n) { + assert(n <= MAX_ARGS+1); value_t f = Stack[SP-n-1]; uint32_t saveSP = SP; value_t v; @@ -598,7 +599,6 @@ value_t apply(value_t f, value_t l) v = cdr_(v); } n = SP - n - 1; - assert(n <= MAX_ARGS+1); v = _applyn(n); POPN(n+1); return v; @@ -606,6 +606,7 @@ value_t apply(value_t f, value_t l) value_t applyn(uint32_t n, value_t f, ...) { + assert(n <= MAX_ARGS); va_list ap; va_start(ap, f); size_t i; @@ -739,15 +740,46 @@ static value_t apply_liststar(value_t L, int star) value_t fl_copylist(value_t *args, u_int32_t nargs) { - if (nargs != 2) - argcount("copy-list", nargs, 1); - value_t l = FL_COPYLIST(args[0]); - if (nargs == 2) { - if (!iscons(args[0])) - return args[1]; - ((cons_t*)(curheap-sizeof(cons_t)))->cdr = args[1]; + argcount("copy-list", nargs, 1); + return FL_COPYLIST(args[0]); +} + +value_t fl_append(value_t *args, u_int32_t nargs) +{ + if (nargs == 0) + return NIL; + value_t first=NIL, lst, lastcons=NIL; + fl_gc_handle(&first); + fl_gc_handle(&lastcons); + uint32_t i=0; + while (1) { + if (i >= MAX_ARGS) { + lst = car_(args[MAX_ARGS]); + args[MAX_ARGS] = cdr_(args[MAX_ARGS]); + if (!iscons(args[MAX_ARGS])) break; + } + else { + lst = args[i++]; + if (i >= nargs) break; + } + if (iscons(lst)) { + lst = FL_COPYLIST(lst); + if (first == NIL) + first = lst; + else + cdr_(lastcons) = lst; + lastcons = tagptr((((cons_t*)curheap)-1), TAG_CONS); + } + else if (lst != NIL) { + type_error("append", "cons", lst); + } } - return l; + if (first == NIL) + first = lst; + else + cdr_(lastcons) = lst; + fl_free_gc_handles(2); + return first; } value_t fl_liststar(value_t *args, u_int32_t nargs) @@ -785,17 +817,17 @@ static value_t do_trycatch() #define fn_env(f) (((value_t*)ptr(f))[2]) #if _BYTE_ORDER == __BIG_ENDIAN -#define GET_UINT32(a, i) \ - ((((uint32_t)a[i+0])<<0) | \ - (((uint32_t)a[i+1])<<8) | \ - (((uint32_t)a[i+2])<<16) | \ - (((uint32_t)a[i+3])<<24)) -#define GET_UINT16(a, i) \ - ((((uint16_t)a[i+0])<<0) | \ - (((uint16_t)a[i+1])<<8)) +#define GET_INT32(a) \ + ((((int32_t)a[0])<<0) | \ + (((int32_t)a[1])<<8) | \ + (((int32_t)a[2])<<16) | \ + (((int32_t)a[3])<<24)) +#define GET_INT16(a) \ + ((((int16_t)a[0])<<0) | \ + (((int16_t)a[1])<<8)) #else -#define GET_UINT32(a, i) (*(uint32_t*)&a[i]) -#define GET_UINT16(a, i) (*(uint16_t*)&a[i]) +#define GET_INT32(a) (*(int32_t*)a) +#define GET_INT16(a) (*(int16_t*)a) #endif /* @@ -814,12 +846,14 @@ static value_t do_trycatch() static value_t apply_cl(uint32_t nargs) { // frame variables - uint32_t i, n, ip, bp, captured; + uint32_t n, captured; + value_t *bp; + const uint8_t *ip; fixnum_t s, hi; - uint8_t *code; // temporary variables (not necessary to preserve across calls) uint8_t op; + uint32_t i; symbol_t *sym; static cons_t *c; static value_t *pv; @@ -829,21 +863,19 @@ static value_t apply_cl(uint32_t nargs) apply_cl_top: captured = 0; func = Stack[SP-nargs-1]; - code = cv_data((cvalue_t*)ptr(fn_bcode(func))); - assert(!ismanaged((uptrint_t)code)); - assert(ismanaged(func)); + ip = cv_data((cvalue_t*)ptr(fn_bcode(func))); + assert(!ismanaged((uptrint_t)ip)); - bp = SP-nargs; + bp = &Stack[SP-nargs]; PUSH(fn_env(func)); - ip = 0; - { + { next_op: - op = code[ip++]; + op = *ip++; dispatch: switch (op) { case OP_ARGC: - n = code[ip++]; + n = *ip++; if (nargs != n) { if (nargs > n) lerror(ArgError, "apply: too many arguments"); @@ -852,11 +884,11 @@ static value_t apply_cl(uint32_t nargs) } goto next_op; case OP_VARGC: - i = code[ip++]; + i = *ip++; s = (fixnum_t)nargs - (fixnum_t)i; v = NIL; if (s > 0) { - v = list(&Stack[bp+i], s); + v = list(&bp[i], s); if (nargs > MAX_ARGS) { if (s == 1) { v = car_(v); @@ -866,8 +898,8 @@ static value_t apply_cl(uint32_t nargs) (c-2)->cdr = (c-1)->car; } } - Stack[bp+i] = v; - Stack[bp+i+1] = Stack[bp+nargs]; + bp[i] = v; + bp[i+1] = bp[nargs]; } else if (s < 0) { lerror(ArgError, "apply: too few arguments"); @@ -882,7 +914,7 @@ static value_t apply_cl(uint32_t nargs) case OP_LARGC: case OP_LVARGC: // move extra arguments from list to stack - i = GET_UINT32(code, ip); ip+=4; + i = GET_INT32(ip); ip+=4; e = POP(); // cloenv if (nargs > MAX_ARGS) { v = POP(); // list of rest args @@ -915,18 +947,18 @@ static value_t apply_cl(uint32_t nargs) case OP_DUP: SP++; Stack[SP-1] = Stack[SP-2]; goto next_op; case OP_POP: POPN(1); goto next_op; case OP_TCALL: - n = code[ip++]; // nargs + n = *ip++; // nargs do_tcall: if (isfunction(Stack[SP-n-1])) { for(s=-1; s < (fixnum_t)n; s++) - Stack[bp+s] = Stack[SP-n+s]; - SP = bp+n; + bp[s] = Stack[SP-n+s]; + SP = (bp-Stack)+n; nargs = n; goto apply_cl_top; } goto do_call; case OP_CALL: - n = code[ip++]; // nargs + n = *ip++; // nargs do_call: func = Stack[SP-n-1]; s = SP; @@ -970,26 +1002,26 @@ static value_t apply_cl(uint32_t nargs) SP = s-n; Stack[SP-1] = v; goto next_op; - case OP_JMP: ip = (uint32_t)GET_UINT16(code,ip); goto next_op; + case OP_JMP: ip += (ptrint_t)GET_INT16(ip); goto next_op; case OP_BRF: v = POP(); - if (v == FL_F) ip = (uint32_t)GET_UINT16(code,ip); + if (v == FL_F) ip += (ptrint_t)GET_INT16(ip); else ip += 2; goto next_op; case OP_BRT: v = POP(); - if (v != FL_F) ip = (uint32_t)GET_UINT16(code,ip); + if (v != FL_F) ip += (ptrint_t)GET_INT16(ip); else ip += 2; goto next_op; - case OP_JMPL: ip = GET_UINT32(code,ip); goto next_op; + case OP_JMPL: ip += (ptrint_t)GET_INT32(ip); goto next_op; case OP_BRFL: v = POP(); - if (v == FL_F) ip = GET_UINT32(code,ip); + if (v == FL_F) ip += (ptrint_t)GET_INT32(ip); else ip += 4; goto next_op; case OP_BRTL: v = POP(); - if (v != FL_F) ip = GET_UINT32(code,ip); + if (v != FL_F) ip += (ptrint_t)GET_INT32(ip); else ip += 4; goto next_op; case OP_RET: v = POP(); return v; @@ -1078,7 +1110,7 @@ static value_t apply_cl(uint32_t nargs) cdr(Stack[SP-2]) = Stack[SP-1]; POPN(1); goto next_op; case OP_LIST: - n = code[ip++]; + n = *ip++; apply_list: if (n > 0) { v = list(&Stack[SP-n], n); @@ -1092,7 +1124,7 @@ static value_t apply_cl(uint32_t nargs) case OP_TAPPLY: case OP_APPLY: - n = code[ip++]; + n = *ip++; apply_apply: v = POP(); // arglist if (n > MAX_ARGS) { @@ -1112,7 +1144,7 @@ static value_t apply_cl(uint32_t nargs) else goto do_call; case OP_ADD: - n = code[ip++]; + n = *ip++; apply_add: s = 0; i = SP-n; @@ -1151,7 +1183,7 @@ static value_t apply_cl(uint32_t nargs) Stack[SP-1] = v; goto next_op; case OP_SUB: - n = code[ip++]; + n = *ip++; apply_sub: if (n == 2) goto do_sub2; if (n == 1) goto do_neg; @@ -1190,7 +1222,7 @@ static value_t apply_cl(uint32_t nargs) Stack[SP-1] = v; goto next_op; case OP_MUL: - n = code[ip++]; + n = *ip++; apply_mul: accum = 1; i = SP-n; @@ -1215,7 +1247,7 @@ static value_t apply_cl(uint32_t nargs) PUSH(v); goto next_op; case OP_DIV: - n = code[ip++]; + n = *ip++; apply_div: i = SP-n; if (n == 1) { @@ -1270,7 +1302,7 @@ static value_t apply_cl(uint32_t nargs) goto next_op; case OP_VECTOR: - n = code[ip++]; + n = *ip++; apply_vector: if (n > MAX_ARGS) { i = llength(Stack[SP-1])-1; @@ -1333,12 +1365,12 @@ static value_t apply_cl(uint32_t nargs) //f = Stack[SP-1]; v = FL_F; SP += 2; - i = SP; + n = SP; for(; s <= hi; s++) { Stack[SP-2] = Stack[SP-3]; Stack[SP-1] = fixnum(s); v = apply_cl(1); - SP = i; + SP = n; } POPN(4); Stack[SP-1] = v; @@ -1349,26 +1381,26 @@ static value_t apply_cl(uint32_t nargs) case OP_LOADNIL: PUSH(NIL); goto next_op; case OP_LOAD0: PUSH(fixnum(0)); goto next_op; case OP_LOAD1: PUSH(fixnum(1)); goto next_op; - case OP_LOADI8: s = (int8_t)code[ip++]; PUSH(fixnum(s)); goto next_op; + case OP_LOADI8: s = (int8_t)*ip++; PUSH(fixnum(s)); goto next_op; case OP_LOADV: - v = fn_vals(Stack[bp-1]); - assert(code[ip] < vector_size(v)); - v = vector_elt(v, code[ip]); ip++; + v = fn_vals(bp[-1]); + assert(*ip < vector_size(v)); + v = vector_elt(v, *ip); ip++; PUSH(v); goto next_op; case OP_LOADVL: - v = fn_vals(Stack[bp-1]); - v = vector_elt(v, GET_UINT32(code,ip)); ip+=4; + v = fn_vals(bp[-1]); + v = vector_elt(v, GET_INT32(ip)); ip+=4; PUSH(v); goto next_op; case OP_LOADGL: - v = fn_vals(Stack[bp-1]); - v = vector_elt(v, GET_UINT32(code,ip)); ip+=4; + v = fn_vals(bp[-1]); + v = vector_elt(v, GET_INT32(ip)); ip+=4; goto do_loadg; case OP_LOADG: - v = fn_vals(Stack[bp-1]); - assert(code[ip] < vector_size(v)); - v = vector_elt(v, code[ip]); ip++; + v = fn_vals(bp[-1]); + assert(*ip < vector_size(v)); + v = vector_elt(v, *ip); ip++; do_loadg: assert(issymbol(v)); sym = (symbol_t*)ptr(v); @@ -1378,13 +1410,13 @@ static value_t apply_cl(uint32_t nargs) goto next_op; case OP_SETGL: - v = fn_vals(Stack[bp-1]); - v = vector_elt(v, GET_UINT32(code,ip)); ip+=4; + v = fn_vals(bp[-1]); + v = vector_elt(v, GET_INT32(ip)); ip+=4; goto do_setg; case OP_SETG: - v = fn_vals(Stack[bp-1]); - assert(code[ip] < vector_size(v)); - v = vector_elt(v, code[ip]); ip++; + v = fn_vals(bp[-1]); + assert(*ip < vector_size(v)); + v = vector_elt(v, *ip); ip++; do_setg: assert(issymbol(v)); sym = (symbol_t*)ptr(v); @@ -1395,71 +1427,69 @@ static value_t apply_cl(uint32_t nargs) case OP_LOADA: assert(nargs > 0); - i = code[ip++]; + i = *ip++; if (captured) { - e = Stack[bp]; + e = *bp; assert(isvector(e)); assert(i < vector_size(e)); v = vector_elt(e, i); } else { - assert(bp+i < SP); - v = Stack[bp+i]; + v = bp[i]; } PUSH(v); goto next_op; case OP_LOADA0: if (captured) - v = vector_elt(Stack[bp], 0); + v = vector_elt(*bp, 0); else - v = Stack[bp]; + v = *bp; PUSH(v); goto next_op; case OP_LOADA1: if (captured) - v = vector_elt(Stack[bp], 1); + v = vector_elt(*bp, 1); else - v = Stack[bp+1]; + v = bp[1]; PUSH(v); goto next_op; case OP_LOADAL: assert(nargs > 0); - i = GET_UINT32(code,ip); ip+=4; + i = GET_INT32(ip); ip+=4; if (captured) - v = vector_elt(Stack[bp], i); + v = vector_elt(*bp, i); else - v = Stack[bp+i]; + v = bp[i]; PUSH(v); goto next_op; case OP_SETA: assert(nargs > 0); v = Stack[SP-1]; - i = code[ip++]; + i = *ip++; if (captured) { - e = Stack[bp]; + e = *bp; assert(isvector(e)); assert(i < vector_size(e)); vector_elt(e, i) = v; } else { - assert(bp+i < SP); - Stack[bp+i] = v; + bp[i] = v; } goto next_op; case OP_SETAL: assert(nargs > 0); v = Stack[SP-1]; - i = GET_UINT32(code,ip); ip+=4; + i = GET_INT32(ip); ip+=4; if (captured) - vector_elt(Stack[bp], i) = v; + vector_elt(*bp, i) = v; else - Stack[bp+i] = v; + bp[i] = v; goto next_op; case OP_LOADC: case OP_SETC: - s = code[ip++]; - i = code[ip++]; - v = Stack[bp+nargs]; + s = *ip++; + i = *ip++; + v = bp[nargs]; while (s--) v = vector_elt(v, vector_size(v)-1); assert(isvector(v)); @@ -1470,16 +1500,16 @@ static value_t apply_cl(uint32_t nargs) PUSH(vector_elt(v, i)); goto next_op; case OP_LOADC00: - PUSH(vector_elt(Stack[bp+nargs], 0)); + PUSH(vector_elt(bp[nargs], 0)); goto next_op; case OP_LOADC01: - PUSH(vector_elt(Stack[bp+nargs], 1)); + PUSH(vector_elt(bp[nargs], 1)); goto next_op; case OP_LOADCL: case OP_SETCL: - s = GET_UINT32(code,ip); ip+=4; - i = GET_UINT32(code,ip); ip+=4; - v = Stack[bp+nargs]; + s = GET_INT32(ip); ip+=4; + i = GET_INT32(ip); ip+=4; + v = bp[nargs]; while (s--) v = vector_elt(v, vector_size(v)-1); if (op == OP_SETCL) @@ -1493,27 +1523,26 @@ static value_t apply_cl(uint32_t nargs) // build a closure (lambda args body . env) if (nargs > 0 && !captured) { // save temporary environment to the heap - //lenv = &Stack[bp]; n = nargs; pv = alloc_words(n + 2); PUSH(tagptr(pv, TAG_VECTOR)); pv[0] = fixnum(n+1); pv++; do { - pv[n] = Stack[bp+n]; + pv[n] = bp[n]; } while (n--); // environment representation changed; install // the new representation so everybody can see it captured = 1; - Stack[bp] = Stack[SP-1]; + *bp = Stack[SP-1]; } else { - PUSH(Stack[bp]); // env has already been captured; share + PUSH(*bp); // env has already been captured; share } if (op == OP_CLOSURE) { pv = alloc_words(4); e = Stack[SP-2]; // closure to copy - assert(isfunction(x)); + assert(isfunction(e)); pv[0] = ((value_t*)ptr(e))[0]; pv[1] = ((value_t*)ptr(e))[1]; pv[2] = Stack[SP-1]; // env @@ -1606,6 +1635,7 @@ static builtinspec_t core_builtin_info[] = { { "gensym", fl_gensym }, { "hash", fl_hash }, { "copy-list", fl_copylist }, + { "append", fl_append }, { "list*", fl_liststar }, { NULL, NULL } }; @@ -1708,13 +1738,7 @@ static void lisp_init(void) value_t toplevel_eval(value_t expr) { - value_t v; - uint32_t saveSP = SP; - PUSH(symbol_value(evalsym)); - PUSH(expr); - v = apply_cl(1); - SP = saveSP; - return v; + return applyn(1, symbol_value(evalsym), expr); } static value_t argv_list(int argc, char *argv[]) diff --git a/femtolisp/system.lsp b/femtolisp/system.lsp index 029daba..193f599 100644 --- a/femtolisp/system.lsp +++ b/femtolisp/system.lsp @@ -21,15 +21,14 @@ (define (symbol-syntax s) (get *syntax-environment* s #f)) (define (map f lst) - ((lambda (first acc) - (begin - (set! first acc) + ((lambda (acc) + (cdr + (prog1 acc (while (pair? lst) (begin (set! acc (cdr (set-cdr! acc (cons (f (car lst)) ())))) - (set! lst (cdr lst)))) - (cdr first))) - () (list ()))) + (set! lst (cdr lst))))))) + (list ()))) (define-macro (label name fn) (list (list 'lambda (list name) (list 'set! name fn)) #f)) @@ -81,12 +80,6 @@ ; standard procedures --------------------------------------------------------- -(define (append . lsts) - (cond ((null? lsts) ()) - ((null? (cdr lsts)) (car lsts)) - (#t (copy-list (car lsts) - (apply append (cdr lsts)))))) - (define (member item lst) (cond ((atom? lst) #f) ((equal? (car lst) item) lst) diff --git a/femtolisp/test.lsp b/femtolisp/test.lsp index 20f4378..bd40a0d 100644 --- a/femtolisp/test.lsp +++ b/femtolisp/test.lsp @@ -188,29 +188,25 @@ ;(tt) (define-macro (accumulate-while cnd what . body) - (let ((first (gensym)) - (acc (gensym))) - `(let ((,first ()) - (,acc (list ()))) - (set! ,first ,acc) - (while ,cnd - (begin (set! ,acc - (cdr (set-cdr! ,acc (cons ,what ())))) - ,@body)) - (cdr ,first)))) + (let ((acc (gensym))) + `(let ((,acc (list ()))) + (cdr + (prog1 ,acc + (while ,cnd + (begin (set! ,acc + (cdr (set-cdr! ,acc (cons ,what ())))) + ,@body))))))) (define-macro (accumulate-for var lo hi what . body) - (let ((first (gensym)) - (acc (gensym))) - `(let ((,first ()) - (,acc (list ()))) - (set! ,first ,acc) - (for ,lo ,hi - (lambda (,var) - (begin (set! ,acc - (cdr (set-cdr! ,acc (cons ,what ())))) - ,@body))) - (cdr ,first)))) + (let ((acc (gensym))) + `(let ((,acc (list ()))) + (cdr + (prog1 ,acc + (for ,lo ,hi + (lambda (,var) + (begin (set! ,acc + (cdr (set-cdr! ,acc (cons ,what ())))) + ,@body)))))))) (define (map-indexed f lst) (if (atom? lst) lst @@ -231,27 +227,54 @@ (set! profile (lambda (s) (let ((f (top-level-value s))) + (put! *profiles* s (cons 0 0)) (set-top-level-value! s (lambda args - (define tt (get *profiles* s 0)) + (define tt (get *profiles* s)) + (define count (car tt)) + (define time (cdr tt)) (define t0 (time.now)) (define v (apply f args)) - (put! *profiles* s (+ tt (- (time.now) t0))) + (set-cdr! tt (+ time (- (time.now) t0))) + (set-car! tt (+ count 1)) v))))) (set! show-profiles (lambda () - (define (swapad c) (cons (cdr c) (car c))) - (for-each (lambda (p) - (princ (cdr p) "\t\t" (car p)) - (newline)) - (simple-sort (map swapad (table.pairs *profiles*))))))) + (define (max a b) (if (< a b) b a)) + (define pr (filter (lambda (x) (> (cadr x) 0)) + (table.pairs *profiles*))) + (define width (+ 4 + (foldl max 0 + (map (lambda (x) + (length (string x))) + (cons 'Function + (map car pr)))))) + (princ (string.rpad "Function" width #\ ) + "#Calls Time (seconds)") + (newline) + (princ (string.rpad "--------" width #\ ) + "------ --------------") + (newline) + (for-each + (lambda (p) + (princ (string.rpad (string (caddr p)) width #\ ) + (string.rpad (string (cadr p)) 11 #\ ) + (car p)) + (newline)) + (simple-sort (map (lambda (l) (reverse (to-proper l))) + pr))))) + (set! clear-profiles + (lambda () + (for-each (lambda (k) + (put! *profiles* k (cons 0 0))) + (table.keys *profiles*))))) #;(for-each profile '(emit encode-byte-code const-to-idx-vec - index-of lookup-sym in-env? + index-of lookup-sym in-env? any every compile-sym compile-if compile-begin list-partition just-compile-args - compile-arglist + compile-arglist macroexpand builtin->instruction compile-app compile-let compile-call compile-in compile compile-f map length> length= count filter append diff --git a/femtolisp/todo b/femtolisp/todo index ceb3c28..8b42d50 100644 --- a/femtolisp/todo +++ b/femtolisp/todo @@ -1048,3 +1048,54 @@ new evaluator todo: loadf+brt => nothing loadt+brt => jmp loadf+brf => jmp + +----------------------------------------------------------------------------- + +new stack organization: + +func +arg1 +... +argn +cloenv | +prev | +args | +nargs | +ip | +capt? | + +to call: +push func and arguments +args[nargs+4] = ip // save my state in my frame +args[nargs+5] = capt? +assign nargs +goto top + +on entry: +push cloenv +push curr_frame (a global initialized to 0) +push args +push nargs +SP += 2 +curr_frame = SP + +to return: +v = POP(); +SP = curr_frame +pop top 4 words into corresponding local vars +curr_frame = pop() +pop cloenv +pop arguments +Stack[SP-1] = v +goto next_op + +to relocate stack: +curr_top = SP +f = curr_frame +while (1) { + for i=f, i