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

ext: fix SST connector

Browse source 
Should work with SST 5.1 and trunk as of right now.
This commit is contained in:
Curtis Dunham 2016-02-04 16:57:59 -06:00
parent fe32b40269
commit b4282af318
2 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
ext/sst/ExtMaster.cc
View file

@ -44,6 +44,10 @@
#include "gem5.hh" #include "gem5.hh"
#ifdef fatal // gem5 sets this
#undef fatal
#endif
#include <sst_config.h> #include <sst_config.h>
#include <mem/packet.hh> #include <mem/packet.hh>
@ -53,10 +57,6 @@
#include <sst/core/link.h> #include <sst/core/link.h>
#include <sst/elements/memHierarchy/memNIC.h> #include <sst/elements/memHierarchy/memNIC.h>
#ifdef fatal // gem5 sets this
#undef fatal
#endif
using namespace SST; using namespace SST;
using namespace SST::gem5; using namespace SST::gem5;
using namespace SST::MemHierarchy; using namespace SST::MemHierarchy;

6
ext/sst/gem5.cc
View file

@ -69,7 +69,6 @@
#include <sst/core/params.h> #include <sst/core/params.h>
#include <sst/core/link.h> #include <sst/core/link.h>
#include <sst/core/timeConverter.h> #include <sst/core/timeConverter.h>
#include <sst/core/debug.h>
using namespace SST; using namespace SST;
using namespace SST::gem5; using namespace SST::gem5;
@ -93,7 +92,7 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
std::string cmd = params.find_string("cmd", ""); std::string cmd = params.find_string("cmd", "");
if (cmd.empty()) { if (cmd.empty()) {
_abort(gem5Component, "Component %s must have a 'cmd' parameter.\n", dbg.fatal(CALL_INFO, -1, "Component %s must have a 'cmd' parameter.\n",
getName().c_str()); getName().c_str());
} }
@ -223,7 +222,8 @@ gem5Component::initPython(int argc, char *argv[])
int ret = initM5Python(); int ret = initM5Python();
if (ret != 0) { if (ret != 0) {
_abort(gem5Component, "Python failed to initialize. Code: %d\n", ret); dbg.fatal(CALL_INFO, -1, "Python failed to initialize. Code: %d\n",
ret);
} }
PySys_SetArgv(argc, argv); PySys_SetArgv(argc, argv);