changeset 10647f5d0f7f in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=10647f5d0f7f
description:
ext: fix SST connector
Should work with SST 5.1 and trunk as of right now.
diffstat:
ext/sst/ExtMaster.cc | 8 ++++----
ext/sst/gem5.cc | 6 +++---
2 files changed, 7 insertions(+), 7 deletions(-)
diffs (55 lines):
diff -r 4a5f52f2defa -r 10647f5d0f7f ext/sst/ExtMaster.cc
--- a/ext/sst/ExtMaster.cc Fri Jan 29 17:47:15 2016 -0600
+++ b/ext/sst/ExtMaster.cc Thu Feb 04 16:57:59 2016 -0600
@@ -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 -r 4a5f52f2defa -r 10647f5d0f7f ext/sst/gem5.cc
--- a/ext/sst/gem5.cc Fri Jan 29 17:47:15 2016 -0600
+++ b/ext/sst/gem5.cc Thu Feb 04 16:57:59 2016 -0600
@@ -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 @@
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 @@
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);
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
