summaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
author Scott Stone <tafoid@users.noreply.github.com>2011-10-06 20:06:59 +0000
committer Scott Stone <tafoid@users.noreply.github.com>2011-10-06 20:06:59 +0000
commit6e04585f0d133709f4b3c6b3fbba32def05e1c75 (patch)
tree745ef62bff9e73129d276833907137942ab7b5b8
parent36b8d751c4778b2a511ddc372c09f95fd9d28fe0 (diff)
A safety check to prevent recursion (avoid drop to command-line on certain sets), fix rom_load for some adder5 sets from Haze (nw)
-rw-r--r--src/mame/drivers/bfm_sc5.c24
-rw-r--r--src/mame/drivers/mpu4.c2
2 files changed, 14 insertions, 12 deletions
diff --git a/src/mame/drivers/bfm_sc5.c b/src/mame/drivers/bfm_sc5.c
index 7c532713e10..2b9a8416129 100644
--- a/src/mame/drivers/bfm_sc5.c
+++ b/src/mame/drivers/bfm_sc5.c
@@ -3887,10 +3887,10 @@ ROM_END
ROM_START( ad5dndpl )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_REGION( 0x1000000, "adder5", ROMREGION_ERASEFF )
- ROM_LOAD16_BYTE( "39211495.bin", 0x0000, 0x1000000, CRC(d87cda50) SHA1(215776dfe2b9393f8c58bdb0e14cf21505d01ae3) )
- ROM_LOAD16_BYTE( "39212495.bin", 0x0000, 0x1000000, CRC(67c829da) SHA1(c30353c432389e5648ffb14f9ff14821e11fcf38) )
- ROM_LOAD16_BYTE( "p3314p71.bin", 0x0000, 0x1000000, CRC(56b9fa95) SHA1(d33d04089b95116da09700278a732d66eb06cf8c) )
- ROM_LOAD16_BYTE( "p3314s71.bin", 0x0000, 0x1000000, CRC(a6285e1d) SHA1(c790c12150c152e08b541521ed2e80ed2203e639) )
+ ROM_LOAD( "39211495.bin", 0x0000, 0x1000000, CRC(d87cda50) SHA1(215776dfe2b9393f8c58bdb0e14cf21505d01ae3) )
+ ROM_LOAD( "39212495.bin", 0x0000, 0x1000000, CRC(67c829da) SHA1(c30353c432389e5648ffb14f9ff14821e11fcf38) )
+ ROM_LOAD( "p3314p71.bin", 0x0000, 0x1000000, CRC(56b9fa95) SHA1(d33d04089b95116da09700278a732d66eb06cf8c) )
+ ROM_LOAD( "p3314s71.bin", 0x0000, 0x1000000, CRC(a6285e1d) SHA1(c790c12150c152e08b541521ed2e80ed2203e639) )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
ROM_LOAD( "95009108.bin", 0x0000, 0x100000, CRC(113b7f60) SHA1(62a8ca9dd9fc663971037936ddbd634273c3055f) )
ROM_LOAD( "95009109.bin", 0x0000, 0x100000, CRC(edf5a701) SHA1(3514b4a46dd921446c74c5b87a3a4b272e7b0fdb) )
@@ -3904,13 +3904,13 @@ ROM_END
ROM_START( ad5eyes )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_REGION( 0x1000000, "adder5", ROMREGION_ERASEFF )
- ROM_LOAD16_BYTE( "39211248.bin", 0x0000, 0x4d88b4, CRC(a2b799c9) SHA1(9088de779c31d33d9f1eb83e46ec28c30181a0fc) )
- ROM_LOAD16_BYTE( "39211256.bin", 0x0000, 0x4d8648, CRC(de99153a) SHA1(42e00c847effc60130451e19328cd36cfba1cc76) )
- ROM_LOAD16_BYTE( "39211264.bin", 0x0000, 0x4d546c, CRC(73602540) SHA1(2418628a565504281d7a50879fc8ed6bcec73f8b) )
- ROM_LOAD16_BYTE( "39212246.bin", 0x0000, 0x4d858a, CRC(028d59c7) SHA1(75b0643ec51dc02c678cf3aa034dd1be88fea67f) )
- ROM_LOAD16_BYTE( "39212248.bin", 0x0000, 0x4d88b4, CRC(25c68cad) SHA1(f80b0ee24187e8c55c4aa66687ba378f3f7d24ea) )
- ROM_LOAD16_BYTE( "39212256.bin", 0x0000, 0x4d8648, CRC(94150812) SHA1(b3839e90e99bfa7ed4e3a1401db99e42d4f58642) )
- ROM_LOAD16_BYTE( "39212264.bin", 0x0000, 0x4d546c, CRC(a6ec1842) SHA1(e4ce5d53d140a00e2d620eece6d182b201662b61) )
+ ROM_LOAD( "39211248.bin", 0x0000, 0x4d88b4, CRC(a2b799c9) SHA1(9088de779c31d33d9f1eb83e46ec28c30181a0fc) )
+ ROM_LOAD( "39211256.bin", 0x0000, 0x4d8648, CRC(de99153a) SHA1(42e00c847effc60130451e19328cd36cfba1cc76) )
+ ROM_LOAD( "39211264.bin", 0x0000, 0x4d546c, CRC(73602540) SHA1(2418628a565504281d7a50879fc8ed6bcec73f8b) )
+ ROM_LOAD( "39212246.bin", 0x0000, 0x4d858a, CRC(028d59c7) SHA1(75b0643ec51dc02c678cf3aa034dd1be88fea67f) )
+ ROM_LOAD( "39212248.bin", 0x0000, 0x4d88b4, CRC(25c68cad) SHA1(f80b0ee24187e8c55c4aa66687ba378f3f7d24ea) )
+ ROM_LOAD( "39212256.bin", 0x0000, 0x4d8648, CRC(94150812) SHA1(b3839e90e99bfa7ed4e3a1401db99e42d4f58642) )
+ ROM_LOAD( "39212264.bin", 0x0000, 0x4d546c, CRC(a6ec1842) SHA1(e4ce5d53d140a00e2d620eece6d182b201662b61) )
ROM_REGION( 0x5000, "pics", 0 )
ROM_LOAD( "95890303.bin", 0x0000, 0x5000, CRC(dd0d9672) SHA1(5cf162e77b2b395138e02aca3ac9327ffb08e3e4) )
ROM_LOAD( "95890304.bin", 0x0000, 0x5000, CRC(c1db66ce) SHA1(e45846411d347cad74135a1392b7ce3df2407b07) )
@@ -4186,7 +4186,7 @@ ROM_END
ROM_START( ad5tornc )
ROM_REGION( 0x400000, "maincpu", ROMREGION_ERASEFF )
ROM_REGION( 0x400000, "ymz", ROMREGION_ERASE00 )
- ROM_LOAD16_BYTE( "95008564.bin", 0x0000, 0x100000, CRC(55d0d855) SHA1(343cfe935c34c8f95a638eccb1397238fa7698e4) )
+ ROM_LOAD( "95008564.bin", 0x0000, 0x100000, CRC(55d0d855) SHA1(343cfe935c34c8f95a638eccb1397238fa7698e4) )
ROM_REGION( 0x1000000, "adder5", ROMREGION_ERASE00 )
ROM_LOAD( "39211114.bin", 0x0000, 0x1000000, CRC(f218d87b) SHA1(230038ee52d47dde9669a6fd3a363264f222f1f8) )
diff --git a/src/mame/drivers/mpu4.c b/src/mame/drivers/mpu4.c
index 247d4c41e83..27a84616bb1 100644
--- a/src/mame/drivers/mpu4.c
+++ b/src/mame/drivers/mpu4.c
@@ -2438,6 +2438,8 @@ static READ8_HANDLER( characteriser_r )
/* a cheat ... many early games use a standard check */
int addr = cpu_get_reg(&space->device(), M6809_X);
+ if ((addr>=0x800) && (addr<=0xfff)) return 0x00; // prevent recursion, only care about ram/rom areas for this cheat.
+
UINT8 ret = space->read_byte(addr);
logerror(" (returning %02x)",ret);