From 95318ad8353299dc38a34dd0240900f22e9bc5cc Mon Sep 17 00:00:00 2001 From: cracyc Date: Sat, 21 Dec 2019 22:31:02 -0600 Subject: i386: feni and fdisi are nops on the 387+ (nw) --- src/devices/cpu/i386/x87ops.hxx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/devices/cpu/i386/x87ops.hxx b/src/devices/cpu/i386/x87ops.hxx index c9503732784..52b1a00ea0c 100644 --- a/src/devices/cpu/i386/x87ops.hxx +++ b/src/devices/cpu/i386/x87ops.hxx @@ -5225,6 +5225,8 @@ void i386_device::build_x87_opcode_table_db() case 0xc8: case 0xc9: case 0xca: case 0xcb: case 0xcc: case 0xcd: case 0xce: case 0xcf: ptr = &i386_device::x87_fcmovne_sti; break; case 0xd0: case 0xd1: case 0xd2: case 0xd3: case 0xd4: case 0xd5: case 0xd6: case 0xd7: ptr = &i386_device::x87_fcmovnbe_sti; break; case 0xd8: case 0xd9: case 0xda: case 0xdb: case 0xdc: case 0xdd: case 0xde: case 0xdf: ptr = &i386_device::x87_fcmovnu_sti; break; + case 0xe0: ptr = &i386_device::x87_fnop; break; /* FENI */ + case 0xe1: ptr = &i386_device::x87_fnop; break; /* FDISI */ case 0xe2: ptr = &i386_device::x87_fclex; break; case 0xe3: ptr = &i386_device::x87_finit; break; case 0xe4: ptr = &i386_device::x87_fnop; break; /* FSETPM */ -- cgit v1.2.3 From 548f1cde7b3f81ec76f73e5afc856fba417e1517 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 22 Dec 2019 19:14:34 +0100 Subject: vf: More fixes, works even worse, it's getting annoying (nw) --- src/devices/machine/gen_fifo.cpp | 6 ++++++ src/mame/drivers/model1.cpp | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) 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 void generic_fifo_device_base::device_timer(emu_timer &t template T generic_fifo_device_base::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) ) -- cgit v1.2.3 From cbb6ac9e35dc6a3698e4475ac3225eef11430ed6 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 22 Dec 2019 19:33:46 +0100 Subject: model1: Clear up some stuff I had forgotten to remove (nw) --- src/mame/includes/model1.h | 19 ------------------- src/mame/machine/model1.cpp | 5 +---- 2 files changed, 1 insertion(+), 23 deletions(-) diff --git a/src/mame/includes/model1.h b/src/mame/includes/model1.h index ea9acbb8b0e..a18ca212966 100644 --- a/src/mame/includes/model1.h +++ b/src/mame/includes/model1.h @@ -356,25 +356,6 @@ private: DECLARE_WRITE8_MEMBER(wingwar360_outputs_w); DECLARE_WRITE8_MEMBER(netmerc_outputs_w); DECLARE_WRITE8_MEMBER(drive_board_w); - - struct racc { - u32 adr; - u32 val; - bool write; - }; - - std::function check_hle; - int count; - int m_check_fipos, m_check_rampos; - std::vector m_check_fi; - std::vector m_check_fo; - std::vector m_check_pfi; - std::vector> m_check_pfo; - std::vector m_check_ram; - std::vector m_check_pram; - void check(); - u32 hle_ram_r(u32 address); - void hle_ram_w(u32 address, u32 data); }; #endif // MAME_INCLUDES_MODEL1_H diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index 123b46c97a7..09682d3bb4a 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -156,7 +156,6 @@ READ32_MEMBER(model1_state::copro_ramadr_r) WRITE32_MEMBER(model1_state::copro_ramdata_w) { - m_check_pram.emplace_back(racc{ m_copro_ram_adr[offset >> 3], data, true }); COMBINE_DATA(&m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]); m_copro_ram_adr[offset >> 3] ++; } @@ -164,10 +163,8 @@ WRITE32_MEMBER(model1_state::copro_ramdata_w) READ32_MEMBER(model1_state::copro_ramdata_r) { u32 val = m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]; - if(!machine().side_effects_disabled()) { - m_check_pram.emplace_back(racc{ m_copro_ram_adr[offset >> 3], val, false }); + if(!machine().side_effects_disabled()) m_copro_ram_adr[offset >> 3] ++; - } return val; } -- cgit v1.2.3 From 0b842fc428b4e3e82b6e1215bec1fbc45ecba936 Mon Sep 17 00:00:00 2001 From: Olivier Galibert Date: Sun, 22 Dec 2019 20:19:58 +0100 Subject: vf: Hack to get rid of the ram collisions makes things work... (nw) --- src/mame/machine/model1.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/mame/machine/model1.cpp b/src/mame/machine/model1.cpp index 09682d3bb4a..5cf0749eb53 100644 --- a/src/mame/machine/model1.cpp +++ b/src/mame/machine/model1.cpp @@ -156,13 +156,17 @@ READ32_MEMBER(model1_state::copro_ramadr_r) WRITE32_MEMBER(model1_state::copro_ramdata_w) { - COMBINE_DATA(&m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]); + if(m_copro_ram_adr[offset >> 3] & 0x40000) { + COMBINE_DATA(&m_copro_ram_data[0x1000 | (m_copro_ram_adr[offset >> 3] & 0x1fff)]); + } else { + COMBINE_DATA(&m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]); + } m_copro_ram_adr[offset >> 3] ++; } READ32_MEMBER(model1_state::copro_ramdata_r) { - u32 val = m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]; + u32 val = (m_copro_ram_adr[offset >> 3] & 0x40000) ? m_copro_ram_data[0x1000 | (m_copro_ram_adr[offset >> 3] & 0x1fff)] : m_copro_ram_data[m_copro_ram_adr[offset >> 3] & 0x1fff]; if(!machine().side_effects_disabled()) m_copro_ram_adr[offset >> 3] ++; return val; -- cgit v1.2.3 From 0644f3cf57ccf467ca8acbda32a433d8c0acdfbd Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Mon, 23 Dec 2019 16:49:10 +1100 Subject: small cleanups (nw) --- hash/c64_flop_misc.xml | 8 ++++---- hash/pce.xml | 42 +++++++++++++++++++++--------------------- hash/samcoupe_cass.xml | 2 +- src/mame/drivers/at.cpp | 2 +- src/mame/drivers/bnstars.cpp | 2 +- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/hash/c64_flop_misc.xml b/hash/c64_flop_misc.xml index e116cb2bf2d..b911be92675 100644 --- a/hash/c64_flop_misc.xml +++ b/hash/c64_flop_misc.xml @@ -343,7 +343,7 @@ - Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt) + Commodore 1541 Floppy Disk Drive Test/Demo Disk (alt) 1984 Commodore @@ -355,7 +355,7 @@ - Commodore 1541 Floppy Disk Drive Test/Demo Disk (Alt 2) + Commodore 1541 Floppy Disk Drive Test/Demo Disk (alt 2) 1985 Commodore @@ -652,7 +652,7 @@ - Commodore 64 CP/M Cartridge Boot Disk (Alt) + Commodore 64 CP/M Cartridge Boot Disk (alt) 1982 Commodore @@ -665,7 +665,7 @@ - Commodore 64 CP/M Cartridge Boot Disk (Alt 2) + Commodore 64 CP/M Cartridge Boot Disk (alt 2) 1982 Commodore diff --git a/hash/pce.xml b/hash/pce.xml index 5006472e479..d00aee8dd3a 100644 --- a/hash/pce.xml +++ b/hash/pce.xml @@ -279,7 +279,7 @@ - Benkei Gaiden (Alt) + Benkei Gaiden (alt) 1989 Sunsoft @@ -307,7 +307,7 @@ - Bikkuriman World (Alt) + Bikkuriman World (alt) 1987 Hudson @@ -550,7 +550,7 @@ - Chikudenya Toubei - Kubikiri Yakata Yori (Alt) + Chikudenya Toubei - Kubikiri Yakata Yori (alt) 1990 Naxat @@ -634,7 +634,7 @@ - Coryoon - Child of Dragon (Alt) + Coryoon - Child of Dragon (alt) 1991 Naxat @@ -910,7 +910,7 @@ - Download (Alt) + Download (alt) 1990 NEC Avenue @@ -952,7 +952,7 @@ - Dragon Saber - After Story of Dragon Spirit (Alt) + Dragon Saber - After Story of Dragon Spirit (alt) 1991 Namcot @@ -994,7 +994,7 @@ - Drop Rock Hora Hora (Alt) + Drop Rock Hora Hora (alt) 1990 Data East @@ -1106,7 +1106,7 @@ - F1 Circus (Alt) + F1 Circus (alt) 1990 Nihon Bussan @@ -1699,7 +1699,7 @@ - Jinmu Denshou (Alt) + Jinmu Denshou (alt) 1989 Big Club @@ -1727,7 +1727,7 @@ - Juuouki (Alt) + Juuouki (alt) 1989 NEC @@ -1956,7 +1956,7 @@ - Lady Sword (Alt) + Lady Sword (alt) 19?? Game Express @@ -2051,7 +2051,7 @@ - Mahjong Gakuen Mild - Touma Soushirou Toujou (Alt) + Mahjong Gakuen Mild - Touma Soushirou Toujou (alt) 1990 Face @@ -2345,7 +2345,7 @@ - Moto Roader II (Alt) + Moto Roader II (alt) 1991 Masiya @@ -2373,7 +2373,7 @@ - Mr. Heli no Daibouken (Alt) + Mr. Heli no Daibouken (alt) 1989 Irem @@ -2803,7 +2803,7 @@ - PC Denjin - Punkic Cyborgs (Alt) + PC Denjin - Punkic Cyborgs (alt) 1992 Hudson @@ -2831,7 +2831,7 @@ - PC Genjin - Pithecanthropus Computerurus (Alt) + PC Genjin - Pithecanthropus Computerurus (alt) 1989 Hudson @@ -2911,7 +2911,7 @@ - Populous (Alt) + Populous (alt) 1991 Hudson @@ -2940,7 +2940,7 @@ - Power Drift (Alt) + Power Drift (alt) 1990 Asmik @@ -3243,7 +3243,7 @@ - R-Type Part-2 (Alt) + R-Type Part-2 (alt) 1988 Hudson @@ -3839,7 +3839,7 @@ - Takeda Shingen (Alt) + Takeda Shingen (alt) 1989 Aicom @@ -3867,7 +3867,7 @@ - Tatsujin (Prototype) + Tatsujin (prototype) 1992 Taito diff --git a/hash/samcoupe_cass.xml b/hash/samcoupe_cass.xml index 25e50a17d91..051a3a851c3 100644 --- a/hash/samcoupe_cass.xml +++ b/hash/samcoupe_cass.xml @@ -25,7 +25,7 @@ - F-16 Combat Pilot (Demo) + F-16 Combat Pilot (demo) 1991 Digital Integration diff --git a/src/mame/drivers/at.cpp b/src/mame/drivers/at.cpp index 0b29c6cd8cd..7a8e37e38b2 100644 --- a/src/mame/drivers/at.cpp +++ b/src/mame/drivers/at.cpp @@ -2374,7 +2374,7 @@ ROM_START( at386 ) // BIOS-String: MR BIOS (r) V1.41 / 386DX CPU - the notes also say it comes from a DX motherboard, so sorted here ROM_SYSTEM_BIOS( 15, "acer310", "Acer 310" ) ROMX_LOAD( "3alr001.bin", 0x10000, 0x10000, CRC(b45e5c73) SHA1(81ef79faed3914ccff23b3da5e831d7a99626538), ROM_BIOS(15)) -// 16: BIOS-String: 30-0200-ZZ1453-00101111-050591-SCAT3.04-0 + // 16: BIOS-String: 30-0200-ZZ1453-00101111-050591-SCAT3.04-0 ROM_SYSTEM_BIOS( 16, "kmxc02", "KMX-C-02" ) ROMX_LOAD( "3ctm005.bin", 0x10000, 0x10000, CRC(cfba6b2a) SHA1(001642016a3c02b031d739bd8b0fcff9470e86d2), ROM_BIOS(16)) // 17: BIOS: AMI; 11/11/92 - ISA16: 5 - CPU/FPU: Am386DX-40, IIT 3C87-40 - Chipset: FOREX FRX46C521, KS83C206Q diff --git a/src/mame/drivers/bnstars.cpp b/src/mame/drivers/bnstars.cpp index ddc8e4709fc..99a690d1256 100644 --- a/src/mame/drivers/bnstars.cpp +++ b/src/mame/drivers/bnstars.cpp @@ -797,7 +797,7 @@ void bnstars_state::bnstars(machine_config &config) TIMER(config, "scantimer").configure_scanline(FUNC(bnstars_state::ms32_interrupt), "lscreen", 0, 1); - Z80(config, m_audiocpu, XTAL(8'000'000)); // 8MHz presented on sound PCB, Verified + Z80(config, m_audiocpu, XTAL(8'000'000)); // 8MHz present on sound PCB, Verified m_audiocpu->set_addrmap(AS_PROGRAM, &bnstars_state::bnstars_sound_map); config.set_maximum_quantum(attotime::from_hz(60000)); -- cgit v1.2.3