From 297b525735fe4f6d87f3a1872465df28f8143af8 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 7 Aug 2021 13:12:34 -0400
Subject: [PATCH] Implemented rest of J.G.Harston minor cleanup.

---
 applecorn.po | Bin 143360 -> 143360 bytes
 auxmem.s     |  40 +++++++++++++++++++++++-----------------
 2 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/applecorn.po b/applecorn.po
index 540273496a1702a62a67506f4763dd1c3a7b7b79..98e2a8227257ed228ddd199a40410adf150f22f4 100644
GIT binary patch
delta 506
zcmX|7O=#0#7|xs7{RmSL4{l@QLneZ|2s`URhah?wa|dspcN)8S5rU^(zJrLy<7-z!
z#Y@{rgY#ngHDhyG*EN}R3Zq?{wcWBslAuh6_@%8oz0VKt!^0z0`lU*L>RIg4{Bz;-
z<^^F~s0l*f#Kl2%F*fz^_NKL-%cs%U+Qx*z2!1B(dv)^L^ACfc)tW=wex~c^J5=pb
zL-nVh0%X*gnK-Dy<42=cKk<N7F9@AF*>Ab6;|2*%I6G4BFHGH-K<=`pQ#&NS6Ovz5
zmtxM?!eyhpW=B@lbxF;wwvL>-`ugp)ffsQl4r8yhcMq~(KpRvFa8A}X;NF~N>!s3m
z0qq@~A~P99J<sraF-_6d%M{JLj!TJD>c5_e^qn*PBW1d2u2}3Fe%&ZyGD7cpf#{OD
z=L95dI_(j(krK>;V#9fP-h!9eUAQ9lSO(KBS74>Lchj<svMvAEhoQ+1{*b22X1ZM<
z*-@h4V(635BSGj#leCUW_i?NNBiB2aPf;+C|598lFg#1cTuJA$(gaa{(tzZf0~prs
f9>AU05{RNKc_3wdkouHAd>rY7v%ergLcH}4Qp7jH

delta 430
zcmZWkKS%;`6ux)(w=5dkr1}w2P)kE=L?l5t74FSV(bmv#G}Ul}%h~wT<S27cE;z8|
zPVWRmPP@A(8$>G6Gf>crAfoySB0+EZzVE&FeeW?f4^#7`4xJO7BkF5$oSLIvD9XLG
zLJ23%KyW^R;%W}PJ-?!l9@{6%U!o3(;N9K@5QM#*7zn;laLRp+Z;+BVg#ClS!YGTg
z>K)Fgj|Eexp3QnArxN%gJ_%NjV|)yz#VrZMF;0gKR|1(OrNnFC@Mq9N*Rt!#Zd$!)
zlr>CQ*Y7nJ>!u+lbqE1hg)nczh#0QIBrPUtptv@l%EDEOgd@Z5TI~k1+DJ}TSZtUT
z-0!8?Ofij%ii|G^y(E)myNm1&>J8_K9+4X0pCN#puBn);u(+V*1`ar@%S7W^aKSf$
zUXQ2p#3$Ej+gAI%P9lk2S=S0#mfSI{TSF)Kzux~xZo!(9>jHBQG%Yd&xVdj&_)l<%
M3;`fAKfo;i0$qFRLjV8(

diff --git a/auxmem.s b/auxmem.s
index c33e3c2..5ff3937 100644
--- a/auxmem.s
+++ b/auxmem.s
@@ -26,9 +26,9 @@ MAXLEN      EQU   OSTEXT+2                   ; $E8
 MINCHAR     EQU   OSTEXT+3                   ; $E9
 MAXCHAR     EQU   OSTEXT+4                   ; $EA
 OSTEMP      EQU   $EB
-* $EC kbd ws
-* $ED kbd ws
-* $EE kbd ws
+OSKBD1      EQU   $EC                        ; Kbd workspace
+OSKBD2      EQU   $ED
+OSKBD3      EQU   $EE
 OSAREG      EQU   $EF
 OSXREG      EQU   OSAREG+1                   ; $F0
 OSYREG      EQU   OSXREG+1                   ; $F1
@@ -45,7 +45,7 @@ ESCFLAG     EQU   $FF                        ; Escape status
 * $0290-$02ED
 * $02EE-$02FF MOS control block
 
-USERV       EQU   $300                       ; USER vector
+USERV       EQU   $200                       ; USER vector
 BRKV        EQU   $202                       ; BRK vector
 CLIV        EQU   $208                       ; OSCLI vector
 BYTEV       EQU   $20A                       ; OSBYTE vector
@@ -59,6 +59,7 @@ BPUTV       EQU   $218                       ; OSBPUT vector
 GBPBV       EQU   $21A                       ; OSGBPB vector
 FINDV       EQU   $21C                       ; OSFIND vector
 FSCV        EQU   $21E                       ; FSCV misc file ops
+
 OSFILECB    EQU   $2EE                       ; OSFILE control block
 
 ***********************************************************
@@ -559,7 +560,7 @@ ARGSHND     PHA
             PLY
             PLX
             PLA
-            LDA   #$04                       ; DFS
+            LDA   #$09                       ; Hosted filing system
             RTS
 :S1         CMP   #$01                       ; Y=0,A=1 => addr of CLI
             BNE   :S2
@@ -1163,8 +1164,8 @@ CLIHND      PHX
             LDA   #$04                       ; Service 4 Unrecognized Cmd
             LDX   #$0F                       ; ROM slot
             JSR   $8003                      ; Service entry point
-            TAX
-            BEQ   :EXIT
+            TAX                              ; Check ret val
+            BEQ   :EXIT                      ; Call claimed
 :UNSUPP     LDA   #<:OSCLIM
             LDY   #>:OSCLIM
             JSR   PRSTR
@@ -1530,9 +1531,15 @@ STARSAVE    JSR   CLRCB
 
 * Handle *RUN command
 * On entry, ZP1 points to command line
-* TODO: Write this!!
-STARRUN
-            RTS
+STARRUN     TYA
+            CLC
+            ADC   ZP1
+            TAX
+            LDA   #$00
+            ADC   ZP2
+            TAY
+            LDA   #$04
+CALLFSCV    JMP   (FSCV)                     ; FSCV does the work
 
 * Clear OSFILE control block to zeros
 CLRCB       LDA   #$00
@@ -1599,6 +1606,7 @@ RDCHHND     PHX
             BNE   :S5
             SEC                              ; Return CS
             ROR   ESCFLAG
+            SEC
             RTS
 :S5         CLC
             RTS
@@ -1704,14 +1712,14 @@ DELAY       PHX
 OUTSTR      TXA
 
 * Print string pointed to by A,Y to the screen
-PRSTR       STA   ZP3+0                      ;  String in A,Y
-            STY   ZP3+1
-:L1         LDA   (ZP3)                      ; Ptr to string in ZP3
+PRSTR       STA   OSTEXT+0                   ;  String in A,Y
+            STY   OSTEXT+1
+:L1         LDA   (OSTEXT)                   ; Ptr to string in OSTEXT
             BEQ   :S1
             JSR   OSASCI
-            INC   ZP3
+            INC   OSTEXT
             BNE   :L1
-            INC   ZP3+1
+            INC   OSTEXT+1
             BRA   :L1
 :S1         RTS
 
@@ -1730,8 +1738,6 @@ OUTHEX      PHA
             JSR   PRNIB
             PLA
             AND   #$0F                       ; Continue into PRNIB
-;           JSR   PRNIB
-;           RTS
 
 * Print hex nibble in A
 PRNIB       CMP   #$0A