summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Pavone <pavone@retrodev.com>2019-02-19 23:14:38 -0800
committerMichael Pavone <pavone@retrodev.com>2019-02-19 23:14:38 -0800
commit9f88d5f4a180bf9841dc0fbfdcb788bbbe66ce89 (patch)
treec195899e0472279ece3e390a280671b00e32181e
parent0fe137cd6fee46393191331627a58b379c06131d (diff)
Fix implementation of halt in new Z80 core
-rw-r--r--z80.cpu15
1 files changed, 15 insertions, 0 deletions
diff --git a/z80.cpu b/z80.cpu
index 7772538..4e422f6 100644
--- a/z80.cpu
+++ b/z80.cpu
@@ -1545,7 +1545,22 @@ ed 01DDD100 neg
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