From a0e5e36bd53ab0bc49d7127c22effa5732b09033 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Sun, 28 May 2017 20:11:44 +1000 Subject: looks like 32-bit release builds need /bigobj as well (nw) --- scripts/genie.lua | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/genie.lua b/scripts/genie.lua index fd1e50e5f82..27c6819d1b5 100644 --- a/scripts/genie.lua +++ b/scripts/genie.lua @@ -465,6 +465,9 @@ flags { } configuration { "vs*" } + buildoptions { + "/bigobj", + } flags { "NoPCH", "ExtraWarnings", @@ -482,9 +485,6 @@ configuration { "Debug", "vs*" } "Symbols", "NoIncrementalLink", } - buildoptions { - "/bigobj", - } configuration { "Release", "vs*" } flags { -- cgit v1.2.3 From 2f31991e7659c0bd84fd6d0cfd3726be9cfe4a66 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 28 May 2017 09:03:17 +0200 Subject: Fix state saving for pfunction lfsr. (nw) --- src/lib/netlist/analog/nlid_twoterm.h | 2 ++ src/lib/netlist/devices/nld_system.cpp | 2 +- src/lib/netlist/devices/nlid_system.h | 5 +++-- src/lib/netlist/plib/pfunction.cpp | 1 - src/lib/netlist/plib/pfunction.h | 17 +++++++++++++++++ 5 files changed, 23 insertions(+), 4 deletions(-) diff --git a/src/lib/netlist/analog/nlid_twoterm.h b/src/lib/netlist/analog/nlid_twoterm.h index 578d5b3b367..7778f5f4585 100644 --- a/src/lib/netlist/analog/nlid_twoterm.h +++ b/src/lib/netlist/analog/nlid_twoterm.h @@ -392,6 +392,7 @@ public: , m_R(*this, "R", 0.1) , m_V(*this, "V", 0.0) , m_func(*this,"FUNC", "") + , m_compiled(this->name() + ".FUNCC", this, this->netlist().state()) { register_subalias("P", m_P); register_subalias("N", m_N); @@ -422,6 +423,7 @@ public: NETLIB_CONSTRUCTOR_DERIVED(CS, twoterm) , m_I(*this, "I", 1.0) , m_func(*this,"FUNC", "") + , m_compiled(this->name() + ".FUNCC", this, this->netlist().state()) { register_subalias("P", m_P); register_subalias("N", m_N); diff --git a/src/lib/netlist/devices/nld_system.cpp b/src/lib/netlist/devices/nld_system.cpp index 98793c657d2..eabc4b4fbff 100644 --- a/src/lib/netlist/devices/nld_system.cpp +++ b/src/lib/netlist/devices/nld_system.cpp @@ -137,7 +137,7 @@ namespace netlist { m_vals[i] = (*m_I[i])(); } - m_Q.push(m_precompiled.evaluate(m_vals)); + m_Q.push(m_compiled.evaluate(m_vals)); } diff --git a/src/lib/netlist/devices/nlid_system.h b/src/lib/netlist/devices/nlid_system.h index 92fb91d627c..a5574706569 100644 --- a/src/lib/netlist/devices/nlid_system.h +++ b/src/lib/netlist/devices/nlid_system.h @@ -306,6 +306,7 @@ namespace netlist , m_N(*this, "N", 1) , m_func(*this, "FUNC", "A0") , m_Q(*this, "Q") + , m_compiled(this->name() + ".FUNCC", this, this->netlist().state()) { std::vector inps; for (int i=0; i < m_N(); i++) @@ -315,7 +316,7 @@ namespace netlist inps.push_back(n); m_vals.push_back(0.0); } - m_precompiled.compile(inps, m_func()); + m_compiled.compile(inps, m_func()); } protected: @@ -331,7 +332,7 @@ namespace netlist std::vector> m_I; std::vector m_vals; - plib::pfunction m_precompiled; + plib::pfunction m_compiled; }; // ----------------------------------------------------------------------------- diff --git a/src/lib/netlist/plib/pfunction.cpp b/src/lib/netlist/plib/pfunction.cpp index a1cfb8f3366..79f09cb4a46 100644 --- a/src/lib/netlist/plib/pfunction.cpp +++ b/src/lib/netlist/plib/pfunction.cpp @@ -37,7 +37,6 @@ void pfunction::compile_postfix(const std::vector &inputs, for (const pstring &cmd : cmds) { - printf("%s %d\n", cmd.c_str(), stk); rpn_inst rc; if (cmd == "+") { rc.m_cmd = ADD; stk -= 1; } diff --git a/src/lib/netlist/plib/pfunction.h b/src/lib/netlist/plib/pfunction.h index 60d85a3358c..7d5984f9d15 100644 --- a/src/lib/netlist/plib/pfunction.h +++ b/src/lib/netlist/plib/pfunction.h @@ -9,6 +9,7 @@ #define PFUNCTION_H_ #include "pstring.h" +#include "pstate.h" #include @@ -43,6 +44,22 @@ namespace plib { double m_param; }; public: + /*! Constructor with state saving support + * + * @param name Name of this object + * @param owner Owner of this object + * @param state_manager State manager to handle saving object state + * + */ + pfunction(const pstring &name, const void *owner, state_manager_t &state_manager) + : m_lfsr(0xACE1u) + { + state_manager.save_item(owner, m_lfsr, name + ".lfsr"); + } + + /*! Constructor without state saving support + * + */ pfunction() : m_lfsr(0xACE1u) { -- cgit v1.2.3 From 0bbe5945e8c6e2b003a7b578bed54127a5613b7c Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 28 May 2017 11:10:22 +0200 Subject: Fixed typo in zac1b11142 schematics. 7414/7474 combo now actually works. (nw) --- src/mame/audio/nl_zac1b11142.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/mame/audio/nl_zac1b11142.cpp b/src/mame/audio/nl_zac1b11142.cpp index 6e716788a3f..d6c2ff9bd72 100644 --- a/src/mame/audio/nl_zac1b11142.cpp +++ b/src/mame/audio/nl_zac1b11142.cpp @@ -199,7 +199,7 @@ NETLIST_START(zac1b11142_schematics) TTL_74LS14_GATE(U4A1) NET_C(ANAL5, R66.1, R67.1) - NET_C(R67.2, C28.1, R40.1, T7.B) + NET_C(R67.2, C28.1, R40.1, T6.B) NET_C(R64.2, T6.C, U3A.3) NET_C(R65.2, U3A.2, U3A.4) NET_C(U3A.1, U4A1.Q) -- cgit v1.2.3 From 59a569000441449b94eddd31d839f12e4ff8844b Mon Sep 17 00:00:00 2001 From: Robbbert Date: Sun, 28 May 2017 21:30:11 +1000 Subject: (nw) It might matter... or not. --- src/zexall/zexall.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/zexall/zexall.cpp b/src/zexall/zexall.cpp index 88de0ce0fae..629aa3fca09 100644 --- a/src/zexall/zexall.cpp +++ b/src/zexall/zexall.cpp @@ -140,7 +140,7 @@ INPUT_PORTS_END Machine Drivers ******************************************************************************/ -static MACHINE_CONFIG_START( zexall, zexall_state ) +static MACHINE_CONFIG_START( zexall ) /* basic machine hardware */ MCFG_CPU_ADD("maincpu", Z80, XTAL_3_579545MHz) MCFG_CPU_PROGRAM_MAP(z80_mem) -- cgit v1.2.3 From 57b8457889a7e1a6e83a3a4bd41ebb115f06bf2b Mon Sep 17 00:00:00 2001 From: AJR Date: Sun, 28 May 2017 22:22:41 -0400 Subject: Fix romcmp regression with identifying bits stuck high (nw) --- src/tools/romcmp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/tools/romcmp.cpp b/src/tools/romcmp.cpp index 8341353c029..6a781bc8c29 100644 --- a/src/tools/romcmp.cpp +++ b/src/tools/romcmp.cpp @@ -133,12 +133,12 @@ static void checkintegrity(const fileinfo *file, int side) { is_ascii = is_ascii && is_ascii_char(file->buf[i]); mask0 |= file->buf[i] << 8; - mask1 &= file->buf[i] << 8; + mask1 &= (file->buf[i] << 8) | 0x00ff; if (i < file->size - 1) { is_ascii = is_ascii && is_ascii_char(file->buf[i+1]); mask0 |= file->buf[i+1]; - mask1 &= file->buf[i+1]; + mask1 &= file->buf[i+1] | 0xff00; } if (mask0 == 0xffff && mask1 == 0x0000) break; } -- cgit v1.2.3 From 5c0466c0b5015e835be1299373f6c6e4851ac066 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 30 May 2017 01:37:58 +1000 Subject: fix typo (nw) --- scripts/target/mame/arcade.lua | 2 +- src/mame/audio/nl_zac1b11142.cpp | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 6be8c6aba26..b67eb59b62d 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -4222,7 +4222,7 @@ files { createMAMEProjects(_target, _subtarget, "zaccaria") files { MAME_DIR .. "src/mame/audio/nl_zac1b11142.cpp", - MAME_DIR .. "src/mame/audio/nl_zacc1b11142.h", + MAME_DIR .. "src/mame/audio/nl_zac1b11142.h", MAME_DIR .. "src/mame/audio/zaccaria.cpp", MAME_DIR .. "src/mame/audio/zaccaria.h", MAME_DIR .. "src/mame/drivers/laserbat.cpp", diff --git a/src/mame/audio/nl_zac1b11142.cpp b/src/mame/audio/nl_zac1b11142.cpp index d6c2ff9bd72..d214eeb5b95 100644 --- a/src/mame/audio/nl_zac1b11142.cpp +++ b/src/mame/audio/nl_zac1b11142.cpp @@ -34,16 +34,16 @@ NETLIST_START(zac1b11142_schematics) RES(R103, RES_K(10)) RES(R104, RES_K(120)) RES(R105, RES_K(56)) + RES(R120, RES_K(47)) RES(R122, RES_K(33)) RES(R123, RES_K(1)) + RES(R124, RES_K(39)) RES(R125, RES_K(560)) RES(R126, RES_K(470)) RES(R127, RES_K(100)) RES(R128A, RES_K(56)) // schematic has two resistors marked as R128, need PCB photo or parts list to resolve RES(R128B, 680) RES(R129, RES_K(1)) - RES(R120, RES_K(47)) - RES(R124, RES_K(39)) RES(R130, RES_K(33)) RES(R131, RES_K(150)) RES(R132, RES_K(1)) -- cgit v1.2.3 From dcc592cff49b0c301635c736886a464694bb5587 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 29 May 2017 18:59:45 +0200 Subject: namcos1.cpp: fixed MT06589 (nw) --- src/mame/drivers/namcos1.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/mame/drivers/namcos1.cpp b/src/mame/drivers/namcos1.cpp index 36d128f6def..02c96aa802d 100644 --- a/src/mame/drivers/namcos1.cpp +++ b/src/mame/drivers/namcos1.cpp @@ -2679,6 +2679,7 @@ ROM_START( puzlclub ) ROM_LOAD( "pc1-c5.bin", 0xa0000, 0x20000, CRC(bc443c27) SHA1(af841b6a2b783b0d9b9bbc33083afbb56e8bff69) ) ROM_LOAD( "pc1-c6.bin", 0xc0000, 0x20000, CRC(ec0a3dc5) SHA1(a5148e99f3198196fd635ff4ac0275393e6f7033) ) ROM_LOAD( "pc1-c7.bin", 0xe0000, 0x20000, NO_DUMP ) // title screen gfxs are here, might not exist. + ROM_FILL( 0xe0000, 0x20000, 0xff) ROM_REGION( 0x100000, "gfx3", ROMREGION_ERASEFF ) /* sprites */ /* no sprites */ -- cgit v1.2.3 From bfe8fee86d32c078c54b4e6ea82508967baad265 Mon Sep 17 00:00:00 2001 From: Ivan Vangelista Date: Mon, 29 May 2017 19:36:49 +0200 Subject: harddriv.cpp: fixed steeltal regression caused by my recent changes. Thanks Tafoid! (nw) --- src/mame/drivers/harddriv.cpp | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index e769c7c1542..1aa6f8da4b4 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -4699,9 +4699,11 @@ void harddriv_state::init_ds3() m_maincpu->space(AS_PROGRAM).install_write_handler(0x823000, 0x8237ff, write16_delegate(FUNC(harddriv_state::hd68k_ds3_sirq_clear_w), this)); m_maincpu->space(AS_PROGRAM).install_write_handler(0x823800, 0x823fff, write16_delegate(FUNC(harddriv_state::hd68k_ds3_control_w), this)); - /* predetermine memory regions, can't use a region_ptr because strtdriv expects uint8_t while hdrivair expects uint16_t */ - m_ds3_sdata_memory = (uint16_t*)memregion("ds3sdsp_data")->base(); - m_ds3_sdata_memory_size = memregion("ds3sdsp_data")->bytes() / 2; + /* predetermine memory regions, can't use a region_ptr because strtdriv expects uint8_t while hdrivair expects uint16_t, also need to check if region exists for steeltal*/ + if (memregion("ds3sdsp_data") != nullptr) + { m_ds3_sdata_memory = (uint16_t*)memregion("ds3sdsp_data")->base(); + m_ds3_sdata_memory_size = memregion("ds3sdsp_data")->bytes() / 2; + } /* @@ -5034,7 +5036,7 @@ READ32_MEMBER(harddriv_state::rddsp_unmap_r) READ16_MEMBER(harddriv_state::steeltal_dummy_r) { - /* this is required so that INT 4 is recongized as a sound INT */ + /* this is required so that INT 4 is recognized as a sound INT */ return ~0; } -- cgit v1.2.3 From a994ea3f294f83617d2d8cc606ed7c33731a1ded Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Tue, 30 May 2017 11:49:40 +1000 Subject: srcclean (nw) --- src/mame/drivers/harddriv.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/mame/drivers/harddriv.cpp b/src/mame/drivers/harddriv.cpp index 1aa6f8da4b4..c1c7d6611ab 100644 --- a/src/mame/drivers/harddriv.cpp +++ b/src/mame/drivers/harddriv.cpp @@ -4701,7 +4701,8 @@ void harddriv_state::init_ds3() /* predetermine memory regions, can't use a region_ptr because strtdriv expects uint8_t while hdrivair expects uint16_t, also need to check if region exists for steeltal*/ if (memregion("ds3sdsp_data") != nullptr) - { m_ds3_sdata_memory = (uint16_t*)memregion("ds3sdsp_data")->base(); + { + m_ds3_sdata_memory = (uint16_t *)memregion("ds3sdsp_data")->base(); m_ds3_sdata_memory_size = memregion("ds3sdsp_data")->bytes() / 2; } /* -- cgit v1.2.3 From e4c6cb15e02301f7b21c8fc155a6edeb417d25e7 Mon Sep 17 00:00:00 2001 From: Vas Crabb Date: Wed, 31 May 2017 09:08:49 +1000 Subject: version bump (nw) --- android-project/app/src/main/AndroidManifest.xml | 4 ++-- makefile | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/android-project/app/src/main/AndroidManifest.xml b/android-project/app/src/main/AndroidManifest.xml index 4dff67c4bee..e01d3befbf9 100644 --- a/android-project/app/src/main/AndroidManifest.xml +++ b/android-project/app/src/main/AndroidManifest.xml @@ -4,8 +4,8 @@ --> diff --git a/makefile b/makefile index 2d48ed5b92a..b9d4a249824 100644 --- a/makefile +++ b/makefile @@ -1546,14 +1546,14 @@ endif ifeq (posix,$(SHELLTYPE)) $(GENDIR)/version.cpp: $(GENDIR)/git_desc | $(GEN_FOLDERS) - @echo '#define BARE_BUILD_VERSION "0.185"' > $@ + @echo '#define BARE_BUILD_VERSION "0.186"' > $@ @echo 'extern const char bare_build_version[];' >> $@ @echo 'extern const char build_version[];' >> $@ @echo 'const char bare_build_version[] = BARE_BUILD_VERSION;' >> $@ @echo 'const char build_version[] = BARE_BUILD_VERSION " ($(NEW_GIT_VERSION))";' >> $@ else $(GENDIR)/version.cpp: $(GENDIR)/git_desc - @echo #define BARE_BUILD_VERSION "0.185" > $@ + @echo #define BARE_BUILD_VERSION "0.186" > $@ @echo extern const char bare_build_version[]; >> $@ @echo extern const char build_version[]; >> $@ @echo const char bare_build_version[] = BARE_BUILD_VERSION; >> $@ -- cgit v1.2.3