From 2c8399dfcf26172901d826566a56ba5c9516d8b1 Mon Sep 17 00:00:00 2001
From: Wayne Warthen <wwarthen@gmail.com>
Date: Thu, 8 Nov 2018 12:04:28 -0800
Subject: [PATCH] More DBGMON Cleanup

---
 Source/HBIOS/dbgmon.asm | 52 ++++++-----------------------------------
 Source/HBIOS/dsky.asm   |  6 ++---
 2 files changed, 10 insertions(+), 48 deletions(-)

diff --git a/Source/HBIOS/dbgmon.asm b/Source/HBIOS/dbgmon.asm
index 8862c76d..2dc20eac 100644
--- a/Source/HBIOS/dbgmon.asm
+++ b/Source/HBIOS/dbgmon.asm
@@ -1,5 +1,4 @@
 ;___ROM_MONITOR_PROGRAM_______________________________________________________
-;___ROM_MONITOR_PROGRAM_______________________________________________________
 ;
 ;  ORIGINAL CODE BY:	ANDREW LYNCH (LYNCHAJ@YAHOO COM)	13 FEB 2007
 ;
@@ -1338,45 +1337,6 @@ GETADDRDISP:
 	LD	(ADDR+3),A		;
 	JP	GETADDR1		;
 ;
-;__DSPSECTOR__________________________________________________________________
-;
-;	DISPLAY SECTOR IN HL ON FRONT PANEL
-;_____________________________________________________________________________
-;
-DSPSECTOR:
-	PUSH	BC			; STORE BC
-	PUSH	HL			; STORE HL
-	LD	A,H			; DISPLAY HIGH BYTE, HIGH NIBBLE
-	SRL 	A			;	
-	SRL 	A			;	
-	SRL 	A			;	
-	SRL 	A			;	
-	AND	0FH			;
-	CALL 	DECODEDISPLAY		;
-	LD	(SEC+3),A		;
-	LD      A,H			; DISPLAY HIGH BYTE, LOW NIBBLE
-	AND	0FH			;
-	CALL 	DECODEDISPLAY		;
-	LD	(SEC+2),A		;
-	LD	A,L			; DISPLAY LOW BYTE, HIGH NIBBLE
-	AND	0F0H			;
-	SRL 	A			;	
-	SRL 	A			;	
-	SRL 	A			;	
-	SRL 	A			;		
-	AND	0FH			;
-	CALL 	DECODEDISPLAY		;
-	LD	(SEC+1),A		; DISPLAY LOW BYTE, LOW NIBBLE
-	LD      A,L			;
-	AND	0FH			;
-	CALL 	DECODEDISPLAY		;
-	LD	(SEC),A			;
-	LD	HL,SEC			; DISPLAY PROMPT
-	CALL	SEGDISPLAY		; 
-	POP	HL			; RESTORE HL
-	POP	BC			; RESTORE BC
-	RET
-;
 ;__GETPORT____________________________________________________________________
 ;
 ;	GET PORT FROM FRONT PANEL
@@ -1696,10 +1656,10 @@ SEGDISPLAY_LP:
 	POP	AF			; RESTORE AF
 	RET
 ;
-CPUUP	.DB 	$84,$EE,$BB,$80,$BB,$EE,$CB,$84
-ADDR	.DB 	$00,$00,$00,$00,$8C,$BD,$BD,$FE
-PORT	.DB 	$00,$00,$80,$80,$94,$8C,$9D,$EE
-SEC	.DB 	$80,$80,$80,$80,$80,$CB,$CF,$D7
+CPUUP	.DB 	$84,$EE,$BB,$80,$BB,$EE,$CB,$84	; "-CPU UP-"
+ADDR	.DB 	$00,$00,$00,$00,$8C,$BD,$BD,$FE ; "Addr    "
+PORT	.DB 	$00,$00,$80,$80,$94,$8C,$9D,$EE ; "Port  .."
+SEC	.DB 	$80,$80,$80,$80,$80,$CB,$CF,$D7 ; "SEC     "
 
 ;_KB DECODE TABLE_____________________________________________________________
 ; 
@@ -1723,11 +1683,13 @@ KB_DECODE:
 ;
 ;_HEX 7_SEG_DECODE_TABLE______________________________________________________
 ; 
-; 0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F, ,-
+; 0,1,2,3,4,5,6,7,8,9,A,B,C,D,E,F, ,-,.,P,o
 ; AND WITH 7FH TO TURN ON DP 
 ;_____________________________________________________________________________
 SEGDECODE:
+	;	0   1   2   3   4   5   6   7   8   9   A   B
 	.DB	$FB,$B0,$ED,$F5,$B6,$D7,$DF,$F0,$FF,$F7,$FE,$9F
+	;	C   D   E   F       -   .   P   o
 	.DB	$CB,$BD,$CF,$CE,$80,$84,$00,$EE,$9D
 ;
 DISPLAYBUF:	.FILL	8,0
diff --git a/Source/HBIOS/dsky.asm b/Source/HBIOS/dsky.asm
index ca89d642..97784078 100644
--- a/Source/HBIOS/dsky.asm
+++ b/Source/HBIOS/dsky.asm
@@ -197,18 +197,18 @@ DSKY_HEXOUT:
 	LD	HL,DSKY_BUF
 	LD	DE,DSKY_HEXBUF
 DSKY_HEXOUT1:
-	LD	A,(DE)		; FIRST NIBBLE
+	LD	A,(DE)			; FIRST NIBBLE
 	SRL	A
 	SRL	A
 	SRL	A
 	SRL	A
 	LD	(HL),A
 	INC	HL
-	LD	A,(DE)		; SECOND NIBBLE
+	LD	A,(DE)			; SECOND NIBBLE
 	AND	0FH
 	LD	(HL),A
 	INC	HL
-	INC	DE		; NEXT BYTE
+	INC	DE			; NEXT BYTE
 	DJNZ	DSKY_HEXOUT1
 
 	LD	A,82H			; SETUP PPI