From: Robert Pengelly <robertapengelly@hotmail.com>
Date: Tue, 24 Sep 2024 01:45:14 +0000 (+0100)
Subject: Bug fixes
X-Git-Url: https://git.candlhat.org/?a=commitdiff_plain;h=264f544821167739e7bfc4465c3d7de9b5e83c5e;p=chimaera.git

Bug fixes
---

diff --git a/build/chimaera.img b/build/chimaera.img
index 3bee871..cecc6fb 100644
Binary files a/build/chimaera.img and b/build/chimaera.img differ
diff --git a/build/chimaera.vhd b/build/chimaera.vhd
index a6a2267..126a746 100644
Binary files a/build/chimaera.vhd and b/build/chimaera.vhd differ
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
 
 ;******************************************************************************