summaryrefslogtreecommitdiffstats
path: root/src/mame/drivers/apollo.cpp
diff options
context:
space:
mode:
author Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
committer Firehawke <Firehawke@users.noreply.github.com>2017-12-13 21:01:10 -0700
commit54155441e9ba9941e85d80c4834a66376a11e791 (patch)
treeaa44bdaf0035cbe188d64c447f225f10f7d76d8d /src/mame/drivers/apollo.cpp
parentf537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4 (diff)
Revert "Merge branch 'master' of https://github.com/mamedev/mame"
This reverts commit f537428e5a40ba6dde8ca9bf0fe9ae6b1f189ac4, reversing changes made to 0d70d798107d4e4e8fb9f230410aeb1e888d65c5.
Diffstat (limited to 'src/mame/drivers/apollo.cpp')
-rw-r--r--src/mame/drivers/apollo.cpp9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/mame/drivers/apollo.cpp b/src/mame/drivers/apollo.cpp
index f175fff6fd1..ce9ec5b76ad 100644
--- a/src/mame/drivers/apollo.cpp
+++ b/src/mame/drivers/apollo.cpp
@@ -29,7 +29,7 @@
#include "includes/apollo.h"
-#include "cpu/m68000/m68000.h"
+#include "cpu/m68000/m68kcpu.h"
#include "sound/beep.h"
// we use set_verbose
@@ -212,7 +212,6 @@ uint8_t apollo_get_ram_config_byte(void) {
return ram_config_byte;
}
-#if 0
/***************************************************************************
apollo_instruction_hook
must be called by the CPU core before executing each instruction
@@ -265,8 +264,6 @@ READ32_MEMBER(apollo_state::apollo_instruction_hook)
return apollo_debug_instruction_hook(m_maincpu, offset);
}
-#endif
-
/***************************************************************************
apollo bus error
***************************************************************************/
@@ -498,7 +495,7 @@ READ32_MEMBER(apollo_state::apollo_unmapped_r)
} else if (address == 0x0000ac00 && VERBOSE < 2) {
// omit logging for Bus error test address in DN3000 boot prom
} else {
- SLOG1(("unmapped memory dword read from %08x with mask %08x (ir=%04x)", address , mem_mask, m68k->state_int(M68K_IR)));
+ SLOG1(("unmapped memory dword read from %08x with mask %08x (ir=%04x)", address , mem_mask, m68k->ir));
}
/* unmapped; access causes a bus error */
@@ -923,9 +920,7 @@ void apollo_state::machine_reset()
m_node_id->set_node_id_from_disk();
}
-#if 0
m_maincpu->set_instruction_hook(read32_delegate(FUNC(apollo_state::apollo_instruction_hook),this));
-#endif
}
WRITE_LINE_MEMBER(apollo_state::apollo_reset_instr_callback)