From 4d077d5416ef5d13c51c2a478ecc6dee9d8fd6fd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9my=20GIBERT?= Date: Fri, 16 Jun 2017 17:27:48 +0200 Subject: [PATCH] Kernel version 0.9 : DHGR.DRV, primitives....(Cont.) --- .Floppies/A2OSX.BOOT.po | Bin 143360 -> 143360 bytes .Floppies/A2OSX.BUILD.po | Bin 819200 -> 819200 bytes .Floppies/A2OSX.SRC.po | Bin 819200 -> 819200 bytes DRV/DHGR.DRV.S.txt | 33 +++++++------- LIB/LIBGFX.S.txt | 4 +- SBIN/DESKTOP.S.txt | 94 ++++++++++++++++++++++++--------------- 6 files changed, 77 insertions(+), 54 deletions(-) diff --git a/.Floppies/A2OSX.BOOT.po b/.Floppies/A2OSX.BOOT.po index 6aee4a99a434478db3fd0ed67016aca2942f710a..436ce9ae3fa3919ab9ff3c84a41d4c572e61a0fc 100644 GIT binary patch delta 3153 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 NkS5vDNseMR^KT2F;2i(} diff --git a/.Floppies/A2OSX.BUILD.po b/.Floppies/A2OSX.BUILD.po index 054c9f5ea3c69767220ebf7d648d5e480528452d..d55b0f9c364ec309facd04b76119ea02a404cbb0 100644 GIT binary patch delta 1746 zcmchVZERCj7{~9u=WgrD7+rACy@=;NZMSt@cQyi~Bhko95XJ;#9TXL*i4w(^1oeY9 zA#IQqMs~@vMJpdlurau4PXk+|X|lU57;!V2T%vAwK@c>NPGl*5k}uYC+A5ogCVsI= zpZlEO^FPmd`-eiSL!s5@(=yUQ9=I)Umv!)12G$qZSW;Cn@@&z{*fNtv(4c0SP54p3 zOg3`-!xJc{8(IEwuT=5A#LC!GC|6bN84xA!+j8Q#oDh?8LXzGK9&q*RsxaZFGh~NB z4)OnBs?VhIJ zkvj&@W)cR`QbfHA+9*+f1#O(DWj5^+QJ31Z=BC69u^!20x3wakC6rHT`UmYZz6bSeL+k07SXaxpTim$dm@{Xsoc;tW=CK0iy?>|d@CeeC~wkn-ZBv=#j> zcKoOJ^ZhpkDw?}>UwB>G0&XIdQi+a}$<#6>I+`0?B9rMGNWU2?p|wi%GgAG9 zevjp=l<1d{gPo}P<(zMsm-5zqsbHzg3b)kf3b)ivg}d|z_43vLvM!kR0Ik9CY8*St z-n38jpV|oOO6XkyCu3!}66k|CURx-Z&D((5V9KMAa%K&E9MmqLJ3!q7bSJ2Lf$jp;2Sb9o8-_%+lLs$Q2aelu zYz5np)!&0NDA(NMxB7=nTq7{e&;x9CaHy8`V`J9t{v6r`))!?~=tJ|Y&;?Uox(DWj zzN_x}{*{6F4itw2CEHB^xu&B2YW$gFbBaoKgpxXyS`E zx!?Kj@Avz@bI{omdK@JFBfdlN{elRj;l%? z!uJAXva#czo&Y)BSo!C@QrSU?(a@Hs<yRGuX3E<%uewas{mD_I{jhh# zGU+!`(`%W|HO$SwacirB|6IoZ%HMtIm@!y%&NzLAoUr{yzau>sV?Vt{T9;?Z?rirr z^g3BKd3Ggc5?v?iEvzSr`U}=C5VhE$PZ4#4LvOB+%@X_3Y<5>ibdK2H=Lbvhg9U<# z8{VPQLUJOTUD?a}=U%Fq%(r~R!COA+;4OFOT6U~ysV)*dn^l(x{gz~!*|pI{GSp#T zy}ZdA-iVNlE|F2=AiwSO9AT=Zd172vg<#S@YQ(M*qo~c7pM)oP-~Tm~lES#O3)~f- z`p+}v!^zF&-hIJQOy|hg^CVM{o{R7403+h~9#B#kd>c$aL7-(YYJ=KiP|!8u-O>czR3fHR_bFBeI~nXu*%mqMjF>Ln=j5=9!LB^)ikNQQ=i;!N!R|cl zj+nK&&&}al2G?@f!@AT)OporX<+z98p1j->G3#`nhr@LY4v#+#_Eoefol2Ut)VI~| zsBdd%Z`j%3Q_OJ9K2X`HlSBoITp-hlQWQz%KBmZY>N+sywRN-_MP^9lSH|xwuR#$b zd}tqNd^6`;=A{+uzLB@o6ylcp5^+n-Bks~0=wDpAYEo{p^?4)l8T`dOanuj4fdQL@ z#t(o4JdxuEo(G>uXI})C@W(HJ_V`N^;0rO_H3@9-yRQLBipz(AY;i7%LhfmTmtiy7 zj($ap=x1~XZNk+UVGnM>58)@m+ui|{!7@y%V6+lyAFxsOiT+a?vHBzGy@^h0#qbA2 zx58+3o-9t^M)WqCX*Cuy51uN=>QAV50Wnz$X%?o{1Qxot9cvn_JlCXd#?vfr$;HZC ztilw*D1=O$LUbdJmSHU@L!gh=6)9aHn!04pqIJ1{JU=%}5V(O8HX*KSV zGu!D_tU58R!Kw?>`?2cA6k@d&4+|>B!=mcoLBZ4sqYBhEvmdhidte6Snz#Dx{$UH( z2uw4)iB&(#qLY8KcB?hiiS4h;jOYVtPT-ln)P)y>zS%U}(2Zx3nM0m+#)UN7Nx?HV zBQd2=H|$r~;$lm*EIjxwsAymZw6XIs)Vo5~<;Z(z!wOozQc`jR;Ir=mIoxyvv_i{s zY=phSc@{;>t1LRimHaK16Y2bzC=H3B00;%-P@o_bC=3PGg#wmPpePiuh63x)28s*+ E0F*?r&;S4c diff --git a/.Floppies/A2OSX.SRC.po b/.Floppies/A2OSX.SRC.po index f07eacb5dba4db1423d84669d38c13c0a7d90617..06110f2261adc6d868fa33b73f876efb74cb05e2 100644 GIT binary patch delta 6133 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 delta 6330 zcmZ`-d3aRS6+iFsUh=Y-ZPp~L83NgOnI&XFgk~}$M6(Q;0cWr-!(`iqEzBqacQ+GqSh`hU0nX?*J5io?V`2kzWXNgGFU%8GxzMjbI(2Z z+&4OEA04$Hk8!ikRLq~)#tm_2D%gUFvs@*+*bBg@Mr9}C}S)++9YSzQZJe>iBU%BE;1y^`NSNiEj1LXY*UBNgej^h6t zCO#dlUdjIfHS_)mVzWFHk6jPKS*SU+XbA|Ps(=4P{~G=btD>&(wpADU_iWxWC@nn2 zZ3NS2a#2y1anoO@OzvNy%`3XQTu}ZuaJkoYwRXBiRM@-1)xp{abc@~@_#@_yHlgnAK9>JT{E+`VHBgTR3@>D| zYcb0&k}SUjqFr9m;R>{3VyS}y^w8!6{>N||%=rn(TaR(&iI*X{IW{DvvIhJssIB`c z^)VfoAB0yS8R`!~-fNHy_J$-&1L$7Q^bUEaakE1qNpyhW4M;`?LTPY*65AQHZg>+! zhXTKc*IVcSx6IPi0*1FU{iAOF&(Ph5kW`NXdGDxx?7;t=1pJE(X93XtGQ&my z&ij?>!q#Gkym!$=*s@g;n<4)_1U1krSr#@y-uvl#{Qymyemzk*YFzM}3~O!C{^$_o z|2Ac@@v-Ci*D?Dh81`=mmoWLVzBBtQ9wcE>WPTsP{qBrj9SggH@nCHO7!G74E`ab% zGWB4wj(KsL#BPu1@9qKpp$yq>515mxs3O?e?Q)Bq-Cf;ayiGo4WDUi)W7v7$S7p%h z9TV20#;iM$YQ9VUi;*?4cdNU9PsZ*G_tIS!?t>&AG~n+?rNYCcBsWCjm>(>26$ClJi&QZmx1i~?T6gQR}Cuh;s z?Ox~Z^4%B(a$Y8PQ&b|A?w1ywe31KmmVD$ew_s}aBb<{dFD+x0 zQ-B-V77X=;Yn9jnHYhEZpI@A9N|erKlcB+3DMJA3a}G=UrUUr7ESC5@R%sS(9X-uf zudlnu4Z?hu?$QFnuVBRnv!bjn_PX>b!s&^ z!1P_UmYT-~qIFVuI1)d_iNJpk%`8mFpS{Uh=8U3<(r?GG(O?e=T_s(N*SLft#_h88 zEzXeGL848ch#q&V%h}Q0b}{I#KPL~SF;e?6?B6r&mF%R5m1L2N3XHo@kaYcqu`T5G zlD0&*g(2?-H5|OnZ^RJvyCIn%`J7fH6}5+EN;5$4Hxc2z8BVaO3^!-Wq5=J_nSu_` z?aL4h06#&D?w^Ii<8O15Z}ZD@ZE#)%lMF|Pq>}|%pEHT#e}cNx>LjN7mqJj&-A#ux z{l7t3DusR{p*4f=iu z&S-CVCv|ED`SRi{Q-WcpjrkSdcF?nFT0o@kvM+>9w=7`~w4_-%^WW-FL;G~@s!+gfZ; zo~xnz?W%Y!VHxu@tN>+M*MN|(B0F!IZO=efpy8yEEh^NI)5s=EvN$Gr@F-`RDllgK zewNIzY~{q9yUVA(RhD&XRU(C4otnyuG*&doo5579;i$-4tY9qBkX7WE51odp;o~J`HU4 zYz;L9%xYD3)I3MSQ+HIsHdn&aKLzF?-9SF^spq=}X?Zd_$b0~J)Mf~d#YVYcQFis}IyM;{BCU2HDs~2ASHl>u1q2R!#uw-4b z!sckHhQ&>++_s;q%x=b@=eDqNbU!ycYZ)#|&nLsKIcGVmyd9mb<5k&{Rl+Yx< zmggPjjPmLITt0gNE5E;=TT-%u46Z@R+3Iz#t{aAmm8@KLfSW(RmD2Ia(jkn}YmV0QTS2+VdH}GrFOmPn-dEGuw z>nb-sPrZcdqu!^tTwKe_dk%4Rm#(85N-Y#$lChI{0hUb0k%3_l){}?C2=JGpJ>$1k zG~^Mg7Q!&(UzQ5d2A0cdh)q|_2=Pi1OpucBAwfed4rNByOQTDKXGFI#BRYN)S}W

hM zT6i-qo9WVThoW29n(a2L%ElMLt<+)ZK6y{4VBR=Epee5lJZJ%&?G9kLGajYbuyhC2 zw5V@lBndK`>$X z1zm#KdzZQy&A{J{I;HoJ{R?HZF~pL0FA8G!6z!0EA4@+af^a`Ykbf9c=8VLh{c)H- zDevhL<|Q5=V7D)m@RLj7gZR4ve|v|NEIowFM!FnN zzPysQTrlk;!~7pL(w$x=@d~b`3xo6XGlJqB5EanM2QX}saNJ?;{Lf5wJ##C@d&yK zt;gpnvq99_c|qRl5%je$Qr^-Tyq74kaYi&hmXD)C&QE9>EHBHaJwip|6}l|`DeG!q z*Mthn8^Qs_uTnx^Bt>|QRW7Bp#OstWEulY6-S$T@7-gn!0{t75))z_Bgfr?+yvepD z)DyCYWP;3hAiPDng>SQd64K4|Em8P0)=&JWmhZ62jiN4vpQ}p0V9AUB7WH9J{7Y6D zfGpNJe8Nt3f57B2 U<33^Bmox6m9rxu;`ts}k2WY{BmH+?% diff --git a/DRV/DHGR.DRV.S.txt b/DRV/DHGR.DRV.S.txt index d5e8a9e3..97aba190 100644 --- a/DRV/DHGR.DRV.S.txt +++ b/DRV/DHGR.DRV.S.txt @@ -489,7 +489,7 @@ VLINE >STYA ZPBase bpl .1 sta SET80STORE - + VLINE.MONO ldx CB.Cache+S.CB.X1+1 Get X Hi byte.... lda DIV7.lo,x @@ -535,26 +535,25 @@ VLINE.MONO ldx CB.Cache+S.CB.X1+1 Get X Hi byte.... eor Mono.Masks,y y = mod 7 sta (ZPBase) - inc CB.Cache+S.CB.Y1 + bra .6 + +.4 lda (ZPBase) + ldx CB.Cache+S.CB.COLOR get color + bne .5 + + and Mono.NMasks,y includes And $7F for mono + sta (ZPBase) + bra .6 + +.5 and #$7F switch back this byte to mono + ora Mono.Masks,y + sta (ZPBase) + +.6 inc CB.Cache+S.CB.Y1 ldx CB.Cache+S.CB.Y1 cpx CB.Cache+S.CB.Y2 bne .3 - sta CLR80STORE - rts - -.4 lda (ZPBase) - ldx CB.Cache+S.CB.COLOR get color - bne .6 - - and Mono.NMasks,y includes And $7F for mono - sta (ZPBase) - sta CLR80STORE - rts - -.6 and #$7F switch back this byte to mono - ora Mono.Masks,y - sta (ZPBase) sta CLR80STORE rts diff --git a/LIB/LIBGFX.S.txt b/LIB/LIBGFX.S.txt index fd940f5c..09414333 100644 --- a/LIB/LIBGFX.S.txt +++ b/LIB/LIBGFX.S.txt @@ -110,12 +110,12 @@ DrawLine ldy #S.CB.Y2+1 lda CB.Cache+S.CB.X2+1 sbc CB.Cache+S.CB.X1+1 sta DX+1 DX% = X2% - X1% - + bmi .1 DX < 0.... ora DX bne .2 DX > 0... - + ldx #DEVMGR.GFX.VLINE jmp GoDevGFX DX=0 : VLIN Y1,Y2 At X1 diff --git a/SBIN/DESKTOP.S.txt b/SBIN/DESKTOP.S.txt index f9932ea8..1421d425 100644 --- a/SBIN/DESKTOP.S.txt +++ b/SBIN/DESKTOP.S.txt @@ -44,6 +44,8 @@ L.DrawLine1.CB .DA DrawLine1.CB L.DrawLine2.CB .DA DrawLine2.CB L.DrawLine3.CB .DA DrawLine3.CB L.DrawLine4.CB .DA DrawLine4.CB +L.DrawLine5.CB .DA DrawLine5.CB +L.DrawLine6.CB .DA DrawLine6.CB .DA 0 *-------------------------------------- CS.INIT >LDYA L.MSG.INIT @@ -188,9 +190,9 @@ Destop.Paint lda #S.CB.MODE.C16 lda #20 sta SetPixel.Y -.1 lda #20 +.1 lda #28 sta SetPixel.X - lda /20 + lda /28 sta SetPixel.X+1 .2 >LDYA L.SetPixel.CB @@ -206,15 +208,15 @@ Destop.Paint lda #S.CB.MODE.C16 inc SetPixel.X+1 .3 lda SetPixel.X - cmp #79 + cmp #84 lda SetPixel.X+1 - sbc /79 + sbc /84 bcc .2 inc SetPixel.Y lda SetPixel.Y cmp #192 - beq .8 + beq .4 and #$7 bne .1 @@ -223,7 +225,7 @@ Destop.Paint lda #S.CB.MODE.C16 cmp #16 bne .1 - >PUSHW L.DrawLine1.CB +.4 >PUSHW L.DrawLine1.CB >LIBCALL hLibGFX,LIBGFX.DrawLine >PUSHW L.DrawLine2.CB >LIBCALL hLibGFX,LIBGFX.DrawLine @@ -231,8 +233,12 @@ Destop.Paint lda #S.CB.MODE.C16 >LIBCALL hLibGFX,LIBGFX.DrawLine >PUSHW L.DrawLine4.CB >LIBCALL hLibGFX,LIBGFX.DrawLine + >PUSHW L.DrawLine5.CB + >LIBCALL hLibGFX,LIBGFX.DrawLine + >PUSHW L.DrawLine6.CB + >LIBCALL hLibGFX,LIBGFX.DrawLine -.8 rts + rts *-------------------------------------- *-------------------------------------- *-------------------------------------- @@ -258,40 +264,58 @@ SetPixel.X .BS 2 SetPixel.Y .BS 2 *-------------------------------------- DrawLine1.CB .BS 1 hDC -DrawLine1.OP .DA #0 -DrawLine1.Mode .DA #S.CB.MODE.C16 -DrawLine1.Color .DA #1 -DrawLine1.X1 .DA 80 -DrawLine1.Y1 .DA 191 -DrawLine1.X2 .DA 80+191 -DrawLine1.Y2 .DA 0 + .DA #0 + .DA #S.CB.MODE.C16 + .DA #1 + .DA 80 + .DA 191 + .DA 80+191 + .DA 0 *-------------------------------------- DrawLine2.CB .BS 1 hDC -DrawLine2.OP .DA #0 -DrawLine2.Mode .DA #S.CB.MODE.MONO -DrawLine2.Color .DA #8 -DrawLine2.X1 .DA 90 -DrawLine2.Y1 .DA 0 -DrawLine2.X2 .DA 140 -DrawLine2.Y2 .DA 191 + .DA #0 + .DA #S.CB.MODE.MONO + .DA #1 + .DA 90 + .DA 0 + .DA 140 + .DA 191 *-------------------------------------- DrawLine3.CB .BS 1 hDC -DrawLine3.OP .DA #0 -DrawLine3.Mode .DA #S.CB.MODE.MONO -DrawLine3.Color .DA #8 -DrawLine3.X1 .DA 100 -DrawLine3.Y1 .DA 0 -DrawLine3.X2 .DA 100+191 -DrawLine3.Y2 .DA 191 + .DA #0 + .DA #S.CB.MODE.MONO + .DA #1 + .DA 100 + .DA 0 + .DA 100+191 + .DA 191 *-------------------------------------- DrawLine4.CB .BS 1 hDC -DrawLine4.OP .DA #0 -DrawLine4.Mode .DA #S.CB.MODE.MONO -DrawLine4.Color .DA #8 -DrawLine4.X1 .DA 110 -DrawLine4.Y1 .DA 0 -DrawLine4.X2 .DA 559 -DrawLine4.Y2 .DA 191 + .DA #0 + .DA #S.CB.MODE.MONO + .DA #1 + .DA 110 + .DA 0 + .DA 559 + .DA 191 +*-------------------------------------- +DrawLine5.CB .BS 1 hDC + .DA #0 + .DA #S.CB.MODE.MONO + .DA #1 + .DA 28 + .DA 0 + .DA 28 + .DA 191 +*-------------------------------------- +DrawLine6.CB .BS 1 hDC + .DA #0 + .DA #S.CB.MODE.MONO + .DA #1 + .DA 84 + .DA 0 + .DA 84 + .DA 191 MAN SAVE /A2OSX.SRC/SBIN/DESKTOP.S ASM