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

Adapt all files to new source tree

This commit is contained in:
Damien Dupuis 2010-06-03 15:05:14 +00:00
parent 73eba62347
commit 6663fbd8dc
20 changed files with 72 additions and 70 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
vlsisapd/src/openChams/src/Circuit.cpp
View File

@ -14,8 +14,15 @@
#include <algorithm> #include <algorithm>
using namespace std; using namespace std;
#include "Circuit.h" #include "vlsisapd/openChams/Circuit.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/Netlist.h"
#include "vlsisapd/openChams/Instance.h"
#include "vlsisapd/openChams/Net.h"
#include "vlsisapd/openChams/Schematic.h"
#include "vlsisapd/openChams/Sizing.h"
#include "vlsisapd/openChams/Transistor.h"
#include "vlsisapd/openChams/Operator.h"
#include "vlsisapd/openChams/OpenChamsException.h"
namespace { namespace {
template<class T> T getValue(xmlChar* str) { template<class T> T getValue(xmlChar* str) {

10
vlsisapd/src/openChams/src/Instance.cpp
View File

@ -10,11 +10,11 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
#include "Instance.h" #include "vlsisapd/openChams/Instance.h"
#include "Netlist.h" #include "vlsisapd/openChams/Netlist.h"
#include "Net.h" #include "vlsisapd/openChams/Net.h"
#include "Transistor.h" #include "vlsisapd/openChams/Transistor.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Instance::Instance(Name name, Name model, Name mosType, bool sourceBulkConnected, Netlist* netlist) Instance::Instance(Name name, Name model, Name mosType, bool sourceBulkConnected, Netlist* netlist)

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

@ -9,7 +9,7 @@
using namespace std; using namespace std;
#include "Name.h" #include "vlsisapd/openChams/Name.h"
namespace OpenChams { namespace OpenChams {
unsigned long Name::_globalId = 0; unsigned long Name::_globalId = 0;

4
vlsisapd/src/openChams/src/Net.cpp
View File

@ -9,8 +9,8 @@
using namespace std; using namespace std;
#include "Net.h" #include "vlsisapd/openChams/Net.h"
#include "Netlist.h" #include "vlsisapd/openChams/Netlist.h"
namespace OpenChams { namespace OpenChams {
Net::Net(Name netName, Name typeName, bool isExternal, Netlist* netlist) Net::Net(Name netName, Name typeName, bool isExternal, Netlist* netlist)

8
vlsisapd/src/openChams/src/Netlist.cpp
View File

@ -11,9 +11,11 @@
#include <algorithm> #include <algorithm>
using namespace std; using namespace std;
#include "Netlist.h" #include "vlsisapd/openChams/Netlist.h"
#include "Circuit.h" #include "vlsisapd/openChams/Instance.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/Net.h"
#include "vlsisapd/openChams/Circuit.h"
#include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Netlist::Netlist(Circuit* circuit) : _circuit(circuit) {} Netlist::Netlist(Circuit* circuit) : _circuit(circuit) {}

4
vlsisapd/src/openChams/src/Operator.cpp
View File

@ -10,8 +10,8 @@
#include <string> #include <string>
using namespace std; using namespace std;
#include "Operator.h" #include "vlsisapd/openChams/Operator.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Operator::Operator(Name operatorName, Name simulModel, unsigned callOrder) Operator::Operator(Name operatorName, Name simulModel, unsigned callOrder)

5
vlsisapd/src/openChams/src/Parameters.cpp
View File

@ -11,8 +11,9 @@
#include <string> #include <string>
using namespace std; using namespace std;
#include "Parameters.h" #include "vlsisapd/openChams/Name.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/Parameters.h"
#include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
double Parameters::getValue(Name name) { double Parameters::getValue(Name name) {

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

@ -9,8 +9,8 @@
using namespace std; using namespace std;
#include "Schematic.h" #include "vlsisapd/openChams/Schematic.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Schematic::Schematic(Circuit* circuit, double zoom) Schematic::Schematic(Circuit* circuit, double zoom)

8
vlsisapd/src/openChams/src/Sizing.cpp
View File

@ -10,10 +10,10 @@
#include <string> #include <string>
using namespace std; using namespace std;
#include "Sizing.h" #include "vlsisapd/openChams/Sizing.h"
#include "Circuit.h" #include "vlsisapd/openChams/Circuit.h"
#include "Operator.h" #include "vlsisapd/openChams/Operator.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Sizing::Sizing(Circuit* circuit): _circuit(circuit) {} Sizing::Sizing(Circuit* circuit): _circuit(circuit) {}

8
vlsisapd/src/openChams/src/Transistor.cpp
View File

@ -10,10 +10,10 @@
#include <iostream> #include <iostream>
using namespace std; using namespace std;
#include "Transistor.h" #include "vlsisapd/openChams/Transistor.h"
#include "Instance.h" #include "vlsisapd/openChams/Instance.h"
#include "Net.h" #include "vlsisapd/openChams/Net.h"
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
Transistor::Transistor(Name name, Instance* instance) Transistor::Transistor(Name name, Instance* instance)

19
vlsisapd/src/openChams/src/vlsisapd/openChams/Circuit.h
View File

@ -15,17 +15,18 @@
#include <libxml/parser.h> #include <libxml/parser.h>
#include <libxml/tree.h> #include <libxml/tree.h>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
#include "Parameters.h" #include "vlsisapd/openChams/Parameters.h"
#include "Netlist.h"
#include "Instance.h"
#include "Net.h"
#include "Schematic.h"
#include "Sizing.h"
#include "Transistor.h"
#include "Operator.h"
namespace OpenChams { namespace OpenChams {
class Netlist;
class Instance;
class Net;
class Schematic;
class Sizing;
class Transistor;
class Operator;
class Circuit { class Circuit {
public: public:
Circuit(Name name, Name techno); Circuit(Name name, Name techno);

4
vlsisapd/src/openChams/src/vlsisapd/openChams/Instance.h
View File

@ -13,8 +13,8 @@
#include <map> #include <map>
#include <vector> #include <vector>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
#include "Parameters.h" #include "vlsisapd/openChams/Parameters.h"
namespace OpenChams { namespace OpenChams {
class Netlist; class Netlist;

2
vlsisapd/src/openChams/src/vlsisapd/openChams/Name.h
View File

@ -13,7 +13,7 @@
#include <string> #include <string>
#include <map> #include <map>
#include "OpenChamsException.h" #include "vlsisapd/openChams/OpenChamsException.h"
namespace OpenChams { namespace OpenChams {
class Name { class Name {

3
vlsisapd/src/openChams/src/vlsisapd/openChams/Net.h
View File

@ -12,8 +12,7 @@
#include <vector> #include <vector>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
#include "Instance.h"
namespace OpenChams { namespace OpenChams {
class Netlist; class Netlist;

17
vlsisapd/src/openChams/src/vlsisapd/openChams/Netlist.h
View File

@ -12,12 +12,12 @@
#include <vector> #include <vector>
#include "Name.h"
#include "Instance.h"
#include "Net.h"
namespace OpenChams { namespace OpenChams {
class Name;
class Instance;
class Net;
class Circuit; class Circuit;
class Netlist { class Netlist {
public: public:
Netlist(Circuit*); Netlist(Circuit*);
@ -28,13 +28,8 @@ class Netlist {
Instance* getInstance(Name); Instance* getInstance(Name);
Net* getNet(Name); Net* getNet(Name);
//pour parcourir les vector
inline bool hasNoInstances(); inline bool hasNoInstances();
inline bool hasNoNets(); inline bool hasNoNets();
//inline vector<Instance*>::iterator getFirstInstanceIt();
//inline vector<Instance*>::iterator getLastInstanceIt();
//inline vector<Net*>::iterator getFirstNetIt();
//inline vector<Net*>::iterator getLastNetIt();
inline const std::vector<Instance*>& getInstances(); inline const std::vector<Instance*>& getInstances();
inline const std::vector<Net*>& getNets(); inline const std::vector<Net*>& getNets();
@ -46,10 +41,6 @@ class Netlist {
inline bool Netlist::hasNoInstances() { return (_instances.size() == 0)? true : false; } inline bool Netlist::hasNoInstances() { return (_instances.size() == 0)? true : false; }
inline bool Netlist::hasNoNets() { return (_nets.size() == 0)? true : false; } inline bool Netlist::hasNoNets() { return (_nets.size() == 0)? true : false; }
//inline vector<Instance*>::iterator Netlist::getFirstInstanceIt() { return _instances.begin(); }
//inline vector<Instance*>::iterator Netlist::getLastInstanceIt() { return _instances.end(); }
//inline vector<Net*>::iterator Netlist::getFirstNetIt() { return _nets.begin(); }
//inline vector<Net*>::iterator Netlist::getLastNetIt() { return _nets.end(); }
inline const std::vector<Instance*>& Netlist::getInstances() { return _instances; }; inline const std::vector<Instance*>& Netlist::getInstances() { return _instances; };
inline const std::vector<Net*>& Netlist::getNets() { return _nets; }; inline const std::vector<Net*>& Netlist::getNets() { return _nets; };

2
vlsisapd/src/openChams/src/vlsisapd/openChams/Operator.h
View File

@ -12,7 +12,7 @@
#include <map> #include <map>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
namespace OpenChams { namespace OpenChams {
class Operator { class Operator {

4
vlsisapd/src/openChams/src/vlsisapd/openChams/Parameters.h
View File

@ -12,9 +12,9 @@
#include <map> #include <map>
#include "Name.h"
namespace OpenChams { namespace OpenChams {
class Name;
class Parameters { class Parameters {
public: public:
Parameters() {}; Parameters() {};

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

@ -12,10 +12,11 @@
#include <map> #include <map>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
namespace OpenChams { namespace OpenChams {
class Circuit; class Circuit;
class Schematic { class Schematic {
public: public:
class Infos { class Infos {

10
vlsisapd/src/openChams/src/vlsisapd/openChams/Sizing.h
View File

@ -12,12 +12,12 @@
#include <map> #include <map>
#include "Name.h"
namespace OpenChams { namespace OpenChams {
class Circuit; class Name;
class Operator; class Circuit;
class Sizing { class Operator;
class Sizing {
public: public:
Sizing(Circuit*); Sizing(Circuit*);

10
vlsisapd/src/openChams/src/vlsisapd/openChams/Transistor.h
View File

@ -13,13 +13,13 @@
#include <map> #include <map>
#include "Name.h" #include "vlsisapd/openChams/Name.h"
#include "Parameters.h" #include "vlsisapd/openChams/Parameters.h"
namespace OpenChams { namespace OpenChams {
class Instance; class Instance;
class Net; class Net;
class Transistor { class Transistor {
public: public:
Transistor(Name, Instance*); Transistor(Name, Instance*);