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

some cleaning again

This commit is contained in:
Christophe Alexandre 2008-03-22 13:19:38 +00:00
parent 98778c4dbd
commit cb9260599c
7 changed files with 23 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
chamsin/src/analogic/GenV1Trans.cpp
View File

@ -493,7 +493,7 @@ END_IF
switch(transistor->getAbutmentType().getCode()) { switch(transistor->getAbutmentType().getCode()) {
case Transistor::Type::INTERNAL : case Transistor::Type::INTERNAL :
transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter() transistor->setAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
, transistor->getBoundingBox().getYMin() , transistor->getBoundingBox().getYMin()
, GET_BOX(string("40")).getXCenter() , GET_BOX(string("40")).getXCenter()
, transistor->getBoundingBox().getYMax() , transistor->getBoundingBox().getYMax()
@ -502,7 +502,7 @@ END_IF
break; break;
case Transistor::Type::LEFT: case Transistor::Type::LEFT:
transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin() transistor->setAbutmentBox( Box(GET_BOX(string("11")).getXMin()
, transistor->getBoundingBox().getYMin() , transistor->getBoundingBox().getYMin()
, GET_BOX(string("40")).getXCenter() , GET_BOX(string("40")).getXCenter()
, transistor->getBoundingBox().getYMax() , transistor->getBoundingBox().getYMax()
@ -511,7 +511,7 @@ END_IF
break ; break ;
case Transistor::Type::RIGHT: case Transistor::Type::RIGHT:
transistor->SetAbutmentBox( Box(GET_BOX(string("20")).getXCenter() transistor->setAbutmentBox( Box(GET_BOX(string("20")).getXCenter()
, transistor->getBoundingBox().getYMin() , transistor->getBoundingBox().getYMin()
, GET_BOX(string("11")).getXMax() , GET_BOX(string("11")).getXMax()
, transistor->getBoundingBox().getYMax() , transistor->getBoundingBox().getYMax()
@ -520,7 +520,7 @@ END_IF
break ; break ;
case Transistor::Type::SINGLE: case Transistor::Type::SINGLE:
transistor->SetAbutmentBox( Box(GET_BOX(string("11")).getXMin() transistor->setAbutmentBox( Box(GET_BOX(string("11")).getXMin()
, transistor->getBoundingBox().getYMin() , transistor->getBoundingBox().getYMin()
, GET_BOX(string("11")).getXMax() , GET_BOX(string("11")).getXMax()
, transistor->getBoundingBox().getYMax() , transistor->getBoundingBox().getYMax()

4
chamsin/src/analogic/MetaTransistor.cpp
View File

@ -85,7 +85,7 @@ void MetaTransistor::createLayout()
throw Error("Can't generate layout : " + getString(this) + " hasn't been dimensionned"); throw Error("Can't generate layout : " + getString(this) + " hasn't been dimensionned");
} }
SetTerminal(false); setTerminal(false);
Transistor * internal_ref = NULL; Transistor * internal_ref = NULL;
Transistor * left_ref = NULL; Transistor * left_ref = NULL;
@ -136,7 +136,7 @@ void MetaTransistor::createLayout()
end_for end_for
Materialize(); materialize();
// CloseUpdateSession(); // CloseUpdateSession();
} }

10
chamsin/src/analogic/Transistor.cpp
View File

@ -372,14 +372,14 @@ void Transistor::createLayout()
break; break;
} }
SetTerminal(false); setTerminal(false);
// Launch the selected algorithme. // Launch the selected algorithme.
// ****************************** // ******************************
_genTrans->Calculate(this); _genTrans->Calculate(this);
_genTrans->Generate(this); _genTrans->Generate(this);
Materialize(); materialize();
delete _genTrans; delete _genTrans;
_genTrans = NULL; _genTrans = NULL;
@ -392,7 +392,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
{ {
OpenUpdateSession(); OpenUpdateSession();
SetTerminal(false); setTerminal(false);
Net * tmp = NULL; Net * tmp = NULL;
Contact * con = NULL; Contact * con = NULL;
@ -422,7 +422,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
end_for end_for
end_for end_for
SetAbutmentBox(transistor->getAbutmentBox()); setAbutmentBox(transistor->getAbutmentBox());
_mapNet2Box.clear(); _mapNet2Box.clear();
@ -434,7 +434,7 @@ void Transistor::DuplicateLayout(Transistor* transistor)
i++; i++;
} }
Materialize(); materialize();
CloseUpdateSession(); CloseUpdateSession();

4
chamsin/src/device/Device.cpp
View File

@ -33,7 +33,7 @@ static void getAllCells(Cell* cell)
{ {
cellSet.insert(cell); cellSet.insert(cell);
if(!(cell->IsLeaf())){ if(!(cell->isLeaf())){
for_each_instance(instance, cell->getInstances()) for_each_instance(instance, cell->getInstances())
Cell * mastercell = instance->getMasterCell(); Cell * mastercell = instance->getMasterCell();
getAllCells(mastercell); getAllCells(mastercell);
@ -131,7 +131,7 @@ void Device::_Place(Instance* ins, const Transformation::Orientation& orientatio
} }
void Device::_SetRefIns(Instance* ins) const void Device::_setRefIns(Instance* ins) const
// ***************************************** // *****************************************
{ {
if(!ins) { if(!ins) {

2
chamsin/src/device/Device.h
View File

@ -82,7 +82,7 @@ class Device : public Cell {
// Description of Layout // Description of Layout
// ********************** // **********************
public: void _Place(Instance* ins, const Transformation::Orientation& orientation, const Point& point); public: void _Place(Instance* ins, const Transformation::Orientation& orientation, const Point& point);
public: void _SetRefIns(Instance*) const; public: void _setRefIns(Instance*) const;
public: void _PlaceRight(Instance* ins, const Transformation::Orientation& orientation, const Point& offset=Point()); public: void _PlaceRight(Instance* ins, const Transformation::Orientation& orientation, const Point& offset=Point());

8
chamsin/src/device/TrMos.cpp
View File

@ -304,7 +304,7 @@ void TrMos::Generate(const unsigned m, const bool sourceisfirst, const bool hasr
// Call function CreateLayout of MetaTransistor to launch the generator of finger. // Call function CreateLayout of MetaTransistor to launch the generator of finger.
// ******************************************************************************* // *******************************************************************************
SetTerminal(false); setTerminal(false);
// //
// IF_DEBUG_HUR_ANALOG // IF_DEBUG_HUR_ANALOG
// cout << endl; // cout << endl;
@ -331,8 +331,8 @@ void TrMos::Generate(const unsigned m, const bool sourceisfirst, const bool hasr
for_each_instance(instance, getInstances()) for_each_instance(instance, getInstances())
//instance->SetTransformation(instance->getTransformation()); //instance->SetTransformation(instance->getTransformation());
instance->Unmaterialize(); instance->unmaterialize();
instance->Materialize(); instance->materialize();
IF_DEBUG_HUR_ANALOG IF_DEBUG_HUR_ANALOG
cout << ts << getString(instance) <<" 's boundingBox is " << getString(instance->getBoundingBox())<<endl; cout << ts << getString(instance) <<" 's boundingBox is " << getString(instance->getBoundingBox())<<endl;
@ -346,7 +346,7 @@ IF_DEBUG_HUR_ANALOG
cout << ts << getString(this) << " 's primary (without wire) boundingBox is " << getString(getBoundingBox()) <<endl; cout << ts << getString(this) << " 's primary (without wire) boundingBox is " << getString(getBoundingBox()) <<endl;
END_IF END_IF
Materialize(); materialize();
IF_DEBUG_HUR_ANALOG IF_DEBUG_HUR_ANALOG
cout << ts << getString(this) << " 's boundingBox is " << getString(getBoundingBox()) <<endl; cout << ts << getString(this) << " 's boundingBox is " << getString(getBoundingBox()) <<endl;

10
chamsin/src/device/TrMos_PlaceRoute.cpp
View File

@ -143,7 +143,7 @@ void TrMos::_PlaceAndRoute()
else else
_Place( leftins, Transformation::Orientation::MX, Point(horizontalMargin, verticalLowMargin) ); _Place( leftins, Transformation::Orientation::MX, Point(horizontalMargin, verticalLowMargin) );
_SetRefIns(leftins); _setRefIns(leftins);
if(_sourceIsFirst) // internal Finger's transformation. if(_sourceIsFirst) // internal Finger's transformation.
internalTransCode = Transformation::Orientation::MX; internalTransCode = Transformation::Orientation::MX;
@ -186,8 +186,8 @@ void TrMos::_PlaceAndRoute()
// Set AbutmentBox. // Set AbutmentBox.
// **************** // ****************
for_each_instance(instance, getInstances()) for_each_instance(instance, getInstances())
instance->Unmaterialize(); instance->unmaterialize();
instance->Materialize(); instance->materialize();
end_for end_for
OpenUpdateSession(); OpenUpdateSession();
@ -195,7 +195,7 @@ void TrMos::_PlaceAndRoute()
cout <<"Bounding box of TrMos is "<<getString(getBoundingBox())<<endl; cout <<"Bounding box of TrMos is "<<getString(getBoundingBox())<<endl;
SetAbutmentBox(Box(0, 0, setAbutmentBox(Box(0, 0,
getBoundingBox().getWidth() + 2*horizontalMargin, getBoundingBox().getWidth() + 2*horizontalMargin,
getBoundingBox().getHeight() + verticalLowMargin + verticalHighMargin getBoundingBox().getHeight() + verticalLowMargin + verticalHighMargin
) )
@ -304,7 +304,7 @@ void TrMos::_PlaceAndRoute()
Net * net = dynamic_cast<Net*>(occurrence.getEntity()); Net * net = dynamic_cast<Net*>(occurrence.getEntity());
Box routingZone; Box routingZone;
if(net->getCell()->IsLeaf()) { if(net->getCell()->isLeaf()) {
Transistor * trans = dynamic_cast<Transistor*>(net->getCell()); Transistor * trans = dynamic_cast<Transistor*>(net->getCell());
if ( !trans ) if ( !trans )
throw Error("Can't launch Trmos::PlaceAndRoute for " + getString(this) throw Error("Can't launch Trmos::PlaceAndRoute for " + getString(this)