Make sure netlist includes are not found directly on include path.

Instead, they have to be prefixed by "netlist/". Removed unneeded link
librariers for nltool and nlwav along the way. (nw)
This commit is contained in:
couriersud 2017-02-07 20:07:56 +01:00
parent 041f7bb549
commit ab17457707
143 changed files with 240 additions and 244 deletions

View File

@ -33,7 +33,6 @@ function devicesProject(_target, _subtarget)
MAME_DIR .. "src/osd", MAME_DIR .. "src/osd",
MAME_DIR .. "src/emu", MAME_DIR .. "src/emu",
MAME_DIR .. "src/devices", MAME_DIR .. "src/devices",
MAME_DIR .. "src/lib/netlist",
MAME_DIR .. "src/mame", -- used for sound amiga MAME_DIR .. "src/mame", -- used for sound amiga
MAME_DIR .. "src/lib", MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util", MAME_DIR .. "src/lib/util",

View File

@ -21,9 +21,9 @@ project "netlist"
} }
includedirs { includedirs {
MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/lib",
MAME_DIR .. "src/osd", -- MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util", -- MAME_DIR .. "src/lib/util",
-- ext_includedir("expat"), -- ext_includedir("expat"),
} }

View File

@ -505,25 +505,15 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then
end end
links { links {
"utils",
ext_lib("expat"),
"7z",
"ocore_" .. _OPTIONS["osd"],
"netlist", "netlist",
ext_lib("zlib"),
ext_lib("flac"),
ext_lib("utf8proc"),
} }
includedirs { includedirs {
MAME_DIR .. "src/osd", MAME_DIR .. "src/lib",
MAME_DIR .. "src/lib/util",
MAME_DIR .. "src/lib/netlist",
} }
files { files {
MAME_DIR .. "src/lib/netlist/prg/nltool.cpp", MAME_DIR .. "src/lib/netlist/prg/nltool.cpp",
MAME_DIR .. "src/emu/emucore.cpp",
} }
configuration { "mingw*" or "vs*" } configuration { "mingw*" or "vs*" }
@ -550,20 +540,20 @@ if _OPTIONS["SEPARATE_BIN"]~="1" then
end end
links { links {
"utils", -- "utils",
"ocore_" .. _OPTIONS["osd"], -- "ocore_" .. _OPTIONS["osd"],
"netlist", "netlist",
} }
includedirs { includedirs {
MAME_DIR .. "src/osd", -- MAME_DIR .. "src/osd",
MAME_DIR .. "src/lib/util", -- MAME_DIR .. "src/lib/util",
MAME_DIR .. "src/lib/netlist", MAME_DIR .. "src/lib",
} }
files { files {
MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp", MAME_DIR .. "src/lib/netlist/prg/nlwav.cpp",
MAME_DIR .. "src/emu/emucore.cpp", -- MAME_DIR .. "src/emu/emucore.cpp",
} }
configuration { "mingw*" or "vs*" } configuration { "mingw*" or "vs*" }

View File

@ -17,7 +17,7 @@
#include "netlist/nl_parser.h" #include "netlist/nl_parser.h"
#include "netlist/devices/net_lib.h" #include "netlist/devices/net_lib.h"
#include "plib/palloc.h" #include "netlist/plib/palloc.h"
#include "debugger.h" #include "debugger.h"

View File

@ -5,9 +5,9 @@
* *
*/ */
#include "solver/nld_solver.h" #include "../solver/nld_solver.h"
#include "analog/nlid_twoterm.h" #include "nlid_twoterm.h"
#include "nl_setup.h" #include "../nl_setup.h"
#include <cmath> #include <cmath>

View File

@ -8,7 +8,7 @@
#ifndef NLD_BJT_H_ #ifndef NLD_BJT_H_
#define NLD_BJT_H_ #define NLD_BJT_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Macros // Macros

View File

@ -9,7 +9,7 @@
#define NLD_FOURTERM_H_ #define NLD_FOURTERM_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// Macros // Macros

View File

@ -6,8 +6,8 @@
*/ */
#include "nld_opamps.h" #include "nld_opamps.h"
#include "nl_base.h" #include "../nl_base.h"
#include "nl_errstr.h" #include "../nl_errstr.h"
#include "nlid_twoterm.h" #include "nlid_twoterm.h"
#include "nlid_fourterm.h" #include "nlid_fourterm.h"

View File

@ -10,7 +10,7 @@
#ifndef NLD_OPAMPS_H_ #ifndef NLD_OPAMPS_H_
#define NLD_OPAMPS_H_ #define NLD_OPAMPS_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// Macros // Macros

View File

@ -6,8 +6,8 @@
*/ */
#include "nlid_twoterm.h" #include "nlid_twoterm.h"
#include "nl_base.h" #include "../nl_base.h"
#include "nl_factory.h" #include "../nl_factory.h"
#define R_OFF (1.0 / netlist().gmin()) #define R_OFF (1.0 / netlist().gmin())
#define R_ON 0.01 #define R_ON 0.01

View File

@ -10,7 +10,7 @@
#ifndef NLD_SWITCHES_H_ #ifndef NLD_SWITCHES_H_
#define NLD_SWITCHES_H_ #define NLD_SWITCHES_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// Macros // Macros

View File

@ -4,7 +4,7 @@
#ifndef NLD_TWOTERM_H_ #ifndef NLD_TWOTERM_H_
#define NLD_TWOTERM_H_ #define NLD_TWOTERM_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Macros // Macros

View File

@ -5,9 +5,9 @@
* *
*/ */
#include "solver/nld_solver.h" #include "../solver/nld_solver.h"
#include "../nl_factory.h"
#include "nlid_fourterm.h" #include "nlid_fourterm.h"
#include "nl_setup.h"
#include <cmath> #include <cmath>

View File

@ -8,7 +8,7 @@
#ifndef NLID_FOURTERM_H_ #ifndef NLID_FOURTERM_H_
#define NLID_FOURTERM_H_ #define NLID_FOURTERM_H_
#include "nl_base.h" #include "../nl_base.h"
namespace netlist { namespace netlist {
namespace analog { namespace analog {

View File

@ -5,10 +5,10 @@
* *
*/ */
#include "solver/nld_solver.h" #include "../solver/nld_solver.h"
#include "nlid_twoterm.h" #include "nlid_twoterm.h"
#include "nl_factory.h" #include "../nl_factory.h"
#include <cmath> #include <cmath>

View File

@ -33,8 +33,8 @@
#ifndef NLID_TWOTERM_H_ #ifndef NLID_TWOTERM_H_
#define NLID_TWOTERM_H_ #define NLID_TWOTERM_H_
#include "nl_base.h" #include "../nl_base.h"
#include "plib/pfunction.h" #include "../plib/pfunction.h"
// ----------------------------------------------------------------------------- // -----------------------------------------------------------------------------
// Implementation // Implementation

View File

@ -21,7 +21,7 @@ endif
# LTO = -flto=4 -fuse-linker-plugin -flto-partition=balanced -Wodr # LTO = -flto=4 -fuse-linker-plugin -flto-partition=balanced -Wodr
CFLAGS = $(LTO) -g -O3 -std=c++11 -march=native -I.. -Wall -Wpedantic -Wsign-compare -Wextra -Wno-unused-parameter $(CEXTRAFLAGS) CFLAGS = $(LTO) -g -O3 -std=c++11 -march=native -I../.. -Wall -Wpedantic -Wsign-compare -Wextra -Wno-unused-parameter $(CEXTRAFLAGS)
LDFLAGS = $(LTO) -g -O3 -std=c++11 $(LDEXTRAFLAGS) LDFLAGS = $(LTO) -g -O3 -std=c++11 $(LDEXTRAFLAGS)
LIBS = -lpthread -ldl LIBS = -lpthread -ldl
@ -175,7 +175,7 @@ maketree: $(sort $(OBJDIRS))
.PHONY: clang clang-5 mingw doc .PHONY: clang clang-5 mingw doc
clang: clang:
$(MAKE) CC=clang++ LD=clang++ CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors" $(MAKE) CC=clang++ LD=clang++ CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors"
clang-5: clang-5:
$(MAKE) CC=clang++-5.0 LD=clang++-5.0 CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors" $(MAKE) CC=clang++-5.0 LD=clang++-5.0 CEXTRAFLAGS="-march=native -Weverything -Werror -Wno-unreachable-code -Wno-padded -Wno-weak-vtables -Wno-missing-variable-declarations -Wconversion -Wno-c++98-compat -Wno-float-equal -Wno-global-constructors -Wno-c++98-compat-pedantic -Wno-format-nonliteral -Wno-weak-template-vtables -Wno-exit-time-destructors"

View File

@ -9,8 +9,8 @@
****************************************************************************/ ****************************************************************************/
#include "net_lib.h" #include "net_lib.h"
#include "nl_factory.h" #include "../nl_factory.h"
#include "solver/nld_solver.h" #include "../solver/nld_solver.h"
#define xstr(s) # s #define xstr(s) # s

View File

@ -11,7 +11,7 @@
#ifndef NET_LIB_H #ifndef NET_LIB_H
#define NET_LIB_H #define NET_LIB_H
#include "nl_setup.h" #include "netlist/nl_setup.h"
//#define NL_AUTO_DEVICES 1 //#define NL_AUTO_DEVICES 1
@ -83,16 +83,16 @@
#include "nld_log.h" #include "nld_log.h"
#include "macro/nlm_cd4xxx.h" #include "../macro/nlm_cd4xxx.h"
#include "macro/nlm_ttl74xx.h" #include "../macro/nlm_ttl74xx.h"
#include "macro/nlm_opamp.h" #include "../macro/nlm_opamp.h"
#include "macro/nlm_other.h" #include "../macro/nlm_other.h"
#include "analog/nld_bjt.h" #include "../analog/nld_bjt.h"
#include "analog/nld_fourterm.h" #include "../analog/nld_fourterm.h"
#include "analog/nld_switches.h" #include "../analog/nld_switches.h"
#include "analog/nld_twoterm.h" #include "../analog/nld_twoterm.h"
#include "analog/nld_opamps.h" #include "../analog/nld_opamps.h"
#include "nld_legacy.h" #include "nld_legacy.h"
#endif #endif

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_2102A.h" #include "nld_2102A.h"
#include "nl_base.h" #include "../nl_base.h"
#define ADDR2BYTE(a) ((a) >> 3) #define ADDR2BYTE(a) ((a) >> 3)
#define ADDR2BIT(a) ((a) & 0x7) #define ADDR2BIT(a) ((a) & 0x7)

View File

@ -24,7 +24,7 @@
#ifndef NLD_2102A_H_ #ifndef NLD_2102A_H_
#define NLD_2102A_H_ #define NLD_2102A_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) \ #define RAM_2102A(name, cCEQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cRWQ, cDI) \
NET_REGISTER_DEV(RAM_2102A, name) \ NET_REGISTER_DEV(RAM_2102A, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_2716.h" #include "nld_2716.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -28,7 +28,7 @@
#ifndef NLD_2716_H_ #ifndef NLD_2716_H_
#define NLD_2716_H_ #define NLD_2716_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \ #define EPROM_2716(name, cGQ, cEPQ, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cA9, cA10) \
NET_REGISTER_DEV(EPROM_2716, name) \ NET_REGISTER_DEV(EPROM_2716, name) \

View File

@ -5,7 +5,7 @@
* *
*/ */
#include "devices/nlid_cmos.h" #include "nlid_cmos.h"
#include "nld_4020.h" #include "nld_4020.h"
namespace netlist namespace netlist

View File

@ -27,7 +27,7 @@
#ifndef NLD_4020_H_ #ifndef NLD_4020_H_
#define NLD_4020_H_ #define NLD_4020_H_
#include "nl_setup.h" #include "../nl_setup.h"
/* FIXME: only used in mario.c */ /* FIXME: only used in mario.c */
#define CD4020_WI(name, cIP, cRESET, cVDD, cVSS) \ #define CD4020_WI(name, cIP, cRESET, cVDD, cVSS) \

View File

@ -5,8 +5,8 @@
* *
*/ */
#include "devices/nlid_cmos.h" #include "nlid_cmos.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
#include "nld_4066.h" #include "nld_4066.h"
namespace netlist namespace netlist

View File

@ -24,7 +24,7 @@
#ifndef NLD_4066_H_ #ifndef NLD_4066_H_
#define NLD_4066_H_ #define NLD_4066_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define CD4066_GATE(name) \ #define CD4066_GATE(name) \
NET_REGISTER_DEV(CD4066_GATE, name) NET_REGISTER_DEV(CD4066_GATE, name)

View File

@ -5,8 +5,8 @@
* *
*/ */
#include "devices/nlid_cmos.h" #include "nlid_cmos.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
#include "nld_4316.h" #include "nld_4316.h"
namespace netlist { namespace devices { namespace netlist { namespace devices {

View File

@ -25,7 +25,7 @@
#ifndef NLD_4316_H_ #ifndef NLD_4316_H_
#define NLD_4316_H_ #define NLD_4316_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define CD4316_GATE(name) \ #define CD4316_GATE(name) \
NET_REGISTER_DEV(CD4316_GATE, name) NET_REGISTER_DEV(CD4316_GATE, name)

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74107.h" #include "nld_74107.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -64,7 +64,7 @@
#ifndef NLD_74107_H_ #ifndef NLD_74107_H_
#define NLD_74107_H_ #define NLD_74107_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74107A(name, cCLK, cJ, cK, cCLRQ) \ #define TTL_74107A(name, cCLK, cJ, cK, cCLRQ) \
NET_REGISTER_DEV(TTL_74107A, name) \ NET_REGISTER_DEV(TTL_74107A, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nlid_system.h" #include "nlid_system.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
#include <cmath> #include <cmath>

View File

@ -49,7 +49,7 @@
#ifndef NLD_74123_H_ #ifndef NLD_74123_H_
#define NLD_74123_H_ #define NLD_74123_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74123(name) \ #define TTL_74123(name) \
NET_REGISTER_DEV(TTL_74123, name) NET_REGISTER_DEV(TTL_74123, name)

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74153.h" #include "nld_74153.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -45,7 +45,7 @@
#ifndef NLD_74153_H_ #ifndef NLD_74153_H_
#define NLD_74153_H_ #define NLD_74153_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG) \ #define TTL_74153(name, cC0, cC1, cC2, cC3, cA, cB, cG) \
NET_REGISTER_DEV(TTL_74153, name) \ NET_REGISTER_DEV(TTL_74153, name) \

View File

@ -8,7 +8,7 @@
#define MAXCNT 15 #define MAXCNT 15
#include "nld_74161.h" #include "nld_74161.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -25,7 +25,7 @@
#ifndef NLD_74161_H_ #ifndef NLD_74161_H_
#define NLD_74161_H_ #define NLD_74161_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74161(name, cA, cB, cC, cD, cCLRQ, cLOADQ, cCLK, cENABLEP, cENABLET) \ #define TTL_74161(name, cA, cB, cC, cD, cCLRQ, cLOADQ, cCLK, cENABLEP, cENABLET) \
NET_REGISTER_DEV(TTL_74161, name) \ NET_REGISTER_DEV(TTL_74161, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74165.h" #include "nld_74165.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -27,7 +27,7 @@
#ifndef NLD_74165_H_ #ifndef NLD_74165_H_
#define NLD_74165_H_ #define NLD_74165_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) \ #define TTL_74165(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH) \
NET_REGISTER_DEV(TTL_74165, name) \ NET_REGISTER_DEV(TTL_74165, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74166.h" #include "nld_74166.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -27,7 +27,7 @@
#ifndef NLD_74166_H_ #ifndef NLD_74166_H_
#define NLD_74166_H_ #define NLD_74166_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) \ #define TTL_74166(name, cCLK, cCLKINH, cSH_LDQ, cSER, cA, cB, cC, cD, cE, cF, cG, cH, cCLRQ) \
NET_REGISTER_DEV(TTL_74166, name) \ NET_REGISTER_DEV(TTL_74166, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74174.h" #include "nld_74174.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -36,7 +36,7 @@
#ifndef NLD_74174_H_ #ifndef NLD_74174_H_
#define NLD_74174_H_ #define NLD_74174_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) \ #define TTL_74174(name, cCLK, cD1, cD2, cD3, cD4, cD5, cD6, cCLRQ) \
NET_REGISTER_DEV(TTL_74174, name) \ NET_REGISTER_DEV(TTL_74174, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74175.h" #include "nld_74175.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -36,7 +36,7 @@
#ifndef NLD_74175_H_ #ifndef NLD_74175_H_
#define NLD_74175_H_ #define NLD_74175_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ) \ #define TTL_74175(name, cCLK, cD1, cD2, cD3, cD4, cCLRQ) \
NET_REGISTER_DEV(TTL_74175, name) \ NET_REGISTER_DEV(TTL_74175, name) \

View File

@ -8,7 +8,7 @@
#define MAXCNT 9 #define MAXCNT 9
#include "nld_74192.h" #include "nld_74192.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -29,7 +29,7 @@
#ifndef NLD_74192_H_ #ifndef NLD_74192_H_
#define NLD_74192_H_ #define NLD_74192_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ #define TTL_74192(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \
NET_REGISTER_DEV(TTL_74192, name) \ NET_REGISTER_DEV(TTL_74192, name) \

View File

@ -8,7 +8,7 @@
#define MAXCNT 15 #define MAXCNT 15
#include "nld_74193.h" #include "nld_74193.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -26,7 +26,7 @@
#ifndef NLD_74193_H_ #ifndef NLD_74193_H_
#define NLD_74193_H_ #define NLD_74193_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \ #define TTL_74193(name, cA, cB, cC, cD, cCLEAR, cLOADQ, cCU, cCD) \
NET_REGISTER_DEV(TTL_74193, name) \ NET_REGISTER_DEV(TTL_74193, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74194.h" #include "nld_74194.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -26,7 +26,7 @@
#ifndef NLD_74194_H_ #ifndef NLD_74194_H_
#define NLD_74194_H_ #define NLD_74194_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \ #define TTL_74194(name, cCLK, cS0, cS1, cSRIN, cA, cB, cC, cD, cSLIN, cCLRQ) \
NET_REGISTER_DEV(TTL_74194, name) \ NET_REGISTER_DEV(TTL_74194, name) \

View File

@ -7,7 +7,7 @@
#include "nlid_truthtable.h" #include "nlid_truthtable.h"
#include "nld_74279.h" #include "nld_74279.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_74365.h" #include "nld_74365.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -25,7 +25,7 @@
#ifndef NLD_74365_H_ #ifndef NLD_74365_H_
#define NLD_74365_H_ #define NLD_74365_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6) \ #define TTL_74365(name, cG1Q, cG2Q, cA1, cA2, cA3, cA4, cA5, cA6) \
NET_REGISTER_DEV(TTL_74365, name) \ NET_REGISTER_DEV(TTL_74365, name) \

View File

@ -24,7 +24,7 @@
#ifndef NLD_7448_H_ #ifndef NLD_7448_H_
#define NLD_7448_H_ #define NLD_7448_H_
#include "nl_setup.h" #include "../nl_setup.h"
/* /*
* FIXME: Using truthtable is a lot slower than the explicit device * FIXME: Using truthtable is a lot slower than the explicit device

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7450.h" #include "nld_7450.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -24,7 +24,7 @@
#ifndef NLD_7450_H_ #ifndef NLD_7450_H_
#define NLD_7450_H_ #define NLD_7450_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4) \ #define TTL_7450_ANDORINVERT(name, cI1, cI2, cI3, cI4) \
NET_REGISTER_DEV(TTL_7450_ANDORINVERT, name) \ NET_REGISTER_DEV(TTL_7450_ANDORINVERT, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7473.h" #include "nld_7473.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -60,7 +60,7 @@
#ifndef NLD_7473_H_ #ifndef NLD_7473_H_
#define NLD_7473_H_ #define NLD_7473_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \ #define TTL_7473(name, cCLK, cJ, cK, cCLRQ) \
NET_REGISTER_DEV(TTL_7473, name) \ NET_REGISTER_DEV(TTL_7473, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7474.h" #include "nld_7474.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -42,7 +42,7 @@
#ifndef NLD_7474_H_ #ifndef NLD_7474_H_
#define NLD_7474_H_ #define NLD_7474_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7474(name, cCLK, cD, cCLRQ, cPREQ) \ #define TTL_7474(name, cCLK, cD, cCLRQ, cPREQ) \
NET_REGISTER_DEV(TTL_7474, name) \ NET_REGISTER_DEV(TTL_7474, name) \

View File

@ -7,7 +7,7 @@
*/ */
#include "nld_7475.h" #include "nld_7475.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -35,7 +35,7 @@
#ifndef NLD_7475_H_ #ifndef NLD_7475_H_
#define NLD_7475_H_ #define NLD_7475_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \ #define PARAMS_7475_7477(name, cC1C2, cC3C4, cD1, cD2, cD3, cD4) \
NET_CONNECT(name, C1C2, cC1C2) \ NET_CONNECT(name, C1C2, cC1C2) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7483.h" #include "nld_7483.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -27,7 +27,7 @@
#ifndef NLD_7483_H_ #ifndef NLD_7483_H_
#define NLD_7483_H_ #define NLD_7483_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI) \ #define TTL_7483(name, cA1, cA2, cA3, cA4, cB1, cB2, cB3, cB4, cCI) \
NET_REGISTER_DEV(TTL_7483, name) \ NET_REGISTER_DEV(TTL_7483, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7485.h" #include "nld_7485.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -23,7 +23,7 @@
#ifndef NLD_7485_H_ #ifndef NLD_7485_H_
#define NLD_7485_H_ #define NLD_7485_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN) \ #define TTL_7485(name, cA0, cA1, cA2, cA3, cB0, cB1, cB2, cB3, cLTIN, cEQIN, cGTIN) \
NET_REGISTER_DEV(TTL_7485, name) \ NET_REGISTER_DEV(TTL_7485, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7490.h" #include "nld_7490.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -55,7 +55,7 @@
#ifndef NLD_7490_H_ #ifndef NLD_7490_H_
#define NLD_7490_H_ #define NLD_7490_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92) \ #define TTL_7490(name, cA, cB, cR1, cR2, cR91, cR92) \
NET_REGISTER_DEV(TTL_7490, name) \ NET_REGISTER_DEV(TTL_7490, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_7493.h" #include "nld_7493.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -57,7 +57,7 @@
#ifndef NLD_7493_H_ #ifndef NLD_7493_H_
#define NLD_7493_H_ #define NLD_7493_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_7493(name, cCLKA, cCLKB, cR1, cR2) \ #define TTL_7493(name, cCLKA, cCLKB, cR1, cR2) \
NET_REGISTER_DEV(TTL_7493, name) \ NET_REGISTER_DEV(TTL_7493, name) \

View File

@ -40,7 +40,7 @@
#include "nld_74ls629.h" #include "nld_74ls629.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
namespace netlist namespace netlist
{ {

View File

@ -28,7 +28,7 @@
#ifndef NLD_74LS629_H_ #ifndef NLD_74LS629_H_
#define NLD_74LS629_H_ #define NLD_74LS629_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define SN74LS629(name, p_cap) \ #define SN74LS629(name, p_cap) \
NET_REGISTER_DEV(SN74LS629, name) \ NET_REGISTER_DEV(SN74LS629, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_82S115.h" #include "nld_82S115.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -28,7 +28,7 @@
#ifndef NLD_82S115_H_ #ifndef NLD_82S115_H_
#define NLD_82S115_H_ #define NLD_82S115_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \ #define PROM_82S115(name, cCE1Q, cCE2, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7, cA8, cSTROBE) \
NET_REGISTER_DEV(PROM_82S115, name) \ NET_REGISTER_DEV(PROM_82S115, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_82S123.h" #include "nld_82S123.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -25,7 +25,7 @@
#ifndef NLD_82S123_H_ #ifndef NLD_82S123_H_
#define NLD_82S123_H_ #define NLD_82S123_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4) \ #define PROM_82S123(name, cCEQ, cA0, cA1, cA2, cA3, cA4) \
NET_REGISTER_DEV(PROM_82S123, name) \ NET_REGISTER_DEV(PROM_82S123, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_82S126.h" #include "nld_82S126.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -24,7 +24,7 @@
#ifndef NLD_82S126_H_ #ifndef NLD_82S126_H_
#define NLD_82S126_H_ #define NLD_82S126_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \ #define PROM_82S126(name, cCE1Q, cCE2Q, cA0, cA1, cA2, cA3, cA4, cA5, cA6, cA7) \
NET_REGISTER_DEV(PROM_82S126, name) \ NET_REGISTER_DEV(PROM_82S126, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_82S16.h" #include "nld_82S16.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -24,7 +24,7 @@
#ifndef NLD_82S16_H_ #ifndef NLD_82S16_H_
#define NLD_82S16_H_ #define NLD_82S16_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_82S16(name) \ #define TTL_82S16(name) \
NET_REGISTER_DEV(TTL_82S16, name) NET_REGISTER_DEV(TTL_82S16, name)

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_9310.h" #include "nld_9310.h"
#include "nl_base.h" #include "../nl_base.h"
#define MAXCNT 9 #define MAXCNT 9

View File

@ -45,7 +45,7 @@
#ifndef NLD_9310_H_ #ifndef NLD_9310_H_
#define NLD_9310_H_ #define NLD_9310_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_9310(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \ #define TTL_9310(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \
NET_REGISTER_DEV(TTL_9310, name) \ NET_REGISTER_DEV(TTL_9310, name) \

View File

@ -37,7 +37,7 @@
#ifndef NLD_9312_H_ #ifndef NLD_9312_H_
#define NLD_9312_H_ #define NLD_9312_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \ #define TTL_9312(name, cA, cB, cC, cD0, cD1, cD2, cD3, cD4, cD5, cD6, cD7, cSTROBE) \
NET_REGISTER_DEV(TTL_9312, name) \ NET_REGISTER_DEV(TTL_9312, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_9316.h" #include "nld_9316.h"
#include "nl_base.h" #include "../nl_base.h"
#define MAXCNT 15 #define MAXCNT 15

View File

@ -51,7 +51,7 @@
#ifndef NLD_9316_H_ #ifndef NLD_9316_H_
#define NLD_9316_H_ #define NLD_9316_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \ #define TTL_9316(name, cCLK, cENP, cENT, cCLRQ, cLOADQ, cA, cB, cC, cD) \
NET_REGISTER_DEV(TTL_9316, name) \ NET_REGISTER_DEV(TTL_9316, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_9322.h" #include "nld_9322.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -21,7 +21,7 @@
#ifndef NLD_9322_H_ #ifndef NLD_9322_H_
#define NLD_9322_H_ #define NLD_9322_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) \ #define TTL_9322(name, cSELECT, cA1, cB1, cA2, cB2, cA3, cB3, cA4, cB4, cSTROBE) \
NET_REGISTER_DEV(TTL_9322, name) \ NET_REGISTER_DEV(TTL_9322, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_am2847.h" #include "nld_am2847.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -21,7 +21,7 @@
#ifndef NLD_AM2847_H_ #ifndef NLD_AM2847_H_
#define NLD_AM2847_H_ #define NLD_AM2847_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD) \ #define TTL_AM2847(name, cCP, cINA, cINB, cINC, cIND, cRCA, cRCB, cRCC, cRCD) \
NET_REGISTER_DEV(TTL_AM2847, name) \ NET_REGISTER_DEV(TTL_AM2847, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_dm9334.h" #include "nld_dm9334.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -65,7 +65,7 @@
#ifndef NLD_DM9334_H_ #ifndef NLD_DM9334_H_
#define NLD_DM9334_H_ #define NLD_DM9334_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \ #define TTL_9334(name, cCQ, cEQ, cD, cA0, cA1, cA2) \
NET_REGISTER_DEV(TTL_9334, name) \ NET_REGISTER_DEV(TTL_9334, name) \

View File

@ -6,7 +6,7 @@
*/ */
#include "nld_legacy.h" #include "nld_legacy.h"
#include "nl_base.h" #include "../nl_base.h"
namespace netlist namespace netlist
{ {

View File

@ -13,7 +13,7 @@
#ifndef NLD_LEGACY_H_ #ifndef NLD_LEGACY_H_
#define NLD_LEGACY_H_ #define NLD_LEGACY_H_
#include "nl_setup.h" #include "../nl_setup.h"
// ---------------------------------------------------------------------------------------- // ----------------------------------------------------------------------------------------
// Macros // Macros

View File

@ -5,9 +5,9 @@
* *
*/ */
#include "nl_base.h" #include "../nl_base.h"
#include "plib/pstream.h" #include "../plib/pstream.h"
#include "plib/pfmtlog.h" #include "../plib/pfmtlog.h"
#include "nld_log.h" #include "nld_log.h"
//#include "sound/wavwrite.h" //#include "sound/wavwrite.h"

View File

@ -18,7 +18,7 @@
#ifndef NLD_LOG_H_ #ifndef NLD_LOG_H_
#define NLD_LOG_H_ #define NLD_LOG_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define LOG(name, cI) \ #define LOG(name, cI) \
NET_REGISTER_DEV(??PG, name) \ NET_REGISTER_DEV(??PG, name) \

View File

@ -6,8 +6,8 @@
*/ */
#include "nld_mm5837.h" #include "nld_mm5837.h"
#include "solver/nld_matrix_solver.h" #include "../solver/nld_matrix_solver.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
#define R_LOW (1000.0) #define R_LOW (1000.0)
#define R_HIGH (1000.0) #define R_HIGH (1000.0)

View File

@ -19,7 +19,7 @@
#ifndef NLD_MM5837_H_ #ifndef NLD_MM5837_H_
#define NLD_MM5837_H_ #define NLD_MM5837_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define MM5837_DIP(name) \ #define MM5837_DIP(name) \
NET_REGISTER_DEV(MM5837_DIP, name) NET_REGISTER_DEV(MM5837_DIP, name)

View File

@ -46,8 +46,8 @@
*/ */
#include "nld_ne555.h" #include "nld_ne555.h"
#include "analog/nlid_twoterm.h" #include "../analog/nlid_twoterm.h"
#include "solver/nld_solver.h" #include "../solver/nld_solver.h"
#define R_OFF (1E20) #define R_OFF (1E20)
#define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2 #define R_ON (25) // Datasheet states a maximum discharge of 200mA, R = 5V / 0.2

View File

@ -4,7 +4,7 @@
#ifndef NLD_NE555_H_ #ifndef NLD_NE555_H_
#define NLD_NE555_H_ #define NLD_NE555_H_
#include "nl_setup.h" #include "../nl_setup.h"
#define NE555(name) \ #define NE555(name) \
NET_REGISTER_DEV(NE555, name) NET_REGISTER_DEV(NE555, name)

Some files were not shown because too many files have changed in this diff Show More