From fb3b3aa33dc081b34d5b54cbb07e36678bd9141d Mon Sep 17 00:00:00 2001
From: Ed94 <edwardgz@gmail.com>
Date: Tue, 18 Jan 2022 17:15:16 -0500
Subject: [PATCH] cleanup of out_dump routine

---
 16bit.Scratch             | Bin 512 -> 512 bytes
 16bit.Scratch.s           |  91 +++++---------------------------------
 AAL.x86.routines.macros.s |  25 +++++++++--
 AAL.x86.routines.s        |  78 +++++++++++++++++++++++++-------
 4 files changed, 93 insertions(+), 101 deletions(-)

diff --git a/16bit.Scratch b/16bit.Scratch
index da660c521dfb012ab8a7257b4f1d4a69ebaaf3a5..ef4cf63cc3bc95510660cdd175a0024aa849f17a 100644
GIT binary patch
delta 237
zcmZo*X<(TkQtwc^(6=_=1q)-umbRTt3};1m``0dv1d4oOi0BrJuH6}58~9=;Lu9vD
zZ0*iuAbTxC<nHv^h50}w=NTe)$Jg#)VF-9}1jtN=Fn2P5j1mAEwS{j3*I5A|$$M5{
zH$%-X2BsHG46pwMhZ%meyjBtu92C|Waf9(g=b@b+Y64$`0uBC912(OkAtEj+8mLj>
ztU#AS^D)LQhQ;q{fa<%&-qnB=YakSRAt{FX!R_^eiJ#3Tn=>Atyns=RDRdP8%28({

delta 253
zcmZo*X<(TkQXf{kFu6A1g%o4NmbRTt3};1mr`9ga2a0eoMs$l6*6u8=4SaEsA+lSn
zxOQhHkiC^5a(8X*!d9S?rwkFhOKW$qFa*4~1!Pu2nCBTlMhO6o+Q9{s*~AdBgBM7z
z0;*uB*~P&0f{Eevzu+*#Z<g0e5)y)g!a8p-e&{^3^G8kKi%6j1KWe}xb}~f7MMZZh
zG#_K^Vp#mG2B>g{0??df2B5pX)qs_2A(Tgfm4j6{f*k<zi`(lt6JMKg2Zwe(-NM)9
P#&%X<vK-?nrqERYcQtJs

diff --git a/16bit.Scratch.s b/16bit.Scratch.s
index 80a1944..9bd2c4f 100644
--- a/16bit.Scratch.s
+++ b/16bit.Scratch.s
@@ -21,6 +21,8 @@
 ;=============================================================================================================
 start:
 Video_SetTextMode_80x25
+; Video_SetGraphicsMode_320x200
+; Video_SetGraphicsMode_640x200
 
 ;	Exclusive-OR (xor'ing a value to itself zeros the value)
 	xor 	AX, AX
@@ -42,11 +44,11 @@ int	SystemService
 
 ;	Hex Testing
 String_Out	HexTest, [HexTest_len]
-Hex16_ToString	[HexNum], HexString
-Hex16_ToString	[HexNumT], HexStringT
+Hex16_ToString	[HexNumA], HexStringA
+Hex16_ToString	[HexNumB], HexStringB
 String_Out	ResultStr, [ResultStr_len]
-String_Out	HexString, 4
-String_Out	HexStringT, 4
+String_Out	HexStringA, 4
+String_Out	HexStringB, 4
 
 	mov	AH, BIOS_Wait
 	mov	CX, 0x10
@@ -55,84 +57,13 @@ int	SystemService
 Char_Out	char_LF
 Char_Out	char_CR
 
-	mov	BX, 0x7C00
-	; sub	BX, 0x7DFF
-	; mov	BX, 0x0000
-	mov	DX, 512
-call	dump_out
+DumpOut		0x7C00, 512
 
 ; Idle
 hang :
 jmp short hang
 
 
-dump_out:
-; Args:
-; BX = StartLocation
-; CX = ByteCount
-%define StartLocation	BX
-%define ByteCount	DX
-	push 	BX
-	push	SI
-	; xor	BX, BX
-	xor 	SI, SI
-
-.loop:
-	cmp	SI, ByteCount
-	je	.break
-
-
-	push BX
-	push DX
-	push SI
-	mov	AX, StartLocation
-	add	AX, SI
-
-Hex16_ToString	AX, .HexStr
-String_Out	.HexStr, 4
-
-	pop	SI
-	pop 	DX
-	pop	BX
-
-	mov	AH, [StartLocation + SI]
-	add	SI, 1
-
-	mov	AL, [StartLocation + SI]
-	mov	[.HexNum], AX
-
-	push BX
-	push DX
-	push SI
-Char_Out	' '
-
-Hex16_ToString	[.HexNum], .HexStr
-String_Out	.HexStr, 4
-	pop SI
-	pop DX
-	pop BX
-	
-Char_Out	' '
-
-	mov	AH, BIOS_Wait
-	mov	CX, 0x02
-int	SystemService
-
-	; add	SI, 4
-	inc	SI
-	jmp	.loop
-
-.break:
-	pop SI
-	pop BX
-ret
-
-.HexNum : dw	0x0000
-.HexStr	: dw	'    '
-%undef StartLocation
-%undef WordCount
-
-
 %include "AAL.x86.routines.s"
 
 
@@ -145,10 +76,10 @@ TestStr_len : dw 	13
 HexTest     : db 	'Hex Test', char_LF, char_CR
 HexTest_len : dw 	10
 
-HexNum     : dw 	0x1994
-HexNumT     : dw 	0x2022
-HexString  : db		'0000'
-HexStringT  : db	'0000'
+HexNumA     : dw 	0x1994
+HexNumB     : dw 	0x2022
+HexStringA  : db	'0000'
+HexStringB  : db	'0000'
 
 ResultStr     : db	'Result: '
 ResultStr_len : db	8
diff --git a/AAL.x86.routines.macros.s b/AAL.x86.routines.macros.s
index ee43a66..84782dd 100644
--- a/AAL.x86.routines.macros.s
+++ b/AAL.x86.routines.macros.s
@@ -12,10 +12,28 @@
 int	VideoService
 %endmacro
 
+%macro	Video_SetGraphicsMode_320x200 0
+	mov	AH, Video_SetMode
+	mov	AL, VideoMode_Graphics_320x200
+int	VideoService
+%endmacro
+
+%macro	Video_SetGraphicsMode_640x200 0
+	mov	AH, Video_SetMode
+	mov	AL, VideoMode_Graphics_640x200
+int	VideoService
+%endmacro
+
 ;=============================================================================================================
 ; Routines
 ;=============================================================================================================
 
+%macro DumpOut 2
+	mov	BX, %1
+	mov	DX, %2
+call	out_Dump
+%endmacro
+
 %macro Hex16_ToString 2
 	mov	DX, %1
 	mov	CX, %2
@@ -25,10 +43,9 @@ call	h16_toString
 %endmacro
 
 %macro Char_Out 1
-	mov	AX, %1
-	push	AX
-call	out_char
-	pop	AX
+	mov	AH, Video_TeleType
+	mov	AL, %1
+int	VideoService
 %endmacro
 
 %macro String_Out 2
diff --git a/AAL.x86.routines.s b/AAL.x86.routines.s
index cffd735..596abad 100644
--- a/AAL.x86.routines.s
+++ b/AAL.x86.routines.s
@@ -7,6 +7,67 @@
 ; Routines
 ;=============================================================================================================
 
+out_Dump:
+; Args:
+; BX = StartLocation
+; CX = ByteCount
+%define StartLocation	BX
+%define ByteCount	DX
+	push 	BX
+	push	SI
+	xor 	SI, SI
+
+.loop:
+	cmp	SI, ByteCount
+	je	.break
+
+
+	push 	BX
+	push 	DX
+	push 	SI
+	mov	AX, StartLocation
+	add	AX, SI
+Hex16_ToString	AX, .HexStr
+String_Out	.HexStr, 4
+	pop	SI
+	pop 	DX
+	pop	BX
+Char_Out	' '
+
+;	Get next set of byte, organize to big endian.
+	mov	AH, [StartLocation + SI]
+	add	SI, 1
+	mov	AL, [StartLocation + SI]
+	mov	[.HexNum], AX
+
+	push 	BX
+	push 	DX
+	push 	SI
+Hex16_ToString	[.HexNum], .HexStr
+String_Out	.HexStr, 4
+	pop 	SI
+	pop 	DX
+	pop 	BX
+Char_Out	' '
+
+	mov	AH, BIOS_Wait
+	mov	CX, 0x02
+int	SystemService
+
+	inc	SI
+	jmp	.loop
+
+.break:
+	pop SI
+	pop BX
+ret
+
+.HexNum : dw	0x0000
+.HexStr	: dw	'    '
+%undef StartLocation
+%undef ByteCount
+
+
 ; Prints out a 16-bit hex value.
 h16_toString:
 ; Arg - DX : Hex Num
@@ -59,23 +120,6 @@ h16_toString:
 ret
 
 
-; Print out an ASCII character.
-out_char:
-%define arg1	BP + 6
-	push	BX
-	push 	BP
-	mov	BP, SP
-
-	mov	AH, Video_TeleType
-	mov	AL, [arg1]
-int VideoService
-
-	pop	BP
-	pop	BX
-%undef arg1
-ret
-
-
 ; Print out an ascii string of speicifed length
 out_string:
 ; Arg - BX: String