From c27bf4645fa8fdf1b25610481d5e7deb491a9a5b Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Thu, 28 Jun 2018 12:30:04 -0400
Subject: [PATCH] added COPY command improved filtering of FshVarscpy

---
 bin/FSHa.8xp               | Bin 2301 -> 2582 bytes
 includes/FshCmd.asm        |  15 +++++++-
 includes/FshVar.asm        |  41 +++++++++++-----------
 includes/commands.inc      |   1 +
 includes/commands/COPY.asm |  68 +++++++++++++++++++++++++++++++++++++
 includes/commands/SET.asm  |   2 +-
 6 files changed, 106 insertions(+), 21 deletions(-)
 create mode 100644 includes/commands/COPY.asm

diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 814de8fe150a7d613cdca80ec8b0070559c953cd..91439f17616ebf970a762d0d67439d819336ba90 100644
GIT binary patch
literal 2582
zcma)7ZA?>F7(Oi&TILu9lOaF0bJyq!_<=aFLx;+@PN}mDzb4w*>udrow#7o!CT>5L
zCCf71bTL`tvLDMWPzuHjlWoLWF}84BkFjKPW66!X$wmirKN!gp+P&xAmM<ak{<!Cy
z_kG^yJ<mPwd2dls<1WLd+M<FiRBLTv@q4U|b(meO1;5*goo!}kD|-4F(>#wxG#Ry~
z`kk_KL=)EheU{g&mAqQ5WWdOO=_lEU|GJC#ORuOR%os=bTbWAc+IU2(2KS(!@K2I!
zZal(IdkF($@SQFayvUK@D?TzaoOYMe%?zX75ag=B2n|f^UlkgdsMLhS<5pM*p&{di
zoSBP(&`?whX=8DuPp?~*Gef{KCXTIFM@71w#-oM9dBeFcmShDqkHv|@B=&e{Y#kmC
z1jd9wNQ@Q?3=$y}6=MZ%frQY3{d?;X+J2<ztvz)Jl^=e4-<!2n2p?)R?yjjs=%A@#
zSM|=~bwwMR6NzJ+%3d!F98Ih*-E7dGJ-@YN<7->i;%yb@5-MhgZuOc(@&TAM0~j4C
zEa{O3X`5@1UAx;$R(XWb?D~sE>$cSTswz^30T|VO-$nRGKEedL2pOsL5&>+Hr0wB6
z8`mx4eBE=nA9`fl?VdT?<)rOu$`;ZBHDB%};gK$)1xjiD1m-{`&42ACTA+~TKlczV
zgi7<C9>VmEN6Hkz5srvM(F{b7iI%}>U3y+eJl`-)0z#<f;I2lLsOhk}oVeC`3I!t^
zG1W98g^2}=8J{t?w6oZ1!%zpfm2I^<IuYZAS^~0WT~myX{O=sWYb)ybo0&?v=q|zL
zXwiKPn@a<LyPxoxy@Uq3rRwWmf?>5B`_;TyRWjDnOJWSfICRe0<WXv9(ly5jua;{%
zxY9>pJMdJqPM6hYc3JJVH!y0V8ept4?mL8(Rra>dWt3r;9h+@-*D2P4%@zymbUuSt
z4}5T{wF5r>Gi%k!T0dMmR?_O8RT>kiROyQg{E@|4P4;%j2`X=)=&C&?lvCBhnjKCI
zg0S<1gJo@q-fMs9WmSYWhu}SqH0|7PLb=seXIqPzewUUOS_ilZ;!p<4ma2v?@so4(
zbkEaQ=ZbhH&W4hrCkZu_jq)=pj!_S-s~rYHX_?0y8E&`@-DGz439U!%0iRr-2Yp2Q
zescZ+pg129Jrv=VLhlP91=9xpWbdLQ%}3c-hr{kDZ?NMkduyxNW+_KX<}(?(5Q2^E
zE^IuBEA8zz3!LQ*85H~}#eu8Yljimo*H%n#0Gbm0b;gN)|3%}qPwSo&{*n5VK64Of
z=<@QXJOkTPt!hA@4wh-?Se^mB>gGLN{`59zgxSawN8#hW(11rb#>)+9y8KD8GoJRK
zw3m2BHyG6M@{)Ajiu}KdJ)<SYVnQ#@BY?vyBa8o+BNvRt^KBN{)=7J6Q~`BO=@X0T
zRSzyMK~LeS6c7R_L?#QaQ=B83>b-)TC*`m#=lCOSnTVWMXC1W7AGgvyDz*d9Bu4@U
z?NC%yygVL>6>6M1hX78Ip{HH%gHJdQw{j>-!;?_jP?m)j4Jmd2{hvTz@)EGq1>`d1
z(%?c3WGZmy>7?Jtyj-)Lk2VRpKBs8ki}8CD%GiK@8vZ>Krf>R)7-ir_Xt_SZLn9{w
z-v<|^j-T`r{)V5#%fhSsNZb(K1n(EZjquiluk;aPM|9!{M1M#04?9P*3_r%#lnl=d
z=QfWFddZ#NAQ-NNTbG{yt;k$L5znOBEd+n@lMXmY7%DJ-BU35T%%07Hyed}B1BeV<
z)du*jFt9N#z~s$U;B-oy^WS0zg`XBg%20-QPOX$V>8}+YD%I7Wl6nT3@={U_VP!uR
zse`vB%=XJ7Ar3@7q9UUplJFofCGHNDbGL6fIp9eG=Hx)~rR6Meq~rj@({iYq+UqGb
z_1BkE^H5SVC8^nRT~-5e3)S5Bl6XQNN-4TUH~e}3a*Du{1k5Rd4J@r_fg_~|7@k)2
G(b)fD1L}|f

literal 2301
zcmZ`)ZA_C_6uvDK3Uf$h$tpj#`=*&I;0Nkt6<qz`OE#p_B6B*?ZoE#C0@@a#QJc6e
z{#ddPmu!hKi~D2JLTO7htBHxRR+hE(-Fl4Whmjxe%$qqnoHH?OF0?zhZ;PPt{^-5;
zoaa3EJolb+TUpuOVp!i)Szb(<x~)9@nD6Cn76;!&KXg+25sSTtJpbKLzep~s3!2Q^
zx600o>QVJy#|6DwDX7&-4voU6J}4o==^^m1`%V?-L^lZ63YFaX$+!mH8Z|;L_&|7=
zwYewb!has%a16H&LHLXt!ew5ViRJyoC}(2C7s36El#t-muH}*7)V89Cbg&y2Vr0y8
zs&wW|C^D8{+{qNt=Ql4eodL8=NE55o35liDzP}<?7F+gmb#bWZo;0-=lJ~|YR?*2&
zXhIA{q(ph}Du|JUlq??*Awu5UwPQOWoA-6>Y;7i_cJJ<Y-)X8R^!;|z+l|`@*<)^N
zY1mq|s&Y+dI(=Y$&Blt*{`Bf~8w~p6C+n)$zVYTty2*GVt>U)mUR#mQehACV5XMFZ
z%X%_HCe0P3Pt)ds<t{NYyFT~K+L2qIRmE#40u!1ahCqmUfx9pSaI?t+BHAuxZI|cR
ze8V#C;_y@4>8$PZoGqe38o}s+XkZ957@nEm#yN&%=Fwr$AUrewei*pGWV}WZj=Mn`
zOB4`x4eY9q>hjA5Q(D6`gv3bWo|bl!ZXE1(*lCmfFbUswgSoMtD9k)sEcBSg+RxMO
zUW)fjd-$F{o0D)Jxn4ST9Z5zi+;;<AX>1lQ7b@k#I)+KG!a9Np<sqOm0Kz|b4j4F)
zsjlG#7+#ZOU2|ep+1TA9kmNANrnAp(o?wO!U1t)6e@8Mk8&-J%)4{K$w~HTqi;@nO
zJ&yIQW>Q*j<t;WlbsXlY{UaOC_Yzjb{&nA~;;b9OH{H;&b(fheYv{Hgv09uc-)d!t
zLOU>y6p)h45el3SPB5t_*^hHcs*sl8`7&8}pe00GU_8J)?2xw@fYEZlyCK$g9b0F1
z^(DI;&33PRSuI}B*t2s7qRx6jaxug}CiE9EqTnp(&o(O?*?x?Tx7qq^wQYU0zOSdp
z(%V%_l-y@BbUuWd`W@7Ch;Hla@9nY^?t%;o-_3E*2L6zx-|DENtQ^Q=$=__68ugzs
zo&UP|1@Z4pGwKVk(gIzX_OUCtIoFp#eLh;Iu{~Wuz3TGMI_>l(?D`VoN|ET!5qxpR
z*QRO>c{=R_$(hQ#r5gd)_!@&cRa>2}TcZ85$~9hXssdI;cMy)Nf@0x`8%~+3=GwYs
zo0B~t2?bs<qks4;z3SE{3(zxoZVL>-EhMfOYfI^YqJ|x!yid;2wV306-XamDug^Nz
zn|839<*3+<JdfNEGHAvUlH%3Lc(S6%uCs~glsI<V8@+ghb8s(>C0KYC%DQV&C}ose
z<P8jEETW<a>B|SobnKy=x5I4nvp$il@-b`uq|mBRCWHEEd|s!_U-&^vaM%Z$ulyk3
zTLq#J!1ibs9(h1G=Yv#Dbcr8QhG;qdE{)dVZ&CE5A54RZseKrI1@yO_<Hd$wQ!A=t
zGqGizH?Mo(#%~ym%`l+L*ZwGR-;lWLfqFm;U-!WvULOudDqJd5N^ED>22oyBspbGA
z4jZ%$Urr7a(;!Sv&Pekaap{w19SnX{lo&$|5!`B}%*p;e@MBW<1#(jN<GZwwR73QS
zjL6~u6WJP&MPeL^yu(B$P$UQ_FemN?lQZI9Ob&XofTwbB^M&QibL8Y8!}D^OnpLAY
zHETu}Q*#A%EREjHsCi{nR)cZ#)!gzxDy@&?6kTHp9}g_12t8TAQ$?7-!iwfOa*B}Q
Jc|~;}{0|#FXjuRN

diff --git a/includes/FshCmd.asm b/includes/FshCmd.asm
index 0593301..670ccfb 100644
--- a/includes/FshCmd.asm
+++ b/includes/FshCmd.asm
@@ -24,6 +24,15 @@ fshcmddecode:
   call z, bytecpy
  pop hl
 
+ push hl
+  push de
+   ld de, fshcmdCOPY
+   call strcmp
+   ld hl, fshcmdCOPYo
+  pop de
+  call z, bytecpy
+ pop hl
+
  push hl
   push de
    ld de, fshcmdVARS
@@ -59,7 +68,11 @@ fshcmdroute:
  ld de, fshcmdSETo
  call bytecmp
  jp z, fshcmdSETf
- 
+
+  ld de, fshcmdCOPYo
+ call bytecmp
+ jp z, fshcmdCOPYf
+
  ld de, fshcmdVARSo
  call bytecmp
  jp z, fshcmdVARSf
diff --git a/includes/FshVar.asm b/includes/FshVar.asm
index c6b2941..e015756 100644
--- a/includes/FshVar.asm
+++ b/includes/FshVar.asm
@@ -77,29 +77,32 @@ fshvarcpy:
   ld bc, FshVarsSize / 2 - 1
   call cpBCDE
  pop bc
- jr c, fshvarcpyOOBException
-
- push bc
- push de
- push hl
-  ld bc, FshVarsSize / 2
-  call cpBCDE
   jr c, fshvarcpyOOBException
-  ld bc, FshVars
-   add hl, hl
-   add hl, bc
-  ex de, hl
-   add hl, hl
-   add hl, bc
-  ld a, (de)
-  ld (hl), a
+ push bc
+  ld bc, FshVarsSize / 2
+  call cpHLBC
+ pop bc
+  jr nc, fshvarcpyOOBException
+  
+ push de
+  push hl
+   ld bc, FshVarsSize / 2
+   call cpBCDE
+   jr c, fshvarcpyOOBException
+   ld bc, FshVars
+    add hl, hl
+    add hl, bc
+   ex de, hl
+    add hl, hl
+    add hl, bc
+   ld a, (de)
+   ld (hl), a
    inc de
    inc hl
-  ld a, (de)
-  ld (hl), a
- pop hl
+   ld a, (de)
+   ld (hl), a
+  pop hl
  pop de
- pop bc
  ret
 
 fshvarcpyOOBException:
diff --git a/includes/commands.inc b/includes/commands.inc
index 93aae0a..6687b9e 100644
--- a/includes/commands.inc
+++ b/includes/commands.inc
@@ -1,4 +1,5 @@
 #include "includes/commands/EXIT.asm"
 #include "includes/commands/SET.asm"
+#include "includes/commands/COPY.asm"
 #include "includes/commands/CLS.asm"
 #include "includes/commands/VARS.asm"
diff --git a/includes/commands/COPY.asm b/includes/commands/COPY.asm
new file mode 100644
index 0000000..a0edeca
--- /dev/null
+++ b/includes/commands/COPY.asm
@@ -0,0 +1,68 @@
+fshcmdCOPY:  .db "COPY", 0
+fshcmdCOPYo: .db $02
+fshcmdCOPYu: .db "Copys a value in FSH memory to another addess", 0
+fshcmdCOPYf:
+fshcmdCOPYfArg0: 
+ ld hl, FshCmdArg0
+ ld de, 0
+ ld e, (hl)
+ inc hl
+ ld d, (hl)
+ ex de, hl
+ ld de, 0
+ call cpHLDE
+ jr nz, fshcmdCOPYfArg1
+fshcmdCOPYfArg0Get:
+ ld a, 'G'
+ call _PutC
+ xor a
+ ld (CurCol), a
+ ld hl, fshcmdCOPYfDSource
+ call _PutS
+ ld hl, fshcmdCOPYfInputBuffer
+ ld de, 3
+ call inputnumstr
+ call strtob
+ ld hl, FshCmdArg0
+ ld (hl), a
+ call _NewLine
+fshcmdCOPYfArg1:
+ ld hl, FshCmdArg1
+ ld de, 0
+ ld e, (hl)
+ inc hl
+ ld d, (hl)
+ ex de, hl
+ ld de, 0
+ call cpHLDE
+ jr nz, fshcmdCOPYfExe
+fshcmdCOPYfArg1Get:
+ xor a
+ ld (CurCol), a
+ ld hl, fshcmdCOPYfDDestination
+ call _PutS
+ ld hl, fshcmdCOPYfInputBuffer
+ ld de, 3
+ call inputnumstr
+ call strtob
+ ex de, hl
+ ld hl, FshCmdArg1
+ ld (hl), a
+fshcmdCOPYfExe:
+ ld hl, FshCmdArg0
+ ld de, 0
+ ld e, (hl)
+ ex de, hl
+ push hl
+  ld hl, FshCmdArg1
+  ld de, 0
+  ld e, (hl)
+ pop hl
+ ;ld de, $77
+ call fshvarcpy
+ call _NewLine
+ jp ErrCatch 
+
+fshcmdCOPYfInputBuffer: .db $00, $00, $00, $00, $00, $00
+fshcmdCOPYfDSource: .db "Source= ", 0
+fshcmdCOPYfDDestination: .db "Destination= ", 0
diff --git a/includes/commands/SET.asm b/includes/commands/SET.asm
index 0c63833..47cbd84 100644
--- a/includes/commands/SET.asm
+++ b/includes/commands/SET.asm
@@ -66,5 +66,5 @@ fshcmdSETfExe:
  jp ErrCatch 
 
 fshcmdSETfInputBuffer: .db $00, $00, $00, $00, $00, $00
-fshcmdSETfDIndex: .db "Index= ", 0
+fshcmdSETfDIndex: .db "Destination= ", 0
 fshcmdSETfDValue: .db "Value= ", 0