From dc4daa010a342d83add920f70aad0b2eb15a3d0d Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Tue, 17 Aug 2021 20:53:11 -0700 Subject: [PATCH] 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 Reviewed-by: Andreas Sandberg Tested-by: kokoro --- src/python/embedded.cc | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/python/embedded.cc b/src/python/embedded.cc index 27bf770a4a..4b129dd138 100644 --- a/src/python/embedded.cc +++ b/src/python/embedded.cc @@ -45,10 +45,10 @@ #include +#include +#include #include -#include "base/logging.hh" - namespace py = pybind11; namespace gem5 @@ -78,8 +78,10 @@ EmbeddedPython::getCode() const 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");