riscv
/
alliance
mirror of https://gitlab.lip6.fr/vlsi-eda/alliance.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

In nero, template methods must be in headers (thanks clang).

This commit is contained in:
Jean-Paul Chaput 2017-11-28 16:55:11 +01:00
parent e16557695e
commit 57b0f4774e
2 changed files with 98 additions and 131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

129
alliance/src/nero/src/MDRGrid.cpp
View File

@ -413,132 +413,3 @@ int CDRGrid::dz (int index, int d)
return (index + d*XY);
}
// -------------------------------------------------------------------
// Destructor : "TMatrix::_CHollow::~_CHollow()".
template<class __CNode__>
TMatrix<__CNode__>::_CHollow::~_CHollow (void)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
for (itLayer = nodes.begin ();
itLayer != nodes.end (); itLayer++) {
for (itRow = itLayer->second.begin ();
itRow != itLayer->second.end (); itRow++) {
delete itRow->second;
}
}
}
// -------------------------------------------------------------------
// Method : "TMatrix::_CHollow::add()".
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::_CHollow::add (int x, int y)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
itLayer = nodes.find (x);
if (itLayer == nodes.end ()) { nodes[x] = _CRow (); }
itRow = nodes[x].find (y);
if (itRow == nodes[x].end ()) { nodes[x][y] = new __CNode__ (); }
return (*(nodes[x][y]));
}
// -------------------------------------------------------------------
// Method : "TMatrix::_CHollow::get()".
template<class __CNode__>
__CNode__ *TMatrix<__CNode__>::_CHollow::get (int x, int y)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
itLayer = nodes.find (x);
if (itLayer == nodes.end ()) { return (NULL); }
itRow = nodes[x].find (y);
if (itRow == nodes[x].end ()) { return (NULL); }
return ((*itRow).second);
}
// -------------------------------------------------------------------
// Constructor : "TMatrix::TMatrix()".
template<class __CNode__>
TMatrix<__CNode__>::TMatrix (CDRGrid *drgrid)
: _drgrid(drgrid)
, hole ()
{
_grid = new __CNode__ [_drgrid->size];
}
// -------------------------------------------------------------------
// Destructor : "~TMatrix::TMatrix()".
template<class __CNode__>
TMatrix<__CNode__>::~TMatrix (void)
{
delete [] _grid;
}
// -------------------------------------------------------------------
// Accessor : "TMatrix::&operator[]".
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::operator[] (int index)
{
if (index < _drgrid->XY ) {
__CNode__ *node = _zero.get (_drgrid->x(index), _drgrid->y(index)) ;
if ( node != NULL ) return ( *node );
} else {
if (index < _drgrid->XYZ) return ( _grid[index - _drgrid->XY] );
}
return ( hole );
}
// -------------------------------------------------------------------
// Modifier : "TMatrix::add ()".
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::add (int index)
{
if (index < _drgrid->XY) {
return ( _zero.add (_drgrid->x(index), _drgrid->y(index)) );
} else {
if (index < _drgrid->XYZ) return ( (*this)[index] );
}
return ( hole );
}

100
alliance/src/nero/src/MDefs.h
View File

@ -213,8 +213,6 @@
};
// ---------------------------------------------------------------
// Detailed Routing Grid Class.
@ -340,6 +338,104 @@
};
// ---------------------------------------------------------------
// Detailed Routing Matrix Class (methods)
template<class __CNode__>
TMatrix<__CNode__>::_CHollow::~_CHollow (void)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
for (itLayer = nodes.begin ();
itLayer != nodes.end (); itLayer++) {
for (itRow = itLayer->second.begin ();
itRow != itLayer->second.end (); itRow++) {
delete itRow->second;
}
}
}
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::_CHollow::add (int x, int y)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
itLayer = nodes.find (x);
if (itLayer == nodes.end ()) { nodes[x] = _CRow (); }
itRow = nodes[x].find (y);
if (itRow == nodes[x].end ()) { nodes[x][y] = new __CNode__ (); }
return (*(nodes[x][y]));
}
template<class __CNode__>
__CNode__ *TMatrix<__CNode__>::_CHollow::get (int x, int y)
{
typename _CRow::iterator itRow;
typename _CLayer::iterator itLayer;
itLayer = nodes.find (x);
if (itLayer == nodes.end ()) { return (NULL); }
itRow = nodes[x].find (y);
if (itRow == nodes[x].end ()) { return (NULL); }
return ((*itRow).second);
}
template<class __CNode__>
TMatrix<__CNode__>::TMatrix (CDRGrid *drgrid)
: _drgrid(drgrid)
, hole ()
{
_grid = new __CNode__ [_drgrid->size];
}
template<class __CNode__>
TMatrix<__CNode__>::~TMatrix (void)
{
delete [] _grid;
}
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::operator[] (int index)
{
if (index < _drgrid->XY ) {
__CNode__ *node = _zero.get (_drgrid->x(index), _drgrid->y(index)) ;
if ( node != NULL ) return ( *node );
} else {
if (index < _drgrid->XYZ) return ( _grid[index - _drgrid->XY] );
}
return ( hole );
}
template<class __CNode__>
__CNode__ &TMatrix<__CNode__>::add (int index)
{
if (index < _drgrid->XY) {
return ( _zero.add (_drgrid->x(index), _drgrid->y(index)) );
} else {
if (index < _drgrid->XYZ) return ( (*this)[index] );
}
return ( hole );
}
// -------------------------------------------------------------------