luke
/
klayout
mirror of https://github.com/KLayout/klayout.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fixed issue #1304 (terminal order for MOS devices)

This commit is contained in:
Matthias Koefferlein 2023-02-26 23:30:17 +01:00
parent 3bef4917ad
commit 0fa9bc6e2b
2 changed files with 23 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/db/db/dbNetlistSpiceReader.cc
View File

@ -420,6 +420,7 @@ void NetlistSpiceReaderDelegate::parse_element (const std::string &s, const std:
bool NetlistSpiceReaderDelegate::element (db::Circuit *circuit, const std::string &element, const std::string &name, const std::string &model, double value, const std::vector<db::Net *> &nets, const std::map<std::string, double> &pv)
{
std::map<std::string, double> params = pv;
std::vector<size_t> terminal_order;
double mult = 1.0;
std::map<std::string, double>::const_iterator mp = params.find ("M");
@ -595,6 +596,12 @@ bool NetlistSpiceReaderDelegate::element (db::Circuit *circuit, const std::strin
p->second *= mult;
}
// issue #1304
terminal_order.push_back (DeviceClassMOS4Transistor::terminal_id_D);
terminal_order.push_back (DeviceClassMOS4Transistor::terminal_id_G);
terminal_order.push_back (DeviceClassMOS4Transistor::terminal_id_S);
terminal_order.push_back (DeviceClassMOS4Transistor::terminal_id_B);
} else {
error (tl::sprintf (tl::to_string (tr ("Not a known element type: '%s'")), element));
}
@ -607,8 +614,14 @@ bool NetlistSpiceReaderDelegate::element (db::Circuit *circuit, const std::strin
db::Device *device = new db::Device (cls, name);
circuit->add_device (device);
for (std::vector<db::DeviceTerminalDefinition>::const_iterator t = td.begin (); t != td.end (); ++t) {
device->connect_terminal (t->id (), nets [t - td.begin ()]);
if (terminal_order.empty ()) {
for (auto t = td.begin (); t != td.end (); ++t) {
device->connect_terminal (t->id (), nets [t - td.begin ()]);
}
} else {
for (auto t = terminal_order.begin (); t != terminal_order.end (); ++t) {
device->connect_terminal (*t, nets [t - terminal_order.begin ()]);
}
}
size_t defp = std::numeric_limits<size_t>::max ();

9
src/db/db/dbNetlistSpiceWriter.cc
View File

@ -160,7 +160,14 @@ void NetlistSpiceWriterDelegate::write_device (const db::Device &dev) const
os << "M";
os << format_name (dev.expanded_name ());
os << format_terminals (dev);
// issue #1304
os << " ";
os << net_to_string (dev.net_for_terminal (db::DeviceClassMOS3Transistor::terminal_id_D));
os << " ";
os << net_to_string (dev.net_for_terminal (db::DeviceClassMOS3Transistor::terminal_id_G));
os << " ";
os << net_to_string (dev.net_for_terminal (db::DeviceClassMOS3Transistor::terminal_id_S));
if (! mos4) {
// we assume for the MOS3 type the bulk is connected to Source