From 264f544821167739e7bfc4465c3d7de9b5e83c5e Mon Sep 17 00:00:00 2001
From: Robert Pengelly <robertapengelly@hotmail.com>
Date: Tue, 24 Sep 2024 02:45:14 +0100
Subject: [PATCH] Bug fixes

---
 build/chimaera.img       | Bin 368640 -> 368640 bytes
 build/chimaera.vhd       | Bin 34120704 -> 34120704 bytes
 src/apps/pcomm/pcomm.asm |  39 ++++++++++++++++++++-------------------
 3 files changed, 20 insertions(+), 19 deletions(-)

diff --git a/build/chimaera.img b/build/chimaera.img
index 3bee871bde57d30677390954a2766c212aa1c5bf..cecc6fbe65482fb2a656388639cc6a0181b057f2 100644
GIT binary patch
delta 746
zcmZoTAl7g|Y=Sxqlij458?_&E*3S{Oh_r}gU;xn!VBqBMAEE#O0uXVSJQG;nEy&f?
z$0bN1I5JoPRi2e$z6}F|w`-7}tB(Q}c~OS0Fa`!^e_vlmKNkfct-v4%wisrCHp2z?
z?H8FDlXxdd@cAM;4Pv#P9@Jq93TRG)I34CRpei(Z=FJPamNElP^+z_98LSPrsi+=y
zc5_GbFbl(3pt*~gHz{asRN2X9<59}|l8ep88%PN=+xP;h8%#F-Kq{5ZCICpOZT7o(
zl|^I!43%($13UjSd|tIXM=AJ)EmQLmmfbT{UfgFY3hBIOcwmjf0if!#$;Q{TSmc6V
zT%VkHO~iVw-hYvo9KZJGD({G42<W^Q{9=wWP@m#~5}wY($JiNw#%zdL<-9`=B3TcS
zECrh1G5P2<MaHzr&#$TI_59pjqw->&qF%GzLN&%BVUY6Oxyr#WL_q4n1_8M*Y878J
zy?7Zvx$wFv^XHc}K-z?R=cku0KNa2rU1mFZ!*v5jp2-id%Q3#4bi-PtR2!&SzUM~Y
zfo?aJfE{yG174_1_P=3j8Qb|&^J3%A{|v>!4K}K!-fj&x45h3aR9C%z2;`So?@(n3
z2zybl1@=fO)9ce<7lgfVo_yejBFn-hujfsEdc&P*hRS5Un?68lbIr|X%$%mC#zvaF
fTnzs=Co%~#HP_s4uer|%#7scUyuIc=OUnTO34Q%B

delta 812
zcmZoTAl7g|Y=Sz=_I-}OH)=oTtPc~gh_r}gU;xn!VBqBMAEE#O0uXVSJQG;nEy&f?
z$0bN1I5JoPRi2e$z6}F|w`-7}tB(Q}c~OS0Fa`!^e_vlmKNkfct-v4%wisrCHp2z?
z?H8FDlXxdd@cAM;4Pv#P9@Jq93TRG)I34CRpei(Z=FJPamNElP^+z_98LSPrsi+=y
zc5_GbFbl(3pt*~gHz{asRN2O6<59}|lAX=Q8%PN=+xP;h8%#F-Kq`sNCICn&Z}z)*
zl||sicc!Au&U=Oj)+ihRiuO(RzNS@g9Q@+FPV*5a#>37H_6#K)4fYD<%+9Yr@1LO(
zZg61de}>Pif?vF5Y(B!WcJ~Ywz5gOFxqt1?Ro)T95YTxq_{Dr>pp4>y5}wY($JiNO
zI52I9S>?P#4<gwFkt|gTe$frGqx0bBC3?r%7OF8aFdp8Zw`xQ3s>%1SaWQ62esxVn
zum9)n8kH9d74@3!fGUcFL8k1^RSte34l)L8K9KvOLGeZFi<e20ZLXWJ?En0-9>_4|
z{`AuQr@~vHryPDxcD$~q_>%u;KyYA?UYFT=HN7se4Qe|Wm<(^971*Dn6crgA@$$oD
z<{Q=`71}_9<$G@Q9q4vr3D_}5HQ<H%<e(d-HVK_SH7_>){LfGv)?lMr>gU#A!%)h)
zL3P#Zhd_Rb-40cTfUp-$T429JBu;=G81}+p@_`$QEc2GUo;~^L4R@v-rOA3XeSp;F
qnw!s<IZX^Lj5K+<82)cgWD;a*uDRb{bDt52nShvid(C~8mIDB|pcAeD

diff --git a/build/chimaera.vhd b/build/chimaera.vhd
index a6a2267b4f72caa6fa67b0b04533f40015122c0c..126a746bcbafbca6d76b4745a184ccbb23931f72 100644
GIT binary patch
delta 3144
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
F{{h<tVW|KB

delta 3208
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
K1NcvAqv=10Zh8p-

diff --git a/src/apps/pcomm/pcomm.asm b/src/apps/pcomm/pcomm.asm
index a8bd365..eda34b5 100644
--- a/src/apps/pcomm/pcomm.asm
+++ b/src/apps/pcomm/pcomm.asm
@@ -1175,6 +1175,22 @@ _main:
 
 .L21:
 
+    mov     di,     offset _formatted_command
+    push    di
+    
+    xor     al,     al
+    
+    mov     cx,     255
+    rep     stosb
+    
+    mov     bx,     offset _scratch
+    push    bx
+    
+    call    _expand_vars
+    add     sp,     4
+    
+    mov     bx,     offset _formatted_command
+    
     call    _get_command
     jc      .L23
     
@@ -1251,24 +1267,9 @@ _main:
 
 .L32:
 
-    mov     di,     offset _formatted_command
-    push    di
-    
-    xor     al,     al
-    
-    mov     cx,     255
-    rep     stosb
-    
-    push    bx
-    
-    call    _expand_vars
-    add     sp,     4
-    
     lodsw
     
-    mov     bx,     offset _formatted_command
     call    cs:[si]
-    
     jmp     .L5
 
 .L23:
@@ -1706,8 +1707,8 @@ _expand_vars:
     and     ax,     ax
     jnz     .L88
     
-    mov     al,     '%'
-    stosb
+    ;mov     al,     '%'
+    ;stosb
     
     jmp     .L87
 
@@ -1844,7 +1845,7 @@ _get_command:
     push    dx
     
     mov     word ptr [bp - 2],      0
-    mov     si,     offset _scratch
+    mov     si,     offset _formatted_command
 
 _get_command.loop:
 
@@ -1915,7 +1916,7 @@ _get_command.done:
 
 _get_command.ret:
 
-    mov     bx,     offset _scratch
+    mov     bx,     offset _formatted_command
     ret
 
 ;******************************************************************************
-- 
2.34.1