sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

SE/FS: Remove FULL_SYSTEM from swig.

Browse source
This commit is contained in:
Gabe Black 2011-11-07 01:06:54 -08:00
parent 8b4a3f4070
commit 812277ac6a
1 changed files with 19 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/python/swig/pyobject.cc
View file

@ -34,16 +34,13 @@
#include "base/inifile.hh" #include "base/inifile.hh"
#include "base/output.hh" #include "base/output.hh"
#include "config/full_system.hh"
#include "mem/mem_object.hh"
#include "mem/port.hh"
#include "sim/sim_object.hh"
#if FULL_SYSTEM
#include "dev/etherdevice.hh" #include "dev/etherdevice.hh"
#include "dev/etherint.hh" #include "dev/etherint.hh"
#include "dev/etherobject.hh" #include "dev/etherobject.hh"
#endif #include "mem/mem_object.hh"
#include "mem/port.hh"
#include "sim/full_system.hh"
#include "sim/sim_object.hh"
using namespace std; using namespace std;
@ -65,8 +62,6 @@ lookupPort(SimObject *so, const std::string &name, int i)
return p; return p;
} }
#if FULL_SYSTEM
EtherInt * EtherInt *
lookupEthPort(SimObject *so, const std::string &name, int i) lookupEthPort(SimObject *so, const std::string &name, int i)
{ {
@ -84,7 +79,6 @@ lookupEthPort(SimObject *so, const std::string &name, int i)
p = ed->getEthPort(name, i); p = ed->getEthPort(name, i);
return p; return p;
} }
#endif
/** /**
* Connect the described MemObject ports. Called from Python via SWIG. * Connect the described MemObject ports. Called from Python via SWIG.
@ -98,28 +92,28 @@ connectPorts(SimObject *o1, const std::string &name1, int i1,
mo1 = dynamic_cast<MemObject*>(o1); mo1 = dynamic_cast<MemObject*>(o1);
mo2 = dynamic_cast<MemObject*>(o2); mo2 = dynamic_cast<MemObject*>(o2);
#if FULL_SYSTEM if (FullSystem) {
EtherObject *eo1, *eo2; EtherObject *eo1, *eo2;
EtherDevice *ed1, *ed2; EtherDevice *ed1, *ed2;
eo1 = dynamic_cast<EtherObject*>(o1); eo1 = dynamic_cast<EtherObject*>(o1);
ed1 = dynamic_cast<EtherDevice*>(o1); ed1 = dynamic_cast<EtherDevice*>(o1);
eo2 = dynamic_cast<EtherObject*>(o2); eo2 = dynamic_cast<EtherObject*>(o2);
ed2 = dynamic_cast<EtherDevice*>(o2); ed2 = dynamic_cast<EtherDevice*>(o2);
if ((eo1 || ed1) && (eo2 || ed2)) { if ((eo1 || ed1) && (eo2 || ed2)) {
EtherInt *p1 = lookupEthPort(o1, name1, i1); EtherInt *p1 = lookupEthPort(o1, name1, i1);
EtherInt *p2 = lookupEthPort(o2, name2, i2); EtherInt *p2 = lookupEthPort(o2, name2, i2);
if (p1 != NULL && p2 != NULL) { if (p1 != NULL && p2 != NULL) {
p1->setPeer(p2); p1->setPeer(p2);
p2->setPeer(p1); p2->setPeer(p1);
return 1; return 1;
}
} }
} }
#endif
Port *p1 = lookupPort(o1, name1, i1); Port *p1 = lookupPort(o1, name1, i1);
Port *p2 = lookupPort(o2, name2, i2); Port *p2 = lookupPort(o2, name2, i2);