From bdeff219e2fb51ac57697b109b6657a9df811a0f Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Mon, 10 Jun 2024 07:12:20 -0800
Subject: [PATCH] Combined immediate printing routines

---
 cli/uxndis/src/uxndis.tal | 35 +++++++++++++----------------------
 1 file changed, 13 insertions(+), 22 deletions(-)

diff --git a/cli/uxndis/src/uxndis.tal b/cli/uxndis/src/uxndis.tal
index dff21ab..88843fd 100644
--- a/cli/uxndis/src/uxndis.tal
+++ b/cli/uxndis/src/uxndis.tal
@@ -13,12 +13,6 @@
 		#000f DEO }
 	BRK
 
-@meta $1
-	( name ) "Uxndis 0a
-	( desc ) "Uxntal 20 "Disassembler 0a
-	( auth ) "By 20 "Devine 20 "Lu 20 "Linvega 0a
-	( date ) "9 20 "Jun 20 "2024 $2
-
 @await-src ( -> )
 	[ LIT2 04 -Console/type ] DEI NEQ ?{ <dis>
 		#800f DEO
@@ -79,21 +73,9 @@
 	( | print hex )
 	LDAk ?{ <print-1-byte>
 		;opcodes/brk !<pstr> }
-	LDAk #20 NEQ ?{
+	LDAk #9f AND ?{
 		<print-3-byte>
-		;opcodes/jci <pstr>
-		#2018 DEO
-		INC2 LDA2k <print-rel>
-		INC2 JMP2r }
-	LDAk #40 NEQ ?{
-		<print-3-byte>
-		;opcodes/jmi <pstr>
-		#2018 DEO
-		INC2 LDA2k <print-rel>
-		INC2 JMP2r }
-	LDAk #60 NEQ ?{
-		<print-3-byte>
-		;opcodes/jsi <pstr>
+		LDAk #03 SFT #00 SWP ;opcodes/brk ADD2 <pstr>
 		#2018 DEO
 		INC2 LDA2k <print-rel>
 		INC2 JMP2r }
@@ -166,6 +148,15 @@
 	INC2 LDAk ?<pstr>
 	POP2 JMP2r
 
+(
+@|assets )
+
+@meta $1
+	( name ) "Uxndis 0a
+	( desc ) "Uxntal 20 "Disassembler 0a
+	( auth ) "By 20 "Devine 20 "Lu 20 "Linvega 0a
+	( date ) "10 20 "Jun 20 "2024 $2
+
 @opcodes [
 	"LIT 00 "INC 00 "POP 00 "NIP 00
 	"SWP 00 "ROT 00 "DUP 00 "OVR 00
@@ -175,8 +166,8 @@
 	"LDA 00 "STA 00 "DEI 00 "DEO 00
 	"ADD 00 "SUB 00 "MUL 00 "DIV 00
 	"AND 00 "ORA 00 "EOR 00 "SFT 00
-	&brk "BRK 00 &jci "JCI 00 &jsi "JSI
-	00 &jmi "JMI 00 ]
+	&brk "BRK 00 &jci "JCI 00 &jmi "JMI
+	00 &jsi "JSI 00 ]
 
 @dict &usage "usage: 20 "uxndis.rom 20 "input.rom 0a $1