From 75ef1f440cb1e3a69e0f9a93b4f2096526adb1c6 Mon Sep 17 00:00:00 2001
From: Virgil Dupras <hsoft@hardcoded.net>
Date: Thu, 29 Oct 2020 12:15:21 -0400
Subject: [PATCH] Make MOVE* words use A@ and A!

This allows us to remove AMOVE* words.
---
 blk/355       |   3 +++
 blk/367       |  15 +++++++--------
 blk/368       |  10 ++++++++--
 blk/385       |  12 ------------
 blk/386       |   6 ------
 cvm/forth.bin | Bin 5200 -> 5167 bytes
 doc/avr.txt   |   6 +++---
 doc/dict.txt  |  24 ++++++++++--------------
 doc/usage.txt |   8 ++++++--
 9 files changed, 37 insertions(+), 47 deletions(-)
 delete mode 100644 blk/386

diff --git a/blk/355 b/blk/355
index 434d27a..f8305a7 100644
--- a/blk/355
+++ b/blk/355
@@ -9,3 +9,6 @@
         DUP I C!
     LOOP DROP ;
 : ALLOT0 ( n -- ) H@ OVER 0 FILL ALLOT ;
+SYSVARS 0x3e + :** A@
+SYSVARS 0x40 + :** A!
+SYSVARS 0x42 + :** A,
diff --git a/blk/367 b/blk/367
index 2f33879..f8c67a0 100644
--- a/blk/367
+++ b/blk/367
@@ -1,14 +1,13 @@
 : MOVE ( a1 a2 u -- )
     ?DUP IF ( u ) 0 DO ( a1 a2 )
-        SWAP C@+ ( a2 a1+1 x )
-        ROT C!+ ( a1+1 a2+1 )
+        OVER I + A@ ( src dst x )
+        OVER I + ( src dst x dst )
+        A! ( src dst )
     LOOP THEN 2DROP ;
 : MOVE- ( a1 a2 u -- )
-    ?DUP IF TUCK + 1- ( a1 u a2+u-1 )
-    ROT 2 PICK + 1- ( u a2+u-1 a1+u-1 )
-    ROT ( u ) 0 DO ( a2 a1 )
-        C@- ( a2 a1-1 x )
-        ROT C!- ( a1-1 a2-1 ) SWAP ( a2 a1 )
+    ?DUP IF ( u ) 0 DO ( a1 a2 )
+        OVER I' + I - 1- A@ ( src dst x )
+        OVER I' + I - 1- ( src dst x dst )
+        A! ( src dst )
     LOOP THEN 2DROP ;
 : MOVE, ( a u -- ) H@ OVER ALLOT SWAP MOVE ;
-: PREV 3 - DUP @ - ;
diff --git a/blk/368 b/blk/368
index d1532ba..4928621 100644
--- a/blk/368
+++ b/blk/368
@@ -1,10 +1,16 @@
+: MOVEW ( src dst u -- )
+    ( u ) 0 DO
+        SWAP DUP I 1 LSHIFT + A@   ( dst src x )
+        ROT TUCK I 1 LSHIFT +      ( src dst x dst )
+        A!                         ( src dst )
+    LOOP 2DROP ;
+: PREV 3 - DUP @ - ;
 : [entry] ( w -- )
     C@+ ( w+1 len ) TUCK MOVE, ( len )
     ( write prev value )
     H@ CURRENT @ - ,
     C, ( write size )
-    H@ CURRENT !
-;
+    H@ CURRENT ! ;
 : (entry) WORD [entry] ;
 : CREATE (entry) 2 ( cellWord ) C, ;
 : VARIABLE CREATE 2 ALLOT ;
diff --git a/blk/385 b/blk/385
index 60dd886..db838a0 100644
--- a/blk/385
+++ b/blk/385
@@ -2,15 +2,3 @@
 ( b1 b2 -- )
 : LOADR 1+ SWAP DO I DUP . NL LOAD LOOP ;
 : LOADR+ BLK> @ + SWAP BLK> @ + SWAP LOADR ;
-( Now, adev stuff )
-SYSVARS 0x3e + :** A@
-SYSVARS 0x40 + :** A!
-SYSVARS 0x42 + :** A,
-
-( src dst u -- )
-: AMOVE
-    ( u ) 0 DO
-        SWAP DUP I + A@   ( dst src x )
-        ROT TUCK I +      ( src dst x dst )
-        A!                ( src dst )
-    LOOP 2DROP ;
diff --git a/blk/386 b/blk/386
deleted file mode 100644
index 6249a9e..0000000
--- a/blk/386
+++ /dev/null
@@ -1,6 +0,0 @@
-: AMOVEW ( src dst u -- )
-    ( u ) 0 DO
-        SWAP DUP I 1 LSHIFT + A@   ( dst src x )
-        ROT TUCK I 1 LSHIFT +      ( src dst x dst )
-        A!                         ( src dst )
-    LOOP 2DROP ;
diff --git a/cvm/forth.bin b/cvm/forth.bin
index 27637a54082cea6525ec13b140573f75e854855b..5a282b49e25ba93bc017f2e092f7935e0b83ec1c 100644
GIT binary patch
delta 2065
zcmYjSeP~lx6hHUn-Mp9gUOt+BsQ993(%KJOOS;KwCfd9<X_KZ+NmA`7)e36ubj@ZX
zP8@W)%sIRLvpWi<xVSNB*`#ArSpINh4Avp5IIK_@!eAf%A#Q(kLqw(Q+?UoFNbb4k
zoO?ch=j7+wFKWvGKW9o}R5dAngO|T7W1=V2>I8v)yArCTcz(AMYT)PhE8*^FT4I;Q
z^+WSw5FSl}4o0dB1Y&>;^P&#%h-%&x^VXIu-t4Qlc*G7OvC@aAnd)s*z=99Grm!cD
zs`SE2IGMB}dy!SqN)ludy2%%$I@F#VJzTdDC|ML^;Pjr%96#tC&1AiYGbct52H82f
zpM1vd(x1o>`^x%(r@`6;79FOG$3MkmiJHvw?10ov82eBPxTmEY7~q53LK9G)%>rAJ
z0-F{j9ny)tiDbJItb~zC;EIo>Col`D%(lqBzAo8Ax?~-=QVAy2CC`vXIfvpVkmg|k
zMYB*(X2`TOi!QdopX9bMi#F~<6Wq;1mn@Sxd{s~Q3+sSf4VEr;Q8r35azxOfMg~G2
z$WKt)a-J>A@$oX70Tw8;>Cm0n6D~!c@1t-%BSYw^g9zlZSUj&{YyO_cWVl}A7AzW9
ztSTz@pkfE%zPbAUH~#3iwMPxj_^1WL9TxL2T=du+-s?s#w~~h(I-DZ6Os8+aq-E{)
z)JktMyr+SEZS!{iU~3T?1V6egNDC6DJp}uCXf%8LRGkkbl97Fi4sFSBC>^$AxjPgC
z1mG>$6G}!yMjUgM$zHZuY1W7>2X87AP1qDRsKm+(sMeO~Nu@(Q=^C!46r?-sn&KfD
z_KT7w6D*-tj&GD1IjwrgB{G7)h}n2oWi=LXMD>%G@SBCAT!%=!FV(po^E{1gEd7#d
zYPY&jI|p3<DO8qK&hU^<(?HQETBTSR?hBz2?Zt#dGNG#mfXK)Ru~93s+jo~^rc>mi
zI>A)Uqb{p?pc=Qf#Gcc3Zs((vgGY!;eA<Wua)~&|1&xDs2i#u+>%3SEf9bG0h*0s9
zE9_HkXXj&WUgTdLw)Jl?M-j+6;<x+lI_!6#BDWDli#b3hH9*ANhtQcHN0F=MIp6MQ
zwf4FiKIFd#aQxc)x_kFwDi0A4eAKxbR%gb9Loa*XUPbSTetM66Y;UhDcW@tyIaJal
zl6Ibp9VhHI29bk#W_2`ZK8FDme#KlKJY>5ZTgW&&<anOuk<Hjg4)3_1UcqX`qp5TS
zdZwBIE;G~)94f)dLvKYCI>>}7m`Sx_ws{yrUclTcSql$;IY5JOLx*TjI-EpQrek13
z$QAP?;?r(M1U_ok0SV_Y3umP#4!ml98UrD7bWsejF6VYK!p=DTeyUAiSNKGG(9!2k
zUJy=C;mvANN7#?f`lD2<24}xnFD~u}zF^{sQ2W;R5G5Q-0=eldvXU-j&8)_sgDYBq
z-gE}x-&N^W9pO@ZkvCDuQ+>_F=jfG@Y~4n7!xcoV%OyMT*C<JmBW$vyX?)IQV5fJ9
z27H55xr0*`ShxV?6px%qoZ<z$Z0gk`b=9O6Bm=G?^-NaITaFlr`^Qd=`IH!_ZJA@o
z4!k;c$eT!Ef#_I?4#E0K>;j))5hu8ePiL^c-h~UD^C<EPtlwQTz9?SD9oL?yg0tvw
z2nx6uc&dqBC*+V5G&wRc+<Xtjqv@V<#DIadEJ)mFtp;aE3`ku@K8<7g0Npqd+a1aj
zS&(>lQT8I2s2qPfzQWN)sJV0S2d>-A)+}J33)pNrATf8fiIB){GnytSFi+{aVZ)ur
z1+GIlp27{pqpC(bQ)F1wN?U|Elwe%Gb*3a{#>>$89sHwc5k9fZVT1VVZNANDb!Vvo
ziz1IAWF(SlUkRKe`;d2CD6r{L&p6M2E!)1HbTnQ8Z=*vD<r%?%8<ReQfEl!6u0=St
zCAxc~@vsBlA;iYqYxNme<quZCyC~p}2Wkctc+1qnO@RL{xCE=bHQsO})yiHd+wdP`
C!LJVh

delta 2148
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
Jhg?%0_#Y%T#B=}v

diff --git a/doc/avr.txt b/doc/avr.txt
index fcfb5f1..60097c1 100644
--- a/doc/avr.txt
+++ b/doc/avr.txt
@@ -97,9 +97,9 @@ Example to write 0x1234 to the first byte of the first page:
 asperase 0x1234 0 aspfb! 0 aspfp!
 
 Please note that aspfb! deals with *words*, not bytes. If, for
-example, you want to hook it to A!*, make sure you use AMOVEW
-instead of AMOVE. You will need to create a wrapper word around
-aspfb! that divides dst addr by 2 because AMOVEW use byte-based
+example, you want to hook it to A!*, make sure you use MOVEW
+instead of MOVE. You will need to create a wrapper word around
+aspfb! that divides dst addr by 2 because MOVEW use byte-based
 addresses but aspfb! uses word-based ones. You also have to make
 sure that A@* points to @ (or another word-based fetcher)
 instead of its default value of C@.
diff --git a/doc/dict.txt b/doc/dict.txt
index c30381e..1b9d50b 100644
--- a/doc/dict.txt
+++ b/doc/dict.txt
@@ -52,6 +52,7 @@ $ - Initialize
                   literal. If not found, aborts.
 ,        n --     Write n in HERE and advance it.
 ALLOT    n --     Move HERE by n bytes
+A,       b --     Indirect C,
 C,       b --     Write byte b in HERE and advance it.
 FIND     w -- a f Like '?, but for w.
 EMPTY    --       Rewind HERE and CURRENT where they were at
@@ -153,6 +154,8 @@ 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
+A@       a -- c          Indirect C@
+A!       c a --          Indirect C!
 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.
@@ -172,23 +175,16 @@ MOVE     a1 a2 u --      Copy u bytes from a1 to a2, starting
 MOVE-    a1 a2 u --      Copy u bytes from a1 to a2, starting
                          with a1+u, going down.
 MOVE,    a u --          Copy u bytes from a to HERE.
+MOVEW    src dst u --    Same as MOVE, but with words
 
-# Addressed devices
+Important note: MOVE* use A@ and A! instead of C@ and C! See
+"Addressed devices" in usage.txt.
 
-ADEV$       --              Initialize adev subsystem
-A@          a -- c          Indirect C@
-A!          c a --          Indirect C!
-A@*         -- a            Address for A@ word
-A!*         -- a            Address for A! word
-AMOVE       src dst u --    Same as MOVE, but with A@ and A!
-AMOVEW      src dst u --    Same as AMOVE, but with words
-
-AMOVEW notes: this word's purpose is to interface with word-
+MOVEW notes: this word's purpose is to interface with word-
 based systems. src and dst are addressed as *bytes* but u is a
-*word* count. Every iteration increases src and dst by 2. When
-you use it, be aware that default values for A!* and A@* are C!
-and C@. If you don't adjust before using AMOVEW, you will get
-weird results.
+*word* count. Every iteration increases src and dst by 2. This
+shouldn't be used on regular memory, it will yield weird
+results. Use it with A! switch pointing to a word-based target.
 
 # Arithmetic / Bits
 
diff --git a/doc/usage.txt b/doc/usage.txt
index 923e266..11d0ccc 100644
--- a/doc/usage.txt
+++ b/doc/usage.txt
@@ -85,12 +85,16 @@ need switches in regular code.
 # Addressed devices
 
 A@, A! and A, are the indirect versions of C@, C! and C,. They
-are switch words and initially point to C@, C! and C,. There is
-also a AMOVE word that is the same as MOVE but using A@ and A!.
+are switch words and initially point to C@, C! and C,.
 
 Addressed device words can be useful to "pipe" processing to
 places outside of regular memory.
 
+All MOVE words use A@ and A! instead of C@ and C!. This gives a
+lot of flexibility to those words, allowing for complex data
+transfers. The cost of the indirection is small because of the
+optimized ways aliases are built.
+
 # Disk blocks
 
 Disk blocks are Collapse OS' main access to permanent storage.