From 6224ea2fe9c4b088b347fde3990b3da8fb597927 Mon Sep 17 00:00:00 2001 From: Virgil Dupras Date: Sun, 23 Feb 2020 18:52:25 -0500 Subject: [PATCH] zasm: use printcrlf instead of hardcoded CRLF --- apps/ed/glue.asm | 2 -- apps/zasm/glue.asm | 1 + apps/zasm/io.asm | 8 +------- emul/zasm/glue.asm | 1 + emul/zasm/kernel.bin | Bin 1316 -> 1319 bytes emul/zasm/user.h | 3 +-- emul/zasm/zasm.bin | Bin 5014 -> 4881 bytes 7 files changed, 4 insertions(+), 11 deletions(-) diff --git a/apps/ed/glue.asm b/apps/ed/glue.asm index 942a384..d854d02 100644 --- a/apps/ed/glue.asm +++ b/apps/ed/glue.asm @@ -1,6 +1,4 @@ ; *** Requirements *** -; BLOCKDEV_SIZE -; FS_HANDLE_SIZE ; _blkGetB ; _blkPutB ; _blkSeek diff --git a/apps/zasm/glue.asm b/apps/zasm/glue.asm index c86cb6e..5b0dd28 100644 --- a/apps/zasm/glue.asm +++ b/apps/zasm/glue.asm @@ -31,6 +31,7 @@ ; _blkSeek ; _blkTell ; printstr +; printcrlf .inc "user.h" diff --git a/apps/zasm/io.asm b/apps/zasm/io.asm index 7e55bc6..6bd9991 100644 --- a/apps/zasm/io.asm +++ b/apps/zasm/io.asm @@ -287,11 +287,5 @@ _ioIncBlk: ; call printstr followed by newline ioPrintLN: - push hl call printstr - ld hl, .sCRLF - call printstr - pop hl - ret -.sCRLF: - .db 0x0a, 0x0d, 0 + jp printcrlf diff --git a/emul/zasm/glue.asm b/emul/zasm/glue.asm index d7eeb0c..d937398 100644 --- a/emul/zasm/glue.asm +++ b/emul/zasm/glue.asm @@ -26,6 +26,7 @@ jp _blkPutB jp _blkSeek jp _blkTell jp printstr +jp printcrlf .inc "core.asm" .inc "str.asm" diff --git a/emul/zasm/kernel.bin b/emul/zasm/kernel.bin index a53790d8e2fda2642378c77ff067e74ef2225376..79bdf491048b2aec0be4427d63d2b3ff334a4f60 100644 GIT binary patch literal 1319 zcmY*ZU1%It6h3$Eoym{H-L)dypfclv4AIgW5|AZK2L%(QnzSiNh>+Taq%WnEn!1)I z>4OgipM23LpM0@Tt}n7wB)j8vG56s@#&ty+E;7VfC^5nsHz7r5Ju}&AeK~XP`R>m- z-}%n)Zy3J~{8Qjpf!_hX0X$Fn7nGl1`~Y~0@I}I#gzFkNwe|<6$deaZqVW`5IPQza zLT+Zq7dvtcc7zJI@w=@8^yKRx7a(@;|9!t)jfkj)#a#NYz!SAeqqBC`?kn3gm);-C zGNA{Ibxl{-4Yk~ZrK>B3TI%uoyramb8evs6qKnV}g?3+gh&dfK%G5e;7}Z5d6`3mP zs%WTUk3i_rWjD8GQq}@fGy2gxqR9$SfPEIRl+H(hKVa=}t!x|e0n26gk*Hd@7W?T# z>_OWZK;P*{gMiiR8mHw5L<9D*sNYUSx9lgPUi)!Gk&h)4+tXZ zeFV&2d6t^AlI@efX>wDO1&9R|8m4vLmDgzCRkNvw%MX(!pa3+>j4#K!+BMYAWi4~w zB@~rXvSwZ58PrPPdstgzQr^(a=R^6iW)8@U)ZE7;?%G=RcYN-~@T?nT=3O#~2k~v+ z6ODL#${EC{yp6KObM~H(%5o^?lew&6)DJ{{-Yq9OndnL{?hE>foVtEjdPzLdQa7H6 zr|Tzu4BPoLt|~(QO|&Hc7FsPoiIxt{x#~Jo%X%w_XF=ik%@B1(Q%f}A7MVPv!FOUp zTVh46>o50zTYyzm6V6segcgAOky=lKqs4@UtEeZrMpsZ`_z6lv9#Wf?cmYD(Czogi z2O{)Ms>eddhw7ocmw@N?Ai*)f~O-Av@vFguC*UNyoAT zFGEJF$UM^b-8&HT`A0=y&#R^3d6#c$nPs=UfunE86Y=PaJ*(3>bTs@s$U7jXSROjV z+bmBy!@n}?7baoiy;J5(=G+{t)X8d{Y(d%9DgyJbW4U!!5jX2}rA}Atbc>d&TZpwE NjhK3?j+D`?tP zvWW)^UPVuyJQWWf){89hklk?{?05K}Acb&O+!TlWEo8aC9*8}%e>V8GtJahNJ9VYG)aofaIltlvFf(C1`bAfqZ?YpARv}V(80W<0k+tS6AN3SO~efNLH1!kK1`C_ z6GY}@EE)QVo@|GsA4>*I)QRIO<#TxRI%D?;<+IizKX7%K0CO2@yX_Z%HnaQ#$ z%bF|?aD<**_H%0|Wi2u}s~)|>+pGj7*kymRVbvW6_keZ7wVJ7k1D4C~BT-(s7W?T# z>_OKWLEjoegMg8;wXeA{<; zE8ae8jbT*WMcLvxbJs^@Srqfh+)yy;2fVOg*Akr+`_ha1f_@^WzTcN#5>K?$k0;{k z`$-?eZsEKw%TTz0mK3JYDurpZG(T_4+e|L2ogkhCxd?KW$XklMP7`jC$s-zkD<-tV zD{@19ZRooatfHE5w(2}I0EADC=fF~8!opS5lUSh@lo)=3Di{0IWL38WA?_1z(>e}B z>>-HI{hXU(VavlI%M@*rikbR??p&I&U%Y7l*S~636E_u0tvSd}m@nFuZ*+PlOYkye zw1LbcecxY&n9o1z9DClVPAu52P%_JQ?LLmaCi3y<^IfCYJG2!1JBWKAF0cahCVpiF z(whjF@e31BymL|?*XQS<(j==*vI#X)sdLP~iRCs~ov$=$rAb$tbd%N^n}~IvjOc2o JiLnkI_y?Adb)*0Q diff --git a/emul/zasm/user.h b/emul/zasm/user.h index 8c80238..493f010 100644 --- a/emul/zasm/user.h +++ b/emul/zasm/user.h @@ -1,7 +1,5 @@ .org 0x4800 ; in sync with USER_CODE in glue.asm .equ USER_RAMSTART 0x6000 -.equ FS_HANDLE_SIZE 8 -.equ BLOCKDEV_SIZE 8 ; *** JUMP TABLE *** .equ strncmp 0x03 @@ -17,3 +15,4 @@ .equ _blkSeek @+3 .equ _blkTell @+3 .equ printstr @+3 +.equ printcrlf @+3 diff --git a/emul/zasm/zasm.bin b/emul/zasm/zasm.bin index 1001f6e39f5ff9e7226a304a22bf3f8c391def3e..0bca4fcc2f422cf158dfa26400e688210654e407 100644 GIT binary patch delta 3040 zcmYjT4{RIN89$%@)JYsCwv*)3HZS{mDFmmV-cFbIVp zCr(nEKdnF@Hrf*#+K{F)F=@aQx=u4ftak8ReC^&K1)~=2HVnE=RTf5o1Whb2`<~OG zS@L`DzW4in-=FurKR@X>(QeL{;wQ|z4v`(fA~ju-&|(TY_!7(#`YNlX+>$3F{97|h z$WN--AE-(eVLN;(|y{s){wazw$Su}$I zFILD`A#c5+b;8IV7OdVj1)0HYXT5^lSdIQMmHAT?MgY61qE`v9NN(eX6?U+Y%6{Yp`5ME+LJo;Bf;DAYk*R79 zt|5)RLSshw(ndA%R2Z)%YA>!LQdGUsy4lh;KrHHrwIh8zm?;(v*Il=IY@%!-&-LJ2 zWGgWT>%Sm{9>8ym2wid?`i_lrM#xLOf_pF2zm1b58W$|iB;uXp4C5H5*9w-&`Q3+; zs7hWz)|PdU)N*B4K$#TtW6=y0F|EA_m8=zv43-zCXf;;X*{a*QfsKn(O-*2RVQ$uB z;gCaY7(iyRbzs3{=L++uu=SIp5jAA<);-$`nV}Bs03S%ISDm!ArUQ|3P8#!Rfrp^l z?eZ0WLUEcjC#TtVBAYFTc-y0aN0ff~0!#pAO;gk9*ZpIPlV=)~!!^_de;(I>io6He zH_N~J!Q=ZHozpX+3j&K16v}vmKoR*5q#n(Y(?>i zBBd7fl=<&|qnt z;3=En(M}1NQdn}ZGvfM^LGB)!D-(Cn=Od5zsJGZRrhnI8>%jH9#DtQ9NQ7#s{_8B{ zz5#M?ohi?1frLUYYw%> zQT*V+t6`y4XAYBop^sGc3Qi`vS%-+3XnRr@TlejwuI>h1{A?dx-|f)F7xz&g`hFeX85(<^LK{w>taNe>h+o^bd{=K0o-*;QXLH3VDUV+Teg8Mi1UZ z#-c*YL`Gn6S> z_~a^q4G7Xa%f#n!Vc>vKDlpp{T~mr_CpZ5(`#@Jo8pJ7Oe*c6*iZNVE*TR9|0mE)M z5oh4a24w!#aEU3@F_X?YFF@}Y%7UX6Tm~(&$qj6B!vuY=Ys17DTs2LO-5V0DE$B;F za4VbwvWGQp)-*t~8b>3mx2CIpI40ijoP56%t+~nzsbItoNS3gM)P@BcP%)E@;M)IB zb*cZUYfV3YfLKDaGi9yxr0X{a;B+F*!IEB{)vu6|p7XnVQnU>>(w!KQ7vni&j_iw< zi*V@W2Z!cZxl7vo!3jmumJQu7$P3Z3US0++-H^!EpkDq|ur87tf(ww4Y&4fC>S88J zeHiY(H>330+_IR?M#=GL4jIjJT4sLVoJP1<1$QM%JF#0AzlhQ;xLOy#iPDW2w!yN< z#VQ&f6?R9+Yr&a0?P!5K7mVLJqmeJ7K=8mSK_Euku~!#&#po1lVlfz_!;G*$MvpSW z;TWC7yn``5u*!H|^|-E2r{IjQmw?5vXW%XcpX}g$D4I)YZz*rxv-0MBZ~jndxxZy} zMHionk;me?`0Q$TGM0ZVE^j`ovBv^TeGr4U0vp5px8svn#|HUP9Q(=fU_U`|yu~Q3 z<>JlyFt5JiYBU{EbFOC7arGnDw)WRzxD_}+55>#4s=|!of@^u$v^>Zo5CA<=x4FIP z=0w3Jrra64iEhSg>0#_%5@=VqhX%Us^!Dx=I@z^G^3>}-WS@4AQ;|H=<7!So-mE>s z9g{A25IH!~7Ze7WU|`Y(4;}}%p(3&}kv!?YDdC?~ru}llKcV=yCrE3E{4^%sGz6~{ zIc@R>66B#Fp+O8W!8CkU9Dghh()>VJ=CwWdK0Nw}aOC#UQEvZTcRo1sgVk{$kf3mD zY-g=kPH3f0IWd3Gt29F~lMs1kC^t?ioVbgyEd?uC8A5aL0O;=>r>65S4^jU7uZJky z0QHm>Wf$y|Wd76sWPV$e?Gf0>9s*hHsH6^dj)(kX2sKyo2I2}^&DFE}gP6ciYn6@i h%Md&Py*DOg78Qib@UXt*jZo)}33$x0=s=v+{tLGn^s4{> delta 3166 zcmYjTeQaCR6@PyIs1rM`KhoyK!OeSqsdM8%NlgdFtgo%8TGwAmTWD-&v`?V5f_3Qx z!LdnVBeV@^+O&c9A@~D^CT;&9xn3(ISES3Ks52%hL$_1KUXtr<-^ruB8_ zzH}9qeD8hd{?6~5bMLw5-d6%Y9yB(x*;kAQQf}T;Wj~kH7Jf9^RG|0Hvs)WwagdP>v#2^R3u?=9z5asdDg}kOI6k~K0I7JwXkUizjI^> z55fQ0BTEf6y4X@>wIWYb^0YyorY*)|6+PfxK8zk7T|R}Z^7E8DWnhMgzk`7C$UMJ% zgzW%Sm&UT)yz?>)I~ki7_Goz=87qw8%d(<0>ypX5)Z@G*F`r87bLDfhub)|yE`_5D z66|0&%Fhp%zi-&>dMes%g6pWJ3KVSR>#=gv@K9+yR=~z6GCOb7o6=Z4|7sJ|LVhvC zi!QIo?M~pWRO7XH#4lFagZOeB4aus^c}3hu$qL)0b=K4%5_vxoVKJ4gKrMl02#KK~ zkpQVpAc1iKagVY9X$9` zIBWI?M8*hqf=-cfb?ApG4@T$c@O$_A(iFIFY| zr37|UHJNjZcpD`cz-eI10DVP|j-wVN0)PW2r{is zAc%_aH5e+G2uD>sNO1=e&?-`ASNS>PNNFR6_eN{X%|-ld0v}8uAGb%e?9==xpberu z(>w;iu>^8x_o7bcb$mDu8OvCquS^57F6jt>xA5Tvy6U{nd^8OzRn+21uMM()v=!~^0+65{x)T2FuXr`?z`LwT~4MIdS|I`I`m{f`VHPD6VXA;PU)dah( z%6?|iB%Ds5?f9uA>cF;i`K)P|>Ay$ua`_F@U}-X1T_VX1i{#pS)MMcU6CRJDxL}6V za{dc{HwH>tl6_D}F<}ekNaAOctQ#r>w!jhAGOWo_U}#64VBC4_KDJXjV5q5Hff&+&)ZrN-%W6|!3E`ZLM!MYW2`g4r4P;ONfv*`6LSxYlkOOcZ11{&AEs zayO2y8LZUe>RZVC*W;=3l-Ymgi6pFyW=D1~k5frl0Ovd$j1*rS)~sQ=DlJIr${BT~ zs9(fR*ogsi3Uv_!<`g^3O~aYwrbNED zE*FiTY(2b&AByQ{tNd$oXeJ{vFd%FU1-gJF3w{zmmPGytd_0jvUf=>6B0ogro!}^u z)69Mzn2LzE!?vRbS}Ja5+X{9^hllb0Soz$Rou%)Lb=i^g0QZ7egh1F%-g$EY@}--h z1#?|#N|6^tZMjy^jJ3#&XpPL06}7_BOZbOL?Kax#_Q=<+&AC0Z?rZY31xavMA)#8M zmC%$J0xxC~tk(rz{%nj*;*|v3MI;AYFawfD3UWVps;@w?Z>Gv;Z75HlI zRePE~I9iT$`RQM!$|t)pI(MJn#xtW#`ZG4y|hXSf3kbv)LNO@T$16ge5mwx#Oov9@&3lf-XC+tMO_ zDViCBB5ujFrE7hMIXH^1l&?CuzDJ|-BrTsd?x{$M&;y&R2-~5B%$qFV<9ayo zOa|QpT%dm?qo5Am!j%l`x^>cU>jce!0L)w|&$#?g*TE-W4$DVS2f5-XN`U(A%emlj zW2YiJaxSYr=+A}xxll>0gt%O&D28_A@U<9zJj4Ay3(pOBV*tlS783k2`L4jHZhl`D zqzxuvFqq5x+)T-r)1bodAg!OvNv$B4Tb&pXdz((Wjv#(}Yx+3Wr{Y*Rv&#eBO9s-0#6kuy`DIV<4!3&Ip0^$Yff5b9C6#xJL