From f009c58de5f835b52c5cffb7e7894633f17485d1 Mon Sep 17 00:00:00 2001 From: David Schmenk Date: Tue, 25 Nov 2014 13:09:10 -0800 Subject: [PATCH] Clean up the est of the sandbox demos. --- SANDBOX.PO | Bin 143360 -> 143360 bytes src/samplesrc/test.pla | 6 +++--- src/toolsrc/sb.pla | 9 +++++---- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/SANDBOX.PO b/SANDBOX.PO index cefda532cbdcf6c01e1d92ca340325affac3eac1..3f38d3f9b765767e0c5fd68cac4f96a9fd4dbf0d 100644 GIT binary patch delta 5762 zcmaJ_4R9P)9p61J>9utWNC#?$$|Dr=L2|hi(ndzw?%ln+Tf4Wr?Cv$Wc4|$VOB)(7^{PHhejQA7@P?+>M+ny%2%l%B9ua_j&&SC>VRWWte}DjE%^Jt-Az&k z?c8kNzW00o@2}05PQ<=+B6k1fQTYPzis4O@m+?t*kiu1q~T?AI!WHm zjRA!pG_I+?+#u~*-h94Lnijs&tLIC35_CppwVAI>?|j(b0Q=0x!ag$}_D^Ynbm^i{ zwL(a)jXaW=14iGIVp6*j;?9E2^IS9{FO=>)_aiXxtww8K?A+)Dmz?nZD@lt#JS|D< zBx$Yp{*8CbeXiUz^UM42(&RmHe+4hy51fg}pY*yO zJc6y$4=$IFcuo6PV7+#KH`X`och7Iy$n*v&A#EI5;+{$;+#}xc{T9wz9$F3@f9T72 z{^Frsc&&M!sk?$FhAwnhtszp^J)8!3@5A2) zxaE-#>G|l_mwwWzNrRGZOFJ%aZa=tAZ;{+4@28K}<)hxZ$F3323%xtU>d0f4;r-3W z{t)c`>G76eb=ko?u-bo+$wlw@!7HY}BS-e$B{v>u{DJ(Q9R0%9ZG$uNqSNy9J#ypp zU2-H^+P-7h-}#XoYq)-7bgYcm_vPsa<=8!MMiz}%sA?><-g?nU*P08Dr%s+LvP2D*qx5`JRo|ux?K&RLb z-)fYn@0NW%?v*3ckY4QV!`_4PdC|m<*5-$vmQTxjpOL?KA&GS@ThW_VQl{a!EU)UE zu>-rGk<0S*vvQ=DHXPRms5!&wrCCwBy6|I~p}Cr>Ya2OJnWN?{+_ZVhw9|1MA5ad< z&z?gTuG`!#*oJ0gSyD}{XRgUq+g6JXQ;jqOZJaoCg*jM(NLtHt!_iD5#HCb&B{?C~ zREj$ePqRMF%|U{+hW8FupqtFiapo2+0i?Cy!usl}!_shz5nPKi!*p?v=(#!74QYki zqyx4cf?)He&CP_=9A;WBgi`f5GY!4Sv<&pl!wUIA9-?m)1Oam_p3*WJxV4%#XwMy;XU(hXfu=%=z(jh{Zb-H7iMkgZ8)v^V%0DuStB8@v1MUbWu z%mG1eusqM3cCmwHU`P#0sz!=;us+jX?+~hw>rjE%_=HH3`GS)PMPvzS>pZ0vAlod0 zeA2y&B{dfz6zKFnOhiTxV@MUeTOdW+X^FFB!DTtKj|^pVq_@Kjml0=T8U*?V2SV5F zFtXM%HLGfdU}^_Agl?ZH!U%E3ZPhi&_!OQ#U!el1h9oI>NQ7Avw!~YQ!(AbqFejN- z@-PqG zkme#=Q2_gSTIs5H!9N)ik!5T%@B5sD^!H=ggv;?9F@a_sfB8S zE?ERjXydGq??9*s2L$X0mtd`G-Ep)m6#-ldC8wK6ls2KRUjh9cBvV3B$P~yym-oAV zM2a1pt++ao=)kj=o;_mSBi5_LdX-qO7VFi$3IA4|uC45)Ybrf^#JWeUSBdp1v0g3K ztJU5)W<7#gS}+sq9dh={C4i{uPQEAD@K|$e0%1pzGAWXX%&30VEQOJ`gDGG3$MC{=>l~ZjsMU^B@ z`R}V_iOR(^Mah|Y-rA;!{DxV(Mb!AB#{)-@m*==6!|Bb3psCKeCca67=Qo2&P%<~+ z`eXM@_5v}tffLF+)KQd*K2 zIW3!``a$IZfzA4I+)(;#bP|-pIo16ztwU^4*5ZLj6v`^!A?RS7CF1e!mA#_a!5^B& zHmG_5?MwVS~ffoou2yJhok6woVL>)H;X9*tUU@5rPd( zjBTqC=~`LrF)DwR@=Q2xZU74beAF{ryeRD4Rqpw<@J-l?{wdvYn+#x>?#a zT=T|HUUc4$ff_^u?G83n9@$y-_MYtVesyvg(xFnSO;pC%j`C>9d;MhZM|RljC-%Lu zBGTxiy!KOOVtct(-Zk0Uo#kgxculrt2nC}K!X z401XG$TUPZfH5eOU5p_D>gY&z7onBbG8v3?2wTT3>LOQ^Jx{#megE)9-uq8nBr~ky z-d9du)&+cW=s>OOhq?x%}#Y&|a~P1R1%eDL$% zM$Qi;`8;+}g3ToNe*f(9S&Vn)*&a4~q-5F@*k6ox@gwL#QEJ!`@}xxAJljH9J-M9l%E*P#g=*EB7Q zGC^e~tP=+JYXUb^YJ4vElXtjnsHp2{%|U4_5o|oMO!n9VoFU1 zV_Ohu&3=UrCkHf4U7vdLpu7~{vABLVn+}F9fgH(DJr>*u!}~2Lqq$Ux%|0UzZ%{Y; z&-#hQ zqDVoJ*EWh8;fDqc95mA~!ai3(J;6NX2LQg<+`t>*w=b9xE#UwgA2WFbF%7n9+qA6E z52Eu6mVUJ3(+Bgfm=_9YZ9-QvnfRjiaUxKZJui9QD=)U5o3e_@LI(BUcb50~OBHYQ zXvN$8@>=hbW19Dg6X$x9$2w=!6NeV;S@5+zhZA+bM$9E7G(=)xc+)WI^M3JxA4Ve$ zJJfI~U1++=;G+QPWQsW^(9nYGkYi!)2;m8ie8eZBp78~yv5^riulM;SVnl>-$RWvs zrn{Y(GH1O=Cd06Zb6+Xpobao`kM_C06i~#IKq!*1?>}pSLc~TW54N>xhEwbsZj!$>&5H8W+SC;_rR$ z#^m51y?A#W{;sD#-?MPjRhu!|p;UOgpP$(C;w#?0hnCItgEKFVQ$LvXsptnYw;t`2 Tqr`RQ__6lI2adfU|FG%5xv4Cj delta 1583 zcmZ8ge{54#6u#%~^{p*=wfjLuLg7)$)|N86j_E)*>DE_R?DlH=hFcL3*e}Ldx6xq- z$_mkFOaSG@UBSdeG&3qrSlQlSE)pPQfEo-@0zsIvC7{UuQ8uGv-gb)&ZeGs)&Ue0h z&Uxp)7adeb2h~RwGLR}~F#FotJZPJdouNiI5g##{QZTZ3iv2>C&+9^yi+LHbXs;&W zETFQ)qB5UYx?;Ml8fj3T?opZ5?{d5R4|Gh3X6w|@qUw0j#VCO=%Jhrw2P%Y^7Q~>_ z%){yA^{TY=Rx|_cNqZ#lmdXdSJL9y&RY@6AT?oCCNj7?qW)gnhmgGoA{AB@R|?*RNDM>{1j#D46g zjzKdvOPrCUld1bMFtIZ&`#C*5^BqyhPA zw~xja^%$wHxMvr&7kVPpx|JuX4J-LH+NErucxG=r*RtN(lqu_VQ+u%Y9m*^^J`uMk z-bmL4!l)8?{it@K$=1Kzn~5ZYeC9+OT#!@x4RWy0JcZutTSn2vz6I3&*>`=4z5R7& z0)0yD@qQl4)UKHDJK@J%o1x?CIu|(i_zR2bETFjoJ+&nTe3Xi9*5GAp^!cuPM zE37oUcHR0IoVpJSEN15tE1%DoKR8pETS!%Q-ZA-D$?{u}#|Wivj(m9wnoZfxoF%zb z?iZvoe<|-Tb(fZv@EN@MX^+Rl#dS*4ZRiAr{~gLfWiE0!97^;KT*mBL>SQ}e?Fbkr zd9r5&a*YX=Tj4Je-2#_*fvI-09d;-Abp(#KW9%Sr4}qS1l7wGsXYm2Ot4tE!I z?j?VjK=!lvSuM{8is)ok=d2-@S=^$os;S*nx4C``{mjRJc$4uBa(xsmB&f#K z2WFSp`IVwSm>888yTijpLja6Gx9!I?_`-|$T``TPp3BACTSZbNIhisx%Wp~?-d zRm9HXCy4tRIOk4HbL0B@dU|h#IZOY)01B++gKLmSez^uWlET|wp_Ru$Ir%e~F*|vV z{B{Gxl-kgiDy}9J4n$P7U8pPVj z_8qUjwzDm|Yd1}P54whS>Xe-rcFS58(VrG7L7Go=?Qnlq%SNvTNtb*M-(M4zNZKqo zP-LH38X#r@HM;3hX&pI0zybs06oCT9QEM@EybtP*j{rW_YvIrtw&OE^u5$n}_6) diff --git a/src/toolsrc/sb.pla b/src/toolsrc/sb.pla index 7947453..6c78c6d 100644 --- a/src/toolsrc/sb.pla +++ b/src/toolsrc/sb.pla @@ -217,7 +217,7 @@ const WPTR_TYPE = $40 const PTR_TYPE = $60 // (BPTR_TYPE | WPTR_TYPE) const XBYTE_TYPE = $22 // (BPTR_TYPE | BYTE_TYPE) const XWORD_TYPE = $44 // (WPTR_TYPE | WORD_TYPE) -const XADDR_TYPE = $6E +const CONSTADDR_TYPE = $61 // (CONST_TYPE | PTR_TYPE) const STR_TYPE = $80 // // Keywords @@ -2110,7 +2110,7 @@ def emit_data(vartype, consttype, constval, constsize) emit_byte(constval) else size = 2 - if consttype & XADDR_TYPE + if consttype == CONSTADDR_TYPE emit_addr(constval) else emit_word(constval) @@ -2684,7 +2684,7 @@ def scan elsif ^scanptr >= 'a' and ^scanptr <= 'f' constval = (constval << 4) + ^scanptr - 'W'// 'a'-10 else - break// + break fin until !^scanptr elsif ^scanptr == $27 // ' @@ -2913,8 +2913,9 @@ def parse_constval(valptr, sizeptr) idptr = id_lookup(tknptr, tknlen) if !idptr; return parse_err(@bad_cnst); fin type = idptr->idtype - if type & XADDR_TYPE + if type & ADDR_TYPE if mod <> 8; return parse_err(@bad_cnst); fin + type = CONSTADDR_TYPE fin *valptr = idptr=>idval break