From 04bd57b5270656b7aa1a2d76bbfdb5aad0cf212a Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Tue, 27 Oct 2020 22:51:08 -0400
Subject: [PATCH] Remove BIT@ and BIT!

They were only used in the ti84 recipe and were not worth their cost.
---
 blk/364              |   6 ------
 cvm/forth.bin        | Bin 5355 -> 5283 bytes
 doc/dict.txt         |   2 --
 recipes/ti84/blk/618 |   8 ++++----
 4 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/blk/364 b/blk/364
index 865da53..a24ff76 100644
--- a/blk/364
+++ b/blk/364
@@ -6,9 +6,3 @@
 ;
 : , H@ ! H@ 2+ HERE ! ;
 : C, H@ C! H@ 1+ HERE ! ;
-: BIT@ ( bit addr -- f ) C@ SWAP RSHIFT 0x01 AND ;
-: BIT! ( f bit addr -- )
-    SWAP 0x01 SWAP LSHIFT ROT ( addr mask f )
-    IF OVER C@ OR
-    ELSE 0xff XOR OVER C@ AND THEN ( addr flg )
-    SWAP C! ;
diff --git a/cvm/forth.bin b/cvm/forth.bin
index eaa38a29bc9e2b2d1e03ce4a5dbe8301deeb6a9d..f06405dbf8d270051694859cce865f2c9ba6515a 100644
GIT binary patch
delta 1572
zcmYjRdu&r>6hG(o@!j5jeUAy@7RI_qJLU?8XVHw^uG?C=c4_aJq)tF228Uo+Q3)zK
zI};L?V7@>c|8&NLZ7~uwk!UbJ{uuvhlqDwkhbB5qR7|EUBSB3(-|a|ja&NzLzVrC~
z&g1?bdpA}G^lJ&;<!7vulpyp$-CAZJDs~3NY4#Y~%Km{FNQuu`WN@5?ah&NelrMA#
zz)t6Be1=sZ#p1wjzy-RRfi|4RJI)y}paX8>qA~+p*&T?(FI5<4DqbP4Hk2OD3#=Jz
z<6^sN@LATQ=+LSH;wCY!7FkX;zy>+-qk0725ouSn@1D9tX;&hsB4-Uup2Mg^^zgCr
ziBqvgU^vT~TskBRsV+0+0Vk$i1}M-#p!RkZ(p^S26#^CaiBDXQxOb@)7;`x&gj+1T
zN|Ajo&VF!3C}1hwGwdU7aj@x-0cXkVOXY?uFe}Ph87IWA+J-ZOOyDb87^iTA-Z~iB
zJsX<IXGDu&iJmgl?se$N4i@`XgM-W?GUP4Ivfk|{>k3HwMI{c7i=e}jCKX}KSOIE5
zDXIe}tz1;~^Z@a)<3vg`0PF%^u*cmsb$90~B0PyzZ9+Q$y||fjv5SNvU{AoGRFwR{
zzV+m~q*Z~rWtLl-_}ZN$K0&^d-dTPK-x61O{j(-dz<r6wDAs|32B=_i9kM-cOVTVU
zS*S^#6)D>zfz9wsWLX?YYG5PB2J14Hec*T-BRD~W;4B06{bMdRdEVYCV^^Tw76-Qh
z50l3fdU21ZLgTX&R8m{DF?lomp+jea=7Y*B{`EYX{?ub~`RLH`_!<iv;6u3JS@7tv
z-%ExvMuH+%V8JuT4X{%^4p6cPVUwm+(#sn$=8d*W+CR@zu<pVBfhUQ~C0-?e6{H<C
zZW^U?Kz!?Ma-8FH{G7P&-EK@#{i7$IK6>m>Y#mMD5RK=HitH#&uO?Z3=anclkUDCJ
z0UiQy-AlACcqMUDjQZO7J+A={_?v8&FNybjEoh3HzAeO)`CFct<7Hx$O&862g2kvz
zev3#i?b$7#B(|G6?!^gBu_*7RT2!Gn1+od}ZIatx^Yr>khjh+N6$T0^GXpN16=(ge
z?m3<T<@m@+KF`H<{}vn(i~dN2xhH7M<O+wWUSob)3wfR-$!VQB#kN2jGI1~vPRdDE
z@UowP=DWHJej3~96%-XHd*=CNe*%_PZa3;QtTm6SwF44xpZGGc8pp)<0X<p`$Q{z5
zt3SUt<)v7%_EjoZFC{r2co{yl$<zB{U9hq7fjo&fr7n<wpKg$E^tppaj>S4CQ>S<;
z*xxM~@D(<jaV#KNwPBV1|HsHb?aP3D|LCdFCRYaB$>T?l9(;cEa6`T*tFv0%4YuM*
zu{PAY?OITNSh8s|w~D%AP-i*gq=|BP9W#KjS$3M1a9M|hk7hCLn#2Y+D_#nPgX`1>
zJHY7!==jLV#B?Z%*TgrWHTatNEwr}1gBD<i@|o=l6{d|oFddESVGOT^3^>VUmM$Y-
zFdGB#Cf*E*&2`b{8l1tLna<Y3IN^yCo*jycwTn`aP<4t|>(<0}sf@zZz?PEv{(*Eh
YHCzv8ahED1ms*E4c!LBczNp*yA7_k3XaE2J

delta 1588
zcmY*ZU2Icj7=GW=pYQbi^|T%1XQ$9^jBaJFq8OoqYtPnUXGfQ|Q_M04qDJBbbPH&N
z5T&v}LIQrtbji#hTx^NSj4a%3dL@{V-5@i1v6~qL6oDBeMhyCXr+8tLp1gnG^ZtC#
z_nvF~wXq85w>S8Ve#w!920dR^)v%nMEu})>#tk?Im(T`;YhVFcqry4{!ZHR|@DL<G
znSc#=3+h3);UBmMLcK=bI9l*xv89<m$+oh?>~C_M<Of+@_Z$o393yAG&=w%LIW~@8
zuri!v31Amtfm{=GdK_<gCn!@hT*JH41RQ3!DBI6tFvnz^q*HMeC%g-+9$a($4zsl-
z)-G8PlL7HvzEv)=Vc7;34D(OqJ$RF&uR&_@@%6qnu_e~;v!Jz*NtZG@c=5E)1_>gR
z`h|2Mo3?YA5Xg9zzwLWMJt~)B*5{GJSmcww9`9M7#?~p^uUNRmo0LJE=Vz7Zk<S>%
zZ<H{e!72LEv~tf!>#4mdr4G;0e-J8u3)*wt#phOlhr;VH0j{X(M5j!OE`x}_D<!})
zOe5c-3PTt_b^t1%gzCW&Cl?Jd+eHnyao$pF05``2?t=s;%xx{psIw8guFUgZHLPt>
z#~`l?w5ZCDsjXD^th$-LZf*CgKhmLw{qOAAJJ`4y7+!X9+zFRmqgoRF5{1~sDv*c?
zGK^{#<l0q7Qyi_eP|@^9TCQDGbXQxX$YNKk0xmijfl+>0tC2wGH?&Wm5-4S;b|pZy
z;W0XR1`XtTnJ#=Y$YgffAJyvNHw#*lbfa}R%`fO%5^iHu6MqYucdT@(09=kuMw4Md
zpFx2FBT0y5Xfkx2M~o`3@RFD`8e*cOpK5dq+PXWtUZy%1HNj^YmJ_e(GR9GK{t`cK
zto2;gbp0wnZ#<1R_%B8zy4o+W6%g0MhDp?^2bZ6UU7+M;>TtckNo(=j;DHAebAOTV
z_OHWHe!{<zs{h)*u2I*gDR(YgELBtPJT-3;FLuH<;(OH8=?$ewHt1FibLA>g?C&*t
z66P$(ZZBmDU4=}k1AIihv>8)%y#u6uZ_a2nIv+4M;uN1S>+16AJaIuhn=s9N))dVN
zd4x2tBMtG}W*qZ;WgvV+&`rYICKZ)Ww-rp{);LW<R8)p(y+*%nCgI*A?|O?ERXH){
z5LKekQvnOosrU-#nxCZvLKTdd4G7kg7L99;GgWa$h4XsF$u9(|)gJ<f;Jj-a)$s@a
zK2TfxpFV<Dge{PS#fyZ~@Yb$9dmEdngdx5v*x4pp)0~EE+BvfU(Qcf8|JSN{$KL_&
zzJd1!`h6Xsw(jfi-?e|>wMf1w#<r7x9*p4(|Bk*7`Ga6&*%Eu7-sF7?l78aSY2OG&
z*b;v{6b`;F)3zC;Md#9J<#;Z5^Sm$A@XEtrW!GhLMOqqVs-Ye<HiB=szYT4YCTSYE
zY^ip+<LMyJCW#Z|0iyaQ=_}VH4Nz>#=GryzA^sV%VMfzv4W;dTp;Q}yW4Nk{-wZVz
zc^DMise5}Vo2!P8C`-b@lCk3G3Bm_BM7P-MrLuQ`c(bkf&aP}OW55s|mGcCxF#+B4
o$lhBG$I0QCV!a9+b)x7I(f*|6wKfuqWZH|V2+659KUEd_7yfu#{Qv*}

diff --git a/doc/dict.txt b/doc/dict.txt
index 61d50f4..ed89469 100644
--- a/doc/dict.txt
+++ b/doc/dict.txt
@@ -151,8 +151,6 @@ J           -- n            Copy RS third item to PS
 !        n a --          Store n in address a
 ?        a --            Print value of addr a
 +!       n a --          Increase value of addr a by n
-BIT@     b a -- f        Get bit b from addr a.
-BIT!     f b a --        Set bit b to f in addr a.
 C@       a -- c          Set c to byte at address a
 C@+      a -- a+1 c      Fetch c from a and inc a.
 C@-      a -- a-1 c      Fetch c from a and dec a.
diff --git a/recipes/ti84/blk/618 b/recipes/ti84/blk/618
index 6847457..377fd39 100644
--- a/recipes/ti84/blk/618
+++ b/recipes/ti84/blk/618
@@ -7,7 +7,7 @@ CREATE _atbl
     0x20 C, 'Y' C, 'T' C, 'O' C, 'J' C, 'E' C, 'B' C, 0 C,
     0 C, 'X' C, 'S' C, 'N' C, 'I' C, 'D' C, 'A' C, 0x80 C,
     0 C, 0 C, 0 C, 0 C, 0 C, 0x81 ( 2nd ) C, 0 C, 0x7f C,
-: _2nd@ 0 [ KBD_MEM LITN ] BIT@ ;
-: _2nd! 0 [ KBD_MEM LITN ] BIT! ;
-: _alock@ 1 [ KBD_MEM LITN ] BIT@ ;
-: _alock^ _alock@ NOT 1 [ KBD_MEM LITN ] BIT! ;
+: _2nd@ [ KBD_MEM LITN ] C@ 1 AND ;
+: _2nd! [ KBD_MEM LITN ] C@ 0xfe AND + [ KBD_MEM LITN ] C! ;
+: _alock@ [ KBD_MEM LITN ] C@ 2 AND ;
+: _alock^ [ KBD_MEM LITN ] C@ 2 XOR [ KBD_MEM LITN ] C! ;