From 9552ae0d296c5ba997b9ae9a2c9b0da569a4be35 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 31 Jul 2021 18:58:59 -0400
Subject: [PATCH] More code cleanup

---
 applecorn.po | Bin 143360 -> 143360 bytes
 applecorn.s  |  10 +++++-----
 auxmem.s     |  41 +++++++++--------------------------------
 loader.s     |   4 ++--
 4 files changed, 16 insertions(+), 39 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 82055d1922356244eeb2db9b2795d5129d4ba34f..eecf91bb023988093433c5a855131bb0bb7c7585 100644
GIT binary patch
delta 1346
zcmZ8heM}Q)7{8}qwgS=tQU`)3(`~?To09lR{9+E4Za6xo%c54MhG~NC53__AxtTOE
z%bKC@q@awQ&K3?SmYx=MgOoAYE(l!9_1bdAl`x!{P#S_8AfvmYan0_%-1Gc?zvrI!
zd7t;qO9YfeKxx}1Q}0({vssX|3LC+&a2A$;cFQ#Cx0gOA@o<(T5q&PB<5>kZm$d|Y
z7P$#+l;<VnV&5H(W;Z9$XXO_Z@FtxeJEBtIcLzFu?sm5fqK}rOA$9UnIxo2k0Kc+K
zLPJVePKQ_IuAxEF2ln0lFD&lp=peiMxlWG{u_sp1y3$jUD2`Sf&VXoaI<i(4h3&_V
z%cCI8o`}zi#xa+sqji(Z2`Q-Xa+|{mtzf@mfaG4mD04c)A?dHgIEmfHbVj+ewwJ#2
zeUTL0=#ga;Ao05#?Pw^5T6Cddo#H*?xRe@1A&Ul$Hk5;${-CiCK#uCE1F#RxQ!7D>
z@TNT2LGN$+6jWarwouuIJgOJ5*LK1|l+=7ek-;0P+Fzo-Y<?M5o4*zFnd^-~X<3C6
zW1*&ER!{9F-FTr(U!>cm+qnj#_9L(LG-7VXpwgBVFoDjr+=)9$a$-nX0bc5&PNTx>
z+ZS}x_43LmoYBu&y&OZZ=~kX&U##P~IxlDSaYt=3>Hs0N`Z;`v3;MXAs7iyPggG;b
z(A}qe1XLQ;&Wc$km6aU{Z_qE(W8za_u3p^K{<L)7aL#Ocr?E;ZHm^)YoU0PMrhlf(
zB5OluZL47jwb-&(?ekR3mgyOcl@PBmi&!~6F+`*@O3_*4A&xOB(b<arv280@<{?&!
zb(u{}5gU8RWUgj3A?1T=BKCoaP~yX$Lnd76(o<Lg9`ux@FdFtReRM$&A4ZBhFV1af
z-MhV-XMmMz=XgdU8l{(!i$>*T6f9OieMR!md-u&#U+ndsqT>8lu}qAVwT5c{M(Or-
zX+3;RC~%glWPRt(GjXBByED9v>6_)NditL5sN9|dX{gS=5k5n_{WZ9Tr1ZzJA<`R3
z9@&=}bd*m0u-<T<@);1`<Fm=}1V52WU5#dP{6q#t{g3&CYK~@p^Aqn=t<lT~66odd
zBbuhup$lnl6vfYwK5<@3MG_ICMkj9^PZ|(115AKjL|r8P5mxM-1x?>r3j-+o=HtkT
zNo>;Bys;&Kh2j<t0h@w{htO8XW{GG{Io>VaOA6wT_yz(0BP_n!5+SbJ?H+L7A+dbn
zEn&Sl=DZqjF|YFwT<PE=ccc4=dyl)_l`r521#P8EyU(Nj+NG^`X<J-cokvTc)V3VO
zdZ9!}5D-XipSfkZ1xizEC!{6)cNrK-uG2@7Kj7}R*M9<6jKdA{;OGaC!7mP<=vz3D
zNv_%~_d(J|#!BWvwQz}$eVtthE+@wfk4@o&teD0(Xezu1CDO@JYg_$2C<UaJEH`=m
zkm<M&UT_59zA9s6cx-I+cYGp<i(#X|smU39Y62gAJdKZ!j!#U^7`rWh!mfV-Hanqz

delta 1798
zcmb_de@qis9KUz{AypCB5P=PRD*kBw5hpHFC(dbfIJ@CM6WQFXqFZ&z@SnwmEpjoI
znI+8%Ppr;g7Zv1~K)G|^Trfq&aY@zdas7csYy(x9*ftf}Le%cHF0PJc*&oYY?tS0)
zectE$<Gp;2@+MH;1j}-Ha+!)4(SXz(qK_aVnu#fBoqSUA`xBo#VMLRaf_BTfB)gJ$
zteHT>kdHMfXt5&irPqmLpZ(>HXjIAEenqts%;&Pl_o=2C>!IyN`;`u{u?w5+q0pee
zFBlHM!Jx0-ABKIwem@$UmdWL%T>>Z5NdVc*h=PT=^FWXTqz$m^uBVvC^?=NG;GJ;r
z0X%JKwlo`Q$=zk7h0b=G{uzq?p+}f;*f;pdZ=^3?yhyvRiXE4oB1YIoAvpIInv5}K
zjb@D7j2gFRa7VVOKn%NKH1@^l(L(+;coYEZ2K*Ob-#uR#hW);NhHKouK)%R!#ZAY`
ziq+B=9L9a|4GzJZ!swuJ2^x`g$3%8#vEqMi4{~qG;l3%oua2@#85b9i`}*+jiaGz3
zY&%Z2OZf9p;&zyqTfr;n@QD`oqyeOf9;4i9jf7;K)B~FMi6}BEtcOMJ$f*JukkI|w
zC7>FAUqvg<6oM0|`b@5}(D*>cbfHk~B;-Hy1yFJ8>(&6ELdTiSpaeZ-rhq~O>+?W9
z_euQ@pxSR(%FH(8F(MLvSPAqf_3SR?ET_TLrslpqI|IzjuQ`SZYmOTOGQGacN(kUk
z*@%uQq(!*Kt}7^7U9@r@!RU~qVbAz@Ec&<+f?>3$@j~KPw1lzxe7M!l>_e-X-hL5i
zYARg@9LC#H!!3!YgzSbMNys?bBOSdZHS|h5EplcvC2P1XL9Z0(l>&HG7Qjn{RZWF#
zF+a+)OrG&9X{VvG#{6!bNru~|S5cKF+%H|t!Ljvi&(_gi%XHvHb(YyVC62NYy^bdY
zlA6hn5fpIvCY8-6U}K?!`kYr`V-@<%vRs+%pr$}C%4<&7+;wa-Lz!L25czP(q0i(e
z3B$VQ<T&`fd(l8uZE95Byis%1$pb;AC0#s;hY2oTfrlg)uM~)UriykxZ_D=xuxa24
zN@sJkY|cX=?|!CSa939GiJ_Nm5vPT}Mz~B@uK^d*vva{TbdX&Pb|ZnE16cHg{iuAH
zc15|O9gf6Id`1ODD~i{znw3MS=MgtQtT64XWKJ8Z7`FjIo7<v*>D|;qras=2+f7Yn
zn*Qb~Vc2+&znl7iX^r;`xTz&?HOMGlE2Pwz4B?te!$X>2<R_D$jAAa)Zk$=!NX3DD
z)ilw309Q1YCqhaXh;&jRhDRyq3X&o*5Tl|gjAhbL>ABKWr$_DOy}}rVrn{qF-0`z0
zd~N}7qUk?AnjC-EMs$bfFZB|k#Mq?}GNICg7PY)d;^E7d_X;=D9!vn=^1!<h{AxFO
z5<5ikhIoM{)_Sy_W%wc8S+0%FVn>DaX;)CJ7xiMX*k)hrfqIX&+^#KgXuq>-kK474
zc5SgkTY*wr=PH+ZHhD5U2$1aF^R?$e0#`sc1GH;<qB+qDlK-2&#Pn?-0NY2YpgT_2
z!mY1afqh)dbpYh8G8=dTNcc;wgeRm3o&xf;<rE;v4A>=!QYZA?8NyoVzS<#Ty^M<d
zL-QL0V5Taj?)0_x%Vtdv*wDJS2W$nc>R#XiD4A5ZctNjf>QE5xc_yY&GFwxO690o@
NGw2KS*ZvAt{{c<E(o6sV

diff --git a/applecorn.s b/applecorn.s
index 2421fbc..4e99194 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -110,10 +110,10 @@ XFADDRAUX   MAC
             PLA
             EOM
 
-* Macro to recover STRTL/STRTH
-* STRTL and STRTH after XFER returns
-* Called by code running in aux mem
-XFRECVR     MAC
+* Macro called on re-entry to aux memory
+ENTAUX      MAC
+            LDX   $0101       ; Recover alt SP
+            TXS
             PHA
             LDA   STRTBCKL
             STA   STRTL
@@ -122,7 +122,7 @@ XFRECVR     MAC
             PLA
             EOM
 
-* Macro called on entry to main memory
+* Macro called on re-entry to main memory
 ENTMAIN     MAC
             LDX   $0100       ; Recover SP
             TXS
diff --git a/auxmem.s b/auxmem.s
index 496b6f5..e746293 100644
--- a/auxmem.s
+++ b/auxmem.s
@@ -322,11 +322,7 @@ FINDHND     PHX
             BRA   :S1
 
 OSFINDRET
-            LDX   $0101                      ; Recover alt SP from $0101
-            TXS
-            PHA                              ; Return value
-            >>>   XFRECVR
-            PLA                              ; Return value
+            >>>   ENTAUX
             PLY                              ; Value of A on entry
             CPY   #$00                       ; Was it close?
             BNE   :S1
@@ -364,9 +360,7 @@ BPUTHND     PHX
             PHA
             >>>   XFMAIN
 OSBPUTRET
-            LDX   $0101                      ; Recover alt SP from $0101
-            TXS
-            >>>   XFRECVR
+            >>>   ENTAUX
             CLC                              ; Means no error
             PLA
             PLY
@@ -384,11 +378,7 @@ BGETHND     PHX
             >>>   XFADDRAUX,FILEGET
             >>>   XFMAIN
 OSBGETRET
-            LDX   $0101                      ; Recover alt SP from $0101
-            TXS
-            PHA                              ; Return code
-            >>>   XFRECVR
-            PLA                              ; Return code (ie: char read)
+            >>>   ENTAUX
             CLC                              ; Means no error
             CPY   #$00                       ; Check error status
             BEQ   :S1
@@ -447,9 +437,7 @@ ARGSHND     PHA
             RTS
 
 OSARGSRET
-            LDX   $0101                      ; Recover alt ZP from $0101
-            TXS
-            >>>   XFRECVR
+            >>>   ENTAUX
             PLY
             PLX
             PLA
@@ -534,11 +522,7 @@ FILEHND     PHX
 :S3         >>>   XFMAIN
 
 OSFILERET
-            LDX   $0101                      ; Recover alt SP from $0101
-            TXS
-            PHA                              ; Return value
-            >>>   XFRECVR
-            PLA                              ; Return value
+            >>>   ENTAUX
             PLY                              ; Value of A on entry
             CPY   #$FF                       ; LOAD
             BNE   :S4                        ; Deal with return from SAVE
@@ -1252,9 +1236,7 @@ STARCAT     TSX
             >>>   XFADDRAUX,CATALOG
             >>>   XFMAIN
 STARCATRET
-            LDX   $0101                      ; Recover alt SP
-            TXS
-            >>>   XFRECVR
+            >>>   ENTAUX
             RTS
 
 * Print one block of a catalog. Called by CATALOG
@@ -1357,9 +1339,7 @@ STARDIR     LDA   ZP1                        ; Move ZP1->ZP3 (OSWRCH uses ZP1)
             >>>   XFADDRAUX,SETPFX
             >>>   XFMAIN
 STARDIRRET
-            LDX   $0101                      ; Recover Alt SP
-            TXS
-            >>>   XFRECVR
+            >>>   ENTAUX
             RTS
 
 * Performs OSBYTE $80 function
@@ -1392,11 +1372,8 @@ CHKEOF      STA   $C004                      ; Write main mem
             STX   $0101
             >>>   XFMAIN
 CHKEOFRET
-            LDX   $0101                      ; Recover alt SP from $0101
-            TXS
-            PHA                              ; Return code in A
-            >>>   XFRECVR
-            PLX                              ; Recover return code -> X
+            >>>   ENTAUX
+            TAX                              ; Return code -> X
             RTS
 
 * Performs OSBYTE $81 INKEY$ function
diff --git a/loader.s b/loader.s
index 9caec4a..064fe5e 100644
--- a/loader.s
+++ b/loader.s
@@ -1,8 +1,8 @@
-*
 * LOADER.S
-* Applecorn loader code
 * (c) Bobbi 2021 GPLv3
 *
+* Applecorn loader code
+
 START       STZ   :BLOCKS
             LDX   #$00
 :L1         LDA   HELLO,X          ; Signon message