diff options
author | 2016-12-29 14:34:59 -0800 | |
---|---|---|
committer | 2016-12-29 14:34:59 -0800 | |
commit | 1fafe7706cbfcfc6e39c23c3c713fbb102557cbe (patch) | |
tree | e717407aa8f98f192a2095f28909c89f3af3a8e5 /src/emu/addrmap.cpp | |
parent | f7a98c4a969478fca51faf30f588d59631394bd9 (diff) | |
parent | 2b74e4c0be91b86b408fca518af7518c1ea994c9 (diff) |
Merge https://github.com/mamedev/mame
Diffstat (limited to 'src/emu/addrmap.cpp')
-rw-r--r-- | src/emu/addrmap.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/src/emu/addrmap.cpp b/src/emu/addrmap.cpp index 24af3a1baac..31fabbea1a5 100644 --- a/src/emu/addrmap.cpp +++ b/src/emu/addrmap.cpp @@ -401,11 +401,13 @@ address_map::~address_map() void address_map::configure(address_spacenum spacenum, u8 databits) { - assert(m_spacenum == spacenum); + if (spacenum != m_spacenum) + osd_printf_error("Space %d configured as address space %d\n", m_spacenum, spacenum); + if (m_databits == 0xff) m_databits = databits; - else - assert(m_databits == databits); + else if (databits != m_databits) + osd_printf_error("Space %d configured with %d data bits when %d expected\n", m_spacenum, databits, m_databits); } |