From 5c10f1881d3f928b5bd88b728406217a4c63b09a Mon Sep 17 00:00:00 2001
From: Dean Netherton <dinoboards@netherton.org>
Date: Thu, 5 Sep 2024 21:16:00 +1000
Subject: [PATCH] ez80: deprecated EZ80_UTIL_HL_TO_EHL - now using local
 implementation EZ80_CPY_UHL_TO_EHL

---
 Source/HBIOS/ez80cpudrv.asm | 19 ++++++++++++++-----
 Source/HBIOS/ez80instr.inc  |  2 +-
 Source/HBIOS/ez80systmr.asm |  2 +-
 3 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/Source/HBIOS/ez80cpudrv.asm b/Source/HBIOS/ez80cpudrv.asm
index 45ebed71..98906270 100644
--- a/Source/HBIOS/ez80cpudrv.asm
+++ b/Source/HBIOS/ez80cpudrv.asm
@@ -84,12 +84,21 @@ EZ80_PLT_C2CYL:
 _EZ80_CPY_EHL_TO_UHL:
 	PUSH	IX
 	PUSH	AF
-	.DB $5B, $DD, $21, $00, $00, $00		; LD.LIL	IX, 0
-	.DB $49, $DD, $39				; ADD.L		IX, SP
-	.DB $49, $E5					; PUSH.L	HL
-	.DB $5B, $DD, $73, $FF				; LD.LIL	(IX-1), E
-	.DB $49, $E1					; POP.L		HL
+	.DB 	$5B, $DD, $21, $00, $00, $00		; LD.LIL	IX, 0
+	.DB 	$49, $DD, $39				; ADD.L		IX, SP
+	.DB 	$49, $E5				; PUSH.L	HL
+	.DB 	$5B, $DD, $73, $FF			; LD.LIL	(IX-1), E
+	.DB 	$49, $E1				; POP.L		HL
 	POP	AF
 	POP	IX
 	RET
 
+_EZ80_CPY_UHL_TO_EHL:
+	PUSH	IX
+	.DB	$5B, $DD, $21, $00, $00, $00		; LD.LIL	IX, 0
+	.DB	$49, $DD, $39				; ADD.L		IX, SP
+	.DB	$49, $E5				; PUSH.L	HL
+	.DB	$5B, $DD, $5E, $FF			; LD.LIL	E, (IX-1)
+	.DB	$49, $E1				; POP.L		HL
+	POP	IX
+	RET
diff --git a/Source/HBIOS/ez80instr.inc b/Source/HBIOS/ez80instr.inc
index 5026de24..6919a481 100644
--- a/Source/HBIOS/ez80instr.inc
+++ b/Source/HBIOS/ez80instr.inc
@@ -15,7 +15,6 @@
   #DEFINE EZ80_BNKSEL 	.DB	$49, $DF
 
   #DEFINE EZ80_UTIL_VER_EXCH		XOR A \ LD B, 0 \ EZ80_FN
-  #DEFINE EZ80_UTIL_HL_TO_EHL		XOR A \ LD B, 2 \ EZ80_FN
   #DEFINE EZ80_UTIL_SET_BUSTM 		XOR A \ LD B, 3 \ EZ80_FN
   #DEFINE EZ80_UTIL_SET_BUSFQ 		XOR A \ LD B, 4 \ EZ80_FN
   #DEFINE EZ80_UTIL_GET_CPU_FQ 		XOR A \ LD B, 5 \ EZ80_FN
@@ -117,6 +116,7 @@ IO_SEGMENT	.EQU		$FF		; THE UPPER 8-BIT ADDRESS FOR I/O
   #DEFCONT \ IN A, (addr)
 
 #define EZ80_CPY_EHL_TO_UHL 	CALL _EZ80_CPY_EHL_TO_UHL
+#define EZ80_CPY_UHL_TO_EHL	CALL _EZ80_CPY_UHL_TO_EHL
 
 #ELSE
   #DEFINE EZ80_IO
diff --git a/Source/HBIOS/ez80systmr.asm b/Source/HBIOS/ez80systmr.asm
index 4e73e971..580ba4a1 100644
--- a/Source/HBIOS/ez80systmr.asm
+++ b/Source/HBIOS/ez80systmr.asm
@@ -55,7 +55,7 @@ SYS_GETTIMER:
 SYS_GETSECS:
 	EZ80_TMR_GET_SECONDS()
 
-	EZ80_UTIL_HL_TO_EHL()		; E:HL{15:0} <- HL{23:0}
+	EZ80_CPY_UHL_TO_EHL		; E:HL{15:0} <- HL{23:0}
 	LD	D, 0
 	RET
 ;