summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCurtis Dunham <Curtis.Dunham@arm.com>2016-02-04 16:57:59 -0600
committerCurtis Dunham <Curtis.Dunham@arm.com>2016-02-04 16:57:59 -0600
commitb4282af3181ad2a6199065cdc7c0275212a2628b (patch)
tree2dd2b0f8f1dc1d51c2ebd87ec201ea528e5525bd
parentfe32b40269f41faa64db712334f1891d0e6d9a35 (diff)
downloadgem5-b4282af3181ad2a6199065cdc7c0275212a2628b.tar.xz
ext: fix SST connector
Should work with SST 5.1 and trunk as of right now.
-rw-r--r--ext/sst/ExtMaster.cc8
-rw-r--r--ext/sst/gem5.cc6
2 files changed, 7 insertions, 7 deletions
diff --git a/ext/sst/ExtMaster.cc b/ext/sst/ExtMaster.cc
index 95cbfe7ad..26a6c4a09 100644
--- a/ext/sst/ExtMaster.cc
+++ b/ext/sst/ExtMaster.cc
@@ -44,6 +44,10 @@
#include "gem5.hh"
+#ifdef fatal // gem5 sets this
+#undef fatal
+#endif
+
#include <sst_config.h>
#include <mem/packet.hh>
@@ -53,10 +57,6 @@
#include <sst/core/link.h>
#include <sst/elements/memHierarchy/memNIC.h>
-#ifdef fatal // gem5 sets this
-#undef fatal
-#endif
-
using namespace SST;
using namespace SST::gem5;
using namespace SST::MemHierarchy;
diff --git a/ext/sst/gem5.cc b/ext/sst/gem5.cc
index 29cea8363..a468e3e82 100644
--- a/ext/sst/gem5.cc
+++ b/ext/sst/gem5.cc
@@ -69,7 +69,6 @@
#include <sst/core/params.h>
#include <sst/core/link.h>
#include <sst/core/timeConverter.h>
-#include <sst/core/debug.h>
using namespace SST;
using namespace SST::gem5;
@@ -93,7 +92,7 @@ gem5Component::gem5Component(ComponentId_t id, Params &params) :
std::string cmd = params.find_string("cmd", "");
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());
}
@@ -223,7 +222,8 @@ gem5Component::initPython(int argc, char *argv[])
int ret = initM5Python();
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);