From 2d2a846b2548aba3899487511d600e8ff8aa2b26 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Sun, 24 May 2020 14:19:25 -0400
Subject: [PATCH] Inline SCPY

I'm planning a string reform and it's standing in the way.
---
 blk/058        |   3 ---
 blk/367        |   6 ------
 blk/368        |   4 +++-
 blk/369        |   4 ----
 blk/399        |   2 +-
 emul/forth.bin | Bin 6126 -> 6126 bytes
 6 files changed, 4 insertions(+), 15 deletions(-)
 delete mode 100644 blk/367

diff --git a/blk/058 b/blk/058
index e9718b2..a323f57 100644
--- a/blk/058
+++ b/blk/058
@@ -5,9 +5,6 @@ LIT    --         Write a LIT entry. You're expected to write
 LIT< x --         Read following word and write to HERE as a
                   string literal.
 S=     a1 a2 -- f Returns whether string a1 == a2.
-SCPY   a --       Copy string at addr a into HERE, without
-                  NULL termination.
-
 
 
 
diff --git a/blk/367 b/blk/367
deleted file mode 100644
index 978f27c..0000000
--- a/blk/367
+++ /dev/null
@@ -1,6 +0,0 @@
-: SCPY
-    BEGIN     ( a )
-        C@+   ( a+1 c )
-        ?DUP NOT IF DROP EXIT THEN
-        C,    ( a c )
-    AGAIN ;
diff --git a/blk/368 b/blk/368
index d851922..6121c98 100644
--- a/blk/368
+++ b/blk/368
@@ -1,5 +1,7 @@
+: +! TUCK @ + SWAP ! ;
 : [entry] ( w -- )
-    H@ SWAP SCPY  ( h )
+    H@ SWAP
+    BEGIN C@+ ( w+1 c ) ?DUP IF C, 0 ELSE 1 THEN UNTIL DROP
     H@ SWAP - ( sz )
     ( write prev value )
     H@ CURRENT @ - ,
diff --git a/blk/369 b/blk/369
index 70e7d75..35f6b3f 100644
--- a/blk/369
+++ b/blk/369
@@ -1,11 +1,7 @@
-( Words here until the end of the low part, unlike words
-  preceeding them, aren't immediately needed for boot. But its
-  better to have as many words as possible in the xcomp part. )
 : IMMEDIATE
     CURRENT @ 1-
     DUP C@ 128 OR SWAP C! ;
 : IMMED? 1- C@ 0x80 AND ;
-: +! TUCK @ + SWAP ! ;
 : -^ SWAP - ;
 : / /MOD NIP ;
 : MOD /MOD DROP ;
diff --git a/blk/399 b/blk/399
index e0befb6..f299bbe 100644
--- a/blk/399
+++ b/blk/399
@@ -1,9 +1,9 @@
+: LIT< WORD 34 , BEGIN C@+ DUP C, NOT UNTIL DROP ; IMMEDIATE
 : BEGIN H@ ; IMMEDIATE
 : AGAIN COMPILE (br) H@ - _bchk , ; IMMEDIATE
 : UNTIL COMPILE (?br) H@ - _bchk , ; IMMEDIATE
 : [ INTERPRET ; IMMEDIATE
 : ] R> DROP ;
-: LIT< WORD 34 , SCPY 0 C, ; IMMEDIATE
 : LITA 36 , , ;
 : COMPILE ' LITA ['] , , ; IMMEDIATE
 : [COMPILE] ' , ; IMMEDIATE
diff --git a/emul/forth.bin b/emul/forth.bin
index 221c9e2acf4e04b8393f6aeb64a9d008b06ec412..ba8aebfa4ae4b8012db6db0be84b4fb6adf3568c 100644
GIT binary patch
delta 1397
zcmY*ZT}T{P6h1R|#&u_QXJ&t9RYJ_{?wB>&x|FtVV}kCEuF2x+%C17An8X$_HZdt0
z3TdHk><<LCHuM&PkcU=KO6kLbLAqcuf*?W2qx7MztynB22!Yl%w!xk|TUzokmpS+R
z-0wU0J9jU-7cG7-ooozdfLB6}Sz?lAzCbJ(9JzXZ;>M649Ll`d%tswMKME3TIg3IL
z1XvbE;n86OPhE1bvK51FOHU;FvV4k8%TaY(vY<ViO!Ot)P@%NY`?Bs>k`3Ttfqo}H
z&;3p%*RaEI89>0G6RwYCa0&dkt_iU~R;kO~A}+}rP9N=Zf6A@VAKk~M7Uc6%QMl(W
zkO#sXt`=D7u3#Mq%A9+ae1hK&SN2=bneNY>tp-uKhufnFR#WWoxCg@<6@h0d=PO2`
z0vdP=m|Y+@?Goj(!Q+^`Y@cR9{mA&(b^5MiA(B-kitA(Lb?$B2uO3gw)Ew*_Vp1-Q
z?K7YfVyXq{PT963+iK62E%(1xy3>s??y55wnd@zrfMB8lF}kiE<-VdntIv@EwM6||
zM>wJtg)OHAO(73VD=E!{0d)iIgq6wm;ogVJ5Pe5GS07U!2puG^3A_O(;jRCeF?f#<
zURx7z$}Cx-e{0RXckmuGxJ3TaVk-Nv{HrxKUf?c~I!~R)f(r^Juxc#`THxzECDp(_
z7KIXaYnB+mLYr|PJ#^aB=!>a&*gjmxVjcb6y~9XwhTiw+T$XNnPMCSMq~_7rl{{zK
zbo(JI&Jw1mO4#9;o^H{wH^hmw)B8f;2Sgz7?BF$wDv)JiP285~N8Va@z1IK{#*pFu
z;SBxS8**$*Ed4Y3lefvSApa?vuu22I2q~#6H0}#0+pxQujeM7E3iUq5Bo4czgRHqt
z!Z^l(X}*MeOK4j@Ci4b<OJ;Q$uU`(==@-7!Qb`TLwaa(~>vYf8%+1j{e>mKxtho(n
zLOumz!XG}S0rtNv7$`6Hw@5Gh8@V=m$6q_eglCc?e$+@N(UH|qW}8C!Y=K|V*3~2a
zJp6_?X1g1Y;_#GHnr+Q8oGX}|h&NQ*eQd=On8_4&;Ab;{R<OZkJL6?%kU6V#=A<v_
zRmUpz$6Uy<i#Y1^Jp6h{aRlnehsUm-h~ROH^bNhco$+wl=uKE62Y$xwOH!pj!^^kt
z4Z(%U8<X%v3PJm|D_4f!oE*vISclY$^gyrY252}C;h*X>9cYTQpzsuYKyFKm;wS|0
zipS;u1+d}FVZ#QU8Txsk#=jt2(04Z3qr>~C!+CK^#v%^`)%Xs46POnTWSvg+ovuOm
zZOMQTY&fG1f!}hfIPm-UF5yfj&!l>4;RAfWuqkH}sU8Up6LJ_kFTO~g>THzyd-_u8
zfbAH4#xdxHo64fkf}skWg@^V_kxr4mgiJ41RlfqR*Q!iRU^NEYGu^$ZbaE&Fw-j)(
Zty7hlZGwdn<<!B*kOuE5K#Nta{{V0%NzniR

delta 1409
zcmYjRT})eL7=F+B&Y`8J=R2oAr=SEVZ5>5~LY6dhBP%^^Vb$`p7N(Q14UiO+F#}_9
z-VEndmXHkd84|qF3rP$Yq={z90-0$tLkMKt7@`+bW5`frNM;tZ3$?yqJB$}S{ocRl
z{eKTa2cg^pTPPFjJ$o7?8nPIoMzT-_&x<DfSe}7{f(Zkolb5Hi4%UE$F3VwY&&E7T
zoi&K$f=yOfL^+{1)@dM8pJj;zNLZXF>}{pBaYivAmQF<b5-OC@7R3t+Vw!L!nodT|
zRKf*TdKbAOtg>&FCgE=;+J`JbyB7!q*&Fs-iq$TOKiQ|`d9ukQ^|*Xj*($GMG4*3%
zn|-I&URzbp*>cjligIZMzb2Tem+PLxOjgt-@(KR-gp%BZj#Pi<R3*rC9obosppq8V
z+a0KWlu9BuIahX=Jg4W$%_2kzw(bZwE_yQ|IC^pXGP^=ejN}dt;rCZMB3x%(+L2U5
z%fKGi&CK|*C|<BaL^C1Pp%f`wk&2~Dl=_rPb*LD|=h`A_W_n{bAZX}?2>V*A7QSK+
zv=_**mS=W7?holXiI=h2=YZ?<v>t$AZ42qB*^}-=-UoD)P3vca5p7e7lQ~@yz3?Jj
z`7bjb-tQP*q!|RdL^jxCJskcN`=G-ZA&!W~e+d8TGsSp87$Z%NCWi^<DH?FJ;~2Cg
zHaYU_g2RxxFwfp`G&V%ES@^lIgU0dxuHGR`Xi*EJz7>JPBCq+bl#}kjYwW(GL7vm{
z+8q1KQ6qfBs+>MSWhb4j(TC_r5;^`od5O%Eb?Kfwqj0Y(9CjxsVFRXKpO|cz!NGbW
zw>Z5Z!#HO6XJL`$oIcBpl0k1@u<xDCmR0469Dq$mUG*fdZLni5f1(qss{@Z^pX^F4
zuDs@jc6`Ulwi+PZTRZSc=JMM}zvRk-4VPlSh|BZ*rLe<3bG6y>nh!3$i7nV+4_#ql
zg;l%#{!Y5BdZ8K8IJp5RxOfTpdtLJ4Zt>R|8*w)Zo$QvoCe8;hK>Ti;k)CKgt>c*O
zN+sWtxS{W8e)lXq#*P)mjn$ZQ$s}BySsv#Gd*rSZMT03uRa>pW=N<>5tLIFDA{x&#
zEK1@&y3vhCg3rQVO~x$zR$#d3!HYxVlMVHVyT*o%t{4y4{xta8L^OC3E2I|x|CfO4
zAEyt_PhXt|S@A*a(!|8jThpUG8D0u)jQwE*g<)3ZsTXAri+h@{@%^W`{|mM+<t%ux
z$s<Y@>#`^CR&C*}DT9IXS3DW`0aHzOwBm3FAd8Y^xp*V+n)IDYbQ^F3hj3Z`P?0_S
z)R>S+W$>2VK<x}_mvq1JEX$INJDBK9c0UX6Q|73s=#@QuQTn_4k|_`J4&jfIl3>6I
z@6t7w34>)g>Gz9AFqQ0UQxJT?<^><Z@8QAW+lTz9!7fx(9<$nqD*`Ct&;zlauHIxS
gG3bGt)N1Ff6IKKbfQcF<#DV%j9p0l>ma91VFZr5B`v3p{