summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Olivier Galibert <galibert@pobox.com>2019-12-22 19:14:34 +0100
committer Olivier Galibert <galibert@pobox.com>2019-12-22 19:19:47 +0100
commit82b55d52d25bf5fe092c06fc61264b630412f3a5 (patch)
treeb38b921fdef9a7c28182a03341cc4d6c988180cf
parent97ffaac9b5a8f5da33d06253b9754b6aeaa5d957 (diff)
vf: More fixes, works even worse, it's getting annoying (nw)
-rw-r--r--src/devices/machine/gen_fifo.cpp6
-rw-r--r--src/mame/drivers/model1.cpp2
2 files changed, 7 insertions, 1 deletions
diff --git a/src/devices/machine/gen_fifo.cpp b/src/devices/machine/gen_fifo.cpp
index bcbd3f54201..10fcf37429c 100644
--- a/src/devices/machine/gen_fifo.cpp
+++ b/src/devices/machine/gen_fifo.cpp
@@ -107,6 +107,12 @@ template<typename T> void generic_fifo_device_base<T>::device_timer(emu_timer &t
template<typename T> T generic_fifo_device_base<T>::pop()
{
+ if(machine().side_effects_disabled()) {
+ if(is_empty())
+ return T();
+ return m_values.front();
+ }
+
// Are we empty?
if(is_empty()) {
// First, trigger the sync
diff --git a/src/mame/drivers/model1.cpp b/src/mame/drivers/model1.cpp
index ed4d4a30923..8ecb85a0700 100644
--- a/src/mame/drivers/model1.cpp
+++ b/src/mame/drivers/model1.cpp
@@ -1188,7 +1188,7 @@ ROM_START( vf )
ROM_LOAD16_BYTE( "mpr-16091.13", 0x1300001, 0x80000, CRC(53115448) SHA1(af798d5b1fcb720d7288a5ac48839d9ace16a2f2) )
ROM_REGION32_LE( 0x2000, "tgp_copro", 0)
- ROM_LOAD("315-5724.bin", 0, 0x2000, CRC(50eb39d4) SHA1(e5411e80c95a6de16b4649cd01a7b8d8f99dc590) BAD_DUMP )
+ ROM_LOAD("315-5724.bin", 0, 0x2000, CRC(a56d0cf9) SHA1(8280a52b9de76c3f06754206f9b7fe88c4673cc3) BAD_DUMP )
ROM_REGION( 0xc0000, M1AUDIO_CPU_REGION, ROMREGION_BE|ROMREGION_16BIT ) /* 68K code */
ROM_LOAD16_WORD_SWAP( "epr-16120.7", 0x00000, 0x20000, CRC(2bff8378) SHA1(854b08ab983e4e98cb666f2f44de9a6829b1eb52) )