uxn

commit 49d74b89d01fd25266f7de97498136f228759072
parent f3674b2562e6c5557fc008edbac71d9fcfde64ff
Author: Devine Lu Linvega <aliceffekt@gmail.com>
Date:   Tue, 27 Jun 2023 11:27:27 -0700

(subleq.tal) Ported to immediate modes

Diffstat:
M
projects/examples/exercises/subleq.tal
 | 
61
++++++++++++++++++++++++++++---------------------------------

1 file changed, 28 insertions(+), 33 deletions(-)
diff --git a/projects/examples/exercises/subleq.tal b/projects/examples/exercises/subleq.tal
@@ -1,46 +1,41 @@
-( Subleq:
-	The subleq instruction subtracts the contents at address a
-	from the contents at address b, stores the result at address b,
-	and then, if the result is not positive, jumps to address c.
-	If the result is positive, execution proceeds to the next instruction
-	in sequence. )
+( Subleq: The subleq instruction subtracts the contents at address a from the contents at address b, stores the result at address b, and then, if the result is not positive, jumps to address c. If the result is positive, execution proceeds to the next instruction in sequence. )
 
-|0000
-
-	@a $2 @b $2 @c $2
-
-|0100 ( -> ) @reset
+|0100
 
+@on-reset ( -> )
 	#0000
-	&while
-		,eval JSR
-		DUP2 #8000 LTH2 ,&while JCN
+	&while ( -- )
+		eval DUP2 #8000 LTH2 ?&while
 	POP2
 	( halt ) #010f DEO
-
-BRK
+	BRK
 
 @eval ( ip* -- ip* )
-
-	DUP2 ,&get JSR .a STZ2
-	INC2 DUP2 ,&get JSR .b STZ2
-	INC2 DUP2 ,&get JSR .c STZ2
+	DUP2 get ,&a STR2
+	INC2 DUP2 get ,&b STR2
+	INC2 DUP2 get ,&c STR2
 	INC2
-	( I/O )
- 	.a LDZ2 #ffff EQU2 ,&input JCN
-	.b LDZ2 #ffff EQU2 ,&output JCN
-	( SUBLEQ )
-	.b LDZ2 STH2k ,&get JSR .a LDZ2 ,&get JSR SUB2 STH2r DUP2 ADD2 ;program ADD2 STA2
-	( SET )
-	.b LDZ2 ,&get JSR #0001 SUB2 #8000 LTH2 ,&end JCN POP2 .c LDZ2 &end
-
-JMP2r
-	&input ( -- ) JMP2r
-	&output ( -- ) .a LDZ2 ,&get JSR NIP #18 DEO JMP2r
-	&get ( a* -- b* ) DUP2 ADD2 ;program ADD2 LDA2 JMP2r
+	( | I/O )
+	[ LIT2 &a $2 ] #ffff EQU2 ?&input
+	[ LIT2 &b $2 ] #ffff EQU2 ?&output
+	( | SUBLEQ )
+	( sub ) ,&b LDR2 get ,&a LDR2 get SUB2 DUP2
+	( write ) ,&b LDR2 DUP2 ADD2 ;program ADD2 STA2
+	( leq ) #0001 SUB2 #8000 LTH2 ?&end
+	POP2 [ LIT2 &c $2 ] &end JMP2r
+	&input ( -- )
+		( TODO ) JMP2r
+	&output ( -- )
+		,&a LDR2 get NIP #18 DEO
+		JMP2r
+
+@get ( a* -- b* )
+	DUP2 ADD2 ;program ADD2 LDA2 JMP2r
 
 @program ( hello world )
+	[
 	000f 0011 ffff 0011 ffff ffff 0010 0001
 	ffff 0010 0003 ffff 000f 000f 0000 0000
 	ffff 0048 0065 006c 006c 006f 002c 0020
-	0077 006f 0072 006c 0064 0021 000a 0000
+	0077 006f 0072 006c 0064 0021 000a 0000 ]
+