jcarr
/
coriolis
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compliance with Clang 3.4 (RHEL7, MacOS). 

* New: In Bootstrap, added support for RHEL7 in ccb.py & coriolisEnv.py.
   In coriolisEnv.py, under RHEL6, directly launch a shell under
   devtoolset-2 (do not put it in .bashrc).
* Change: All tools, compliance with Clang 3.2.
   - Call using namespace std *after* at least one include of std has
     been used.
   - In Utilities.h define both const and non-cont overload for operator<<
     of mstream (this was the true cause of the Banner display problem).
   - No longer use defaults arguments in templates, instead create two
     separated overloads.
   - Put template static attributes allocation outside of namespaces
     (this one I'm not sure how to justify).
   - Protect by NDEBUG variables that are only needed in assert().
   - In PyInterval getUnion() & getIntersection() we where silently
     overwriting the "self" object (interval).
   - In Mauka, *do no* overload _postCreate() and add an argument, breaks
     the virtual function mechanism. Rename it into _maukaPostCreate().
     Idem for SubRow().
   - In Katabatic::GCell(), invalidate() overload a Go funtion but is
     used for different purpose at this level. Rename it invalidateCt()
     (invalidate *ConTents*).
   - Miscellaneous small cleanup.
This commit is contained in:
Jean-Paul Chaput 2014-12-09 23:49:46 +01:00
parent 37c8498962
commit 978315c017
76 changed files with 403 additions and 525 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
bootstrap/builder/Configuration.py
View File

@ -121,6 +121,7 @@ class Configuration ( object ):
def _guessOs ( self ):
self._libSuffix = None
self._osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*")
self._osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*")
self._osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*")
self._osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
@ -139,7 +140,10 @@ class Configuration ( object ):
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines()
if self._osSlsoc6x_64.match(lines[0]):
if self._osSlsoc7x_64.match(lines[0]):
self._osType = "Linux.el7"
self._libSuffix = "64"
elif self._osSlsoc6x_64.match(lines[0]):
self._osType = "Linux.slsoc6x_64"
self._libSuffix = "64"
elif self._osSlsoc6x .match(lines[0]): self._osType = "Linux.slsoc6x"

6
bootstrap/ccb.py
View File

@ -54,6 +54,7 @@ def safeImport ( moduleName, symbol=None ):
def guessOs ():
libDir = 'lib'
osSlsoc7x_64 = re.compile (".*Linux.*(el7|slsoc7).*x86_64.*")
osSlsoc6x_64 = re.compile (".*Linux.*(el6|slsoc6).*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*(el6|slsoc6).*")
osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
@ -72,7 +73,10 @@ def guessOs ():
uname = subprocess.Popen ( ["uname", "-srm"], stdout=subprocess.PIPE )
lines = uname.stdout.readlines()
if osSlsoc6x_64.match(lines[0]):
if osSlsoc7x_64.match(lines[0]):
osType = "Linux.el7_64"
libDir = "lib64"
elif osSlsoc6x_64.match(lines[0]):
osType = "Linux.slsoc6x_64"
libDir = "lib64"
elif osSlsoc6x.match(lines[0]):

10
bootstrap/coriolisEnv.py
View File

@ -33,6 +33,7 @@ def stripPath ( pathName ):
def guessOs ():
useDevtoolset2 = False
osSlsoc7x_64 = re.compile (".*Linux.*el7.*x86_64.*")
osSlsoc6x_64 = re.compile (".*Linux.*el6.*x86_64.*")
osSlsoc6x = re.compile (".*Linux.*(el|slsoc)6.*")
osSLSoC5x_64 = re.compile (".*Linux.*el5.*x86_64.*")
@ -54,7 +55,10 @@ def guessOs ():
lines = uname.stdout.readlines()
libDir="lib"
if osSlsoc6x_64.match(lines[0]):
if osSlsoc7x_64.match(lines[0]):
osType = "Linux.el7_64"
libDir = "lib64"
elif osSlsoc6x_64.match(lines[0]):
osType = "Linux.slsoc6x_64"
libDir = "lib64"
useDevtoolset2 = True
@ -100,8 +104,8 @@ def guessOs ():
uname = subprocess.Popen ( ["uname", "-sr"], stdout=subprocess.PIPE )
osType = uname.stdout.readlines()[0][:-1]
#print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
#print " (using: \"%s\")" % osType
print "[WARNING] Unrecognized OS: \"%s\"." % lines[0][:-1]
print " (using: \"%s\")" % osType
return (osType,libDir,useDevtoolset2)

64
crlcore/src/ccore/Banner.cpp
View File

@ -1,74 +1,34 @@
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
// -*- C++ -*-
//
// $Id$
// This file is part of the Coriolis Software.
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Header : "./Banner.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// | C++ Module : "./Banner.cpp" |
// +-----------------------------------------------------------------+
# include <time.h>
# include <cstring>
# include <cstdlib>
# include <iomanip>
# include "crlcore/Banner.h"
# include <time.h>
# include <cstring>
# include <cstdlib>
# include <iomanip>
# include "hurricane/Error.h"
# include "crlcore/Banner.h"
namespace {
using std::make_pair;
using std::cerr;
using std::endl;
using std::setw;
using Hurricane::Error;
const char* badChar =

3
crlcore/src/ccore/alliance/ap/ApDriver.cpp
View File

@ -15,7 +15,6 @@
#include <time.h>
using namespace std;
#include "hurricane/Pin.h"
#include "hurricane/Instance.h"
@ -33,6 +32,8 @@ using namespace std;
#include "Ap.h"
#include "crlcore/Catalog.h"
using namespace std;
namespace {

4
crlcore/src/ccore/alliance/ap/ApParser.cpp
View File

@ -1,7 +1,7 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2014, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | C O R I O L I S |
@ -478,7 +478,7 @@ namespace {
orientation = fields[5];
index = -1;
if (fields[4] != '\0') index = atoi( fields[4] );
if (fields[4][0] != '\0') index = atoi( fields[4] );
size_t length = strlen( fields[3] );
if (length > 1000) {

17
crlcore/src/ccore/bookshelf/BookshelfDriver.cpp
View File

@ -34,16 +34,15 @@
// Authors-Tag
#include <time.h>
using namespace std;
#include "hurricane/Pin.h"
#include "hurricane/Cell.h"
#include "hurricane/Instance.h"
#include "hurricane/Net.h"
#include "hurricane/Horizontal.h"
#include "hurricane/Vertical.h"
#include "hurricane/Warning.h"
#include "hurricane/Pin.h"
#include "hurricane/Cell.h"
#include "hurricane/Instance.h"
#include "hurricane/Net.h"
#include "hurricane/Horizontal.h"
#include "hurricane/Vertical.h"
#include "hurricane/Warning.h"
using namespace Hurricane;
using namespace std;
namespace {

109
crlcore/src/ccore/bookshelf/BookshelfParser.cpp
View File

@ -45,22 +45,17 @@
#include <string.h>
#include <sstream>
#include <regex.h>
#include "hurricane/DataBase.h"
#include "hurricane/Horizontal.h"
#include "hurricane/Vertical.h"
#include "hurricane/UpdateSession.h"
#include "hurricane/DataBase.h"
#include "hurricane/Horizontal.h"
#include "hurricane/Vertical.h"
#include "hurricane/UpdateSession.h"
using namespace Hurricane;
#include "crlcore/Utilities.h"
#include "crlcore/AllianceFramework.h"
#include "Bookshelf.h"
#include "Bookshelf.h"
const char* badRegex =
@ -77,13 +72,13 @@ namespace {
char* lower ( char* str )
{
for ( char* ptr = str; *ptr != '\0' ; ptr++ )
*ptr = (char)tolower ( *ptr );
return str;
}
// char* lower ( char* str )
// {
// for ( char* ptr = str; *ptr != '\0' ; ptr++ )
// *ptr = (char)tolower ( *ptr );
//
// return str;
// }
// CParsAP should read this code :
// *******************************
@ -297,24 +292,24 @@ Name BKParser::getNewNetName()
}
Net* MergeNets ( Net* net1, Net* net2 )
// ************************************
{
if ( net2->getName()[0] != '~' ) {
if ( ( net1->getName()[0] == '~' ) ||
( net2->isGlobal() && !net1->isGlobal() ) ||
( net2->isExternal() && !net1->isExternal() ) ) {
Net* tmpNet = net1;
net1 = net2;
net2 = tmpNet;
}
}
net1->setExternal ( net1->isExternal() || net2->isExternal() );
net1->setGlobal ( net1->isGlobal() || net2->isGlobal() );
net1->merge ( net2 ); // Caution : net2 will be deleted
return net1;
}
// Net* MergeNets ( Net* net1, Net* net2 )
// // ************************************
// {
// if ( net2->getName()[0] != '~' ) {
// if ( ( net1->getName()[0] == '~' ) ||
// ( net2->isGlobal() && !net1->isGlobal() ) ||
// ( net2->isExternal() && !net1->isExternal() ) ) {
// Net* tmpNet = net1;
// net1 = net2;
// net2 = tmpNet;
// }
// }
// net1->setExternal ( net1->isExternal() || net2->isExternal() );
// net1->setGlobal ( net1->isGlobal() || net2->isGlobal() );
//
// net1->merge ( net2 ); // Caution : net2 will be deleted
// return net1;
// }
// ************************************************************************************
@ -734,28 +729,28 @@ Transformation getTransformation ( const Box& abox, const DbU::Unit& x, const Db
}
void UpdateSizes ( Contact* contact )
// **********************************
{
DbU::Unit width = 0;
DbU::Unit height = 0;
const Layer* layer = contact->getLayer();
//if ( layer->getType() == CompositeLayer::Type::VIA ) {
width = max ( contact->getWidth(), layer->getMinimalSize() );
height = max ( contact->getHeight(), layer->getMinimalSize() );
//}
for_each_hook ( hook, contact->getBodyHook()->getSlaveHooks() ) {
Component* component = hook->getComponent();
if ( Vertical* vertical = dynamic_cast<Vertical*> ( component ) ) {
width = max ( width, vertical->getWidth() );
} else if ( Horizontal* horizontal = dynamic_cast<Horizontal*> ( component ) ) {
height = max ( height, horizontal->getWidth() );
}
end_for;
}
contact->setSizes ( width, height );
}
// void UpdateSizes ( Contact* contact )
// // **********************************
// {
// DbU::Unit width = 0;
// DbU::Unit height = 0;
// const Layer* layer = contact->getLayer();
// //if ( layer->getType() == CompositeLayer::Type::VIA ) {
// width = max ( contact->getWidth(), layer->getMinimalSize() );
// height = max ( contact->getHeight(), layer->getMinimalSize() );
// //}
//
// for_each_hook ( hook, contact->getBodyHook()->getSlaveHooks() ) {
// Component* component = hook->getComponent();
// if ( Vertical* vertical = dynamic_cast<Vertical*> ( component ) ) {
// width = max ( width, vertical->getWidth() );
// } else if ( Horizontal* horizontal = dynamic_cast<Horizontal*> ( component ) ) {
// height = max ( height, horizontal->getWidth() );
// }
// end_for;
// }
// contact->setSizes ( width, height );
// }
// ***************************************************************************************

79
crlcore/src/ccore/crlcore/Banner.h
View File

@ -1,78 +1,37 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Project.
// Copyright (C) Laboratoire LIP6 - Departement ASIM
// Universite Pierre et Marie Curie
// This file is part of the Coriolis Software.
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// Main contributors :
// Christophe Alexandre <Christophe.Alexandre@lip6.fr>
// Sophie Belloeil <Sophie.Belloeil@lip6.fr>
// Hugo Clément <Hugo.Clement@lip6.fr>
// Jean-Paul Chaput <Jean-Paul.Chaput@lip6.fr>
// Damien Dupuis <Damien.Dupuis@lip6.fr>
// Christian Masson <Christian.Masson@lip6.fr>
// Marek Sroka <Marek.Sroka@lip6.fr>
//
// The Coriolis Project is free software; you can redistribute it
// and/or modify it under the terms of the GNU General Public License
// as published by the Free Software Foundation; either version 2 of
// the License, or (at your option) any later version.
//
// The Coriolis Project is distributed in the hope that it will be
// useful, but WITHOUT ANY WARRANTY; without even the implied warranty
// of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
// GNU General Public License for more details.
//
// You should have received a copy of the GNU General Public License
// along with the Coriolis Project; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
// USA
//
// License-Tag
// Authors-Tag
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
// | Author : Jean-Paul CHAPUT |
// | E-mail : Jean-Paul.Chaput@asim.lip6.fr |
// | =============================================================== |
// | C++ Header : "./Banner.h" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// | C++ Header : "./crlcore/Banner.h" |
// +-----------------------------------------------------------------+
#ifndef CRL_BANNER_H
#define CRL_BANNER_H
#include <map>
#include <string>
#include <vector>
#include <ostream>
#include <sstream>
# ifndef __CRL_BANNER_H__
# define __CRL_BANNER_H__
# include <map>
# include <string>
# include <vector>
# include <ostream>
# include <sstream>
# ifdef __CCORE_INTERNAL__
# include "hurricane/CConfig.h"
# endif
# include "crlcore/Utilities.h"
#ifdef __CCORE_INTERNAL__
# include "hurricane/CConfig.h"
#endif
#include "crlcore/Utilities.h"
namespace CRL {
using std::string;
using std::map;
using std::vector;
using std::ostream;
@ -220,7 +179,7 @@ namespace CRL {
inline unsigned int Banner::getScreenWidth () const { return _screenWidth; }
} // End of CRL namespace.
} // CRL namespace.
// Hurricane Management.
@ -233,4 +192,4 @@ inline std::ostream& operator<< ( std::ostream& o, const CRL::Banner& b ) { retu
MSTREAM_R_SUPPORT(CRL::Banner);
# endif
#endif // CRL_BANNER_H

8
crlcore/src/ccore/crlcore/Catalog.h
View File

@ -180,11 +180,9 @@ namespace CRL {
inline bool Catalog::State::isLogical () const { return (_flags&Logical )?1:0; }
inline unsigned int Catalog::State::getFlags ( unsigned int mask ) const { return ( _flags & mask ); }
inline bool Catalog::State::setFlags ( unsigned int mask, bool value ) {
switch ( value ) {
case true: _flags |= mask; break;
case false: _flags &= ~mask; break;
}
return ( (_flags&mask) ? true : false );
if (value) { _flags |= mask; }
else { _flags &= ~mask; }
return ((_flags&mask) ? true : false);
}
inline bool Catalog::State::setFlattenLeaf ( bool value ) { return setFlags(FlattenLeaf,value); }
inline bool Catalog::State::setFeed ( bool value ) { return setFlags(Feed ,value); }

31
crlcore/src/ccore/crlcore/LefDefExtension.h
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
@ -17,19 +11,15 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Header : "./LefDefExtension.h" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#ifndef __LEFDEF_EXTENSION__
#define __LEFDEF_EXTENSION__
#ifndef CRL_LEFDEF_EXTENSION_H
#define CRL_LEFDEF_EXTENSION_H
#include <list>
#include "hurricane/Box.h"
#include "hurricane/Property.h"
#include <list>
#include "hurricane/Box.h"
#include "hurricane/Property.h"
namespace Hurricane {
class Cell;
@ -91,7 +81,6 @@ namespace CRL {
};
} // End of CRL namespace.
} // CRL namespace.
#endif // __LEFDEF_EXTENSION__
#endif // CRL_LEFDEF_EXTENSION_H

8
crlcore/src/ccore/crlcore/Measures.h
View File

@ -147,7 +147,8 @@ namespace CRL {
public:
typedef StandardPrivateProperty<MeasuresDatas> Extension;
public:
template<typename Data> friend inline void addMeasure ( DBo*, const Name&, const Data&, unsigned int width=8 );
template<typename Data> friend inline void addMeasure ( DBo*, const Name&, const Data&, unsigned int width );
template<typename Data> friend inline void addMeasure ( DBo*, const Name&, const Data& );
template<typename Data> friend inline void addMeasure ( DBo*, const Name&, Data* );
template<typename Data> friend inline const Measure<Data>* getMeasure ( DBo*, const Name& );
static const MeasuresSet* get ( const DBo* );
@ -170,6 +171,11 @@ namespace CRL {
}
template<typename Data>
inline void addMeasure ( DBo* object, const Name& name, const Data& data )
{ return addMeasure(object,name,data,8); }
template<typename Data>
inline void addMeasure ( DBo* object, const Name& name, Data* data )
{

29
crlcore/src/ccore/crlcore/NetExtension.h
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
@ -17,18 +11,14 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Header : "./NetExtension.h" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#ifndef __NET_EXTENSION__
#define __NET_EXTENSION__
#ifndef CRL_NET_EXTENSION_H
#define CRL_NET_EXTENSION_H
#include <set>
#include "hurricane/Property.h"
#include <set>
#include "hurricane/Property.h"
namespace Hurricane {
class Net;
@ -79,7 +69,6 @@ namespace CRL {
};
} // End of CRL namespace.
} // CRL namespace.
#endif // __NET_EXTENSION__
#endif // CRL_NET_EXTENSION_H

94
crlcore/src/ccore/crlcore/Utilities.h
View File

@ -31,7 +31,6 @@
namespace CRL {
using Hurricane::_TName;
using Hurricane::Record;
using Hurricane::Error;
@ -152,12 +151,9 @@ namespace CRL {
} // End of CRL namespace.
// -------------------------------------------------------------------
// Class : "::tty()".
class tty {
public:
enum Flags { Black = 0
@ -253,7 +249,6 @@ inline std::string tty::bgcolor ( unsigned int mask )
// Wrapper around the STL ostream which uses a verbose level to choose
// wether to print or not.
class mstream : public std::ostream {
public:
enum StreamMasks { PassThrough = 0x00000001
@ -298,46 +293,57 @@ inline std::string tty::bgcolor ( unsigned int mask )
inline mstream& mstream::flush () { if (enabled()) static_cast<std::ostream*>(this)->flush(); return *this; }
inline mstream& mstream::operator<< ( std::ostream& (*pf)(std::ostream&) ) { if (enabled()) (*pf)(*this); return *this; }
// For POD Types.
template<typename T>
inline mstream& mstream::operator<< ( T& t )
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
template<typename T>
inline mstream& mstream::operator<< ( T* t )
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
template<typename T>
inline mstream& mstream::operator<< ( const T& t )
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
template<typename T>
inline mstream& mstream::operator<< ( const T* t )
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
{ if (enabled()) { *(static_cast<std::ostream*>(this)) << t; } return *this; };
// For STL Types.
inline mstream& operator<< ( mstream& o, const std::string& s )
{ if (o.enabled()) { static_cast<std::ostream&>(o) << s; } return o; };
// Specific non-member operator overload. Must be one for each type.
#define MSTREAM_V_SUPPORT(Type) \
inline mstream& operator<< ( mstream& o, const Type s ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << s; } return o; };
inline mstream& operator<< ( mstream& o, Type t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; }; \
\
inline mstream& operator<< ( mstream& o, const Type t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; };
#define MSTREAM_R_SUPPORT(Type) \
inline mstream& operator<< ( mstream& o, const Type& s ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << s; } return o; };
inline mstream& operator<< ( mstream& o, const Type& t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; }; \
\
inline mstream& operator<< ( mstream& o, Type& t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; };
#define MSTREAM_P_SUPPORT(Type) \
inline mstream& operator<< ( mstream& o, const Type* s ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << s; } return o; };
inline mstream& operator<< ( mstream& o, const Type* t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; }; \
\
inline mstream& operator<< ( mstream& o, Type* t ) \
{ if (o.enabled()) { static_cast<std::ostream&>(o) << t; } return o; };
#define MSTREAM_PR_SUPPORT(Type) \
MSTREAM_P_SUPPORT(Type) \
MSTREAM_R_SUPPORT(Type)
MSTREAM_PR_SUPPORT(std::string);
// -------------------------------------------------------------------
// Shared objects.
extern mstream cmess0;
extern mstream cmess1;
extern mstream cmess2;
@ -346,39 +352,12 @@ extern mstream cparanoid;
extern mstream cbug;
// -------------------------------------------------------------------
// Class : "::Dots".
class Dots {
public:
static Dots asPercentage ( const std::string& left, float );
static Dots asBool ( const std::string& left, bool );
static Dots asInt ( const std::string& left, int );
static Dots asUInt ( const std::string& left, unsigned int );
static Dots asULong ( const std::string& left, unsigned long );
static Dots asSizet ( const std::string& left, size_t );
static Dots asDouble ( const std::string& left, double );
static Dots asLambda ( const std::string& left, Hurricane::DbU::Unit );
static Dots asLambda ( const std::string& left, double );
static Dots asIdentifier ( const std::string& left, const std::string& );
static Dots asString ( const std::string& left, const std::string& );
private:
Dots ( const std::string& left, const std::string& right );
friend std::ostream& operator<< ( std::ostream&, const Dots& );
private:
const std::string _left;
const std::string _right;
};
// -------------------------------------------------------------------
// Class : "::linefill()".
//
// Wrapper around the STL ostream which try print unbufferized filed
// lines.
class linefill : public std::ostream {
public:
inline linefill ( const std::string& header, mstream &s );
@ -460,4 +439,29 @@ inline linefill& linefill::operator<< ( const T* t )
LINEFILL_PR_SUPPORT(std::string);
// -------------------------------------------------------------------
// Class : "::Dots".
class Dots {
public:
static Dots asPercentage ( const std::string& left, float );
static Dots asBool ( const std::string& left, bool );
static Dots asInt ( const std::string& left, int );
static Dots asUInt ( const std::string& left, unsigned int );
static Dots asULong ( const std::string& left, unsigned long );
static Dots asSizet ( const std::string& left, size_t );
static Dots asDouble ( const std::string& left, double );
static Dots asLambda ( const std::string& left, Hurricane::DbU::Unit );
static Dots asLambda ( const std::string& left, double );
static Dots asIdentifier ( const std::string& left, const std::string& );
static Dots asString ( const std::string& left, const std::string& );
private:
Dots ( const std::string& left, const std::string& right );
friend std::ostream& operator<< ( std::ostream&, const Dots& );
private:
const std::string _left;
const std::string _right;
};
#endif // CRL_UTILITIES

2
crlcore/src/ccore/ioc/IocParserGrammar.yy
View File

@ -2,7 +2,6 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
using namespace std;
#include "hurricane/DataBase.h"
#include "hurricane/Technology.h"
@ -15,6 +14,7 @@ using namespace Hurricane;
#include "crlcore/LefDefExtension.h"
#include "crlcore/NetExtension.h"
using namespace CRL;
using namespace std;
#include "crlcore/Ioc.h"
#define yyin Iocin

28
crlcore/src/ccore/lefdef/LefDefExtension.cpp
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
@ -17,16 +11,16 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Module : "./LefDefExtension.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#include "hurricane/Error.h"
#include "hurricane/Cell.h"
#include "hurricane/Error.h"
#include "hurricane/Cell.h"
#include "crlcore/LefDefExtension.h"
#include "crlcore/LefDefExtension.h"
template<>
Hurricane::Name CRL::LefDefExtension::Extension::_name = "CRL::LefDefExtension";
namespace CRL {
@ -37,10 +31,6 @@ namespace CRL {
const char* MissingLefDefExtension = "LefDefExtension::%s(): %s missing the LEF/DEF extension.";
template<>
Name LefDefExtension::Extension::_name = "CRL::LefDefExtension";
// -------------------------------------------------------------------
// Class : "CRL::LefDefExtensionDatas".

25
crlcore/src/ccore/properties/Measures.cpp
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
@ -17,20 +11,19 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Module : "./Measures.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#include <iomanip>
#include "hurricane/Error.h"
#include "hurricane/DBo.h"
#include "crlcore/Measures.h"
template<>
Hurricane::Name Hurricane::StandardPrivateProperty<CRL::MeasuresDatas>::_name = "CRL::Measures";
namespace CRL {
@ -60,10 +53,6 @@ namespace CRL {
// Class : "CRL::MeasuresSet".
template<>
Name StandardPrivateProperty<MeasuresDatas>::_name = "CRL::Measures";
MeasuresSet::~MeasuresSet ()
{
iterator imeasure = begin();

30
crlcore/src/ccore/properties/NetExtension.cpp
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2010, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | Alliance / Hurricane Interface |
// | |
@ -17,17 +11,17 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Module : "./NetExtension.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#include "hurricane/Error.h"
#include "hurricane/Net.h"
#include "hurricane/Cell.h"
#include "hurricane/Error.h"
#include "hurricane/Net.h"
#include "hurricane/Cell.h"
#include "crlcore/NetExtension.h"
#include "crlcore/NetExtension.h"
template<>
Hurricane::Name Hurricane::StandardPrivateProperty<CRL::NetExtensionDatas>::_name = "CRL::NetExtension";
namespace CRL {
@ -39,10 +33,6 @@ namespace CRL {
const char* MissingNetExtension = "NetExtension::%s(): %s missing the Net extension.";
template<>
Name StandardPrivateProperty<NetExtensionDatas>::_name = "CRL::NetExtension";
// -------------------------------------------------------------------
// Class : "CRL::NetExtensionDatas".

10
crlcore/src/ccore/spice/SpiceParser.cpp
View File

@ -551,10 +551,12 @@ END_IF
list<string>::iterator it6_begin = (*it5_begin).second.begin(),
it6_end = (*it5_begin).second.end(); // signal index list iterator
list<Net*>::iterator it7_begin = // masterModel port list iterator
modelNameToPortListMap[getString(masterModel->getName())].begin(),
it7_end =
modelNameToPortListMap[getString(masterModel->getName())].end();
list<Net*>::iterator it7_begin = // masterModel port list iterator
modelNameToPortListMap[getString(masterModel->getName())].begin();
#ifndef NDEBUG
list<Net*>::iterator it7_end =
modelNameToPortListMap[getString(masterModel->getName())].end();
#endif
while(it6_begin!=it6_end){ // For all port<=> signals to branch.
ins->getPlug(*it7_begin)->setNet(_model->getNet((*_indexToNetNameMap)[*it6_begin]));

35
crlcore/src/cyclop/CyclopMain.cpp
View File

@ -45,6 +45,7 @@ using namespace Hurricane;
#include "DemoGo.h"
#include "Cyclop.h"
#include "crlcore/Utilities.h"
using namespace CRL;
@ -54,23 +55,23 @@ namespace {
// -------------------------------------------------------------------
// Function : "printHelp()".
void printHelp ()
{
cout << endl;
cout << "Usage: cyclop [-v|--verbose] [-V|--very-verbose] [-D|--core-dump] \\\n"
<< " [-l|--trace-level <traceLevel>] [-c|--cell <cellName>] \\\n"
<< endl;
cout << "Options:\n"
<< " o [-v|--verbose] : First level of verbosity.\n"
<< " o [-V|--very-verbose] : Second level of verbosity (very talkative).\n"
<< " o [-D|--core-dump] : Enable core dumping.\n"
<< " o [-l|--trace-level <traceLevel>] :\n"
<< " Sets the level of trace, trace messages with a level superior to\n"
<< " <traceLevel> will be printed on <stderr>.\n"
<< " o [-c|--cell <cellName>] :\n"
<< " The name of the Cell to load, without extention.\n"
<< endl;
}
// void printHelp ()
// {
// cout << endl;
// cout << "Usage: cyclop [-v|--verbose] [-V|--very-verbose] [-D|--core-dump] \\\n"
// << " [-l|--trace-level <traceLevel>] [-c|--cell <cellName>] \\\n"
// << endl;
// cout << "Options:\n"
// << " o [-v|--verbose] : First level of verbosity.\n"
// << " o [-V|--very-verbose] : Second level of verbosity (very talkative).\n"
// << " o [-D|--core-dump] : Enable core dumping.\n"
// << " o [-l|--trace-level <traceLevel>] :\n"
// << " Sets the level of trace, trace messages with a level superior to\n"
// << " <traceLevel> will be printed on <stderr>.\n"
// << " o [-c|--cell <cellName>] :\n"
// << " The name of the Cell to load, without extention.\n"
// << endl;
// }
} // End of anonymous namespace.

2
crlcore/src/pyCRL/PyIspd05.cpp
View File

@ -14,9 +14,9 @@
// +-----------------------------------------------------------------+
#include "crlcore/Ispd05Bookshelf.h"
#include "crlcore/PyIspd05.h"
#include "hurricane/isobar/PyCell.h"
#include "crlcore/Ispd05Bookshelf.h"
#include <string>
#include <sstream>

10
equinox/src/equinox/SweepLine.h
View File

@ -89,10 +89,10 @@ namespace Equinox {
/**/ Record* _getRecord () const;
/**/ string _getString () const;
/**/ Box getBoundingBox () const;
/**/ void run ( vector < ITEM >* _itemsByXmin,
vector < ITEM >* _itemsByXmax,
bool stopToMax,
int max);
/**/ void run ( vector < ITEM >* _itemsByXmin
, vector < ITEM >* _itemsByXmax
, bool stopToMax = false
, int max = 0 );
/**/ void initIntervalSets () ;
/**/inline void insertInterval (ITEM newitem);
@ -346,7 +346,7 @@ inline void SweepLine<ITEM,ENGINE>::insertInterval(ITEM item)
template < typename ITEM, typename ENGINE >
void SweepLine<ITEM,ENGINE>::run (vector < ITEM >* _itemsByXmin, vector < ITEM >* _itemsByXmax,bool stopAtMax = false,int max = 0)
void SweepLine<ITEM,ENGINE>::run (vector < ITEM >* _itemsByXmin, vector < ITEM >* _itemsByXmax,bool stopAtMax, int max )
{
///*DEBUG*/ cmess1 << " o SweepLine :: run : " << endl;

4
etesian/src/EtesianEngine.cpp
View File

@ -50,6 +50,7 @@ namespace {
using namespace Hurricane;
#if HAVE_COLOQUINTE
string extractInstanceName ( const RoutingPad* rp )
{
ostringstream name;
@ -101,7 +102,6 @@ namespace {
}
#if HAVE_COLOQUINTE
Coloquinte::cell::pin::pin_dir extractDirection ( const RoutingPad* rp )
{
switch ( rp->_getEntityAsComponent()->getNet()->getDirection() ) {
@ -114,7 +114,6 @@ namespace {
return Coloquinte::cell::pin::O;
}
#endif
Point extractRpOffset ( const RoutingPad* rp )
@ -130,6 +129,7 @@ namespace {
return offset;
}
#endif
} // Anonymous namespace.

16
hurricane/src/isobar/PyDbU.cpp
View File

@ -60,15 +60,15 @@ extern "C" {
#if defined(__PYTHON_MODULE__)
static DbU::SnapMode PyInt_AsSnapMode ( PyObject* object ) {
switch ( PyAny_AsLong(object) ) {
case DbU::Inferior : return ( DbU::Inferior );
case DbU::Superior : return ( DbU::Superior );
case DbU::Nearest : return ( DbU::Nearest );
}
// static DbU::SnapMode PyInt_AsSnapMode ( PyObject* object ) {
// switch ( PyAny_AsLong(object) ) {
// case DbU::Inferior : return ( DbU::Inferior );
// case DbU::Superior : return ( DbU::Superior );
// case DbU::Nearest : return ( DbU::Nearest );
// }
return ( DbU::Superior );
}
// return ( DbU::Superior );
// }
static DbU::UnitPower PyInt_AsUnitPower ( PyObject* object ) {
switch ( PyAny_AsLong(object) ) {

12
hurricane/src/isobar/PyInterval.cpp
View File

@ -95,12 +95,13 @@ extern "C" {
METHOD_HEAD ( "Interval.getUnion()" )
PyInterval* otherPyInterval;
Interval* uinterval = NULL;
PyInterval* otherPyInterval = NULL;
if (PyArg_ParseTuple(args,"O!:Interval.getUnion", &PyTypeInterval, &otherPyInterval)) {
HTRY
Interval* interval = new Interval ( interval->getUnion(*PYINTERVAL_O(otherPyInterval)));
uinterval = new Interval ( interval->getUnion(*PYINTERVAL_O(otherPyInterval)));
HCATCH
return PyInterval_Link( interval );
return PyInterval_Link( uinterval );
} else {
PyErr_SetString ( ConstructorError, "invalid number of parameters for Interval.getUnion.");
}
@ -113,12 +114,13 @@ extern "C" {
METHOD_HEAD ( "Interval.getIntersection()" )
Interval* iinterval = NULL;
PyInterval* otherPyInterval = NULL;
if (PyArg_ParseTuple(args,"O!:Interval.getIntersection", &PyTypeInterval, &otherPyInterval)) {
HTRY
Interval* interval = new Interval(interval->getIntersection(*PYINTERVAL_O(otherPyInterval)));
iinterval = new Interval(interval->getIntersection(*PYINTERVAL_O(otherPyInterval)));
HCATCH
return PyInterval_Link( interval );
return PyInterval_Link( iinterval );
} else {
PyErr_SetString(ConstructorError, "invalid number of parameters for Interval.getIntersection.");
}

5
hurricane/src/viewer/CellViewer.cpp
View File

@ -682,9 +682,8 @@ namespace Hurricane {
list< shared_ptr<CellWidget::State> >::iterator istate = _cellHistory.begin();
size_t index = historyAction->data().toUInt();
for ( ; index>0 ; index--, istate++ );
//cerr << "History: " << (*istate)->getName() << endl;
//for ( ; index>0 ; index--, istate++ )
// cerr << "History: " << (*istate)->getName() << endl;
emit stateChanged ( *istate );
}
}

9
hurricane/src/viewer/PyDisplayStyle.cpp
View File

@ -29,12 +29,12 @@ namespace {
using std::istringstream;
void parseInt ( const char* s, int& value )
{ istringstream is ( s ); is >> value; }
// void parseInt ( const char* s, int& value )
// { istringstream is ( s ); is >> value; }
void parseFloat ( const char* s, float& value )
{ istringstream is ( s ); is >> value; }
// void parseFloat ( const char* s, float& value )
// { istringstream is ( s ); is >> value; }
void parseRgbColor ( const char* color, int& red, int& green, int& blue )
@ -46,7 +46,6 @@ namespace {
}
} // Anonymous namespace.

10
hurricane/src/viewer/PyDrawingGroup.cpp
View File

@ -2,7 +2,7 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2012-2012, All Rights Reserved
// Copyright (c) UPMC 2012-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | C O R I O L I S |
@ -26,12 +26,12 @@ namespace {
using std::istringstream;
void parseInt ( const char* s, int& value )
{ istringstream is ( s ); is >> value; }
// void parseInt ( const char* s, int& value )
// { istringstream is ( s ); is >> value; }
void parseFloat ( const char* s, float& value )
{ istringstream is ( s ); is >> value; }
// void parseFloat ( const char* s, float& value )
// { istringstream is ( s ); is >> value; }
void parseRgbColor ( const char* color, int& red, int& green, int& blue )

1
katabatic/src/ChipTools.cpp
View File

@ -18,6 +18,7 @@
#include <sstream>
#include "hurricane/Warning.h"
#include "hurricane/Bug.h"
#include "hurricane/Torus.h"
#include "hurricane/DataBase.h"
#include "hurricane/Technology.h"
#include "hurricane/Horizontal.h"

26
katabatic/src/GCell.cpp
View File

@ -611,14 +611,12 @@ namespace Katabatic {
if ( (i%2) and (_densities[i] > density) ) density = _densities[i];
}
//density = roundfp(density);
density = density;
} else if (getGCellGrid()->getDensityMode() == GCellGrid::MaxVDensity) {
// Density of the most saturated vertical layer.
for ( size_t i=_pinDepth ; i<_depth ; i++ ) {
if ( (i%2 == 0) and (_densities[i] > density) ) density = _densities[i];
}
//density = roundfp(density);
density = density;
}
return density;
@ -758,18 +756,18 @@ namespace Katabatic {
sort ( _hsegments.begin(), _hsegments.end(), AutoSegment::CompareByDepthLength() );
sort ( _vsegments.begin(), _vsegments.end(), AutoSegment::CompareByDepthLength() );
float hcapacity = getHCapacity ();
float vcapacity = getVCapacity ();
float ccapacity = hcapacity * vcapacity * 4;
DbU::Unit hpenalty = 0 /*_box.getWidth () / 3*/;
DbU::Unit vpenalty = 0 /*_box.getHeight() / 3*/;
DbU::Unit uLengths1 [ _depth ];
DbU::Unit uLengths2 [ _depth ];
float localCounts [ _depth ];
UsedFragments ufragments [ _depth ];
float hcapacity = getHCapacity ();
float vcapacity = getVCapacity ();
float ccapacity = hcapacity * vcapacity * 4;
DbU::Unit hpenalty = 0 /*_box.getWidth () / 3*/;
DbU::Unit vpenalty = 0 /*_box.getHeight() / 3*/;
DbU::Unit uLengths1 [ _depth ];
DbU::Unit uLengths2 [ _depth ];
float localCounts [ _depth ];
vector<UsedFragments> ufragments ( _depth );
for ( size_t i=0 ; i<_depth ; i++ ) {
ufragments [i].setPitch ( Session::getPitch(i) );
ufragments[i].setPitch ( Session::getPitch(i) );
_feedthroughs[i] = 0.0;
uLengths2 [i] = 0;
localCounts [i] = 0.0;
@ -809,7 +807,7 @@ namespace Katabatic {
size_t count = 0;
for ( size_t i=0 ; i<_hsegments.size() ; i++ ) {
_globalsCount[depth] += 1.0;
ufragments [depth].incGlobals();
ufragments[depth].incGlobals();
if ( layer != _hsegments[i]->getLayer() ) {
uLengths2[depth] += count * _box.getWidth();
@ -833,7 +831,7 @@ namespace Katabatic {
size_t count = 0;
for ( size_t i=0 ; i<_vsegments.size() ; i++ ) {
_globalsCount[depth] += 1.0;
ufragments [depth].incGlobals();
ufragments[depth].incGlobals();
if ( layer != _vsegments[i]->getLayer() ) {
uLengths2[depth] += count * _box.getHeight();

2
katabatic/src/KatabaticEngine.cpp
View File

@ -43,6 +43,7 @@ namespace {
using namespace Hurricane;
#if 0
bool isTopAndBottomConnected ( Segment* segment, set<const Layer*>& layers )
{
ltrace(88) << "* Potential Null Length: " << segment << endl;
@ -77,6 +78,7 @@ namespace {
return layers.size()+supplemental > 2;
}
#endif
} // End of anonymous namespace.

10
katabatic/src/katabatic/GCell.h
View File

@ -178,7 +178,7 @@ namespace Katabatic {
bool stepNetDesaturate ( unsigned int depth
, set<Net*>& globalNets
, SetIndex& invalidateds );
inline void invalidate ();
inline void invalidateCt ();
inline void setUnderIoPad ();
// Inspector Management.
Record* _getRecord () const;
@ -246,7 +246,7 @@ namespace Katabatic {
inline const vector<AutoSegment*>& GCell::getHSegments () const { return _hsegments; }
inline const vector<AutoContact*>& GCell::getContacts () const { return _contacts; }
inline string GCell::_getTypeName () const { return _TName("GCell"); }
inline void GCell::invalidate () { _flags |= GCellInvalidated; }
inline void GCell::invalidateCt () { _flags |= GCellInvalidated; }
inline void GCell::setUnderIoPad() { _flags |= GCellUnderIoPad; }
inline const GCell::Key& GCell::getKey () const { return _key; }
inline void GCell::updateKey ( unsigned int depth ) { _key.update(depth); }
@ -276,13 +276,13 @@ namespace Katabatic {
{ return (depth<_depth) ? _blockages[depth] : 0; }
inline void GCell::addVSegment ( AutoSegment* segment )
{ invalidate(); _vsegments.push_back(segment); }
{ invalidateCt(); _vsegments.push_back(segment); }
inline void GCell::addHSegment ( AutoSegment* segment )
{ invalidate(); _hsegments.push_back(segment); }
{ invalidateCt(); _hsegments.push_back(segment); }
inline void GCell::addContact ( AutoContact* contact )
{ invalidate(); _contacts.push_back(contact); }
{ invalidateCt(); _contacts.push_back(contact); }
// GCell::CompareByIndex Inline Functions.

1
kite/src/BuildPowerRails.cpp
View File

@ -417,7 +417,6 @@ namespace {
DbU::Unit _axis;
DbU::Unit _width;
list<Interval> _chunks;
Net* _net;
};
private:

4
kite/src/Track.cpp
View File

@ -40,8 +40,8 @@ namespace {
};
DbU::Unit getPositionByIterator ( const vector<TrackElement*>& v, size_t i )
{ return (*(v.begin()+i))->getSourceU(); }
// DbU::Unit getPositionByIterator ( const vector<TrackElement*>& v, size_t i )
// { return (*(v.begin()+i))->getSourceU(); }
} // Anonymous namespace.

4
knik/src/Edge.cpp
View File

@ -56,8 +56,8 @@ Edge::Edge ( Vertex* from, Vertex* to, unsigned capacity )
//cerr << " Edge::Edge() capacity:" << _capacity << endl;
}
void Edge::_postCreate ( bool capacity )
// *************************************
void Edge::_postCreate ()
// **********************
{
Inherit::_postCreate();

4
knik/src/Graph.cpp
View File

@ -858,7 +858,9 @@ void Graph::addToSTuplePQ ( STuple* stuple )
STuple::CostProperty* costProperty = stuple->getCostProperty();
assert( costProperty );
costProperty->setPQIter ( _stuplePriorityQueue.insert( stuple ) );
#ifndef NDEBUG
STuple::STuplePQIter pqit = costProperty->getPQIter();
#endif
assert( (*pqit) == stuple );
}
@ -2068,7 +2070,7 @@ unsigned Graph::analyseRouting ( set<Segment*>& segmentsToUnroute )
}
else {
STuple* topSTuple = getMaxFromSTuplePQ();
float maxCost = topSTuple->getCost();
//float maxCost = topSTuple->getCost();
//cmess1 << " - Maximum segment cost : " << maxCost << endl;
float minCost = 0.20;
if (_stuplePriorityQueue.size() <= 100)

10
knik/src/HEdge.cpp
View File

@ -36,7 +36,7 @@ HEdge* HEdge::create ( Vertex* from, Vertex* to )
HEdge* hEdge = new HEdge ( from, to );
hEdge->_postCreate(true);
hEdge->_postCreate();
return hEdge;
}
@ -49,15 +49,15 @@ HEdge* HEdge::create ( Vertex* from, Vertex* to, unsigned capacity )
HEdge* hEdge = new HEdge ( from, to, capacity );
hEdge->_postCreate(false);
hEdge->_postCreate();
return hEdge;
}
void HEdge::_postCreate ( bool fenceCapacity )
// *******************************************
void HEdge::_postCreate ()
// ***********************
{
Inherit::_postCreate ( fenceCapacity );
Inherit::_postCreate();
}
HEdge::~HEdge()

4
knik/src/MatrixVertex.cpp
View File

@ -308,7 +308,7 @@ unsigned int MatrixVertex::getLineIndex ( DbU::Unit y )
}
assert(is_sorted(_linesIndexes.begin(), _linesIndexes.end()));
if ( _linesIndexes.empty() );
if ( _linesIndexes.empty() )
throw Error ( "MatrixVertex::getLineIndex(): Indexes map is empty." );
pair<pairIterator,pairIterator> result = equal_range (_linesIndexes.begin(), _linesIndexes.end()
@ -346,7 +346,7 @@ unsigned int MatrixVertex::getColumnIndex ( DbU::Unit x )
}
assert(is_sorted(_columnsIndexes.begin(),_columnsIndexes.end()));
if ( _columnsIndexes.empty() );
if ( _columnsIndexes.empty() )
throw Error ( "MatrixVertex::getColumnIndex(): Indexes map is empty." );
pair<pairIterator,pairIterator> result = equal_range (_columnsIndexes.begin(), _columnsIndexes.end()

31
knik/src/NetExtension.cpp
View File

@ -1,15 +1,9 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2008, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// ===================================================================
//
// $Id$
//
// x-----------------------------------------------------------------x
// | |
// +-----------------------------------------------------------------+
// | C O R I O L I S |
// | K n i k - Global Router |
// | |
@ -17,32 +11,27 @@
// | E-mail : Jean-Paul.Chaput@lip6.fr |
// | =============================================================== |
// | C++ Module : "./NetExtension.cpp" |
// | *************************************************************** |
// | U p d a t e s |
// | |
// x-----------------------------------------------------------------x
// +-----------------------------------------------------------------+
#include "hurricane/Error.h"
#include "hurricane/Net.h"
#include "hurricane/Cell.h"
#include "hurricane/Error.h"
#include "hurricane/Net.h"
#include "hurricane/Cell.h"
#include "knik/NetExtension.h"
#include "knik/NetExtension.h"
template<>
Hurricane::Name Hurricane::StandardPrivateProperty<Knik::NetExtensionDatas>::_name = "Knik::NetExtension";
namespace Knik {
using Hurricane::Error;
using Hurricane::ForEachIterator;
const char* MissingNetExtension = "NetExtension::%s(): %s missing the Knik::Net extension.";
template<>
Name StandardPrivateProperty<NetExtensionDatas>::_name = "Knik::NetExtension";
// -------------------------------------------------------------------
// Class : "Knik::NetExtensionDatas".

10
knik/src/VEdge.cpp
View File

@ -36,7 +36,7 @@ VEdge* VEdge::create ( Vertex* from, Vertex* to )
VEdge* vEdge = new VEdge ( from, to );
vEdge->_postCreate(true);
vEdge->_postCreate();
return vEdge;
}
@ -49,15 +49,15 @@ VEdge* VEdge::create ( Vertex* from, Vertex* to, unsigned capacity )
VEdge* vEdge = new VEdge ( from, to, capacity );
vEdge->_postCreate(false);
vEdge->_postCreate();
return vEdge;
}
void VEdge::_postCreate( bool fenceCapacity )
// ******************************************
void VEdge::_postCreate()
// **********************
{
Inherit::_postCreate ( fenceCapacity );
Inherit::_postCreate ();
}
VEdge::~VEdge()

2
knik/src/knik/Edge.h
View File

@ -55,7 +55,7 @@ namespace Knik {
public:
//static Edge* create ( Fence* fence, Vertex* from, Vertex* to );
void destroy();
void _postCreate ( bool capacity );
void _postCreate();
void _preDestroy();
// Modifiers

2
knik/src/knik/HEdge.h
View File

@ -23,7 +23,7 @@ namespace Knik {
static HEdge* create ( Vertex* from, Vertex* to );
static HEdge* create ( Vertex* from, Vertex* to, unsigned capacity );
//void destroy();
void _postCreate ( bool fenceCapacity );
void _postCreate ();
//void _preDestroy();
// Others

2
knik/src/knik/SlicingTreeNode.h
View File

@ -44,7 +44,7 @@ namespace Knik {
// Predicates
// **********
public:
virtual bool isTerminal() { return false; };
virtual bool isTerminal() const { return false; };
virtual bool isVertical() const = 0;
virtual bool isHorizontal() const = 0;

2
knik/src/knik/VEdge.h
View File

@ -23,7 +23,7 @@ namespace Knik {
static VEdge* create ( Vertex* from, Vertex* to );
static VEdge* create ( Vertex* from, Vertex* to, unsigned capacity );
//void destroy();
void _postCreate ( bool fenceCapacity );
void _postCreate ();
//void _preDestroy();
// Others

44
mauka/src/MaukaEngine.cpp
View File

@ -94,13 +94,13 @@ MaukaEngine* MaukaEngine::create(Cell* cell, Box placementbox)
{
MaukaEngine* mauka = new MaukaEngine(cell);
mauka->_postCreate(placementbox);
mauka->_maukaPostCreate(placementbox);
return mauka;
}
void MaukaEngine::_postCreate(Box& placementbox)
// *********************************************
void MaukaEngine::_maukaPostCreate(Box& placementbox)
// **************************************************
{
Inherit::_postCreate();
@ -109,17 +109,11 @@ void MaukaEngine::_postCreate(Box& placementbox)
addFeed ( AllianceFramework::get()->getCell("rowend_x0",Catalog::State::Views) );
Construct();
//_simAnnealingPlacer = new SimAnnealingPlacer(this, 1, 0.0, 0.0);
_simAnnealingPlacer = new SimAnnealingPlacer(this);
//_displaySlot = DisplaySlot::create(getCell(),,139,0,139);
_surface = Surface::create(this, placementbox);
_simAnnealingPlacer->init();
//Plot();
}
@ -162,22 +156,22 @@ void MaukaEngine::Run()
}
namespace {
void VerifyPathCellBox(const Occurrence& occurrence)
//On occurrence Path set all cells Abox to (0,0,0,0) if Box is empty
//This avoids bad Transfos on Path
{
Path path = occurrence.getPath();
while (!path.isEmpty())
{
Instance* instance = path.getHeadInstance();
Cell* model = instance->getMasterCell();
if (model->getAbutmentBox().isEmpty())
{
model->setAbutmentBox(Box(Point(0,0), Point(0,0)));
}
path = path.getTailPath();
}
}
// void VerifyPathCellBox(const Occurrence& occurrence)
// //On occurrence Path set all cells Abox to (0,0,0,0) if Box is empty
// //This avoids bad Transfos on Path
// {
// Path path = occurrence.getPath();
// while (!path.isEmpty())
// {
// Instance* instance = path.getHeadInstance();
// Cell* model = instance->getMasterCell();
// if (model->getAbutmentBox().isEmpty())
// {
// model->setAbutmentBox(Box(Point(0,0), Point(0,0)));
// }
// path = path.getTailPath();
// }
// }
}
void MaukaEngine::Construct()

18
mauka/src/Move.cpp
View File

@ -53,18 +53,18 @@ namespace {
using Hurricane::DbU;
DbU::Unit PositionRand(const DbU::Unit position, const double distance, const DbU::Unit min, const DbU::Unit max)
{
DbU::Unit borneInf, borneSup;
// DbU::Unit PositionRand(const DbU::Unit position, const double distance, const DbU::Unit min, const DbU::Unit max)
// {
// DbU::Unit borneInf, borneSup;
if ((borneSup = position + DbU::lambda((int)(distance * DbU::getLambda(max) + 0.5)) ) > max )
borneSup = max;
// if ((borneSup = position + DbU::lambda((int)(distance * DbU::getLambda(max) + 0.5)) ) > max )
// borneSup = max;
if ((borneInf = position - DbU::lambda((int)(distance * DbU::getLambda(max) + 0.5)) ) < min )
borneInf = min;
// if ((borneInf = position - DbU::lambda((int)(distance * DbU::getLambda(max) + 0.5)) ) < min )
// borneInf = min;
return borneInf + DbU::lambda((int)(DbU::getLambda(borneSup - borneInf) * rand() / (RAND_MAX+1.0)));
}
// return borneInf + DbU::lambda((int)(DbU::getLambda(borneSup - borneInf) * rand() / (RAND_MAX+1.0)));
// }
} // End of anonymous namespace.

4
mauka/src/SubRow.cpp
View File

@ -56,11 +56,11 @@ SubRow::SubRow(Cell* cell, Surface* surface, const Box& box)
SubRow* SubRow::create(Cell* cell, Surface* surface, const Box& box, bool orientation)
{
SubRow* subRow = new SubRow(cell, surface, box);
subRow->_postCreate(orientation);
subRow->_subRowPostCreate(orientation);
return subRow;
}
void SubRow::_postCreate(bool orientation)
void SubRow::_subRowPostCreate(bool orientation)
{
_row = _surface->InsertSubRowInRow(this, orientation);

4
mauka/src/mauka/MaukaEngine.h
View File

@ -1,7 +1,7 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2006-2014, All Rights Reserved
// Copyright (c) UPMC 2006-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | C O R I O L I S |
@ -134,7 +134,7 @@ namespace Mauka {
private:
// Internals.
MaukaEngine ( Cell* );
void _postCreate ( Box& placementbox );
void _maukaPostCreate ( Box& placementbox );
void _preDestroy ();
inline Surface* _getSurface () const { return _surface; }
Box PlotFixedPointsLabels ( std::ofstream& ) const;

2
mauka/src/mauka/SubRow.h
View File

@ -100,7 +100,7 @@ class SubRow : public Container {
private: void _computeCapacity(double margin);
private: bool _MergeBins();
public: void DisplayBinHits() const;
protected: virtual void _postCreate(bool orientation);
protected: virtual void _subRowPostCreate(bool orientation);
protected: virtual void _preDestroy();
public: double getBinCost() const;
public: DbU::Unit getBinsSize() const;

2
metis/src/MetisEngine.cpp
View File

@ -64,8 +64,10 @@ namespace Metis {
: Inherit (cell)
, _configuration(new Configuration())
, _step (0)
#ifdef HAVE_HMETIS_LIB
, _actualGraphs ()
, _newGraphs ()
#endif
, _globalEdgeCut(0)
{
#ifdef HAVE_HMETIS_LIB

2
metis/src/metis/MetisEngine.h
View File

@ -89,8 +89,10 @@ namespace Metis {
static const Name _toolName;
Configuration* _configuration;
unsigned _step;
#ifdef HAVE_HMETIS_LIB
MetisGraphs* _actualGraphs;
MetisGraphs* _newGraphs;
#endif
int _globalEdgeCut;
private:
// Internals.

6
nimbus/src/FenceProperty.cpp
View File

@ -12,10 +12,10 @@
#include "nimbus/FenceProperty.h"
#include "nimbus/Fence.h"
namespace Nimbus {
template<>
Hurricane::Name Hurricane::StandardPrivateProperty<Nimbus::Fence*>::_name = "ComponentFencePropName";
template<>
Name StandardPrivateProperty<Fence*>::_name = "ComponentFencePropName";
namespace Nimbus {
Fence* getFence ( const Component& component )

4
nimbus/src/GCell.cpp
View File

@ -768,7 +768,9 @@ GCell* GCell::getSubUpperLeft () const
assert (col != _pavement.end());
RBMap::const_reverse_iterator rbit = ((*col).second)->rbegin();
#ifndef NDEBUG
RBMap::const_reverse_iterator rbend = ((*col).second)->rend();
#endif
assert (rbit != rbend);
return (*rbit).second;
@ -783,7 +785,9 @@ GCell* GCell::getSubUpperRight () const
assert (col != _pavement.rend());
RBMap::const_reverse_iterator rbit = ((*col).second)->rbegin();
#ifndef NDEBUG
RBMap::const_reverse_iterator rbend = ((*col).second)->rend();
#endif
assert (rbit != rbend);
return (*rbit).second;

1
nimbus/src/Grid.cpp
View File

@ -9,6 +9,7 @@
#include <math.h>
#include "hurricane/Box.h"
#include "hurricane/DataBase.h"
#include "hurricane/Technology.h"
#include "hurricane/UpdateSession.h"

8
nimbus/src/StepProperty.cpp
View File

@ -46,9 +46,13 @@ namespace Nimbus {
typedef StandardPrivateProperty<unsigned> InstanceProperty;
template<>
Name InstanceProperty::_name = "Nimbus::InstanceProperty";
}
template<>
Hurricane::Name Nimbus::InstanceProperty::_name = "Nimbus::InstanceProperty";
namespace Nimbus {
unsigned getStep(const Instance& instance)
{

1
unicorn/src/UnicornGui.cpp
View File

@ -21,6 +21,7 @@
#include "hurricane/viewer/Script.h"
#include "hurricane/viewer/CellViewer.h"
#include "hurricane/viewer/PyCellViewer.h"
#include "crlcore/Utilities.h"
#include "crlcore/Catalog.h"
#include "crlcore/AllianceFramework.h"
#include "crlcore/GraphicToolEngine.h"

3
unicorn/src/unicorn/UnicornGui.h
View File

@ -1,7 +1,7 @@
// -*- C++ -*-
//
// This file is part of the Coriolis Software.
// Copyright (c) UPMC/LIP6 2008-2014, All Rights Reserved
// Copyright (c) UPMC 2008-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | C O R I O L I S |
@ -24,7 +24,6 @@
using namespace std;
#include "hurricane/viewer/CellViewer.h"
#include "crlcore/Banner.h"
namespace CRL {
class GraphicTool;

2
vlsisapd/src/agds/src/Library.cpp
View File

@ -29,7 +29,7 @@ bool Library::writeToFile(string filename) {
tm now = *localtime(&curtime);
char date[BUFSIZ]={0};
const char format[]="%y-%m-%d %H:%M:%S";
if (!strftime(date, sizeof(date)-1, format, &now)>0)
if (strftime(date, sizeof(date)-1, format, &now) == 0)
cerr << "[GDS DRIVE ERROR]: cannot build current date." << endl;
ofstream file;

2
vlsisapd/src/agds/src/PyAgds.cpp
View File

@ -1,4 +1,3 @@
using namespace std;
#include <boost/python.hpp>
using namespace boost::python;
@ -7,6 +6,7 @@ using namespace boost::python;
#include "vlsisapd/agds/Structure.h"
#include "vlsisapd/agds/Element.h"
#include "vlsisapd/agds/Rectangle.h"
using namespace std;
namespace AGDS {
BOOST_PYTHON_MODULE(AGDS) {

2
vlsisapd/src/agds/src/Structure.cpp
View File

@ -25,7 +25,7 @@ bool Structure::write(ofstream &file) {
tm now = *localtime(&curtime);
char date[BUFSIZ]={0};
const char format[]="%y-%m-%d %H:%M:%S";
if (!strftime(date, sizeof(date)-1, format, &now)>0)
if (strftime(date, sizeof(date)-1, format, &now) == 0)
cerr << "[GDS DRIVE ERROR]: cannot build current date." << endl;
// Header

2
vlsisapd/src/bookshelf/src/BookshelfTkMain.cpp
View File

@ -57,7 +57,7 @@ void doFindMegaCells ( Circuit* circuit )
Node* node = (*inode).second;
map<size_t,Pin*>& pins = node->getPins();
map<size_t,Pin*>::iterator ipin = pins.begin();
//map<size_t,Pin*>::iterator ipin = pins.begin();
if ( (double)pins.size() > node->getWidth() ) {
cout << setw(4) << right << megacellsNb
<< ":megacell:" << node->getName()

2
vlsisapd/src/cif/src/Circuit.cpp
View File

@ -25,7 +25,7 @@ bool Circuit::writeToFile(string filename) {
tm now = *localtime(&curtime);
char date[BUFSIZ]={0};
const char format[]="%d-%b-%Y %H:%M:%S";
if (!strftime(date, sizeof(date)-1, format, &now)>0)
if (strftime(date, sizeof(date)-1, format, &now) == 0)
cerr << "[CIF DRIVE ERROR]: cannot build current date." << endl;
ofstream file;

2
vlsisapd/src/cif/src/PyCif.cpp
View File

@ -1,10 +1,10 @@
using namespace std;
#include <boost/python.hpp>
using namespace boost::python;
#include "vlsisapd/cif/Polygon.h"
#include "vlsisapd/cif/Circuit.h"
using namespace std;
namespace CIF {
BOOST_PYTHON_MODULE(CIF) {

5
vlsisapd/src/cif/src/vlsisapd/cif/Circuit.h
View File

@ -2,6 +2,7 @@
#define __CIF_CIRCUIT_H
#include <vector>
#include <string>
namespace CIF {
class Polygon;
@ -13,8 +14,8 @@ class Circuit {
bool writeToFile ( std::string );
private:
string _name;
string _unit;
std::string _name;
std::string _unit;
double _scale;
std::vector<Polygon*> _polygons;

2
vlsisapd/src/cif/src/vlsisapd/cif/Polygon.h
View File

@ -10,7 +10,7 @@ class Polygon {
Polygon(long);
void addPoint (long, long);
void write ( ofstream& );
void write ( std::ofstream& );
private:
long _layer;

2
vlsisapd/src/dtr/src/PyDtr.cpp
View File

@ -1,5 +1,4 @@
using namespace std;
#include <boost/python.hpp>
using namespace boost::python;
@ -7,6 +6,7 @@ using namespace boost::python;
#include "vlsisapd/dtr/Techno.h"
#include "vlsisapd/dtr/Rules.h"
#include "vlsisapd/dtr/DTRException.h"
using namespace std;
namespace DTR {

2
vlsisapd/src/liberty/src/Library.cpp
View File

@ -244,7 +244,7 @@ bool Library::writeToFile(string filename) {
tm now = *localtime(&curtime);
char date[BUFSIZ]={0};
const char format[]="%y-%m-%d %H:%M:%S";
if (!strftime(date, sizeof(date)-1, format, &now)>0)
if (strftime(date, sizeof(date)-1, format, &now) == 0)
cerr << "[Liberty DRIVE ERROR]: cannot build current date." << endl;
ofstream file;

2
vlsisapd/src/liberty/src/Name.cpp
View File

@ -1,6 +1,6 @@
using namespace std;
#include "vlsisapd/liberty/Name.h"
using namespace std;
namespace LIB {
unsigned long Name::_globalId = 0;

3
vlsisapd/src/liberty/src/PyLiberty.cpp
View File

@ -1,4 +1,3 @@
using namespace std;
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
@ -14,8 +13,8 @@ using namespace boost::python;
#include "vlsisapd/liberty/Timing.h"
#include "vlsisapd/liberty/FlipFlop.h"
#include "vlsisapd/liberty/Library.h"
#include "vlsisapd/liberty/PySTLMapWrapper.h"
using namespace std;
namespace LIB {
//void translator(LibertyException const& e) {

3
vlsisapd/src/openChams/src/PyOpenChams.cpp
View File

@ -1,4 +1,3 @@
using namespace std;
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
@ -20,8 +19,8 @@ using namespace boost::python;
#include "vlsisapd/openChams/Port.h"
#include "vlsisapd/openChams/Wire.h"
#include "vlsisapd/openChams/OpenChamsException.h"
#include "vlsisapd/openChams/PySTLMapWrapper.h"
using namespace std;
namespace OpenChams {

2
vlsisapd/src/openChams/src/Schematic.cpp
View File

@ -2,7 +2,7 @@
// -*- C++ -*-
//
// This file is part of the VLSI SAPD Software.
// Copyright (c) UPMC/LIP6 2010-2012, All Rights Reserved
// Copyright (c) UPMC 2010-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | V L S I S A P D |

1
vlsisapd/src/openChams/src/SimulModel.cpp
View File

@ -7,7 +7,6 @@
*
*/
using namespace std;
#include "vlsisapd/openChams/SimulModel.h"

6
vlsisapd/src/openChams/src/vlsisapd/openChams/Schematic.h
View File

@ -2,7 +2,7 @@
// -*- C++ -*-
//
// This file is part of the VLSI SAPD Software.
// Copyright (c) UPMC/LIP6 2010-2012, All Rights Reserved
// Copyright (c) UPMC 2010-2014, All Rights Reserved
//
// +-----------------------------------------------------------------+
// | V L S I S A P D |
@ -15,8 +15,8 @@
// +-----------------------------------------------------------------+
#ifndef __OPENCHAMS_SCHEMATIC_H__
#define __OPENCHAMS_SCHEMATIC_H__
#ifndef VLSISAPD_OPENCHAMS_SCHEMATIC_H
#define VLSISAPD_OPENCHAMS_SCHEMATIC_H
#include <map>
#include <string>

3
vlsisapd/src/spice/src/PySpice.cpp
View File

@ -1,4 +1,3 @@
using namespace std;
#include <boost/python.hpp>
#include <boost/python/suite/indexing/vector_indexing_suite.hpp>
@ -9,8 +8,8 @@ using namespace boost::python;
#include "vlsisapd/spice/Subckt.h"
#include "vlsisapd/spice/Circuit.h"
#include "vlsisapd/spice/SpiceException.h"
#include "vlsisapd/spice/PySTLMapWrapper.h"
using namespace std;
namespace SPICE {
void translator(SpiceException const& e) {

3
vlsisapd/src/spice/src/vlsisapd/spice/Circuit.h
View File

@ -43,7 +43,6 @@ class Circuit {
typedef std::vector<std::string> string_vector;
typedef std::map<std::string, std::string> strings_map;
private:
unsigned _line;
std::string _title;
string_vector _includes;
strpair_vector _libraries;
@ -54,7 +53,7 @@ class Circuit {
std::vector<Source*> _sources;
public:
Circuit(): _line(0), _title(""), _includes(), _libraries(), _options(), _parameters(), _subckts(), _instances() {};
Circuit(): _title(""), _includes(), _libraries(), _options(), _parameters(), _subckts(), _instances() {};
~Circuit() {};
inline std::string getTitle();

2
vlsisapd/src/utilities/src/Path.cpp
View File

@ -243,7 +243,7 @@ namespace Utilities {
Path& Path::operator= ( const Path& other )
{
_elements.swap( vector<std::string>() );
vector<std::string>().swap( _elements );
_elements = other._elements;
_flags = other._flags;
_pathcache = other._pathcache;