From e8dda24e6c0619caf25b3d0f9c983e0a41b8fec4 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 31 Jul 2021 16:10:12 -0400
Subject: [PATCH] Some more code cleanup

---
 applecorn.po | Bin 143360 -> 143360 bytes
 applecorn.s  |  18 ++++++++++++++----
 auxmem.s     |  24 ++++++++++++------------
 3 files changed, 26 insertions(+), 16 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 10f235e5e3e9f217b73664f8a534e5867d996e82..e428930482948ff26bd54b72ac46452561e11fa0 100644
GIT binary patch
delta 3421
zcmZu!eN+=y7N3^{gccP1Kt*()3Ct);ZCCAKTSZo@P22R?h5q43_cZmZY-?BTdbX>c
zU1ocX$95ezFs)b*+8ip>K_^D2=-TxVic-dc4j~DF_z|io>@jKDRkpIa+50Bs12xIX
zym#lm-~HWtfA3Ag`jS{*lC4ma){sOE<)ZP~)OCsq<tC-^uW2TxEt?QE;!ti%TKxwa
zgwhVaP2JBOO%1yyr`7LH*t<H})6#VAoTJI*;itXzacov^d#hU&H!WNDE{dCKHn5tw
z>7IA?B*dmX-aI8Xt6#D?J2y7vHytR5&FW7cu*c*6xw1GO*JGKAiYwc26?OI_I+%$4
z5Bk}=c<%$;j`9C6muz46IhSM?nz@U#Ky#O9{2p!20Owjdm=tzqM-lfc|22vZnj4@6
zE12;PzPRd{v0y+9-bxEwO$!9Zv{2Z}@2e^tm&8~pwT#858@U7qQ;p{}3_noy#|3(U
z;{0ks<^t-H{Mjo)hVjit@o#qc01pfG52}buuz%+8avHlm6jZmeeqt<EjQnR`Fa=uf
zCM_`BEgC?Z`e;GR_0WVk!+8mJ$l@|BByv}12y~TvU84oW`DoGH$o0}yhgDf(StIv7
zEtWTO*J+V&<ZjS-132P3?cUvdX3dOJH@&Be06Ph)iv()zq-|-Uht^wnYki?$(m|`1
zRST3p%v>+bAvrlnPLZT2D}@e-f3=g3mI;>#1`q_+CkPZE7=Ev%;8jIkv1)^(`h6OC
zuqtG<QqROM{E>ve5TwoOBWz+7B~nGvpw4JeK2VcU3Q_KnRPU3dAJF(iI>PSLsN-<O
zM{=9UaAQe}Ix-mBT)19JXKb^?Nld<f9K#*fiIW-sc!sOiiJ6Rl0>jnl#KSsyv{<c^
zlf@dHtPw)2N}x)kygn!4dPWq3dZ-*~60cpwL>Ly4C7p4ah%u~OlMSs<8muVORv6YG
z-a(raB}4FecAh|i^!WQ<rj)K@OpC?!jCD=6j|wJaW?o?bV_K4r)0+cpvRS);^lZAI
z(uZ3Y5pIM-GU4DHK|96*D2$L@r8Va<$}1g~p16?#?TPO(BgOYv;n@tZ-E1%Bi<=og
zEIXDXZejeeQp^Dq(*jcgz?c@A7Ttt5$sBr2kshm{$5v|&<e7SNA-v)Cg;MrMcC{$x
zNGjWOiIPW&$8uy9y9%HIW(#9l1O`|O9<Ugywpb`KEtv%62?K*<Y?w_5SaaB&`QYlm
zPZK_3j{gA-eAt@;VzY>Ac*CpMF|i3{Rtc(@1|CyPiVECObFbT>^XsQDp!0~#!SL;q
zjJy=`f;Jb04<OsK1bcvvw0Rnvh5s-;(yO(kSKV=X2@@%Wb134XNJ?>uY{{y1!yA&V
z9ud4{G-Fo7;TBn`kLq`Ly8uCZH*JJVYrAr3qZl%~(67wC`<XU21%tQyuJhY!S)}EM
zYL6%H21(9>)6l`!9bJM-_`#!_6KA+h=Cd>TjmH`_g?d59&k?i8u1&D(MZel~Pz<O|
zhXfmmK3$RFq|<OZ!a=y_5vPxcla@HKJywJc==IeH!Bl-nS-0Iz$!P!fA)`=aap0Fa
zjLVCc6)$;;5{wpy;iZn{#V;;?ZShl7&ni8a9YH^{7om6>_oER?^!#*d#-b9y>sb|L
z^RRzY)L&u!2q}KP6_*b7uuG*7U{op@u~R{$D)yHWg74XqN~WZcoE;4jPv=VluOrzh
z@Y{z<j7o^Ow22K;+GXBZCaf`)!?TFDP$$d)S5^)+Zncl)Wos(Z@mH-`8<qGZhZ22o
ziWCaY5q4OdP^uC=Ueh7$438n>cn*r_vX!D|#M|8?xjmY?@%W|!<l?S5#VbyUm8Xf9
zo$}<$%g)LxPVuVq9h*jYlU0k?oY?0KTy+NEt~vm>DEmw{*rwR|RNF7;uzcL6vg(SL
zkC@evSV=NlW`^91)%%{PJv%I~B3lmf@qe<-%3kXtHBoBJNTcKg4E3KTCBa~xi+xv0
zhQU()TU%k`G#5J^`}ouolX7pl)>UA2hY=ob_>QY2Q<^9b8l&J4yuY6WDhC}eKd~aW
z(hbd18&qA;J+)zUmy`gPF<nxkOzDMki#uA<1ANDc4D^8SKQVV|n|puIw_7NcJ!R!m
zYH(az$ZeC_sV;L%JL=-|>++yU8|r?AKHx2Nvr!%2Ubnh*(9%V)NOwZY5Sp{Rc=5{D
zm(IwhW)d+gjXw;H_n3Ix=CLK<N!{>lsExPG?Pj&Y@rNvHg}Qi4UpM<3;Z(e3z{5Vb
zNK~_uK~AqWn|`V;GyU5_37V=gSj`IGSUkXN`_QgWc76(i`vfw2LZaYjRv^^M1_g=l
ztzVuVQk;Zj3k$wNhNYYT^;c8p$E)Z#QBh7*;ScYxe@1V^Zk+I{qJGiso#~T&@+iS#
z=_a_)vt!-Rvs8JIg&!xeLnV)_rla65{O<krYqxHCf7^4IsukS4|Est2lpWF9&-yQb
zu=YmxM?6Y?6oqi$%TMa`ieJ3XeBz^QRFc8t&w?T2{-+m^2bUsoITI&(`FkgySHb1k
zhF6Q;w0I#IyvU1hh2Ud&!<%~E;ke{DW1(L08oUMYR(Ym&t#Ge&?Q(AD{J~M{C~>TG
zob7nUi%YzQ(hkE~m*MXnhC>|&YlmT_%dm@gHRL50c;E0&_VP$|=EKu9r%}?AHp|!8
zgO3jO9m5TFv?cBb^r>x4Xh%v#?<JIXD(@odRHxwK*VnkErNM#jpc*IAq;yIbB`3yG
zVBijJ@PPFTq*4|BbT<$f2;9O00o;4{XYB9ubDkE*`DVAn(%#g}S>)Cx&eC?S$<pa`
zIKOHBu8o6Hcm~6^bNeo%iE6p6>C}YFs0O8+1DY)@=bQ1R&aQ^55TwC}wkFN1#m&99
zZ};86-`~U6f4I?y<HGuTA$B+}`CAeVTk)5EG@C$I9O*|3=R9_8jPme5n%L^B0W`0I
a?MJx^#BT@CjEa*3NSFQym70H{W&Z~Qc$Mq`

delta 3372
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
R%)rdIf@yPo@on;r{{y43j~D;|

diff --git a/applecorn.s b/applecorn.s
index ad15472..2f7c84f 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -83,31 +83,41 @@ XFMAIN      MAC
             EOM
 
 * Macro to load addr into STRTL/STRTH
+* Called by code running in main mem
 XFADDR      MAC
+            PHA
             LDA   #<]1
             STA   STRTL
             LDA   #>]1
             STA   STRTH
+            PLA
             EOM
 
 * Macro to backup STRTL/STRTH then load XFADDR
-* Callers running with AltZP should call this one
-ALXFADDR    MAC
+* Called by code running in aux mem
+XFADDRAUX   MAC
+            PHA
             LDA   STRTL
             STA   STRTBCKL
             LDA   STRTH
             STA   STRTBCKH
-            >>>   XFADDR,]1
+            LDA   #<]1
+            STA   STRTL
+            LDA   #>]1
+            STA   STRTH
+            PLA
             EOM
 
 * Macro to recover STRTL/STRTH
-* Used by callers running with AltZP to recover
 * STRTL and STRTH after XFER returns
+* Called by code running in aux mem
 XFRECVR     MAC
+            PHA
             LDA   STRTBCKL
             STA   STRTL
             LDA   STRTBCKH
             STA   STRTH
+            PLA
             EOM
 
 * Code is all included from PUT files below ...
diff --git a/auxmem.s b/auxmem.s
index 4d9518a..496b6f5 100644
--- a/auxmem.s
+++ b/auxmem.s
@@ -311,14 +311,14 @@ FINDHND     PHX
             STA   $C004                      ; Write main
             STY   MOSFILE                    ; Length (Pascal string)
             STA   $C005                      ; Write aux
-            >>>   ALXFADDR,OFILE
+            >>>   XFADDRAUX,OFILE
             PLA                              ; Recover options
 :S1         >>>   XFMAIN
 
 :CLOSE      STA   $C004                      ; Write main
             STY   MOSFILE                    ; Write file number
             STA   $C005                      ; Write aux
-            >>>   ALXFADDR,CFILE
+            >>>   XFADDRAUX,CFILE
             BRA   :S1
 
 OSFINDRET
@@ -359,7 +359,7 @@ BPUTHND     PHX
             STA   $C005                      ; Write to aux memory
             TSX                              ; Stash alt SP in $0101
             STX   $0101
-            >>>   ALXFADDR,FILEPUT
+            >>>   XFADDRAUX,FILEPUT
             PLA                              ; Char to write
             PHA
             >>>   XFMAIN
@@ -381,7 +381,7 @@ BGETHND     PHX
             STA   $C005                      ; Write to aux memory
             TSX                              ; Stash alt SP in $0101
             STX   $0101
-            >>>   ALXFADDR,FILEGET
+            >>>   XFADDRAUX,FILEGET
             >>>   XFMAIN
 OSBGETRET
             LDX   $0101                      ; Recover alt SP from $0101
@@ -439,7 +439,7 @@ ARGSHND     PHA
             STA   $C004                      ; Write main memory
             STY   MOSFILE                    ; File ref num
             STA   $C005                      ; Write aux memory
-:FLUSH      >>>   ALXFADDR,FLUSH
+:FLUSH      >>>   XFADDRAUX,FLUSH
             >>>   XFMAIN
 :EXIT       PLY
             PLX
@@ -528,9 +528,9 @@ FILEHND     PHX
             PLX
             RTS
 
-:S1         >>>   ALXFADDR,SAVEFILE
+:S1         >>>   XFADDRAUX,SAVEFILE
             BRA   :S3
-:S2         >>>   ALXFADDR,LOADFILE
+:S2         >>>   XFADDRAUX,LOADFILE
 :S3         >>>   XFMAIN
 
 OSFILERET
@@ -1244,12 +1244,12 @@ STARHELP    LDA   #<:MSG
             DB    $0D,$0D,$00
 :MSG2       DB    $0D,$00
 
-STARQUIT    >>>   ALXFADDR,QUIT
+STARQUIT    >>>   XFADDRAUX,QUIT
             >>>   XFMAIN
 
 STARCAT     TSX
             STX   $0101                      ; Stash alt SP
-            >>>   ALXFADDR,CATALOG
+            >>>   XFADDRAUX,CATALOG
             >>>   XFMAIN
 STARCATRET
             LDX   $0101                      ; Recover alt SP
@@ -1278,7 +1278,7 @@ PRONEBLK    LDX   $0101                      ; Recover alt SP
             BNE   :L1
             BRA   :END
 
-:END        >>>   ALXFADDR,CATALOGRET
+:END        >>>   XFADDRAUX,CATALOGRET
             >>>   XFMAIN
 :DIRM       ASC   'Directory: '
             DB    $00
@@ -1354,7 +1354,7 @@ STARDIR     LDA   ZP1                        ; Move ZP1->ZP3 (OSWRCH uses ZP1)
             STA   $C005                      ; Write aux
             TSX
             STX   $0101                      ; Stash alt SP
-            >>>   ALXFADDR,SETPFX
+            >>>   XFADDRAUX,SETPFX
             >>>   XFMAIN
 STARDIRRET
             LDX   $0101                      ; Recover Alt SP
@@ -1387,7 +1387,7 @@ OSBYTE80    CPX   #$00                       ; X=0 Last ADC channel
 CHKEOF      STA   $C004                      ; Write main mem
             STX   MOSFILE                    ; File reference number
             STA   $C005                      ; Write aux mem
-            >>>   ALXFADDR,FILEEOF
+            >>>   XFADDRAUX,FILEEOF
             TSX                              ; Stash alt SP in $0101
             STX   $0101
             >>>   XFMAIN