From 63e595ae364a6f9e6b3692af673d1a0c48523f2d Mon Sep 17 00:00:00 2001 From: hap Date: Fri, 10 Jun 2022 15:27:03 +0200 Subject: [PATCH] pong: remove obsolete external version --- scripts/target/mame/arcade.lua | 4 +-- scripts/target/mame/nl.lua | 4 +-- src/lib/netlist/build/makefile | 2 +- src/lib/netlist/generated/static_solvers.cpp | 12 +++---- src/lib/netlist/nl_config.h | 2 +- src/lib/netlist/plib/ppmf.h | 2 +- src/mame/drivers/pong.cpp | 32 +++---------------- .../machine/{nl_pongf.cpp => nl_pong.cpp} | 4 +-- src/mame/machine/{nl_pongf.h => nl_pong.h} | 2 +- src/mame/mame.lst | 1 - src/mame/nl.lst | 1 - 11 files changed, 20 insertions(+), 46 deletions(-) rename src/mame/machine/{nl_pongf.cpp => nl_pong.cpp} (99%) rename src/mame/machine/{nl_pongf.h => nl_pong.h} (70%) diff --git a/scripts/target/mame/arcade.lua b/scripts/target/mame/arcade.lua index 11a356b4a3c..c3edab375b5 100644 --- a/scripts/target/mame/arcade.lua +++ b/scripts/target/mame/arcade.lua @@ -1319,8 +1319,8 @@ files { MAME_DIR .. "src/mame/audio/orbit.cpp", MAME_DIR .. "src/mame/video/orbit.cpp", MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pongf.cpp", - MAME_DIR .. "src/mame/machine/nl_pongf.h", + MAME_DIR .. "src/mame/machine/nl_pong.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.h", MAME_DIR .. "src/mame/machine/nl_pongdoubles.cpp", MAME_DIR .. "src/mame/machine/nl_pongdoubles.h", MAME_DIR .. "src/mame/machine/nl_breakout.cpp", diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index c250fef9d3b..aae35d0f243 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -146,8 +146,8 @@ function createProjects_mame_nl(_target, _subtarget) files{ MAME_DIR .. "src/mame/drivers/pong.cpp", - MAME_DIR .. "src/mame/machine/nl_pongf.cpp", - MAME_DIR .. "src/mame/machine/nl_pongf.h", + MAME_DIR .. "src/mame/machine/nl_pong.cpp", + MAME_DIR .. "src/mame/machine/nl_pong.h", MAME_DIR .. "src/mame/machine/nl_pongdoubles.cpp", MAME_DIR .. "src/mame/machine/nl_pongdoubles.h", MAME_DIR .. "src/mame/machine/nl_breakout.cpp", diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index 728582dd0e0..d0b13693686 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -290,7 +290,7 @@ gcc9: $(MAKE) CC=g++-9 LD=g++-9 CEXTRAFLAGS="-march=native -Wall -pedantic -Wpedantic -fext-numeric-literals -Wsign-compare -Wextra" EXTRALIBS="-lquadmath" OBJ=obj/gcc9 emsdk: - emmake $(MAKE) CC=emcc LD=emcc CEXTRAFLAGS="-fexceptions -msimd128" LDEXTRAFLAGS="-s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -fexceptions -msimd128 --emrun --embed-file ../../../mame/machine/nl_pongf.cpp@nl_pongf.cpp --embed-file ../../../mame/audio/nl_kidniki.cpp@nl_kidniki.cpp" OBJ=obj/emsdk EXESUFFIX=.html + emmake $(MAKE) CC=emcc LD=emcc CEXTRAFLAGS="-fexceptions -msimd128" LDEXTRAFLAGS="-s ALLOW_MEMORY_GROWTH=0 -s TOTAL_MEMORY=268435456 -fexceptions -msimd128 --emrun --embed-file ../../../mame/machine/nl_pong.cpp@nl_pong.cpp --embed-file ../../../mame/audio/nl_kidniki.cpp@nl_kidniki.cpp" OBJ=obj/emsdk EXESUFFIX=.html # LDFLAGS -s ASSERTIONS=1 clang: diff --git a/src/lib/netlist/generated/static_solvers.cpp b/src/lib/netlist/generated/static_solvers.cpp index aab9bedc898..edfb3233632 100644 --- a/src/lib/netlist/generated/static_solvers.cpp +++ b/src/lib/netlist/generated/static_solvers.cpp @@ -43299,7 +43299,7 @@ static void nl_gcr_62_double_double_afce66fb47d3c5f3(double * __restrict V, cons V[0] = (RHS0 - tmp0) / m_A0; } -// pongf +// pong static void nl_gcr_10_double_double_13e7b5ac1a260dbf(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV) { @@ -43375,7 +43375,7 @@ static void nl_gcr_10_double_double_13e7b5ac1a260dbf(double * __restrict V, cons V[0] = (RHS0 - tmp0) / m_A0; } -// pongf +// pong static void nl_gcr_35_double_double_dbafc5ddaf7a08f8(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV) { @@ -43621,7 +43621,7 @@ static void nl_gcr_35_double_double_dbafc5ddaf7a08f8(double * __restrict V, cons V[0] = (RHS0 - tmp0) / m_A0; } -// pongf +// pong static void nl_gcr_7_double_double_e51b463cd890ef6d(double * __restrict V, const double * __restrict go, const double * __restrict gt, const double * __restrict Idr, const double * const * __restrict cnV) { @@ -80369,11 +80369,11 @@ const plib::static_library::symbol nl_static_solver_syms[] = { {"nl_gcr_29_double_double_80b4b1e5cc58d303", reinterpret_cast(&nl_gcr_29_double_double_80b4b1e5cc58d303)}, // NOLINT // mario {"nl_gcr_62_double_double_afce66fb47d3c5f3", reinterpret_cast(&nl_gcr_62_double_double_afce66fb47d3c5f3)}, // NOLINT -// pongf +// pong {"nl_gcr_10_double_double_13e7b5ac1a260dbf", reinterpret_cast(&nl_gcr_10_double_double_13e7b5ac1a260dbf)}, // NOLINT -// pongf +// pong {"nl_gcr_35_double_double_dbafc5ddaf7a08f8", reinterpret_cast(&nl_gcr_35_double_double_dbafc5ddaf7a08f8)}, // NOLINT -// pongf +// pong {"nl_gcr_7_double_double_e51b463cd890ef6d", reinterpret_cast(&nl_gcr_7_double_double_e51b463cd890ef6d)}, // NOLINT // popeye {"nl_gcr_50_double_double_c6f25bb06e161d1c", reinterpret_cast(&nl_gcr_50_double_double_c6f25bb06e161d1c)}, // NOLINT diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h index 005f8a30252..1559589606d 100644 --- a/src/lib/netlist/nl_config.h +++ b/src/lib/netlist/nl_config.h @@ -140,7 +140,7 @@ namespace netlist /// \brief Prefer 128bit int type for ptime if supported /// /// Set this to one if you want to use 128 bit int for ptime. - /// This is about 10% slower on a skylake processor for pongf. + /// This is about 10% slower on a skylake processor for pong. /// using prefer_int128 = std::integral_constant; diff --git a/src/lib/netlist/plib/ppmf.h b/src/lib/netlist/plib/ppmf.h index bd95b4691d5..b0612c6aea9 100644 --- a/src/lib/netlist/plib/ppmf.h +++ b/src/lib/netlist/plib/ppmf.h @@ -20,7 +20,7 @@ /// Use the same approach as MAME for deriving the function pointer. /// This is compiler-dependent as well /// -/// Benchmarks for `./nltool -c run -t 10 -n pongf src/mame/machine/nl_pongf.cpp` +/// Benchmarks for `./nltool -c run -t 10 -n pong src/mame/machine/nl_pong.cpp` /// /// PMF_TYPE_INTERNAL: 215% 215% 564% 580% /// PMF_TYPE_GNUC_PMF: 163% 196% 516% 490% diff --git a/src/mame/drivers/pong.cpp b/src/mame/drivers/pong.cpp index bf4820426d1..8fa0c9f4126 100644 --- a/src/mame/drivers/pong.cpp +++ b/src/mame/drivers/pong.cpp @@ -59,7 +59,7 @@ TODO: Volleyball... #include "machine/nl_breakout.h" #include "machine/nl_rebound.h" -#include "machine/nl_pongf.h" +#include "machine/nl_pong.h" #include "machine/nl_pongdoubles.h" #include "screen.h" @@ -198,15 +198,6 @@ public: void pongd(machine_config &config); void pong(machine_config &config); - void pongf(machine_config &config); - - NETLIST_START(pong) - - MEMREGION_SOURCE("maincpu") - PARAM(NETLIST.USE_DEACTIVATE, 1) - INCLUDE(pong_schematics) - - NETLIST_END() protected: @@ -472,7 +463,7 @@ INPUT_PORTS_END void pong_state::pong(machine_config &config) { /* basic machine hardware */ - NETLIST_CPU(config, "maincpu", netlist::config::DEFAULT_CLOCK()).set_source(this, &pong_state::NETLIST_NAME(pong)); + NETLIST_CPU(config, "maincpu", netlist::config::DEFAULT_CLOCK()).set_source(NETLIST_NAME(pong)); NETLIST_ANALOG_INPUT(config, "maincpu:vr0", "ic_b9_R.R").set_mult_offset(1.0 / 100.0 * RES_K(50), RES_K(56) ); NETLIST_ANALOG_INPUT(config, "maincpu:vr1", "ic_a9_R.R").set_mult_offset(1.0 / 100.0 * RES_K(50), RES_K(56) ); @@ -557,15 +548,6 @@ void breakout_state::breakout(machine_config &config) DAC_16BIT_R2R_TWOS_COMPLEMENT(config, m_dac, 0).add_route(ALL_OUTPUTS, "speaker", 0.5); // unknown DAC } -void pong_state::pongf(machine_config &config) -{ - pong(config); - - /* basic machine hardware */ - - subdevice("maincpu")->set_setup_func(NETLIST_NAME(pongf)); -} - void pong_state::pongd(machine_config &config) { /* basic machine hardware */ @@ -651,16 +633,11 @@ void rebound_state::rebound(machine_config &config) ***************************************************************************/ -ROM_START( pong ) /* dummy to satisfy game entry*/ - ROM_REGION( 0x10000, "maincpu", 0 ) /* enough for netlist */ - ROM_LOAD( "pong.netlist", 0x000000, 18273, CRC(d249ce49) SHA1(e1d2cfca74b75f0520965639e6947a351650fc3e) ) -ROM_END - ROM_START( breakout ) ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END -ROM_START( pongf ) /* dummy to satisfy game entry*/ +ROM_START( pong ) /* dummy to satisfy game entry*/ ROM_REGION( 0x10000, "maincpu", ROMREGION_ERASE00 ) ROM_END @@ -712,8 +689,7 @@ ROM_START( consolet ) // dummy to satisfy game entry ROM_END */ -GAME( 1972, pong, 0, pong, pong, pong_state, empty_init, ROT0, "Atari", "Pong (Rev E) external [TTL]", MACHINE_SUPPORTS_SAVE) -GAME( 1972, pongf, pong, pongf, pong, pong_state, empty_init, ROT0, "Atari", "Pong (Rev E) [TTL]", MACHINE_SUPPORTS_SAVE) +GAME( 1972, pong, 0, pong, pong, pong_state, empty_init, ROT0, "Atari", "Pong (Rev E) [TTL]", MACHINE_SUPPORTS_SAVE) GAME( 1973, pongd, 0, pongd, pongd, pong_state, empty_init, ROT0, "Atari", "Pong Doubles [TTL]", MACHINE_SUPPORTS_SAVE) GAMEL( 1974, rebound, 0, rebound, rebound, rebound_state, empty_init, ROT0, "Atari", "Rebound (Rev B) [TTL]", MACHINE_SUPPORTS_SAVE, layout_rebound) GAMEL( 1976, breakout, 0, breakout, breakout, breakout_state, empty_init, ROT90, "Atari", "Breakout [TTL]", MACHINE_SUPPORTS_SAVE, layout_breakout) diff --git a/src/mame/machine/nl_pongf.cpp b/src/mame/machine/nl_pong.cpp similarity index 99% rename from src/mame/machine/nl_pongf.cpp rename to src/mame/machine/nl_pong.cpp index 0ec22bfc886..a72c699f62e 100644 --- a/src/mame/machine/nl_pongf.cpp +++ b/src/mame/machine/nl_pong.cpp @@ -3,7 +3,7 @@ /*************************************************************************** - Netlist (pong) included from pong.c + Netlist (pong) included from pong.cpp ***************************************************************************/ @@ -14,7 +14,7 @@ #define FAST_CLOCK (1) -NETLIST_START(pongf) +NETLIST_START(pong) SOLVER(Solver, 5000) PARAM(Solver.PARALLEL, 0) // Don't do parallel solvers diff --git a/src/mame/machine/nl_pongf.h b/src/mame/machine/nl_pong.h similarity index 70% rename from src/mame/machine/nl_pongf.h rename to src/mame/machine/nl_pong.h index 81ed3482185..869085cc1db 100644 --- a/src/mame/machine/nl_pongf.h +++ b/src/mame/machine/nl_pong.h @@ -1,4 +1,4 @@ // license:BSD-3-Clause // copyright-holders: Couriersud -NETLIST_EXTERNAL(pongf) +NETLIST_EXTERNAL(pong) diff --git a/src/mame/mame.lst b/src/mame/mame.lst index f8494902d76..f08bf03bbca 100644 --- a/src/mame/mame.lst +++ b/src/mame/mame.lst @@ -35907,7 +35907,6 @@ poly61 // breakout // (c) 1976 Atari pong // (c) 1972 Atari pongd // (c) 1973 Atari -pongf // (c) 1972 Atari rebound // @source:poolshrk.cpp diff --git a/src/mame/nl.lst b/src/mame/nl.lst index 6033503388f..7d217f6c5be 100644 --- a/src/mame/nl.lst +++ b/src/mame/nl.lst @@ -596,7 +596,6 @@ tankii // (c) 1975 Atari / Kee breakout // (c) 1976 Atari pong // (c) 1972 Atari pongd // (c) 1973 Atari -pongf // (c) 1972 Atari rebound // @source:cheekyms.cpp