Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/49420 )
(
4 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: python: Remove python/embedded.cc's dependence on the
rest of gem5.
......................................................................
python: Remove python/embedded.cc's dependence on the rest of gem5.
If embedded python modules are going to be built into other binaries,
then they can't depend on other parts of gem5.
Change-Id: I4e12f1962cb6330e70866a40388689102c23693a
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/49420
Maintainer: Gabe Black <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/python/embedded.cc
1 file changed, 22 insertions(+), 4 deletions(-)
Approvals:
Andreas Sandberg: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/python/embedded.cc b/src/python/embedded.cc
index 27bf770..4b129dd 100644
--- a/src/python/embedded.cc
+++ b/src/python/embedded.cc
@@ -45,10 +45,10 @@
#include <zlib.h>
+#include <cstdlib>
+#include <iostream>
#include <list>
-#include "base/logging.hh"
-
namespace py = pybind11;
namespace gem5
@@ -78,8 +78,10 @@
Bytef marshalled[len];
uLongf unzlen = len;
int ret = uncompress(marshalled, &unzlen, (const Bytef *)code, zlen);
- if (ret != Z_OK)
- panic("Could not uncompress code: %s\n", zError(ret));
+ if (ret != Z_OK) {
+ std::cerr << "Could not uncompress code: " << zError(ret) <<
std::endl;
+ std::abort();
+ }
assert(unzlen == (uLongf)len);
auto marshal = py::module_::import("marshal");
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/49420
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: I4e12f1962cb6330e70866a40388689102c23693a
Gerrit-Change-Number: 49420
Gerrit-PatchSet: 34
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
