From 9f5e546768e37bee68b71e4e1ee66324e883db04 Mon Sep 17 00:00:00 2001
From: Daniele Verducci su MatissePenguin <daniele.verducci@gmail.com>
Date: Wed, 16 Dec 2020 23:39:24 +0100
Subject: [PATCH] Working DUMP stub in monitor

---
 assembly/bios/drivers/sn76489.asm |  2 +-
 assembly/bios/monitor.asm         | 55 ++++++++++++++++++++++++++-----
 2 files changed, 47 insertions(+), 10 deletions(-)

diff --git a/assembly/bios/drivers/sn76489.asm b/assembly/bios/drivers/sn76489.asm
index 2bc4d8f..57bf387 100644
--- a/assembly/bios/drivers/sn76489.asm
+++ b/assembly/bios/drivers/sn76489.asm
@@ -40,7 +40,7 @@ Snd_beep:
     ld a,%00001000
     out (SND_DATA_REG),a
     ; wait
-    ld bc, (TIME_DUR_MILLIS * 150)
+    ld bc, (TIME_DUR_MILLIS * 100)
     call Time_delay55
     ; silence ch1
     ld a,%10011111
diff --git a/assembly/bios/monitor.asm b/assembly/bios/monitor.asm
index 61e5c4f..43b0e36 100644
--- a/assembly/bios/monitor.asm
+++ b/assembly/bios/monitor.asm
@@ -78,7 +78,18 @@ monitor_help:
 monitor_dump:
     ld bc, MON_COMMAND_DUMP + 1 ; autocomplete command
     call Print
-    call monitor_arg_byte
+    call monitor_arg_2byte  ; returns the read bytes in hl
+    ld b, 64    ; the number of bytes to display
+    monitor_dump_show_bytes_loop:
+    ; print character at mem position
+    ld a, (hl)
+    call Printc
+    ; move to next mem position
+    inc hl
+    ; decrement counter: if non zero continue loop
+    dec b
+    jp nz, monitor_dump_show_bytes_loop
+    ; if counter 0, finished
     jp monitor_main_loop
 
 monitor_set:
@@ -107,29 +118,55 @@ monitor_adb:
     call Print
     jp monitor_main_loop
 
-; Read 1 hex byte (e.g. 0x8C)
+; Prints "0x" and read 1 hex byte (2 hex digits, e.g. 0x8C)
+; @return a the read byte
+; @uses a, b, c
 monitor_arg_byte:
     ; Print 0x... prompt
     ld bc, MON_ARG_HEX
     call Print
-    ; Receive two hex digits
-    call monitor_readHexDigit
-    call monitor_readHexDigit
+    ; Read 2 digits
+    call monitor_arg_byte_impl
     ret
 
-; Reads 2 hex bytes (e.g. 0x3F09)
+; Prints "0x" and reads 2 hex bytes (4 hex digits e.g. 0x3F09)
+; @return hl the two read bytes
+; @uses a, b, c, h, l
 monitor_arg_2byte:
     ; Print 0x... prompt
     ld bc, MON_ARG_HEX
     call Print
-    ; Receive four hex digits
-    call monitor_readHexDigit
-    call monitor_readHexDigit
+    ; Read 2 digits
+    call monitor_arg_byte_impl
+    ld h, a ; move result to h
+    ; Read 2 digits
+    call monitor_arg_byte_impl
+    ld l, a ; move result to l
+    ret
+
+; Read 2 hex digits
+; @return a the read byte
+; @uses a, b, c
+monitor_arg_byte_impl:
+    ; Receive first hex digit
     call monitor_readHexDigit
+    ; First hex digit is the most signif nibble, so shift left by 4 bits
+    sla a
+    sla a
+    sla a
+    sla a
+    ld c, a     ; save shifted nibble in c
+    ; Read second hex digit
     call monitor_readHexDigit
+    ; Join the two nibbles in a single byte: second digit is already in a,
+    ; so we OR with the previously shifted c and obtain the complete byte in a.
+    or c
+    ld a, c ; store c in a for return
     ret
 
 ; Reads an hex digit (0 to 9, A to F)
+; @return a the read nibble
+; @uses a, b
 monitor_readHexDigit:
     call Readc
     ; check if is a valid hex digit (0-9 -> ascii codes 48 to 57; A-F -> ascii codes 65 to 70)