From 8fe74d5267480b85c66b1e290c7acea0e987f689 Mon Sep 17 00:00:00 2001 From: Nathan Woods Date: Sun, 30 Oct 2016 11:11:33 -0400 Subject: [PATCH] Fixed a recently introduced bug in the 6x09 disassembler that could cause asserts when hitting what would be a legal 6309 instruction when disassembling non-6309 code --- src/devices/cpu/m6809/6x09dasm.cpp | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/devices/cpu/m6809/6x09dasm.cpp b/src/devices/cpu/m6809/6x09dasm.cpp index b409ee0a2dd..2efd49e352c 100644 --- a/src/devices/cpu/m6809/6x09dasm.cpp +++ b/src/devices/cpu/m6809/6x09dasm.cpp @@ -167,6 +167,11 @@ const opcodeinfo *m6x09_disassembler_base::fetch_opcode(const uint8_t *oprom, in break; } }; + + // is this an HD6309 exclusive instruction, and we're not HD6309? if so, reject it + if (op && (op->level() > m_level)) + op = nullptr; + return op; }