From 2acad1f854dc256ef5ae7f62814b9445ad816446 Mon Sep 17 00:00:00 2001 From: couriersud Date: Sun, 19 Feb 2017 00:31:56 +0100 Subject: [PATCH] Add prodigy to mamenl build. Fix clang5 warnings. (nw) --- scripts/target/mame/nl.lua | 4 ++++ src/lib/netlist/build/makefile | 1 + src/lib/netlist/devices/nld_2102A.cpp | 2 +- src/lib/netlist/nl_base.h | 3 +-- src/lib/netlist/nl_config.h | 2 +- src/mame/nl.lst | 3 +++ 6 files changed, 11 insertions(+), 4 deletions(-) diff --git a/scripts/target/mame/nl.lua b/scripts/target/mame/nl.lua index f94bcb4d5f8..6d33559134a 100644 --- a/scripts/target/mame/nl.lua +++ b/scripts/target/mame/nl.lua @@ -17,6 +17,7 @@ -------------------------------------------------- CPUS["Z80"] = true +CPUS["M6502"] = true CPUS["M6800"] = true CPUS["M6803"] = true CPUS["M6809"] = true @@ -65,6 +66,9 @@ MACHINES["AY31015"] = true MACHINES["KB3600"] = true MACHINES["COM8116"] = true +MACHINES["TTL74145"] = true +MACHINES["6522VIA"] = true + --MACHINES["6821PIA"] = true --MACHINES["TTL74148"] = true --MACHINES["TTL74153"] = true diff --git a/src/lib/netlist/build/makefile b/src/lib/netlist/build/makefile index 843af2838c3..51c770778e4 100644 --- a/src/lib/netlist/build/makefile +++ b/src/lib/netlist/build/makefile @@ -93,6 +93,7 @@ NLOBJS := \ $(NLOBJ)/devices/nld_74123.o \ $(NLOBJ)/devices/nld_74153.o \ $(NLOBJ)/devices/nld_74161.o \ + $(NLOBJ)/devices/nld_74164.o \ $(NLOBJ)/devices/nld_74165.o \ $(NLOBJ)/devices/nld_74166.o \ $(NLOBJ)/devices/nld_74174.o \ diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102A.cpp index 3b7d32f6322..5296bf2d029 100644 --- a/src/lib/netlist/devices/nld_2102A.cpp +++ b/src/lib/netlist/devices/nld_2102A.cpp @@ -75,7 +75,7 @@ namespace netlist unsigned a = 0; for (std::size_t i=0; i<10; i++) { - a |= m_A[i]() << i; + a |= (m_A[i]() << i); } const unsigned byte = ADDR2BYTE(a); const unsigned bit = ADDR2BIT(a); diff --git a/src/lib/netlist/nl_base.h b/src/lib/netlist/nl_base.h index 1984380e583..9f2ecd098cd 100644 --- a/src/lib/netlist/nl_base.h +++ b/src/lib/netlist/nl_base.h @@ -29,8 +29,7 @@ // ---------------------------------------------------------------------------------------- /*! netlist_sig_t is the type used for logic signals. */ -//using netlist_sig_t = std::uint32_t; -using netlist_sig_t = std::uint8_t; +using netlist_sig_t = std::uint32_t; //============================================================ // MACROS / New Syntax diff --git a/src/lib/netlist/nl_config.h b/src/lib/netlist/nl_config.h index 47a1c9131d7..04afe2aebf6 100644 --- a/src/lib/netlist/nl_config.h +++ b/src/lib/netlist/nl_config.h @@ -37,7 +37,7 @@ * setting param USE_DEACTIVATE for the device. */ -#define USE_TRUTHTABLE_7448 (1) +#define USE_TRUTHTABLE_7448 (0) // How many times do we try to resolve links (connections) #define NL_MAX_LINK_RESOLVE_LOOPS (100) diff --git a/src/mame/nl.lst b/src/mame/nl.lst index 0377148d474..df3f4a5f4ea 100644 --- a/src/mame/nl.lst +++ b/src/mame/nl.lst @@ -60,6 +60,9 @@ popeyeu // (c) 1982 popeyef // (c) 1982 popeyebl // bootleg +@source:prodigy.cpp +prodigy // ACI Destiny Prodigy, 1981 + /******************************************************************************/ /* Do not use CPUs */