From c1eae2f3212b0725eae53d33b3c171e557750a40 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Thu, 11 Jan 2024 21:17:56 -0800
Subject: [PATCH] Bootstrap with assembler

---
 ref/console.tal  | 108 +++++++++++++++++++++++++++++++++++++++++++++++
 ref/drifloon.bin | Bin 0 -> 1437 bytes
 ref/makefile     |   5 +--
 ref/opc-test.bin | Bin 61188 -> 0 bytes
 4 files changed, 110 insertions(+), 3 deletions(-)
 create mode 100644 ref/console.tal
 create mode 100644 ref/drifloon.bin
 delete mode 100644 ref/opc-test.bin

diff --git a/ref/console.tal b/ref/console.tal
new file mode 100644
index 0000000..23ef375
--- /dev/null
+++ b/ref/console.tal
@@ -0,0 +1,108 @@
+( usage: uxncli console.rom arg1 arg2 arg3 Prints Hello Uxn!, and listens for incoming stdin events on enter. )
+
+|10 @Console &vector $2 &read $1 &pad $4 &type $1 &write $1 &error $1
+
+|0000
+
+	@buf
+
+|0100
+
+@on-reset ( -> )
+	;on-argument .Console/vector DEO2
+	.Console/type DEI ?{ ;on-stdin .Console/vector DEO2 }
+	;dict/hello <print-str>
+	BRK
+
+@on-argument ( -> )
+	.Console/read DEI .buf skey ?{ BRK }
+	<print-type>
+	;dict/yousent <print-str>
+	LIT "" #18 DEO
+	;buf <print-str>/
+	LIT "" #18 DEO
+	#0a18 DEO
+	;buf sclr/ .Console/type DEI #04 NEQ ?{
+		;dict/argend <print-str>
+		;on-stdin .Console/vector DEO2 }
+	BRK
+
+@on-stdin ( -> )
+	.Console/read DEI .buf skey ?{ BRK }
+	;buf ;dict/quit scmp ?&quit
+	<print-type>
+	;dict/yousaid <print-str>
+	LIT "" #18 DEO
+	;buf <print-str>/
+	LIT "" #18 DEO
+	#0a18 DEO
+	;buf sclr/ BRK
+	&quit ( buf* -> )
+		#800f DEO
+		BRK
+
+@<print-type> ( -- )
+	[ LIT2 00 -Console/type ] DEI #01 GTH DUP ADD ;types ADD2
+	( ) LDA2 !<print-str>/
+
+(
+@|stdlib )
+
+@<print-str> ( str* -- )
+	&w ( -- )
+		LDAk #18 DEO
+		INC2 & LDAk ?&w
+	POP2 JMP2r
+
+@sclr ( str* -- )
+	&w ( -- )
+		STH2k #00 STH2r STA
+		INC2 & LDAk ?&w
+	POP2 JMP2r
+
+@skey ( key buf -- proc )
+	OVR #20 LTH ?{
+		#00 SWP sput #00 JMP2r }
+	POP2 #01 JMP2r
+
+@scap ( str* -- end* )
+	&w ( -- )
+		INC2 & LDAk ?&w
+	JMP2r
+
+@sput ( chr str* -- )
+	scap/ STA
+	JMP2r
+
+@scmp ( a* b* -- f )
+	STH2
+	&l ( a* b* -- f )
+		LDAk LDAkr STHr NEQk ?&d
+		DUP EOR EQUk ?&d
+		POP2 INC2 INC2r !&l
+	&d ( a* c1 c2 b* -- f )
+		NIP2 POP2r EQU JMP2r
+
+@<phex> ( short* -- )
+	SWP <phex>/b
+	&b ( -- )
+		DUP #04 SFT <phex>/c
+	&c ( -- )
+		#0f AND DUP #09 GTH #27 MUL ADD [ LIT "0 ] ADD #18 DEO
+		JMP2r
+
+(
+@|assets )
+
+@types
+	=dict/std =dict/arg
+
+@dict ( )
+	&hello "Welcome 20 "to 20 "Uxn! 0a $1
+	&yousaid "You 20 "said: 20 $1
+	&yousent "You 20 "sent: 20 $1
+	&std "(std) $1
+	&arg "(arg) $1
+	&quit "quit $1
+	&argend "(argend) 0a $1
+
diff --git a/ref/drifloon.bin b/ref/drifloon.bin
new file mode 100644
index 0000000000000000000000000000000000000000..2b88239f19cf01685896f4c47ead7c2bb0a08dc3
GIT binary patch
literal 1437
zcmY*ZZ){Ul6hHUA_N^NXn5AqbBKN+L=Ln1q+Qn{Yd>frIEN$0zsF=y^pbX;Mx|Gd8
zkZ?u_0b(%5ry(YoyZA+nhLE6%@&%32FGhosXrdD12mhg&1`QF+p68WMet7Tv&UroO
z{Lb&5Tg@79*#m(0tS|+Hxq=EPV1VNE;t)sCfOn#{7NSGI0E$Kd_nP=rM8HZDN6AD@
z>>#t&#I<BBWCA#M|ChFiBj|>6?@0V7VY%25*DM=zHQSq%wl?1H(Z-)W^j#SX$f&!3
zQ6vVV0!B0f9`BYZJqsSTwaW9tzhzmJlcb#FoLnxz)?lPO?2qHhMFQGv9sW=mV*-}w
z@Vm<R(pJXjx+&hOi~;$k@ISRISL4!F7f-cl28y*4wa}qhki}+*gpDUQ+6tn0a+!dL
zG8Riu_`h1@x*kTN+B~PtDGz~k2(`=P`k*`2{oS$@C&p(KpAazNKvpVt*@2J9Tte(l
zIq;rzSd`qb!)!zauM+;+ftLb&hVUzf11C@`m?h_w1J6nn4(yTWIPf$o2cDD;#OZ0Y
z9QLiJ$R}#IELZVG4rFY_D~5@o2<BHKu2RtFK$wDg3UXo_;fkN67VQ`!&s6-d15rzd
zzoC$VX2n(zO(}ar3cw^d*G1x|VhYw(5jVOz{ITMw_z^AQt$3na@q^e$=oq2NKw!;I
zwzvWqDND+c!EU>O8fnu|{s&ZRUEqX&Q2r%6PW1p3m-KdRJhss$a6$1F-33*}&R*!L
zGW;%4uf%CUW(Y_s78S68&L$;S30P0{gQRk~2VuS(v*#82Lb0)GO5#rm`Xcdm!ln8C
zb^I-4t~&mM*pjHP4!|1%R!~nPML$$5N!y~B73{~4v|YaMwz~>m5bOyDT0A@)oVBGO
zSLbt|hjtK<%HOQ~x8|rqhk(X8>9KG)mL#EmaTcyB|C76NQWs2dx)a7-VMv0TYT=@V
zzKbwRSBnHXH%DA!DBG|tsza~4_}eB8tk+Zi4YhC^uP5BkE(6$f<QG^#1;GuDex5Fy
zOL{a5Xt1?OOE((?a7jW7KxjZ?r8b-EBf_|VCU#o*KU+aItpr4HYW1q6^~)o`uyVBC
zn`kcMiWv3qnL0v3wK{S}rQ?4UG`&L|{ab5#-7b&*ES8sY5!btxYZU%pvh4Ubx~_TT
z058kwWVOS^?zo9fbT6CnenQI#8JtG{9^i^|lm@(h1(qHR>i%I>U4(GhL(xR*^KuZo
z8KW+Ax;^E<``a2Lj`7w2)7E!(ijm2g1C>2}0)~fofs|sfR;$*?P0viZ`*)Y8E0CR;
z7^~DEQ<)r}-Uo%s-b$@9xw``C{RgJY0Vp1t7^}Llvr?;ePL;<ikQpisWw+#W`Rq`>
z_;|jME2T&BxgCYU;gRg%@S~-znbOv6+w<GDWVaOyMRL<Si=~~JG~q%f-Cr#Arw519
zgSq~6x;QeheI%0}+R>j)=L-FUxkB-g(m>&{=lG5_eAMClZ0@%6^GEo__58ptesBXn
W+R2Y^=FdOGUwoLKmHah}zx^L-U8tS_

literal 0
HcmV?d00001

diff --git a/ref/makefile b/ref/makefile
index 39f4cdb..1ec0e48 100644
--- a/ref/makefile
+++ b/ref/makefile
@@ -4,9 +4,8 @@ all: bin/uxn
 
 run: all
 	@ wc -c bin/uxn
-	@ bin/uxn test.bin "Text from arg"
-test: all
-	@ bin/uxn opc-test.bin
+	@ cat console.tal | bin/uxn drifloon.bin > bin/console.rom
+	@ bin/uxn test.bin "String sent through stdin"
 format:
 	@ clang-format -i uxn.c
 clean:
diff --git a/ref/opc-test.bin b/ref/opc-test.bin
deleted file mode 100644
index 3cb434dee520894bdafb0bf325a79a1ac595491a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 61188
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
DejDZn