From e6d373f59fe40231d2a1442200e1115623cbbbaa Mon Sep 17 00:00:00 2001 From: Bobbi Webber-Manners Date: Fri, 25 Oct 2019 23:07:58 -0400 Subject: [PATCH] More minor cleanup to CCP parser. Still WIP. --- SOFTCARD80.ASM#040000 | 11 +++-------- SOFTCARD80.BIN#041000 | Bin 43011 -> 43011 bytes zapple2.po | Bin 819200 -> 819200 bytes 3 files changed, 3 insertions(+), 8 deletions(-) diff --git a/SOFTCARD80.ASM#040000 b/SOFTCARD80.ASM#040000 index df8afb9..d03521d 100644 --- a/SOFTCARD80.ASM#040000 +++ b/SOFTCARD80.ASM#040000 @@ -1572,8 +1572,6 @@ N2FL3 INC HL ; Advance source pointer LD A,(HL) ; Read character CP '.' ; See if it is a period JP Z,N2FS2 ; Prepare to copy the extension - CP ' ' ; See if it is a space ** TODO:STILL NEED THIS? ** - JP Z,N2FS3 ; If so, we are done ** TODO:STILL NEED THIS? ** LD (DE),A ; Write character INC B ; Increment count of chars written N2FS1 DEC C ; Decrement count of chars remaining @@ -1893,7 +1891,6 @@ N2H2 OR 0F0H ; ; TODO: Implement the built-in commands using a table ; TODO: Built-in commands argument handling ; TODO: Parse * wildcard and generate FCB with ?s -; TODO: Command tail -> 080F buffer ; TODO: Build default FCB1 and 2 from args, if present ; Get a line of text from the console & handle it @@ -1949,8 +1946,6 @@ CCPS1 CP 3 ; Check if three chars ; Attempt to load .COM file from disk CCPS2 CALL PARSE ; Parse the command line - LD HL,0080H ; Reset DMAADDR to 0080H - LD (DMAADDR),HL ; ... LD DE,PATHBUF2 ; Point to the FCB in PATHBUF2 CALL RUNCOM ; Try to run .COM file @@ -2154,18 +2149,18 @@ CNS6 RET ; Load and run a .COM file to 0100H ; DE is the address of the FCB describing the file to run -RUNCOM CALL F_OPEN ; +RUNCOM LD HL,0080H ; Set DMAADDR to 0080H + LD (DMAADDR),HL ; ... + CALL F_OPEN ; CP 0 ; JP NZ,RCOERR ; Open error LD HL,0100H ; Set DMAADDR to 0100H LD (DMAADDR),HL ; ... RCL1 CALL F_READ ; Read records until done - PUSH AF ; Preserve A LD HL,(DMAADDR) ; Advance DMAADDR for each record LD BC,80H ; ... ADD HL,BC ; ... LD (DMAADDR),HL ; ... - POP AF ; Restore A CP 0 ; Check return code from F_READ JP Z,RCL1 ; If zero, keep looping CP 1 ; Check return code from F_READ diff --git a/SOFTCARD80.BIN#041000 b/SOFTCARD80.BIN#041000 index 0db71bb24811f13aa247dbc6444135b157db00a2..03a18479bb3eb2fd24e6bec11e18392087778832 100644 GIT binary patch delta 1597 zcmZuxTTD}D9RE&RC?K~^=^RDqX_=;7yd9@oDk)B!yDH1(%fbweyQFSzEc#GIEHHea zhqmYP9haHxsjw|Xk}_Ec%WmwH2hVYz12$Z;rHfsn8E74e58?xd{l6A;BR-t-zkI*{ z?fd`E>6tY3OqzyE8OAeG#@J0Iw-r(<`j^^l^LVq_Va=Jg+at|p^=!$U!rfH3TMCyQ zarA!3Fhw{TsXrK0$V6;rF_R>+U@Yl~=V}pyDvMoz%IvQ)`7&l874g1n@?xl*+m2Ze z2A_8aCc3Z~sz@$|oW5Gb&MJkdx!89N8xec86|+mrkqx}hiu0Kpcy<t!*Wk%=W%D>E^EGyjKA%3*mHWC9aN6I$5f)? zLxPIhi0XkM3Yz$9tpOXkIA(0h@luMdpPE#UoKiCoP`q`DI;?8cq6BeQ;CL z(Pi|4kncGO!!Ym^|8J=6n0p-4(H7+V%2wC#aya`^HU1*Ice*N;ZQ6+04Ro_GH{JOG zy(Na-u}7Yzv*mhd0*~>$-b(rKX6zw7(E6r)4|LRTmKnguygF`=u}lVk8vCV8ik~#r z=u$jvY|*=Lcidjr5zn^R(aMrm!oG`pb=l(~3wSiX5hw%naM=;L!b5q70MubmoLl9% zv)XauMplEvW$sfr@0WP{eG?kro^cz}q5##3)6LGWFd&6e0ASZ%!H0 zFABb!AjSmWEfC)ezAT6dJSsF-Be8zpnH!xN$q2v#t%Eqk4pJwcAr4$8Zawyi=<7z1 z*&`Yz^{D9UL57dYkI>a;T1h;Tf&;S}r4C~sl>m5w%CpFL6(rdz1B48Vwn2pqOQ0V- zWuQy$var!UJtP`|--pDj&QR*S$R5SxVwF2B(le+2n@A2zsgy_<`ewV(an0=xL-D&J zUJz?KizUrq)LqhPE~wO^>%exnU;4TICBnt|o4AXLznL3R{0F$N6iY^f_8TC?tiC7} zr9&v~UT4t^i~0)q3e-1Nd|J^-*z)^Q(P9WKx@!Q!sO>8j&C$DzY@y+1_1yhH$ko4M zz)^vkT(LB0p0eTd2&BFzv53iY1E|1s!3OR0ekUZTgk<_}s>E|rwQapjHb*qD^U*dp zu9DyG?3QiE5D5bn$4R%GIxhRmxG3`1b1`J=Ml`~Sei%QW2v~yyDOf)P4+7VZLx}(r z8~{xnO$1EAfkCQIsEI&HaDZZRK&s^6m;Oiu%((+V>3=5z7Vvi=)JSt(zI)%M=1+zF g0fs81Vp+MezCU1E&NNy7K%d$+@-)7@PTFJr7i{I%W&i*H delta 1657 zcmZuxZA=qq9DlAYuhL?L)rAu5Q8Ho~%-s@SPEw~Z*|G`A=01_dW-q#Bi#7Ygi`v4_ zgdT10de4nz$vzk$TNalULNZil=B_UB&OHp+@WYmVs0rwoMo@`~Nss-X9_U7Fa`*rL zf6wpvzdXopD)8R~6!v{A)qyBiv|p7v)3e>STviJy*J-aQ7AN zfxjF7+Lz&kClj}@i?mDDO?k{cGYoz;kZA{t2V5mHBmq~>4KvhP$QpCaV%KJWLQfqOULkd?>n$=7r)X+4S*RvMN3;9*Mfcw0OSfw{$&fwCH<= z;H2iG>+GCp_MC)a7s!no=&0(tc7&L34)?}bW(j{2`?GC0 z-fe8rhvOlmNk1PqJm7A#*;B{k*-jU#SpO9kr~322#?@^kQ{%oldFM`&!xQlrKu92( zS{EWS0yO0jK~QY(mz#jcn}Ocp|1grNTG79j0Yt0txsca^s*D5rKJoA+wN?$cS|GeZ?Kxz;4VLVd zfkLJwwhzGpIL8$-odBf0$3Qo{_K?v#KP4G~zo(>Ip03oG#GXNEv-Y($6)oHv~Od5;!YWhbt4B!Keolr@5d~gBIb_fU5M{ z%t~;c{ub`C;_u+DDE=edv|`I>FjX6Dv8wMTiql;v?X9$FhE44RtUx`nfoa9vaQWSd z;#?QXd8>iKsOL8#ngg#h!*shg4G+ZjS`4`2}F<_eKIX!21w7Ky%$Rp2Rf#-98#%s6$-q&diR{fMq?? PY{OH3ZqMY)_-5t5u-EMJ diff --git a/zapple2.po b/zapple2.po index 3af1fb7164212f6eaf91025f4278eb21f52aecb7..a3f8b720d1bf2aef44ad67cc7362b267fc687384 100644 GIT binary patch delta 1694 zcmZuxZERCj7(RFH+S84VRiMB+*zP)6HpACN(3GVhL+}e`ls{w=8vIDn=?wfBAEWEU z1bWx@e&UtHUt=l@BtWKckN3Xkea`c~ z=Y7w4+DL?pM7UF5*-Pzn5&8>NY^}G?J$TlB=&YRqD+05D(YScvtlhD3Hq$UrHs9eX zD!Hwa8De0f-94r)_By=IeC)n`sKx65a}Kn4vEEiPs&Y3~?v~1B2fT;zy9|T1SQOW7 z4yj}~emR#(5?Qb&OvG~w5rZmRwSUO$uQK^8ZXq4<{%dlsqnul=unh`ejVlyl3b~G% z$y`T`e<5N=R0nEt`LAhK6niS23Og~G+Qj>vN}+TU&yHwIc&lhq}Ov_Cj zF7U}(9!4_xG@GB2{kYIny>9aDP_Ny%oX(`f<=lLQ8VpEylCK^q-p@EERXA*c32nfVd>p|oK4=s2F5E8rl z$TZ;2bYS-f|6wFk3xvQ#1`uObqX+rQQKhxUd|cQtsIL)b`DO%4ztkIqB$b^5g>TFR zA#NA0UnZ*)7c;HkYlVv$z;-|pBWZvnL6~HnfSLNdgaK#*6=R^psbH-#{mlXuA+*sy zst%f`1^-QOgM$ASxbFmi7TmCQM!+qVNUU3b;6|50G6IOf=pZr)>)P_Vn$CnoAW{r7OB-^A^N+b;ZvJte) z@cF`U`dv{Q7jadWOEN4*UnTA5Lh3?v9i$I;On-oXig0;>X702aXyHCr1Dm)nRC~sN z0h%Diravd)bO%cNX4?(RuD=LavHr>wX5c;W(r-&R*MV}rDxfg>zNv`TI6TR0rRg^P z$o)j9b!;kttztbn6&cVyRm3MzD1A?25mV3y$bpH#D|+Y+4@+bN*^cO#logT5a++8cC+`cfbQ z1`Gl8!^z$t6Y7JNex^5A6zc1z>tVe&SQ6@^oIH^(^7M1R_XchG4Pcpn_Xh2NM-W;= zYn{J)Kc?Z2j$=WFF38Nu#f5ptf<=>+ey)44zPN1QNd=#ut*xEsa2~Q9$6zk7k^$TC I(%jX50nk6~(f|Me delta 1754 zcmZuxZ)_7~7=N$px_28b6h^^q8NGFJp~%ED;m@%YVaPNJOB6qt#nAW%G!jbuG8oWy zB4NF?z3bh%i-{k|SQLY?BPNzV67k9s?(jv2f{CUdirL^x!v-uQB)$2(?FPEg0*zUZ$j*(>Ofu9{B6yOVNbnFVI7nPN81J7rIb^*3+$xUCg6rhyW(zFh+Ux1 z(=qZ#5{QQc_L0i0LeLU$t~ABh$+4+`0xLfQz-7=B7JwCbi1f_x$4MlPQVyEw1HP0G2jH@9s8sgaslCC&L1 zcDZ&JinUM4>>bTDfHy7!+RW2v!2zHlg?*?+2JqUd^1Hs!egxQ43Ucg-`tHZfB2>Ne z9k^}w2dyxGy-Y}R#qos6YiM>TVjr8^-Aty%Cq=~KaAUNHQt_{wX58v9*A2jx zU60Swi(G<3y)RsXNM^$Pc#LVKK%%hQ|x68{FJ@EWUpUD$GcX`;}vT47u0^w{O4 z8E!Yb6Pho97r#tfEEUlKkoAhWiw^j`#8Zl(1=z|((0=t<9SI5lnAV%XEHj~fnZUny z4kiy+wdPdI$f*NN1bHz)T(xV~O8`d@fXPZ8A5A+s^7+#U;K4 zf!cF=o0z6rbfECWLQv=X;`j}+F*%m+2Hz@<Vfbo^`9Z@ z4e(^G3>0!fVxtJIz&)ap3n@T$9JJ6CpEGRrUe8EY@UM(?)7z6Bme~F3crnlRq48XP zhXbwhpe6)V^NvKxUh|ejK1^k=Nn``o;RSaPB>Dbzm>wd9+dOd*$vCCcLP?b@0r64 zd;sQuAcc!PsOW113ZoyJi)apImKmYPEA$hO4??c*<^tHN)X&dF2Kg!mNs-JVrmUA~ z&<7KRv3k%H^lYTyEmbo8Q(GpJ)v@vw62vq)$!LE$GTbZZmI0&^P=VZj%_ZXxBK@*^ zFCt;k?IqGLXAjB&Cl^P77A}F@eTbg%qMt6E7z$Q}hO?j*1`Gl8^Y=qRCNvBy{o+v2 z78)L*>&wPauqHH2IVB=pl;~G(4FxMo8^AK}4h8LiM-kdYb6vF_$29!Kc{0e*1@X)- puB|v3w9RJvZPkJykpX=f5V%1+4%8