summaryrefslogtreecommitdiffstatshomepage
path: root/src/lib
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib')
-rwxr-xr-xsrc/lib/netlist/buildVS/netlistlib.vcxproj12
-rwxr-xr-xsrc/lib/netlist/buildVS/netlistlib.vcxproj.filters28
-rw-r--r--src/lib/netlist/core/setup.h4
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/devices/nld_2102a.cpp (renamed from src/lib/netlist/devices/nld_2102A.cpp)0
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/devices/nld_82s115.cpp (renamed from src/lib/netlist/devices/nld_82S115.cpp)0
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/devices/nld_82s16.cpp (renamed from src/lib/netlist/devices/nld_82S16.cpp)0
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp (renamed from src/lib/netlist/macro/modules/nlmod_ICL8038_DIP.cpp)0
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp (renamed from src/lib/netlist/macro/modules/nlmod_NE556_DIP.cpp)0
-rwxr-xr-x[-rw-r--r--]src/lib/netlist/macro/modules/nlmod_rtest.cpp (renamed from src/lib/netlist/macro/modules/nlmod_RTEST.cpp)0
-rw-r--r--src/lib/netlist/nl_base.cpp6
-rw-r--r--src/lib/netlist/nl_setup.cpp2
-rw-r--r--src/lib/netlist/plib/poptions.h10
12 files changed, 32 insertions, 30 deletions
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj b/src/lib/netlist/buildVS/netlistlib.vcxproj
index 85a6087fbf6..1344d71ba50 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj
@@ -114,7 +114,7 @@
<ClCompile Include="..\analog\nlid_fourterm.cpp" />
<ClCompile Include="..\analog\nlid_twoterm.cpp" />
<ClCompile Include="..\devices\net_lib.cpp" />
- <ClCompile Include="..\devices\nld_2102A.cpp" />
+ <ClCompile Include="..\devices\nld_2102a.cpp" />
<ClCompile Include="..\devices\nld_4006.cpp" />
<ClCompile Include="..\devices\nld_4017.cpp" />
<ClCompile Include="..\devices\nld_4029.cpp" />
@@ -160,8 +160,8 @@
<ClCompile Include="..\devices\nld_7490.cpp" />
<ClCompile Include="..\devices\nld_7493.cpp" />
<ClCompile Include="..\devices\nld_74ls629.cpp" />
- <ClCompile Include="..\devices\nld_82S115.cpp" />
- <ClCompile Include="..\devices\nld_82S16.cpp" />
+ <ClCompile Include="..\devices\nld_82s115.cpp" />
+ <ClCompile Include="..\devices\nld_82s16.cpp" />
<ClCompile Include="..\devices\nld_9310.cpp" />
<ClCompile Include="..\devices\nld_9316.cpp" />
<ClCompile Include="..\devices\nld_9322.cpp" />
@@ -179,9 +179,9 @@
<ClCompile Include="..\devices\nlid_truthtable.cpp" />
<ClCompile Include="..\generated\nlm_modules_lib.cpp" />
<ClCompile Include="..\generated\static_solvers.cpp" />
- <ClCompile Include="..\macro\modules\nlmod_ICL8038_DIP.cpp" />
- <ClCompile Include="..\macro\modules\nlmod_NE556_DIP.cpp" />
- <ClCompile Include="..\macro\modules\nlmod_RTEST.cpp" />
+ <ClCompile Include="..\macro\modules\nlmod_icl8038_dip.cpp" />
+ <ClCompile Include="..\macro\modules\nlmod_ne556_dip.cpp" />
+ <ClCompile Include="..\macro\modules\nlmod_rtest.cpp" />
<ClCompile Include="..\macro\nlm_base_lib.cpp" />
<ClCompile Include="..\macro\nlm_cd4xxx_lib.cpp" />
<ClCompile Include="..\macro\nlm_opamp_lib.cpp" />
diff --git a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
index cb55a2d862e..68df009f9ec 100755
--- a/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
+++ b/src/lib/netlist/buildVS/netlistlib.vcxproj.filters
@@ -87,9 +87,6 @@
<ClCompile Include="..\devices\nld_7483.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\devices\nld_82S115.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\devices\nld_4013.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -129,9 +126,6 @@
<ClCompile Include="..\devices\nld_74153.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\devices\nld_82S16.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\devices\nld_74123.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -189,9 +183,6 @@
<ClCompile Include="..\devices\nld_74174.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\devices\nld_2102A.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\devices\nld_4316.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -291,9 +282,6 @@
<ClCompile Include="..\generated\nlm_modules_lib.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\macro\modules\nlmod_RTEST.cpp">
- <Filter>Source Files</Filter>
- </ClCompile>
<ClCompile Include="..\devices\nld_4042.cpp">
<Filter>Source Files</Filter>
</ClCompile>
@@ -303,10 +291,22 @@
<ClCompile Include="..\devices\nld_4029.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\macro\modules\nlmod_ICL8038_DIP.cpp">
+ <ClCompile Include="..\devices\nld_2102a.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\devices\nld_82s16.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\devices\nld_82s115.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\macro\modules\nlmod_icl8038_dip.cpp">
+ <Filter>Source Files</Filter>
+ </ClCompile>
+ <ClCompile Include="..\macro\modules\nlmod_ne556_dip.cpp">
<Filter>Source Files</Filter>
</ClCompile>
- <ClCompile Include="..\macro\modules\nlmod_NE556_DIP.cpp">
+ <ClCompile Include="..\macro\modules\nlmod_rtest.cpp">
<Filter>Source Files</Filter>
</ClCompile>
</ItemGroup>
diff --git a/src/lib/netlist/core/setup.h b/src/lib/netlist/core/setup.h
index ba783c52130..1c8fc5742f9 100644
--- a/src/lib/netlist/core/setup.h
+++ b/src/lib/netlist/core/setup.h
@@ -304,8 +304,9 @@ namespace netlist
{
public:
- explicit source_pattern_t(const pstring &pat)
+ explicit source_pattern_t(const pstring &pat, bool force_lowercase)
: m_pattern(pat)
+ , m_force_lowercase(force_lowercase)
{
}
@@ -314,6 +315,7 @@ namespace netlist
private:
pstring m_pattern;
+ bool m_force_lowercase;
};
class source_mem_t : public source_netlist_t
diff --git a/src/lib/netlist/devices/nld_2102A.cpp b/src/lib/netlist/devices/nld_2102a.cpp
index 91c7c6b7ee0..91c7c6b7ee0 100644..100755
--- a/src/lib/netlist/devices/nld_2102A.cpp
+++ b/src/lib/netlist/devices/nld_2102a.cpp
diff --git a/src/lib/netlist/devices/nld_82S115.cpp b/src/lib/netlist/devices/nld_82s115.cpp
index f1e49bd9f83..f1e49bd9f83 100644..100755
--- a/src/lib/netlist/devices/nld_82S115.cpp
+++ b/src/lib/netlist/devices/nld_82s115.cpp
diff --git a/src/lib/netlist/devices/nld_82S16.cpp b/src/lib/netlist/devices/nld_82s16.cpp
index 2fc92adfe30..2fc92adfe30 100644..100755
--- a/src/lib/netlist/devices/nld_82S16.cpp
+++ b/src/lib/netlist/devices/nld_82s16.cpp
diff --git a/src/lib/netlist/macro/modules/nlmod_ICL8038_DIP.cpp b/src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp
index 05a4d300099..05a4d300099 100644..100755
--- a/src/lib/netlist/macro/modules/nlmod_ICL8038_DIP.cpp
+++ b/src/lib/netlist/macro/modules/nlmod_icl8038_dip.cpp
diff --git a/src/lib/netlist/macro/modules/nlmod_NE556_DIP.cpp b/src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp
index 7f278a18b6d..7f278a18b6d 100644..100755
--- a/src/lib/netlist/macro/modules/nlmod_NE556_DIP.cpp
+++ b/src/lib/netlist/macro/modules/nlmod_ne556_dip.cpp
diff --git a/src/lib/netlist/macro/modules/nlmod_RTEST.cpp b/src/lib/netlist/macro/modules/nlmod_rtest.cpp
index c2ad129c6e3..c2ad129c6e3 100644..100755
--- a/src/lib/netlist/macro/modules/nlmod_RTEST.cpp
+++ b/src/lib/netlist/macro/modules/nlmod_rtest.cpp
diff --git a/src/lib/netlist/nl_base.cpp b/src/lib/netlist/nl_base.cpp
index 52cad23e9ba..2baf96d73fc 100644
--- a/src/lib/netlist/nl_base.cpp
+++ b/src/lib/netlist/nl_base.cpp
@@ -140,9 +140,9 @@ namespace netlist
//m_setup->parser().register_source<source_pattern_t>("../macro/nlm_{1}.cpp");
#else
#if 1
- m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp");
- m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/generated/nlm_{1}.cpp");
- m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/modules/nlmod_{1}.cpp");
+ m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/nlm_{1}.cpp", true);
+ m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/generated/nlm_{1}.cpp", true);
+ m_setup->parser().register_source<source_pattern_t>("src/lib/netlist/macro/modules/nlmod_{1}.cpp", true);
m_setup->parser().include("base_lib");
#else
// FIXME: This is very slow - need optimized parsing scanning
diff --git a/src/lib/netlist/nl_setup.cpp b/src/lib/netlist/nl_setup.cpp
index 09c84642c75..8392f156117 100644
--- a/src/lib/netlist/nl_setup.cpp
+++ b/src/lib/netlist/nl_setup.cpp
@@ -1733,7 +1733,7 @@ plib::istream_uptr source_file_t::stream(const pstring &name)
plib::istream_uptr source_pattern_t::stream(const pstring &name)
{
- pstring filename = plib::pfmt(m_pattern)(name);
+ pstring filename = plib::pfmt(m_pattern)(m_force_lowercase ? plib::lcase(name) : name);
auto f = std::make_unique<plib::ifstream>(plib::filesystem::u8path(filename));
if (f->is_open())
{
diff --git a/src/lib/netlist/plib/poptions.h b/src/lib/netlist/plib/poptions.h
index 714a357da86..a0368ebdc09 100644
--- a/src/lib/netlist/plib/poptions.h
+++ b/src/lib/netlist/plib/poptions.h
@@ -261,12 +261,12 @@ namespace plib {
return nullptr;
}
- option *getopt_short(const pstring &arg) const;
- option *getopt_long(const pstring &arg) const;
+ option *getopt_short(const pstring &arg) const;
+ option *getopt_long(const pstring &arg) const;
- std::vector<option_base *> m_opts;
- pstring m_app;
- option_args * m_other_args;
+ std::vector<option_base *> m_opts;
+ pstring m_app;
+ option_args * m_other_args;
};
} // namespace plib