From ef14a6ad697e9723c16f9fe7099bc1f46d974677 Mon Sep 17 00:00:00 2001
From: Devine Lu Linvega <aliceffekt@gmail.com>
Date: Tue, 4 Jun 2024 17:47:02 -0800
Subject: [PATCH] Keep x on stack

---
 gui/notepad/src/notepad.tal | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/gui/notepad/src/notepad.tal b/gui/notepad/src/notepad.tal
index 1c53651..38ee4ef 100644
--- a/gui/notepad/src/notepad.tal
+++ b/gui/notepad/src/notepad.tal
@@ -249,25 +249,25 @@
 	,&y2 STR2
 	,&x2 STR2
 	STH2
-	,&x1 STR2
-	,&x2 LDR2 ,&x1 LDR2 SUB2 abs2 ,&dx STR2
+	STH2
+	SWP2r ,&x2 LDR2 OVR2r STH2r SUB2 abs2 ,&dx STR2
 	#0000 ,&y2 LDR2 STH2kr SUB2 abs2 SUB2 ,&dy STR2
-	#ffff [ LIT2 00 _&x1 ] LDR2 ,&x2 LDR2 lts2 DUP2 ADD2 ADD2 ,&sx STR2
+	#ffff #00 OVR2r STH2r ,&x2 LDR2 lts2 DUP2 ADD2 ADD2 ,&sx STR2
 	#ffff #00 STH2kr ,&y2 LDR2 lts2 DUP2 ADD2 ADD2 ,&sy STR2
 	[ LIT2 &dx $2 ] [ LIT2 &dy $2 ] ADD2
 	&>while ( -- )
-		( draw ) ,&x1 LDR2 STH2kr [ LIT &color $1 ] <set-pixel>
-		( x ) [ LIT2 &x1 $2 ] [ LIT2 &x2 $2 ] EQU2
+		( draw ) OVR2r STH2r STH2kr [ LIT &color $1 ] <set-pixel>
+		( x ) OVR2r STH2r [ LIT2 &x2 $2 ] EQU2
 		( y ) STH2kr [ LIT2 &y2 $2 ] EQU2 AND ?&end
 		DUP2k ADD2 DUP2
 		( y ) ,&dy LDR2 lts2 ?{
 			( e+dy ) SWP2 ,&dy LDR2 ADD2 SWP2
-			( x1+sx ) ,&x1 LDR2 [ LIT2 &sx $2 ] ADD2 ,&x1 STR2 }
+			( x1+sx ) SWP2r [ LIT2r &sx $2 ] ADD2r SWP2r }
 		( x ) ,&dx LDR2 gts2 ?{
 			( e+dx ) ,&dx LDR2 ADD2
-			( y1+sy )  [ LIT2r &sy $2 ] ADD2r  }
+			( y1+sy ) [ LIT2r &sy $2 ] ADD2r }
 		!&>while
-	&end POP2 POP2r JMP2r
+	&end POP2 POP2r POP2r JMP2r
 
 @snap ( x1* x2* -- x* )
 	SUB2k abs2 #0008 LTH2 ?{ NIP2 JMP2r }