From 15452c4fce91f8513ff53605e6562858d52ed2ff Mon Sep 17 00:00:00 2001
From: Stephen Toth <stephentoth.st@gmail.com>
Date: Sun, 24 Jun 2018 22:19:08 -0400
Subject: [PATCH] Added Err Handler similar to cmd routing FshCmd is now 24
 bytes err flag is unused cleaned up code a bit

---
 FSHa.asm            |  15 +++++----------
 bin/FSHa.8xp        | Bin 1907 -> 1967 bytes
 includes/Err.asm    |  29 +++++++++++++++++++++++++---
 includes/FshCmd.asm |  46 ++++++++++++++++++++------------------------
 includes/define.inc |   3 ++-
 5 files changed, 54 insertions(+), 39 deletions(-)

diff --git a/FSHa.asm b/FSHa.asm
index f840b55..07010e9 100644
--- a/FSHa.asm
+++ b/FSHa.asm
@@ -6,15 +6,15 @@
  .DB tExtTok,tAsm84CeCmp
 
 Setup:
- CALL _homeup      ;Put up home
- CALL _ClrLCDFull  ;Clear screen 
+ CALL _homeup
+ CALL _ClrLCDFull
 
  LD HL, $00
  CALL fshvarfill
 
 
 Input:
- LD   HL, $00      ; fill fshcmd with $00
+ LD   C, $00
  CALL fshcmdfill
 
  XOR  A
@@ -30,10 +30,6 @@ Input:
  CALL _NewLine
 
 Decode:
- LD   HL, FshCmdOP ; resets op to 0, TEMP
- LD   A, $00
- LD   (HL), A
-
  LD   HL, FshCmd
  LD   DE, FshCmdOP
  CALL fshcmddecode
@@ -46,8 +42,7 @@ Fin:
  JP   Input
 
 Err:
-;TODO: Err Handler
- JP   ErrDefault
+ JP   ErrRoute
 
 Cleanup:
  SET  graphdraw,(IY+graphflags)
@@ -60,7 +55,7 @@ Exit:
 PS1: .DB "FSH> ",0
 FshFlags: .DB %00000000
 ; 0: Debug Flag
-; 1: Error Flag
+; 1: Error Flag (Unused)
 ; 2: Program Flag
 
 
diff --git a/bin/FSHa.8xp b/bin/FSHa.8xp
index dddae35ac6cbcc001bdc66b83008d887262ec5ff..9a96b84fc5161ebe933c44f81d34eadcd4d376db 100644
GIT binary patch
delta 1227
zcmZ{kT}TvB6vt<0*4<G|odQw%V5TJzEV3e7R+7rp3UtAGhyqE{Q1AoOQi*nvdg&p|
zhN2!K!I%9WjgTM$WmMYHi+jRdNP1afdl1v0Bn(_T*V$!Lwt2Ys&i|Zq@9&&@W`5=<
zxlc|y@0xcp&1O^e<qKz-t*6<1)4Y0*6!R?Mc~(M=obo^pLl!-t9Dkk>lA<mk6J}O=
zy%ZAAEb!>E?gR28p}Ceq#O?tJXLZ;E>W~Z6hYD=Wax-+xjaeoT#PcddhFKf>P+5E5
zjoU|##cfv3Qm_*1k8_{wZg517TKTxG)M&{rST1oyO6?^;hTO1-?)YZPA|q}Xu$TO+
zHIWgy*6`8Ec)+-)FMh_l29wcXEG+!;09ki|wC(|zd*p^FYP?t1vb`y7BcZXrlon2C
zpObz;0k<IoZqSTg5HNgeU5slCqw8v|&<6tgZyA=oAdN1C$_#4A1+nR{iJ?`a)$6iQ
z%53XzN?CRF;uU7Is;{-DTdeMGVbleAfjv=#8H<N2YREe?t5<&-x24se#Pc|;{F?xf
zBKZinPo%B~btjV6sg>KCiKU?zrOwHZxpKpt9OMoe1bLM^fa@HiQ#$8^LI>82UVIVL
zDGcs-Z;=DW{m!T#VqpoJLHOzif(3;r8Rc1}hJ3>ktok5crrq#E+^Tipn5zxqn5lsu
z?0w<y*D?A%6fg8gvaIv*qSD!o+1(9u<35;*U@#`yYcUp#$E2rB$g#rrM%8>j^u-ws
zrwWn0HM24KQbt~7N{va+GD3BDrxMZ#NTm~1h(@|w-k+TY>fRNNsrmA&jKXV5AeqY;
zmNH!~R_%0vX3>CSrZybVv%omaVv%MM#w>tf21)uU%4?AGOof$(z!p4CDNH;lJ?1t;
z64M~JnF<;PlqBW@<$svD3dJnNF;ly(=$II{9dib6XR|n%M4h0h^Ay!NucP9WLdC<<
zqi!=KQ8BcPAugWPFDeQ_+UnT-!V83^pUg`IR8;|kG=@UrFG6Q*N-K7y3##htZDL)g
kSlQX$-q_J(6B%h<cU8Y6tmm6=HQs6KDHrM2!i2ql0kY3~2><{9

delta 1195
zcmZ{jT}V@57{`xi-&)x*h%GF38kx30OR_OxEO1&-3F^fl5~L4|f-n^)fg=bbuhK(Z
zbkjvQJNt|<D7rBw;?8_&k9bx|QiB#WG^2<h^w{%mt@*JAdq1A{|Gdxd|GZnI{Kt-a
z$GmpkcBV$BZEin#g2{erbO&|IH%YagC3-!}V~jZckewI&5IOolli)KxAQL*4f0RjZ
zDB$!cS_uOAhB03z;a~=`N4O+z%*8n>`XM^%gXo<Itj1MS^zPL-6CMqmJ~J%B4kmd-
zvD;J@<Ja_{qMCJ!FqEvd=@omO+Oo~KXdOz{wOWBZ6k#6axYL%Bpa{2Gt?OeKNl<7i
znf4m|px)(CoVK6vDiur1+%G>6Rs?><4=^((LJDJLfn2OSP>3;Tg6cHELhS8d-TS;Q
z#^E(&L<C6}01nf$Yb&lXjjo+iWe_;jXAhPG5S4w9mOIY#VkXgRxnWuNg;dPtKGngj
zxja|;dd<zf-Ar^r0Jgpgy_yd@TF7%9o9p^CUP!w>iIr5?@n>NmwZb7)WfPU|&xsPn
zMCd4xNes~P^u0Riu9-e*H^ElXXN$_hh^nzf7N%4OO7;kgs(rXFQ+s(=5KKeZL#nP~
zu5)9X_E&{~dawIa2>tQ+)8IabfMA0mMV{!{NDKLbE%_b<r9rw70>viv;8-q=;b@TN
zLeT1wm(F4KOQ@b3OqSYSD^+#z)p$kc%!?pQz7x!v-3C(#JPIS3Lc&L_(fe-)Y5u+@
zaTcGF$D$k-&lPr<)wE|je{VjZ@}5*WiZ?Vc#HVK+W-_j0QxHRMjGSI-e;Ur)7{}fg
zvtc_fIm6UJ7mfz$aX9Ay6Vbsubs(byAV^Ok1}tjhB!yQCAG9W~I-GTaQ-K{T6=&aY
zkY~r#t?U&2b|jBJ9QhBrWUq)&^m-f(Qhy|ej)@!5WB6KY)v-MO1jV1F_@3DuK28OE
stX3R<!$BS&Q@7&t0utj7JDT=^tF6s$Zn|{2tN&VGqnZ9Em^XL-0H~j5n*aa+

diff --git a/includes/Err.asm b/includes/Err.asm
index d905463..fa3fe2f 100644
--- a/includes/Err.asm
+++ b/includes/Err.asm
@@ -1,6 +1,29 @@
+;;ErrRoute
+;;Routes err codes.
+;;Outputs:
+;; Jp to loc for err func
+ErrRoute:
+ ld hl, FshCmdErrCode
+
+ ld de, ErrCmdNotFoundo
+ call bytecmp
+ jp z, ErrCmdNotFoundf
+
+ jp ErrDefault
+
+
+ErrCmdNotFoundo: .db $01
+ErrCmdNotFoundf:
+ ld hl, ErrCmdNotFoundt
+ call _PutS
+ ld hl, FshCmd
+ call _PutS
+ call _NewLine
+ jp Fin
+ErrCmdNotFoundt: .db "ERR: No Command: ", 0
+
 ErrDefault:
- ld hl, ErrDefaultT
+ ld hl, ErrDefaultt
  call _PutS
  jp Exit
-ErrDefaultT:
- .db "ERR: Default; Exit",0
+ErrDefaultt: .db "ERR: Default; Exit", 0
diff --git a/includes/FshCmd.asm b/includes/FshCmd.asm
index d5ca43d..732e2a0 100644
--- a/includes/FshCmd.asm
+++ b/includes/FshCmd.asm
@@ -68,36 +68,32 @@ fshcmdroute:
  call bytecmp
  jp z, fshcmdCLSf
 
- jp Fin
+ ld hl, FshCmdErrCode
+ ld (hl), $01
+ jp Err
 
-; fshcmdfill
-;;  fills fshvars with word
+; fshvarfill
+;;  fills fshcmd with byte
 ;; Inputs:
-;;  HL: 16b
+;;  C: byte
 fshcmdfill:
  push hl
-  push de
-   ld d, h
-   ld e, l
-   ld hl, FshCmdArg0
-   ld (hl), e
-   inc hl
-   ld (hl), d
-   inc hl
-   ld (hl), e
-   inc hl
-   ld (hl), d
-   inc hl
-   ld (hl), e
-   inc hl
-   ld (hl), d
-   inc hl
-   ld (hl), e
-   inc hl
-   ld (hl), d
-  pop de
+  push bc
+   push de
+    ld b, 0
+    ld de, 0
+    ld hl, FshCmd
+fshcmdfillLoop:
+    ld (hl), c
+    inc hl
+    inc b
+    inc de
+    ld a, b
+    cp FshCmdSize / 2
+    jr c, fshcmdfillLoop
+   pop de
+  pop bc
  pop hl
  ret
 
-
 #include "includes/commands.inc"
diff --git a/includes/define.inc b/includes/define.inc
index 6694cf2..64ce319 100644
--- a/includes/define.inc
+++ b/includes/define.inc
@@ -8,7 +8,7 @@
 #define END .end
 
 #define FshVarsSize 128      ;256 bytes   | 64 words
-#define FshCmdSize 17        ;17 bytes    | 8 chars | 1 null, 4 words
+#define FshCmdSize 24        ;17 bytes    | 8 chars | 1 null, 4 words (args) | 1 byte (err code) | 6 unused
 #define FshCmdInptSize 8     ;8 bytes     | 8 chars
 #define FshPrgmSize 1024     ;1024 bytes  | max size
 
@@ -23,3 +23,4 @@ FshCmdArg0    equ FshCmdOP + 1
 FshCmdArg1    equ FshCmdOP + 3
 FshCmdArg2    equ FshCmdOP + 5
 FshCmdArg3    equ FshCmdOP + 7
+FshCmdErrCode equ FshCmdArg3 + 1