From 1b91f4493cab6407f57b636bb0c8bda235309442 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Thu, 8 Aug 2024 11:15:54 -0700
Subject: [PATCH] Optimized rel resolver

---
 src/zeppelin.tal | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/zeppelin.tal b/src/zeppelin.tal
index a6eb8cf..c21fa3a 100644
--- a/src/zeppelin.tal
+++ b/src/zeppelin.tal
@@ -222,8 +222,9 @@
 		( ) DUP .Ref/abs-byte NEQ ?{ STH2kr resolve-abs STA
 			POP }
 		( ) DUP .Ref/abs-short NEQ ?{ STH2kr resolve-abs STA2 }
-		( ) DUP .Ref/rel-byte NEQ ?{ STH2kr resolve-rel-byte }
-		( ) DUP .Ref/rel-short NEQ ?{ STH2kr resolve-rel-short }
+		( ) DUP .Ref/rel-byte NEQ ?{ STH2kr resolve-rel STA
+			POP }
+		( ) DUP .Ref/rel-short NEQ ?{ STH2kr resolve-rel STA2 }
 		POP POP2r
 		( ) #0005 ADD2 GTH2k ?&>l
 	POP2 POP2 JMP2r
@@ -232,16 +233,9 @@
 	( value* ) INC2k INC2 LDA2 LDA2
 	( addr* ) SWP2 LDA2 ;Rom/mem ADD2 JMP2r
 
-@resolve-rel-byte ( ref* -- )
-	( | catch distance overflow )
-	( value ) INC2k INC2 LDA2 LDA2 OVR2 LDA2 INC2 INC2 SUB2
-	( addr* ) SWP2 LDA2 ;Rom/mem ADD2 STA
-	POP JMP2r
-
-@resolve-rel-short ( ref* -- )
+@resolve-rel ( ref* -- value* addr* )
 	( value* ) INC2k INC2 LDA2 LDA2 OVR2 LDA2 INC2 INC2 SUB2
-	( addr* ) SWP2 LDA2 ;Rom/mem ADD2 STA2
-	JMP2r
+	( addr* ) SWP2 LDA2 ;Rom/mem ADD2 JMP2r
 
 @get-abs-byte ( label* -- addr )
 	.Ref/abs-byte ;get-ref/type STA