Sprinter/mame
2
0
Fork 0
mirror of https://github.com/holub/mame synced 2025-10-04 16:34:53 +03:00
Code Issues Actions 6 Packages Projects Releases Wiki Activity

netlist: fix some issues. (nw)

Browse Source
This commit is contained in:
couriersud 2019-02-02 14:56:56 +01:00
parent 68c56f5876
commit f9f341f4d6
5 changed files with 82 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/lib/netlist/macro/nlm_ttl74xx.cpp
View File

@ -825,8 +825,9 @@ NETLIST_END()
NETLIST_START(TTL74XX_lib)
NET_MODEL("DM7414 SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
NET_MODEL("DM74LS14 SCHMITT_TRIGGER(VTP=1.6 VTM=0.8 VI=4.4 RI=19.3k VOH=3.45 ROH=130 VOL=0.1 ROL=31.2 TPLH=15 TPHL=15)")
NET_MODEL("DM7414 SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
NET_MODEL("TTL_7414_GATE SCHMITT_TRIGGER(VTP=1.7 VTM=0.9 VI=4.35 RI=6.15k VOH=3.5 ROH=120 VOL=0.1 ROL=37.5 TPLH=15 TPHL=15)")
NET_MODEL("DM74LS14 SCHMITT_TRIGGER(VTP=1.6 VTM=0.8 VI=4.4 RI=19.3k VOH=3.45 ROH=130 VOL=0.1 ROL=31.2 TPLH=15 TPHL=15)")
//NET_MODEL("DM7414 FAMILY(FV=5 IVL=0.16 IVH=0.4 OVL=0.1 OVH=0.05 ORL=10.0 ORH=1.0e8)")

4
src/lib/netlist/nl_lists.h
View File

@ -136,9 +136,7 @@ namespace netlist
{
if (QueueOp::equal(*i, elem))
{
--m_end;
for (;i < m_end; ++i)
*i = std::move(*(i+1));
std::copy(i+1, m_end--, i);
return;
}
}

39
src/lib/netlist/nl_setup.cpp
View File

@ -295,6 +295,42 @@ const pstring setup_t::resolve_alias(const pstring &name) const
return ret;
}
std::vector<pstring> setup_t::get_terminals_for_device_name(const pstring &devname)
{
std::vector<pstring> terms;
for (auto & t : m_terminals)
{
if (plib::startsWith(t.second->name(), devname))
{
pstring tn(t.second->name().substr(devname.length()+1));
if (tn.find(".") == pstring::npos)
terms.push_back(tn);
}
}
for (auto & t : m_alias)
{
if (plib::startsWith(t.first, devname))
{
pstring tn(t.first.substr(devname.length()+1));
//printf("\t%s %s %s\n", t.first.c_str(), t.second.c_str(), tn.c_str());
if (tn.find(".") == pstring::npos)
{
terms.push_back(tn);
pstring resolved = resolve_alias(t.first);
//printf("\t%s %s %s\n", t.first.c_str(), t.second.c_str(), resolved.c_str());
if (resolved != t.first)
{
auto found = std::find(terms.begin(), terms.end(), resolved.substr(devname.length()+1));
if (found!=terms.end())
terms.erase(found);
}
}
}
}
return terms;
}
detail::core_terminal_t *setup_t::find_terminal(const pstring &terminal_in, bool required)
{
const pstring &tname = resolve_alias(terminal_in);
@ -371,9 +407,6 @@ devices::nld_base_proxy *setup_t::get_d_a_proxy(detail::core_terminal_t &out)
auto new_proxy =
out_cast.logic_family()->create_d_a_proxy(netlist(), x, &out_cast);
m_proxy_cnt++;
//new_proxy->start_dev();
/* connect all existing terminals to new net */
for (auto & p : out.net().m_core_terms)

17
src/lib/netlist/nl_setup.h
View File

@ -294,16 +294,12 @@ namespace netlist
/* helper - also used by nltool */
const pstring resolve_alias(const pstring &name) const;
/* needed by nltool */
std::vector<pstring> get_terminals_for_device_name(const pstring &devname);
log_type &log();
const log_type &log() const;
//std::vector<std::pair<pstring, factory::element_t *>> m_device_factory;
std::unordered_map<pstring, factory::element_t *> m_device_factory;
std::unordered_map<pstring, pstring> m_alias;
std::unordered_map<pstring, pstring> m_param_values;
std::unordered_map<pstring, detail::core_terminal_t *> m_terminals;
/* needed by proxy */
detail::core_terminal_t *find_terminal(const pstring &outname_in, const detail::terminal_type atype, bool required = true);
@ -333,6 +329,13 @@ namespace netlist
devices::nld_base_proxy *get_d_a_proxy(detail::core_terminal_t &out);
devices::nld_base_proxy *get_a_d_proxy(detail::core_terminal_t &inp);
//std::vector<std::pair<pstring, factory::element_t *>> m_device_factory;
std::unordered_map<pstring, factory::element_t *> m_device_factory;
std::unordered_map<pstring, pstring> m_alias;
std::unordered_map<pstring, pstring> m_param_values;
std::unordered_map<pstring, detail::core_terminal_t *> m_terminals;
netlist_t &m_netlist;
std::unordered_map<pstring, param_ref_t> m_params;
std::vector<link_t> m_links;

69
src/lib/netlist/prg/nltool.cpp
View File

@ -31,21 +31,30 @@ public:
opt_quiet(*this, "q", "quiet", "be quiet - no warnings"),
opt_version(*this, "", "version", "display version and exit"),
opt_help(*this, "h", "help", "display help and exit"),
opt_grp2(*this, "Options for run and static commands", "These options apply to run and static commands."),
opt_name(*this, "n", "name", "", "the netlist in file specified by ""-f"" option to run; default is first one"),
opt_grp3(*this, "Options for run command", "These options are only used by the run command."),
opt_ttr (*this, "t", "time_to_run", 1.0, "time to run the emulation (seconds)"),
opt_logs(*this, "l", "log" , "define terminal to log. This option may be specified repeatedly."),
opt_inp(*this, "i", "input", "", "input file to process (default is none)"),
opt_loadstate(*this,"", "loadstate", "", "load state from file and continue from there"),
opt_savestate(*this,"", "savestate", "", "save state to file at end of run"),
opt_grp4(*this, "Options for convert command", "These options are only used by the convert command."),
opt_type(*this, "y", "type", 0, std::vector<pstring>({"spice","eagle","rinf"}), "type of file to be converted: spice,eagle,rinf"),
opt_grp5(*this, "Options for header command", "These options are only used by the header command."),
opt_tabwidth(*this, "", "tab-width", 4, "Tab width for output."),
opt_linewidth(*this,"", "line-width", 72, "Line width for output."),
opt_ex1(*this, "nltool -c run -t 3.5 -f nl_examples/cdelay.c -n cap_delay",
"Run netlist \"cap_delay\" from file nl_examples/cdelay.c for 3.5 seconds"),
opt_ex2(*this, "nltool --cmd=listdevices",
"List all known devices.")
"List all known devices."),
opt_ex3(*this, "nltool --cmd=header --tab-width=8 --line-width=80",
"Create the header file needed for including netlists as code.")
{}
plib::option_group opt_grp1;
@ -67,8 +76,12 @@ public:
plib::option_str opt_savestate;
plib::option_group opt_grp4;
plib::option_str_limit<unsigned> opt_type;
plib::option_group opt_grp5;
plib::option_num<unsigned> opt_tabwidth;
plib::option_num<unsigned> opt_linewidth;
plib::option_example opt_ex1;
plib::option_example opt_ex2;
plib::option_example opt_ex3;
int execute();
pstring usage();
@ -261,7 +274,6 @@ void netlist_tool_callbacks_t::vlog(const plib::plog_level &l, const pstring &ls
throw netlist::nl_exception(err);
}
struct input_t
{
input_t(const netlist::setup_t &setup, const pstring &line)
@ -429,13 +441,26 @@ void tool_app_t::static_compile()
void tool_app_t::mac_out(const pstring &s, const bool cont)
{
static constexpr unsigned RIGHT = 72;
if (cont)
{
unsigned adj = 0;
unsigned pos = 0;
pstring r;
for (const auto &x : s)
adj += (x == '\t' ? 3 : 0);
pout("{1}\\\n", plib::rpad(s, pstring(" "), RIGHT-1-adj));
{
if (x == '\t')
{
auto pos_mod_4 = pos % opt_tabwidth();
auto tab_adj = opt_tabwidth() - pos_mod_4;
r += plib::rpad(pstring(""), pstring(" "), tab_adj);
pos += tab_adj;
}
else
{
r += x;
pos++;
}
}
pout("{1}\\\n", plib::rpad(r, pstring(" "), opt_linewidth()-1));
}
else
pout("{1}\n", s);
@ -604,42 +629,12 @@ void tool_app_t::listdevices()
for (auto & f : list)
{
pstring out = plib::pfmt("{1:-20} {2}(<id>")(f->classname())(f->name());
std::vector<pstring> terms;
f->macro_actions(nt.setup().netlist(), f->name() + "_lc");
auto d = f->Create(nt.setup().netlist(), f->name() + "_lc");
// get the list of terminals ...
for (auto & t : nt.setup().m_terminals)
{
if (plib::startsWith(t.second->name(), d->name()))
{
pstring tn(t.second->name().substr(d->name().length()+1));
if (tn.find(".") == pstring::npos)
terms.push_back(tn);
}
}
for (auto & t : nt.setup().m_alias)
{
if (plib::startsWith(t.first, d->name()))
{
pstring tn(t.first.substr(d->name().length()+1));
//printf("\t%s %s %s\n", t.first.c_str(), t.second.c_str(), tn.c_str());
if (tn.find(".") == pstring::npos)
{
terms.push_back(tn);
pstring resolved = nt.setup().resolve_alias(t.first);
//printf("\t%s %s %s\n", t.first.c_str(), t.second.c_str(), resolved.c_str());
if (resolved != t.first)
{
auto found = std::find(terms.begin(), terms.end(), resolved.substr(d->name().length()+1));
if (found!=terms.end())
terms.erase(found);
}
}
}
}
std::vector<pstring> terms(nt.setup().get_terminals_for_device_name(d->name()));
out += "," + f->param_desc();
for (auto p : plib::psplit(f->param_desc(),",") )