From cf9a22fb88f6ad53471cd51629aa70bb876ebc32 Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Mon, 25 Jun 2018 13:45:10 -0400
Subject: [PATCH] FshVar functions now set Err SET calls ErrCatch Out Of Bounds
 Err added

---
 FSHa.asm                  |  18 +++++++-------
 bin/FSHa.8xp              | Bin 2019 -> 2156 bytes
 includes/Err.asm          |  45 +++++++++++++++++++++++++++++++----
 includes/FshVar.asm       |  48 +++++++++++++++++++++++++++++++-------
 includes/commands/SET.asm |   2 +-
 5 files changed, 91 insertions(+), 22 deletions(-)

diff --git a/FSHa.asm b/FSHa.asm
index 5e23f86..1f0d98c 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -26,7 +26,7 @@ Input:
  LD   DE, 0
  LD   DE, FshCmdInptSize
  CALL inputstr
- 
+
  CALL _NewLine
 
 Decode:
@@ -55,17 +55,19 @@ Exit:
 PS1: .DB "FSH> ",0
 FshFlags: .DB %00000000
 ; 0: Debug Flag
-; 1: Error Flag (Unused)
+; 1: Error Flag
 ; 2: Program Flag
 
-
-#include "includes/String.asm"
-#include "includes/Byte.asm"
 #include "includes/Math.asm"
-#include "includes/FshVar.asm"
-#include "includes/FshCmd.asm"
+#include "includes/Byte.asm"
 #include "includes/Char.asm"
 #include "includes/Cursor.asm"
-#include "includes/Input.asm"
+
+#include "includes/FshCmd.asm"
 #include "includes/Err.asm"
+#include "includes/String.asm"
+
+#include "includes/FshVar.asm"
+
+#include "includes/Input.asm"
 .end
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index 5f4b27c68fa9164d7b62a177bd5ddae8244bf993..c1b2cb591a25332455e934e042e66d4b2b2fe5cc 100644
GIT binary patch
literal 2156
zcmZ`(Z%k8H6u&LBw5W`N%L*~seRLz`k6L76hYnDn$aHjCMAWG3#&eJr&=yu2wTam$
zKWv#xT(V@*uWk9$E?KOJiLt9)_FA6nT`V7rn7o;nEg)`wU?j_EckX+wB0`hid(Sz)
zbME<_ch0S@?(Q_#TdK<ok!8Ta;!oKj)@dJM`|!se>^f_A4Wd_n^_oqnLZi0W_V1OA
z6&kGh>pXAND0z)W$$*k?87D=Ee>_ftJHAyV8No;RI|WMS`dm^6W}OBgo2Ll>cUI?{
zOY*(rgn>QkA1Bc(J`(-MN0t+LKhu!Q2{gsQeN7l4<_{l9bo~U@=(LYW(pO9f;@0>H
zzbioEwSJ;InmzaWN%W$hh+c|tOW=C~r(oK^p3R5uG!Gh$bvlQgjks$Vw+;^u+K2iY
zk&@|`v8yoF(GhGtgZB-O4)wVZb6EyOA3hJ##-6c{I!1Qm_OXExv?vBUtP4K`uUM~t
z-LXM<#)+x&u(9AaRvSw7i{5ZE5xA5%U+xYY^FgyD5Y8Jms&4*b&@b)bVkvJL#p?r5
z)0w(-qdCu@e=2&?dB3Rw#5=RytVuVT@(mmHPinj~CTk7hI|AeZz(G<M^2Y+?lC@@~
zu20r^NJPrxcJ6YxHN0@R43>RbPW)&91c8fLFBLCeiEycH=t$x%lj5@~lcH>$KUJ3z
zE;cL9ZquYh+6vt#s}iM&k~d6+5$$7f;W(Lp9Gl&W=OU3=A;QHJ&Cm*m0wiMA#Zsc;
z&AH@!mDXi&3N$x{e#b3-NN)vhb1X&UW}&AHJ@e~AF%8)wUtlh!9#vWhU+yk7l)G2m
zAjVQ^M4OYp5g_@cW9b(2B8do4Al>pf;e&p{C?^P+ZVnIubh-&y_xcK*dQ#SHn0$eI
zl*Rp?!*MzYBQ@%#38Djc>0AeAaFfmzlSBt_>AW~WXzMm8qDdclo+6#2a|W8E-n>MU
zZ13&tMj6^^E^Kl2qv(Afv9)(2g^dM`9e-|jjIwxO2*VKJL3VK1=|PNN9!6S0i8nM2
zu5IezZx$%!sl5kD&?$*Sa(Pe~K1le7PzP{yOQSo!MuZC4cV-=5aB)AsnE}Z{KW0BI
zx-?;b`UuFVbEuCUdk>=?nmFvO2W_ah)xp}GE<DoDV%H~5mK{R$aR~0Xs!GyVhE8zL
z-orLj(l+2a>#%!(xx+#0fqTFYsZo*qfgc6P1<LXwT|67p1-J-GORtAo79qX5=`^*-
zO&~op=;+}O_9N7MqUX@T4ul$yANlZrr4`|0-PZTp_aW44>*{RVTeG!#`>9OkbbZ6S
zRgsgKZ98_Fjpr}!Hr2hes}}ERx{y&ZErz!%Gua=&q!YmCPGMP#v`N!biH3D2CrOzX
z8j%)?%7In#7diPmRk8sK+&q6!p_~sJm*7QNu>Chh#1sSN(WT+Rh3+K+AA+iN@CuL%
zr%1XXejZkH{4%Vs#RITv<4>lDbu6`T0=#b#<9*Leq50Qzr75wTC^<DvCdu7r(5z4+
zw;^ADLu9@|N$*pQTZq<8kui9xU~9tsj|EDR-t65e$Wo1J1wdrryLG`VF_4%JU~+Oz
zIG+YC{&%&3!p{jJjnII2pGGOigg1*e45b<m=BQ3Xr>;fS9PbTMk{(#K@moQeB=`Zz
z2b5$AND>|h=E&WpbhZT7qXU*K-~}DHd~G@}8FF+W!mD&Bo9{z8HrGPyv8fJGHV0tU
v#=i{7Y{2hjHo_!HXN+8q(H)xb+`5dwk_EhA1PQFo=p{pr5kz>E(Y5sd?7|B$

literal 2019
zcmZ`)Z%k8H6u&K$w&;*bHVc06zEw#9#fpP<=<pB!gfY8OWd4b|ZoEyh0z%Q!s7?I1
zZ^LXeWJ^r8WNAyGESamx5@T0c)|Qv`ES3*ue0U*mOJL~s!H~Jp?%dawKMF7Dz4!dR
z=XcJzr{(1xE$01A<t6!~soT!e5BXkxz&6Nt(f3@`ana`JA<ut4^$TP~o!4YNb|ftv
zQQuTQz9JYkN<pJha>x`;`JjLZ|M?(L^|>m}i5?K{sg>NVxwsC+It{Aq83W<349_zc
z7y5m`;U50c2jO84gzp4kDVFmSbGZ~F;}N{CjuP@j3N%|5z6}gpZhg|cN&Gt^B}#%u
z^<A20DAGT12M>W5Nl5c0&Y&?DIg27h+(D!2&d&z@;=#yd!kr}1YhH|QdS9~EoMX^G
zl3dB0UoBp6PwzErlC`E>!)E=T74B)1r2>RuFFZtbr1J8Guf1^HQn8xXmFBr1B*$?#
zdpX`3Txc)G<)}6yz1xk17@4$OFI*Z9MG}?dL~N%?@llycQM|#Av5O%xIU~(fY7!Dl
zYRB2KSW#^2HdB5`J1Z@mhWXjanLTta6q*r3h)hx(#<YIn1#`Y)$6S2AOzSWVh#1*q
zf|)N%H)W*f44w0`bj5HB6P0Pvw8U9tC~-1tX)=*VSk(mLgWRH_<YDs@2#JVS_tGc`
z|9F7gJ_<1Pu@^+-m1lUBt9U#7X}z8P6}`ob-oIJBhz{Kd*S!!e9R(el%jZ@+qnUg@
z;0GP5%jW_=a1(R!8bvtnf#nccgY_F&kb3hX3$pQKO9x3c4s{PYXp`dt2|w_FwXuUJ
ztUPjT^s>!<iKpGY6uXP|@I8G4F2Z@!UCQz!<HjDKyX%^TJ8EURo&UffSUb;Ra5<Qm
z-^W2H^#U_=$~`^0j)#}iwvRWkMHA=p%^XrqtY{Zl(wWQfln0O|Exld*(Cd_RvcPe#
zZ?lrZdOL3$aL~aEJaxQ3!1KL?y_!JPXR0`Re$2M>NV}D6ZRmDfwA);W+-_(2pq*$(
z@<>6tz}tOrm7%=G7T4yanigPc+4Y#q0;12WJI^HPCIC64ciP`PM#!Nvoo}}_6H<Hn
z#9MDP)f0NE!_wM#l#r9w<1GzGD)yA`J(o(I-(T}uS?Fx4vZ~r_ymIY;Y2Pca?xqLp
zuBKGnVZ*M{ROUl9`Gjh0XKERVyvdKDl=SH?`=Qv4jmQ$k=<qZ2msxs56|bRUWL{`f
zDCdL5MH~<d))&V?N^qDS-8L*Ab}xv+1ZJ&SD8b2O7=vU@^iy2T(XVjb5)I?3jjG1M
zGL%?2gVsNQ@queP-~3Cm)D&BaZ9O+N=ZE|GXpA{>8gljDOWX|-cR$iN#c=Bw4B_O#
zt&R%csg)AD*<CHBsS4F91&PDD9mluCVPHB`O9xj+bD879r_TzQdcP<!4>d&aXq0K6
zID%NiFsQT3P^Ar^nxp;W4CD=5wb2I|kZ6Y>A2N^$1PKBH%!0em;8c%q1P3J<g%vn>
z`TB6y2(oa{!}D+$n%jYF;evtn3ulhj2N;?zT(!|}0_l>W-C8tH{g6x<BUwcESim`f
zjS!(Eqp*Sq16Uu?8bKBjdUzfYn_{{t1i~ht5P<Mv02G{rjLaV<+p`m(vAw;P9`B>|
keLX$4-mY3oxSR=DGyIzeWN8Ecf$frg@Bn2)kL<erKd7F;TmS$7

diff --git a/includes/Err.asm b/includes/Err.asm
index fa3fe2f..8d1b47c 100644
--- a/includes/Err.asm
+++ b/includes/Err.asm
@@ -1,17 +1,46 @@
+;;ErrCatch
+;;Checks err bit and jp to err route
+ErrCatch:
+ ld hl, FshFlags
+ bit 1, (hl)
+ jp nz, ErrRoute
+ jp Fin
+
 ;;ErrRoute
 ;;Routes err codes.
-;;Outputs:
-;; Jp to loc for err func
 ErrRoute:
+ ld hl, FshFlags
+ res 1, (hl)
+
  ld hl, FshCmdErrCode
 
  ld de, ErrCmdNotFoundo
  call bytecmp
  jp z, ErrCmdNotFoundf
 
+ ld de, ErrOutOfBoundso
+ call bytecmp
+ jp z, ErrOutOfBoundsf
+
  jp ErrDefault
 
 
+;;ErrSet
+;;Sets all things relating to Err codes
+;; Inputs:
+;; HL: Err____o
+ErrSet:
+ push hl
+  ld a, (hl)
+  ld hl, FshCmdErrCode
+  ld (hl), a
+  ld hl, FshFlags
+  set 1, (hl)
+ pop hl
+ ret
+
+;;ERR FUNCS
+
 ErrCmdNotFoundo: .db $01
 ErrCmdNotFoundf:
  ld hl, ErrCmdNotFoundt
@@ -20,10 +49,18 @@ ErrCmdNotFoundf:
  call _PutS
  call _NewLine
  jp Fin
-ErrCmdNotFoundt: .db "ERR: No Command: ", 0
+ErrCmdNotFoundt: .db "error: No Command:", 0
+
+ErrOutOfBoundso: .db $02
+ErrOutOfBoundsf:
+ ld hl, ErrOutOfBoundst
+ call _PutS
+ call _NewLine
+ jp Fin
+ErrOutOfBoundst: .db "error: Out Of Bounds", 0
 
 ErrDefault:
  ld hl, ErrDefaultt
  call _PutS
  jp Exit
-ErrDefaultt: .db "ERR: Default; Exit", 0
+ErrDefaultt: .db "error: Default; Exit", 0
diff --git a/includes/FshVar.asm b/includes/FshVar.asm
index 11d3c8c..c6b2941 100644
--- a/includes/FshVar.asm
+++ b/includes/FshVar.asm
@@ -4,12 +4,15 @@
 ;;  HL: 16b
 ;;  DE: Destination Word Relitive to FshVars
 fshvarset:
+ push bc 
+  ld bc, FshVarsSize / 2 - 1
+  call cpBCDE
+ pop bc
+ jr c, fshvarsetOOBException
+
  push bc
  push de
  push hl
-  ld bc, FshVarsSize / 2
-  call cpBCDE
-  jr c, fshvarsetOOBException
   ld bc, FshVars
   ex de, hl
    add hl, hl
@@ -17,12 +20,18 @@ fshvarset:
   ld (hl), e
   inc hl
   ld (hl), d
-fshvarsetOOBException:
  pop hl
  pop de
  pop bc
  ret
 
+fshvarsetOOBException:
+ push hl
+  ld hl, ErrOutOfBoundso
+  call ErrSet
+ pop hl
+ ret
+
 ;;; fshvarget [Words]
 ;;  Gets a Word in FshVars.
 ;; Inputs:
@@ -30,12 +39,15 @@ fshvarsetOOBException:
 ;; Outputs:
 ;;  HL: Word in (DE)
 fshvarget:
+ push bc 
+  ld bc, FshVarsSize / 2 - 1
+  call cpBCDE
+ pop bc
+ jr c, fshvargetOOBException
+
  push bc
  push de
   ld hl, 0
-  ld bc, FshVarsSize / 2
-  call cpBCDE
-  jr c, fshvargetOOBException
   ld bc, FshVars
   ex de, hl
    add hl, hl
@@ -44,17 +56,29 @@ fshvarget:
   inc hl
   ld d, (hl)
   ex de, hl
-fshvargetOOBException:
  pop de
  pop bc
  ret
 
+fshvargetOOBException:
+ push hl
+  ld hl, ErrOutOfBoundso
+  call ErrSet
+ pop hl
+ ret
+
 ; fshvarcpy [Bytes]
 ;;  Copies a word.
 ;; Inputs:
 ;;  HL: Byte pointer
 ;;  DE: Destination
 fshvarcpy:
+ push bc 
+  ld bc, FshVarsSize / 2 - 1
+  call cpBCDE
+ pop bc
+ jr c, fshvarcpyOOBException
+
  push bc
  push de
  push hl
@@ -73,12 +97,18 @@ fshvarcpy:
    inc hl
   ld a, (de)
   ld (hl), a
-fshvarcpyOOBException:
  pop hl
  pop de
  pop bc
  ret
 
+fshvarcpyOOBException:
+ push hl
+  ld hl, ErrOutOfBoundso
+  call ErrSet
+ pop hl
+ ret
+
 ; fshvarfill
 ;;  fills fshvars with word
 ;; Inputs:
diff --git a/includes/commands/SET.asm b/includes/commands/SET.asm
index 25b646e..159eaa8 100644
--- a/includes/commands/SET.asm
+++ b/includes/commands/SET.asm
@@ -57,7 +57,7 @@ fshcmdSETfExe:
  ld l, b
  call fshvarset
  call _NewLine
- jp Fin 
+ jp ErrCatch 
 
 fshcmdSETfInputBuffer: .db $00,$00,$00,$00
 fshcmdSETfDIndex: .db "Index= ", 0