6502/EightBit
1
0
Fork 0
mirror of https://github.com/MoleskiCoder/EightBit.git synced 2025-08-09 00:25:10 +00:00
Code Issues Projects Releases Wiki Activity

Correct problematic continuation from "halt" on Z80.

Browse Source 
Signed-off-by: Adrian Conlon <Adrian.conlon@gmail.com>
This commit is contained in:
Adrian Conlon
2019-08-28 23:06:56 +01:00
parent 4b0cf426b9
commit 2efd53d33a
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Z80/src/Z80.cpp
View File

@@ -56,7 +56,8 @@ void EightBit::Z80::handleRESET() {
void EightBit::Z80::handleNMI() { void EightBit::Z80::handleNMI() {
raiseNMI(); raiseNMI();
raiseHALT(); if (halted())
proceed();
IFF1() = false; IFF1() = false;
restart(0x66); restart(0x66);
tick(13); tick(13);
@@ -64,7 +65,8 @@ void EightBit::Z80::handleNMI() {
void EightBit::Z80::handleINT() { void EightBit::Z80::handleINT() {
IntelProcessor::handleINT(); IntelProcessor::handleINT();
raiseHALT(); if (halted())
proceed();
if (IFF1()) { if (IFF1()) {
di(); di();
switch (IM()) { switch (IM()) {