From 4ad57d2ac4a7342c96d47001d81cfc441f062f31 Mon Sep 17 00:00:00 2001
From: Bobbi Webber-Manners <bobbi.manners@gmail.com>
Date: Sat, 14 Aug 2021 23:42:06 -0400
Subject: [PATCH] Refactored code. Renamed source file.

---
 applecorn.po                      | Bin 819200 -> 819200 bytes
 applecorn.s                       |   2 +-
 auxmem.bytwrd.s                   |  27 ++++++++++++++++++++
 auxmem.kernel.s => auxmem.oscli.s |  41 +++---------------------------
 extract                           |   2 +-
 5 files changed, 32 insertions(+), 40 deletions(-)
 rename auxmem.kernel.s => auxmem.oscli.s (92%)

diff --git a/applecorn.po b/applecorn.po
index 2c53ade3009e3b3edcba4af903d0c545b2e60598..cac0190161b4fe63979a1e44caa305a0900a9dc8 100644
GIT binary patch
delta 1385
zcmZXSe^3-<7{~X0clYq_xC2BuNQ@V<gh)yT%bKa?L=4mu<>ZHDdKMZIsaR@Q>L%V=
z(AD87FNPc^!j4Ny2TYv)k&dVd1&J}vc*|lM(J&(+22=Q>=)F58FMD@p=ly=4&-1+B
zeP=l?iQ|%-Uo%-%DoUFWr<+OjQ)CmbgVfXdtXxB?A#wi76*-v;5{=Ak5Ki&&{@5%(
zEG12!nVvzg6riEzhI=uaij7h)1Hn{QluyrLqjsBsf-))n$7sSKl{k4?hB0MHdZLkH
z)&nhdCDI@Bgql5x8Pbg@grb=D2v+<bEEqh<ZpbjEF3%#N_5haJuJB9)I$IY>wGV_+
z_E=x4F*Zj11p)r_0y-N~L?zV_ZSiUEov0G%AV|d<^yy1ImqL#AET#@jr(%<QV>T+H
zrkw#nRN3@@QzLCcqOQfRsA2(a(+BReEej05jzNH0f?)*Mqvf@rRSQ?Av6p(zb#~xq
zPBHUbhqGZGa82aEFbMQE0B=^PVHiegc-<BZ)vc>w>`Ye!Vt)dzSPotT#EcR4Ko~fG
zLF&R+($W_#USe2E+QtMkj10<Ho@rc>m7SBj^3~T?y}p|Gw}l!Q&8}Jd#+!LKrX5UR
z)&TFhCeA=OWdS;S<!aZ3u10T~#vV%pI@T|uwo7eo9jMva+=MQ6cmC00X&{C68^ga0
z4InRxM(>P{4g7}sZww8M;^>Xc9GBb)OMzzHTlpIb-Y$G+<EG6;Tgcg?!c7S9k#4AS
z?fe0r)?s%UGmCrxBMd^Qd3Wo!?e7=w_~65xyLNMv^mOK<lD%dk?h665aw`AvC#7Yd
zT0Z;STE5?Q;9v!=B&A^?gnpbkRCT!8%RNUc8N1_1tyk!2B|KV>!6G_>=wF4!^jz)f
zvu)?jU-<T7d&hU*cXko`ccFv^0!PEvy>x330N7=tbMU4b=CR#t&HF{S*@i4`CyV;r
zT&}p@-}&3kEffnLa+1YDe<$=R7b|Y|cbX+`o4D2A`Ag#R#2x-lZZDT9?$Y{Ojcy$6
zV4@Ty4mUDi!+Hl3sVMdBO%5hA<h*w;Djggti@gpvE;~rqPCG6QUT3<;YbgiSWJM{G
zQ(b)=>nrGp>|>IOtQn$YX_CHa@QE)ai&Kg)dH-(D3+449AUR(~$x^-5G7Rg>Ew><w
zmYh$BnsRG9sgVj=BROZBa7vaDc%lh^RY5<J=4;FNU)zfhwaxaljgvOXatA(`7Vfd{
zd!~h8I#i!53D&xDktuu>ic~FCJq!o0PwgHzmB_qok*)F}`Ppl@uSTwuMY&P#x$L?e
z)~At8a=!Q3AQ$0vm|hsSrPqA#R8g<_ZvCyg+ro&GC08;s52@sWxF_>Zn$Un;I}w-v
zlnVD?`g!mI)>P7Q%3`_sZuy7_72}sG=~S#eK*zgEDro_-g;!7ZR=X0b=pW(HU=`%;
bG;e2kJImV@ygh)oPvPxK-mVht>Yx7s9&s9r

delta 1356
zcmZ8f4Nw$i7~b#OZ%^+I?ij%vh$B}*K}a$T$Ho}uM374l^bi3PJCllxq+iX_SkXHW
zyX3fF17tl<ZfOnll)RJ5ObeqFM=(ckZ(+zLhh~bOVkS}>TJ8vL{B~ydeSY5Oedn8{
zs3eL?a-K!GM`V~HfmFp{zhGhk0mPor<mT(rb%`qrHstA7CFY>TU@q1YJ7be2sH8Kt
zv`md&n=RT_f?zCJ<+E93gj${rLa<!5A3sT`lb#0>%pjeKQ6vPbW@6T)>$B3=iZL&W
zZ7I`jp(}LSoV3Io3`6e#1-3gPus<YVTU~Ze`ube4e?K6wT@wG;ZgGuD5Q;I;emq9Z
zmp6*~-%~m%Q773%Z1!W{CCCzRCBzo#G}^4mTM#Et9^?R#Sagy<W`{%_b`dDCLy^<l
zkcxx_s&+=wNC05f1XWnq1<j&ugMe%gf#INBVNw8>0&dBaT<Pq+)_Ij)(t(z{8#lrt
z;L3+#&<f!1b#fR+lX5s<4S_+f%`iHK{sy6~?#eqT2GCjwDqs&l7^F#Cm7cLWQ~T_i
zwK}nFjIDqX%B*$k^*I}IH|FIRY<g~Up~#Q2$KX6-i(%^v+vxdSV1g!e@V<NEB80PP
zxCE`BQ-g5Ats#jEKw0$C%f+v3f3@Vb9i^|o@#b4o-GGfI)a+ddgWuk{>)qY&y}xJg
z2W8YgQT>bk4Mw8!14few9<T&1ol|kJ>d=Sgj}BK`YOEjE*3qBTi_#FQ#2283BTbCY
zmyAo%(PQ@GK9Gt_A8BS=KIKk)*4lRRl=JkN_Rr6{+~+#J`0}gsUyGKztQJpZDI6*;
zT>AFA&dc9-{qW<JtKHW`=})!{2d;A5r3CS`+k)rOo9ggIbm>v_SXq^^hVvM$q|4(Z
zNC{8nbB6<&Sf0w@tPe3yakYU==xr*Rs}E$nJhhW!0-1$gs)#!t$n5h{dagwgNZs<#
z^K3{hX|;JsV?V92p$JL4zc$#AUiF8s=A<@ClsRPM#g8GFF0H~<^j<4o5q6Uw96;B{
z?U)TaT}_toPI=Q!+H6PRWj(x1JW;*8ndi^n@PnUtvxg5i`2N?)7ispA@w_vYEaV;4
z<{{{?n1>;m$vYQv!ItVSQ4<xil6OY6d3f^(Y~y+JD6|jRAU8qwO&GWd^BAOt$%1~v
zR8;o=QDxIvDGy~Wp3EBeW&HzZMyMv~2R`~={|IbygfF|0XRDhn94dJfa+n=!8iIoZ
zbFPmYT7^@BOXv_T3CsHFzAm9#=oM}WH+tMXa}|BdgoA>`_tXdt^fR@1MqH!Uc)z2;
zYrN+eZXRVvoP>C5Bg@I9!uGiM;&TS_SHV6JSN!-=`a~`MG}uP(aiBPvT{v^kGGZX@
z0)5hfV(FARJj%Vl4rd`zd;4eaWp`pd-V03(Zeoy$Axw<K#LO}=vrUZD#K>4ie&;_%
Cw-Z|c

diff --git a/applecorn.s b/applecorn.s
index 5517a88..e256504 100644
--- a/applecorn.s
+++ b/applecorn.s
@@ -143,7 +143,7 @@ WRTAUX      MAC
             PUT   AUXMEM.INIT
             PUT   AUXMEM.VDU
             PUT   AUXMEM.HOSTFS
-            PUT   AUXMEM.KERNEL
+            PUT   AUXMEM.OSCLI
             PUT   AUXMEM.BYTWRD
             PUT   AUXMEM.CHARIO
             PUT   AUXMEM.MISC
diff --git a/auxmem.bytwrd.s b/auxmem.bytwrd.s
index 2072340..e5e43cd 100644
--- a/auxmem.bytwrd.s
+++ b/auxmem.bytwrd.s
@@ -352,6 +352,33 @@ BYTE85       LDY   #$80                   ; $85 = top user mem for mode
 BYTE8B       LDA   #$00                   ; $8B = *OPT
              JMP   (FSCV)                 ; Hand over to filing system
 
+* OSBYTE $8E - Enter language ROM
+*
+BYTE8E       PHP                          ; Save CLC=RESET, SEC=Not RESET
+             LDA   #$08
+             STA   FAULT+0
+             LDA   #$80
+             STA   FAULT+1
+             JSR   PRERR                  ; Print ROM name with PRERR to set FAULT
+             JSR   OSNEWL
+             JSR   OSNEWL
+             PLP                          ; Get entry type back
+             LDA   #$01
+             JMP   AUXADDR
+
+* OSBYTE $8F - Issue service call
+* X=service call, Y=parameter
+*
+BYTE8F       TXA
+SERVICE      LDX   #$0F
+             BIT   $8006
+             BPL   :SERVSKIP              ; No service entry
+             JSR   $8003                  ; Call service entry
+             TAX
+             BEQ   :SERVDONE
+:SERVSKIP    LDX   #$FF
+:SERVDONE    RTS
+
 BYTEDA       RTS                          ; $DA = clear VDU queue
 
 BYTEEA       LDX   #$00                   ; No tube
diff --git a/auxmem.kernel.s b/auxmem.oscli.s
similarity index 92%
rename from auxmem.kernel.s
rename to auxmem.oscli.s
index 7929ba5..581fd6e 100644
--- a/auxmem.kernel.s
+++ b/auxmem.oscli.s
@@ -1,40 +1,7 @@
-*********************************************************
-* AppleMOS Kernel
-*********************************************************
-
-* KERNEL/SWROM.S
-****************
-
-* OSBYTE $8E - Enter language ROM
+* AUXMEM.OSCLI.S
+* (c) BOBBI 2021 GPLv3
 *
-BYTE8E      PHP                 ; Save CLC=RESET, SEC=Not RESET
-            LDA   #$08
-            STA   FAULT+0
-            LDA   #$80
-            STA   FAULT+1
-            JSR   PRERR         ; Print ROM name with PRERR to set FAULT
-            JSR   OSNEWL
-            JSR   OSNEWL
-            PLP                 ; Get entry type back
-            LDA   #$01
-            JMP   AUXADDR
-
-* OSBYTE $8F - Issue service call
-* X=service call, Y=parameter
-*
-BYTE8F      TXA
-SERVICE     LDX   #$0F
-            BIT   $8006
-            BPL   :SERVSKIP     ; No service entry
-            JSR   $8003         ; Call service entry
-            TAX
-            BEQ   :SERVDONE
-:SERVSKIP   LDX   #$FF
-:SERVDONE   RTS
-
-
-* KERNEL/OSCLI.S
-****************
+* Handle OSCLI system calls
 
 * OSCLI HANDLER
 * On entry, XY=>command string
@@ -436,5 +403,3 @@ CLRCB       LDA   #$00
             BNE   :L1
             RTS
 
-
-
diff --git a/extract b/extract
index eda4fe0..d61f674 100755
--- a/extract
+++ b/extract
@@ -1,5 +1,5 @@
 #!/bin/sh
-for file in APPLECORN AUXMEM.BYTWRD AUXMEM.CHARIO AUXMEM.HOSTFS AUXMEM.INIT AUXMEM.KERNEL AUXMEM.MISC AUXMEM.MOSEQU AUXMEM.VDU LOADER MAINMEM MAIN.ROMMENU; do
+for file in APPLECORN AUXMEM.BYTWRD AUXMEM.CHARIO AUXMEM.HOSTFS AUXMEM.INIT AUXMEM.MISC AUXMEM.MOSEQU AUXMEM.OSCLI AUXMEM.VDU LOADER MAINMEM MAIN.ROMMENU; do
   cadius extractfile applecorn.po /APPLECORN/${file}.S .
   rm _FileInformation.txt
   cadius clearhighbit ${file}.S\#040000