Add prodigy to mamenl build. Fix clang5 warnings. (nw)

This commit is contained in:
couriersud 2017-02-19 00:31:56 +01:00
parent 65806114b0
commit 2acad1f854
6 changed files with 11 additions and 4 deletions

View File

@ -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

View File

@ -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 \

View File

@ -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);

View File

@ -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

View File

@ -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)

View File

@ -60,6 +60,9 @@ popeyeu // (c) 1982
popeyef // (c) 1982
popeyebl // bootleg
@source:prodigy.cpp
prodigy // ACI Destiny Prodigy, 1981
/******************************************************************************/
/* Do not use CPUs */