From 7117255ced55e3931998b4d61cca0dc672718ac6 Mon Sep 17 00:00:00 2001 From: FeralChild64 Date: Sun, 28 Jun 2020 15:45:22 +0200 Subject: [PATCH] another tokenizer bugfix, updated binaries --- bin/basic_generic.rom | Bin 8192 -> 8192 bytes bin/basic_ultimate64.rom | Bin 8192 -> 8192 bytes bin/kernal_generic.rom | Bin 8192 -> 8192 bytes bin/kernal_ultimate64.rom | Bin 8192 -> 8192 bytes bin/mega65.rom | Bin 131072 -> 131072 bytes bin/mega65_pxlfont.rom | Bin 131072 -> 131072 bytes src/basic/editor/tk_shorten.s | 7 +++---- 7 files changed, 3 insertions(+), 4 deletions(-) diff --git a/bin/basic_generic.rom b/bin/basic_generic.rom index 24f25b284ba8ef6157d9df3beb1d0f00cb7b5821..6291a248bc5580455ba872e913ffe59a6e38276e 100644 GIT binary patch delta 1433 zcmYjReQZ-z6uQe+YCf4&djJ)KX`#a~J z+;h(FoO^p3dKyATEs?Bt;-%a}8RX#NxU?jUjNSFo8u@{;~>GH0r53=n)H z8+gW>#LGV&Kwc9zX9Beg8nd7sp4S3R-jwR1nK$BoX+RIznKS%8iij;|oQ&p|vcC?J z+5A;Yw?*XVA;BGUc;C%4h?QNQC*|7EX5uKQC<^=W7w1BHyi0j%GnAK{56b?KX((Bn za3}K*NRWjI&mYOkZ8Sb6KrJ$fs+gIkc!A5V=>f2 z-Zid2jsxWMqApXfFI4}@9`|&GkCf%DG&TC%@wM=S+LZS!$>eNbDm&90<>aiwT7>`- zIlgn)D&T{pfO9gPWDB>-;uwaF0mJ((S1f;vhXh2rIlCIB+Hg90n>)Z1d3vDNg7nne z+lJyZamc4|=2lmlz12;ATUO0BM2N#)va}{5Po(qJ!IIIC`$P8?Tsq6wL`bt8zh`zF z{U;(n3gr|;p>-CyE@U1HcPW)JR#xzbBlu_(C$o4|CGnLg{vnIUBJ*8NKX-ty~pyW>~CV&?_c?Wv){{aIWzPxah7mYrx6ykH)HE9lCTd=-{6=@THx0P1rYlZb_Zy`BCYf&`F1;T3Qq3n`H)^LF!Sn0l0pkdn&3YmqH_e6d4o zrmMtyS}AUV&Ui?atKNA2+y+6IWEiC+Ps2D_CR7^KF_l`zW$AlI$Heu_O75hdnba~s zHGrQ1fI|SOE@ZXUSw80HQIJ11j1YFr(Y?wR+5&VLefZQc-M#goMZ=Gi9;;oQ#gDCa z<__7PXCq0|V;UYTOwl$nZ7t6SDqc%@H2i()Md7aL&*MbOTc3l1+2Fdh>qw&LW#TS! z9_=j`%e>lfnb^?>qFohjAdEd?Yq-p!31ll_PIjy2mfl0OMc^HCf)E;!lIK&S7ryLl zzu5fMrN$2~e|`Vr-7)#ftK)6$SNBg$UNfZc-MfAx6?^cFjHtj5x|EUt&Bc5(u{Z$z zNQ}~0jNG)X)b;ySTDjsaP3U`iK%4iDh-9SG)QV6kNE;5ZqsP8)BRYs>vQH+8TY`o?)yt y2&pH2CxuusA>d8n;q0LhO4uFuOsp3jYF7DQ!Cd delta 1471 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 F{|nH%q~QPn delta 2107 zcma)7eN0=|6@Ty92J>NT0tsdixN(BP4Izn=GzlvqNz3G*Vo(JU5D{AuhCO5=^@Ejb&N2v|WOMWk^Y%luBKesor^p zY5QY;?CR;>bI;d3_nzN5uV;VHemO;dxTd!18B|wOU5|cHQ-_}8j~uE#aHI-7zLUvc zGqf^Hr&lRc!3tq|FR{L9VCt&)ssr^^h=D=s_0O4}K0C^?YJ>PP-X*?IF6e*F)k>ts zP*|+cK=NpiQ@KDAuTX(*#uc;_?-LocVLr+z#+k&bl82RYU|YkAPd7mGw)lT-RzaS#*}oNCdljnwIG-I~DrWS2#hAE{7H-&5#oft0_8SK{BuHNI+ zCG>85-R5VgtKX*DW@uNxjk=X2+U4l(hi#`eb!bz2KWHTkNI_a|_poZ7wd`B^f5$Ri zayokOQd_EF+0i{rmtnKq=L|4Np>4xxmIib{(eh|qO%Lc3WNTr~U5Xd+JBmaOiEk?1Bx$Nyv`y3J>amdoigp;y$>C{j!KISG9+f+BG=9fu6w z7}1Q2Mn)Mfx=lGc%4*B={PmIl&ScbRF~~apMF~%6sh?Q}*!{;rz>Kb}xbid8wQ4pR zkMB^-=(82x0K?7j2S&UC91>u>+fpJB?_B(@@(mm!GQkPI06{}YWOHV9cHbT9Q!hbC zaE=p}Hh#B6PG;uz=ZWOBDTM>TiKZgdDDjn&-&E?);17-gz|c2SQHQz(Fa~`1$bC~` zdaZ=SmhbL|i z=olbH{uDssg;SY2Q989o2gs0d2-z0+@fdYo_NcXT4fX631Zgm5)E_;-Ff+oSBRf9DX4|WOEwdjc=c`LZf zr5??lhj!vF+JQT1JMI93cJSNldtj}( zIJM4#_qE{)fe`{6QpkJebt$zH!0s;pX^4Di-kdWeMUMg6=EhO)Py$H4{n5Sh6K`4^ zS-+&R4mDn+$(N0)4zXc=Hbg2dYtIj+<*_LOv<<*uqjdh=tb9F*q^@s_(C<$Gjwbj$I2T<3~Z^Ml`YJ;g;EJKfCnPPk(p)!Dme^%C+Cm{lR#n zq2Z4=!?D$|un_wo7R$K}jD@KMU|x)k&Bua3OvWUM{N;OATcy;CAa(FuZvTY%kT*}F z*TP!C!gaN))=MNeZ#Q>ng4E?b%SDC>&2ywfnhysKp+9}V-y0@>&a-c*l(cF>>O&r? z2iR|n{rhJl@UVsA+K|64zfuwaBz`9FL;l93fUchLndpS$?~t!!5~ z-yz=oiX>=PEU%Dj`MGB3Wg(PxpUN<4ulgYWmhsV9@TFxLWf? diff --git a/bin/kernal_generic.rom b/bin/kernal_generic.rom index ed644e42fd924ceb7fdab35ac34797fa409dffc6..e9d83db5ef73dafd330e90237ee159f25b9acaf6 100644 GIT binary patch delta 274 zcmV+t0qy>PK!89)q96usCTu2aCTb=rCMYH+CMGzgDdlB_C8a3kWQ8Q9C*@;>Bc&$g zVvrPtBBdpTDWxQZD5WEXC#52VCgyF*(7<4kL&5^Bu9F7=kOiKFHL0kRoB_%Ov8GG_ ztdna3r5iY)u+SE%eW0b#5UKB=;?N4IW1z0k1gV~&sFN!L_yX3ZlO+T&fB%I#-~#Xi zO!lR%0RqWP@B>WtrKtdgw}lFz0ip*Wy8lcJy&!zQurMIAvB^8|EFh`lAfBzI4G<8Z z0K{SN3Lq-tAkzQHOp)Xue7~>?$t>{T$vf}`(AOZ&>P!Hv0000V=TA}rL`7CEGB7YU YGB_?qLoPA^08H7XOxdN1v(yAE8-zx6r2qf` delta 274 zcmZp0XmD^|Ia%S-|CN0Ub}GoNUc|6~OM&O<$}$L#5yIO9=B*4}upgv^87!zUXU`(G z1q?vNKG{nrIv-+sx_mM_;{?{SR@0T6CeL9!#rkuV&-oRTvzeAkzgV#Tg4oL11xqgo ztbD)V(FLxR$qUw9U;)~)X|gu+4KPOi_b9mTQOMkHu~hdZQ>*T(4NS-M zmgp_zQn>nm0<+J>rER(`dI~>RDHt#HIk2%sxm9Ta%SNTv)D9q#0wR)u1ZP8Q(nci# z=9T|-Rx-4vfrJxV3YI1&FfcI4Klcw}ba4&SGcqtRGqTWgbJjCtVDP!Q6o|SuUt!Ua F1^^qCbJhR= diff --git a/bin/kernal_ultimate64.rom b/bin/kernal_ultimate64.rom index 4124be18a7549c09bf410ebf82ce13d1d0ba5021..d40bcbbd5fb5ee237c2193c5feff4c12148eb05f 100644 GIT binary patch delta 708 zcma)3&ubGw6y9di5?fY$622_2kVuoB9Vh4Bvcj-g_V4o5@Y(rnD;U z%L*AGEu;id@Ca@}2%y+XfD1jXIEwJGnsE1GuwB&}Tez~F9isw-tR&C5y0+ulj35-D;qY$fc5H-HE=VGuVV#^6{EqMN*f z)DFj)h+4hP}T-9Nd@(0qJZ+Yi^zQUng;tl>IW=lLO%|6VET8V`j6VfK6O023o j1ULFU6ec%*M(4 zii${7$pk`2i3@s}VWm;<5mn20OUxfNPUxvbvn~xc>TisE^9&sYoDZC@@f_uUE$MIn zCl^f8%n$6B0ysv6aX}w47!tKcjECw~c#DW}SI%SlEax>W&cJ1!)8t1?kECXltI$da zH;3@VSehr(`1T~V;EySQ)f)eNf?M5*k_As!3zG$$5w2XxLEPBjk34R@2rUIv)Kh}E z)q=IGYr8oH^?xry3+sj4W^`-0;l}onwS4D0A9shl^t-UF^=IyEvZVT39%Ny-@Ps_b z?qD82kyX~t)M;`Z+rsi_QQnt%P{Q}8z}avLZwq1DbkK_L&EP8(EVXO=eE6^LrbRqE z7Tf|&1zCLa(`dQ>z(4Q(6@4~pNwECUFqFfGC=~M_`2xgz*zD``sWWU-bGxm|Za-XA UV>{Mpt3(Js70k&GnH9VK0E6c@1ONa4 diff --git a/bin/mega65.rom b/bin/mega65.rom index d63794212d8e956b72e6e98c639b9cf00f164f21..d6ac550404c1714eb69965cc047cd6b84d9de6b5 100644 GIT binary patch delta 97 zcmV-n0G|JVfCzwq2(U(a3osCfj0FL?1_3D#lTmsY0Wh;_dig{FGP7jA{UHTI$vLn; zlV;&82L>R0r65$~la}Frvlrq;0t6tzxsa1=8lj$$?c8j2kv*RsD2fG~ArB|F0se!%52xHj~pH z>aZ{?)GnPo^I_d)kw+d(0xKC5R34pVxWI7&On;c1@Whb$yhXx9M)Aqpp9nJ=HlKd7 K{qz$?Q)vLzAuIj> diff --git a/bin/mega65_pxlfont.rom b/bin/mega65_pxlfont.rom index f56acc9fb3a63bcb853abec92fa85dee9549bae6..d04867f434592ed481816fe9e30b08c5ec34fcca 100644 GIT binary patch delta 97 zcmV-n0G|JVfCzwq2(U(a3osCfj0FL?1_3D#lTmsY0Wh;_dig{FGP7jA{UHTI$vLn; zlV;&82L>R0r65$~la}Frvlrq;0t6tzxsa1=8lj$$?c8j2kv*RsD2fG~ArB|F0se!%52xHj~pH z>aZ{?)GnPo^I_d)kw+d(0xKC5R34pVxWI7&On;c1@Whb$yhXx9M)Aqpp9nJ=HlKd7 K{qz$?Q)vLzAuIj> diff --git a/src/basic/editor/tk_shorten.s b/src/basic/editor/tk_shorten.s index 1d3fe0a1..916a8f41 100644 --- a/src/basic/editor/tk_shorten.s +++ b/src/basic/editor/tk_shorten.s @@ -31,9 +31,8 @@ tk_shorten_1n: ldy tk__byte_offset // will be needed in both cases // Now we need to check which nibble to cut away - bit tk__nibble_flag - bcs tk_shorten_1n_lo + bmi tk_shorten_1n_lo // FALLTROUGH @@ -45,7 +44,7 @@ tk_shorten_1n_hi: // tk__nibble_flag = $00, both nibbles fr sty tk__byte_offset lda tk__packed, y - and #$F0 + and #$0F sta tk__packed, y // Adjust remaining counters / flags, and quit @@ -78,7 +77,7 @@ tk_shorten_3n: // Now we need to check which nibble to cut away bit tk__nibble_flag - bcs tk_shorten_3n_2bytes + bmi tk_shorten_3n_2bytes // FALLTROUGH