changeset 1763:7e97d820b491

Fix implementation of halt in new Z80 core
author Michael Pavone <pavone@retrodev.com>
date Tue, 19 Feb 2019 23:14:38 -0800
parents 057198058196
children 6cc2fa6a1955
files z80.cpu
diffstat 1 files changed, 15 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/z80.cpu	Tue Feb 19 22:59:30 2019 -0800
+++ b/z80.cpu	Tue Feb 19 23:14:38 2019 -0800
@@ -1545,7 +1545,22 @@
 00000000 nop
 
 01110110 halt
+	cmp nmi_cycle cycles
+	if >=U
+	
+	else
+	cmp int_cycle cycles
+	if >=U
+	
+	if iff1
+	else
 	sub 1 pc pc
+	end
+	
+	else
+	sub 1 pc pc
+	end
+	end
 
 11110011 di
 	mov 0 iff1