Removed duplicated std/old style lists, touched design.odb for odb re…

…gressions
andyfox-rushc · Jan 11, 2024 · 5d390a0 · 5d390a0
1 parent 90fc00b
commit 5d390a0
Show file tree

Hide file tree

Showing 11 changed files with 0 additions and 50 deletions.
diff --git a/src/odb/src/codeGenerator/schema/chip/dbModInst.json b/src/odb/src/codeGenerator/schema/chip/dbModInst.json
@@ -41,12 +41,6 @@
 	    "flags":["no-set"],
 	    "parent":"dbBlock"
 	},
-
-	{
-	    "name": "_moditerms",
-	    "type": "dbId<_dbModITerm>",
-	    "flags":["no-set","no-get"]
-	},
 	{
       	    "name":"_pin_vec",
 	    "type":"std::vector<dbId<dbModITerm > >",

diff --git a/src/odb/src/codeGenerator/schema/chip/dbModIterm.json b/src/odb/src/codeGenerator/schema/chip/dbModIterm.json
@@ -26,11 +26,6 @@
             "name":"_next_entry",
             "type":"dbId<_dbModITerm>",
             "flags":["no-set","no-get"]
-        },
-        {
-            "name":"_moditerm_next",
-            "type":"dbId<_dbModITerm>",
-            "flags":["no-set","no-get"]
         }
     ],
     "constructors":[],

diff --git a/src/odb/src/codeGenerator/schema/chip/dbModule.json b/src/odb/src/codeGenerator/schema/chip/dbModule.json
@@ -36,13 +36,6 @@
 	    "flags":["no-set","no-get"],
 	    "parent":"dbBlock"
 	},
-
-	{
-	    "name":"_modbterms",
-	    "type":"dbId<_dbModBTerm>",
-	    "flags":["no-set","no-get"],
-	    "parent":"dbModule"
-	},
 	{
 	    "name":"_port_vec",
 	    "type":"std::vector< dbId<dbModBTerm> >",

diff --git a/src/odb/src/db/dbModBTerm.cpp b/src/odb/src/db/dbModBTerm.cpp
@@ -199,7 +199,6 @@ dbModBTerm* dbModBTerm::create(dbModule* parentModule,
   modbterm->_direction = strdup(direction);
   ZALLOCATED(modbterm->_name);
   modbterm->_parent = module->getOID();
-  module->_modbterms = modbterm->getOID();
   module->_port_map[std::string(name)] = module->_port_vec.size();
   module->_port_vec.push_back(modbterm->getOID());
   return (dbModBTerm*) modbterm;

diff --git a/src/odb/src/db/dbModITerm.cpp b/src/odb/src/db/dbModITerm.cpp
@@ -62,9 +62,6 @@ bool _dbModITerm::operator==(const _dbModITerm& rhs) const
   if (_next_entry != rhs._next_entry) {
     return false;
   }
-  if (_moditerm_next != rhs._moditerm_next) {
-    return false;
-  }
 
   return true;
 }
@@ -84,7 +81,6 @@ void _dbModITerm::differences(dbDiff& diff,
   DIFF_FIELD(_parent);
   DIFF_FIELD(_net);
   DIFF_FIELD(_next_entry);
-  DIFF_FIELD(_moditerm_next);
   DIFF_END
 }
 
@@ -96,7 +92,6 @@ void _dbModITerm::out(dbDiff& diff, char side, const char* field) const
   DIFF_OUT_FIELD(_parent);
   DIFF_OUT_FIELD(_net);
   DIFF_OUT_FIELD(_next_entry);
-  DIFF_OUT_FIELD(_moditerm_next);
 
   DIFF_END
 }
@@ -112,7 +107,6 @@ _dbModITerm::_dbModITerm(_dbDatabase* db, const _dbModITerm& r)
   _parent = r._parent;
   _net = r._net;
   _next_entry = r._next_entry;
-  _moditerm_next = r._moditerm_next;
 }
 
 dbIStream& operator>>(dbIStream& stream, _dbModITerm& obj)
@@ -122,7 +116,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModITerm& obj)
   stream >> obj._parent;
   stream >> obj._net;
   stream >> obj._next_entry;
-  stream >> obj._moditerm_next;
   return stream;
 }
 
@@ -133,7 +126,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbModITerm& obj)
   stream << obj._parent;
   stream << obj._net;
   stream << obj._next_entry;
-  stream << obj._moditerm_next;
   return stream;
 }
 
@@ -206,8 +198,6 @@ dbModITerm* dbModITerm::create(dbModInst* parentInstance, const char* name)
   moditerm->_name = strdup(name);
   ZALLOCATED(moditerm->_name);
   moditerm->_parent = parent->getOID();  // dbModInst -- parent
-  moditerm->_moditerm_next = parent->_moditerms;
-  parent->_moditerms = moditerm->getOID();
   parent->_pin_vec.push_back(moditerm->getOID());
 
   return (dbModITerm*) moditerm;

diff --git a/src/odb/src/db/dbModITerm.h b/src/odb/src/db/dbModITerm.h
@@ -65,7 +65,6 @@ class _dbModITerm : public _dbObject
   dbId<_dbModInst> _parent;
   dbId<_dbModNet> _net;
   dbId<_dbModITerm> _next_entry;
-  dbId<_dbModITerm> _moditerm_next;
 };
 dbIStream& operator>>(dbIStream& stream, _dbModITerm& obj);
 dbOStream& operator<<(dbOStream& stream, const _dbModITerm& obj);

diff --git a/src/odb/src/db/dbModInst.cpp b/src/odb/src/db/dbModInst.cpp
@@ -72,9 +72,6 @@ bool _dbModInst::operator==(const _dbModInst& rhs) const
   if (_group != rhs._group) {
     return false;
   }
-  if (_moditerms != rhs._moditerms) {
-    return false;
-  }
 
   return true;
 }
@@ -100,7 +97,6 @@ void _dbModInst::differences(dbDiff& diff,
   DIFF_FIELD(_master);
   DIFF_FIELD(_group_next);
   DIFF_FIELD(_group);
-  DIFF_FIELD(_moditerms);
   DIFF_END
 }
 
@@ -114,7 +110,6 @@ void _dbModInst::out(dbDiff& diff, char side, const char* field) const
   DIFF_OUT_FIELD(_master);
   DIFF_OUT_FIELD(_group_next);
   DIFF_OUT_FIELD(_group);
-  DIFF_OUT_FIELD(_moditerms);
 
   DIFF_END
 }
@@ -140,7 +135,6 @@ _dbModInst::_dbModInst(_dbDatabase* db, const _dbModInst& r)
   _master = r._master;
   _group_next = r._group_next;
   _group = r._group;
-  _moditerms = r._moditerms;
 }
 
 dbIStream& operator>>(dbIStream& stream, _dbModInst& obj)
@@ -152,7 +146,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModInst& obj)
   stream >> obj._master;
   stream >> obj._group_next;
   stream >> obj._group;
-  stream >> obj._moditerms;
   stream >> obj._pin_vec;
   return stream;
 }
@@ -166,7 +159,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbModInst& obj)
   stream << obj._master;
   stream << obj._group_next;
   stream << obj._group;
-  stream << obj._moditerms;
   stream << obj._pin_vec;
   return stream;
 }

diff --git a/src/odb/src/db/dbModInst.h b/src/odb/src/db/dbModInst.h
@@ -43,7 +43,6 @@ class dbDiff;
 class _dbDatabase;
 class _dbModule;
 class _dbGroup;
-class _dbModITerm;
 // User Code Begin Classes
 class dbModITerm;
 // User Code End Classes
@@ -71,7 +70,6 @@ class _dbModInst : public _dbObject
   dbId<_dbModule> _master;
   dbId<_dbModInst> _group_next;
   dbId<_dbGroup> _group;
-  dbId<_dbModITerm> _moditerms;
   std::vector<dbId<dbModITerm>> _pin_vec;
 };
 dbIStream& operator>>(dbIStream& stream, _dbModInst& obj);

diff --git a/src/odb/src/db/dbModule.cpp b/src/odb/src/db/dbModule.cpp
@@ -76,9 +76,6 @@ bool _dbModule::operator==(const _dbModule& rhs) const
   if (_modnets != rhs._modnets) {
     return false;
   }
-  if (_modbterms != rhs._modbterms) {
-    return false;
-  }
 
   return true;
 }
@@ -103,7 +100,6 @@ void _dbModule::differences(dbDiff& diff,
   DIFF_FIELD(_mod_inst);
   DIFF_FIELD(_modinsts);
   DIFF_FIELD(_modnets);
-  DIFF_FIELD(_modbterms);
   DIFF_END
 }
 
@@ -116,7 +112,6 @@ void _dbModule::out(dbDiff& diff, char side, const char* field) const
   DIFF_OUT_FIELD(_mod_inst);
   DIFF_OUT_FIELD(_modinsts);
   DIFF_OUT_FIELD(_modnets);
-  DIFF_OUT_FIELD(_modbterms);
 
   DIFF_END
 }
@@ -139,7 +134,6 @@ _dbModule::_dbModule(_dbDatabase* db, const _dbModule& r)
   _mod_inst = r._mod_inst;
   _modinsts = r._modinsts;
   _modnets = r._modnets;
-  _modbterms = r._modbterms;
 }
 
 dbIStream& operator>>(dbIStream& stream, _dbModule& obj)
@@ -150,7 +144,6 @@ dbIStream& operator>>(dbIStream& stream, _dbModule& obj)
   stream >> obj._mod_inst;
   stream >> obj._modinsts;
   stream >> obj._modnets;
-  stream >> obj._modbterms;
   stream >> obj._port_vec;
   stream >> obj._modinst_vec;
   stream >> obj._dbinst_vec;
@@ -167,7 +160,6 @@ dbOStream& operator<<(dbOStream& stream, const _dbModule& obj)
   stream << obj._mod_inst;
   stream << obj._modinsts;
   stream << obj._modnets;
-  stream << obj._modbterms;
   stream << obj._port_vec;
   stream << obj._modinst_vec;
   stream << obj._dbinst_vec;

diff --git a/src/odb/src/db/dbModule.h b/src/odb/src/db/dbModule.h
@@ -49,7 +49,6 @@ class _dbDatabase;
 class _dbInst;
 class _dbModInst;
 class _dbModNet;
-class _dbModBTerm;
 class dbModBTerm;
 class dbModInst;
 class dbInst;
@@ -80,7 +79,6 @@ class _dbModule : public _dbObject
   dbId<_dbModInst> _mod_inst;
   dbId<_dbModInst> _modinsts;
   dbId<_dbModNet> _modnets;
-  dbId<_dbModBTerm> _modbterms;
   std::vector<dbId<dbModBTerm>> _port_vec;
   std::vector<dbId<dbModInst>> _modinst_vec;
   std::vector<dbId<dbInst>> _dbinst_vec;

diff --git a/src/odb/test/data/design.odb b/src/odb/test/data/design.odb