X-Git-Url: http://cloudbase.mooo.com/gitweb/avrcpm.git/blobdiff_plain/80e1fa71b367c67c81ac4e82d703a469818d21e6..d8fa6a36ffba80be398c90641b3e7e7a79d56d43:/avr/utils.asm

diff --git a/avr/utils.asm b/avr/utils.asm
index 4bbc33d..155c027 100644
--- a/avr/utils.asm
+++ b/avr/utils.asm
@@ -212,16 +212,16 @@ printregs:
 	mov	temp,z_a
 	rcall	printhex	
 	printstring " BC ="
-	lds	temp2,z_b
-	lds	temp, z_c
+	ldd	temp2,y+oz_b
+	ldd	temp,y+oz_c
 	rcall	printhexw
 	printstring " DE ="
-	lds	temp2,z_d
-	lds	temp, z_e
+	ldd	temp2,y+oz_d
+	ldd	temp,y+oz_e
 	rcall	printhexw
 	printstring " HL ="
-	lds	temp2,z_h
-	lds	temp, z_l
+	ldd	temp2,y+oz_h
+	ldd	temp,y+oz_l
 	rcall	printhexw
 	printstring " SP="
 	movw	temp, z_spl
@@ -231,46 +231,44 @@ printregs:
 	rcall	printhexw
 	printstring "       "
 	movw 	xl,z_pcl
-	mem_read
+	lcall	dram_read_pp
 	rcall	printhex
 	printstring " "
-	adiw	x,1
-	mem_read
+	lcall	dram_read_pp
 	rcall	printhex
 	printstring " "
-	adiw	x,1
-	mem_read
+	lcall	dram_read
 	rcall	printhex
 	printstring " "
 
 #if EM_Z80
-	lds	temp,z_flags2
+	ldd	temp,y+oz_f2
 	rcall	printflags
-	printstring "  A'="
-	lds	temp,z_a2
+	printstring "  a'="
+	ldd	temp,y+oz_a2
 	rcall	printhex	
-	printstring " BC'="
-	lds	temp2,z_b2
-	lds	temp, z_c2
+	printstring " bc'="
+	ldd	temp2,y+oz_b2
+	ldd	temp,y+oz_c2
 	rcall	printhexw
-	printstring " DE'="
-	lds	temp2,z_d2
-	lds	temp, z_e2
+	printstring " de'="
+	ldd	temp2,y+oz_d2
+	ldd	temp,y+oz_e2
 	rcall	printhexw
-	printstring " HL'="
-	lds	temp2,z_h2
-	lds	temp, z_l2
+	printstring " hl'="
+	ldd	temp2,y+oz_h2
+	ldd	temp,y+oz_l2
 	rcall	printhexw
 	printstring " IX="
-	lds	temp2,z_xh
-	lds	temp, z_xl
+	ldd	temp2,y+oz_xh
+	ldd	temp,y+oz_xl
 	rcall	printhexw
 	printstring " IY="
-	lds	temp2,z_yh
-	lds	temp, z_yl
+	ldd	temp2,y+oz_yh
+	ldd	temp,y+oz_yl
 	rcall	printhexw
 	printstring " I="
-	lds	temp,z_i
+	ldd	temp,y+oz_i
 	rcall	printhex	
 
 	printstring "       "