Lukas Steiner has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/39215 )
Change subject: util: Fix gem5_within_systemc and tlm coupling
......................................................................
util: Fix gem5_within_systemc and tlm coupling
Adapt the code to changes introduced with commits 3fb9139 and 392c1ce.
Jira Issue: https://gem5.atlassian.net/browse/GEM5-874
Change-Id: I0023157f1a2e5935f624c0a12e61f6b3e0d98b97
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/39215
Reviewed-by: Gabe Black <gabe.bl...@gmail.com>
Maintainer: Gabe Black <gabe.bl...@gmail.com>
Tested-by: kokoro <noreply+kok...@google.com>
---
M util/systemc/gem5_within_systemc/sc_module.cc
M util/tlm/src/sc_master_port.cc
2 files changed, 2 insertions(+), 1 deletion(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/util/systemc/gem5_within_systemc/sc_module.cc
b/util/systemc/gem5_within_systemc/sc_module.cc
index 9e6d5aa..a0f36c7 100644
--- a/util/systemc/gem5_within_systemc/sc_module.cc
+++ b/util/systemc/gem5_within_systemc/sc_module.cc
@@ -71,6 +71,7 @@
setTickFrequency()
{
::setClockFrequency(1000000000000);
+ ::fixClockFrequency();
}
Module::Module(sc_core::sc_module_name name) : sc_core::sc_channel(name),
diff --git a/util/tlm/src/sc_master_port.cc b/util/tlm/src/sc_master_port.cc
index 2d569e8..0008e9b 100644
--- a/util/tlm/src/sc_master_port.cc
+++ b/util/tlm/src/sc_master_port.cc
@@ -47,7 +47,7 @@
Request::Flags flags;
auto req = std::make_shared<Request>(
trans.get_address(), trans.get_data_length(), flags,
- owner.masterId);
+ owner.id);
MemCmd cmd;
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/39215
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: I0023157f1a2e5935f624c0a12e61f6b3e0d98b97
Gerrit-Change-Number: 39215
Gerrit-PatchSet: 2
Gerrit-Owner: Lukas Steiner <lstei...@rhrk.uni-kl.de>
Gerrit-Reviewer: Gabe Black <gabe.bl...@gmail.com>
Gerrit-Reviewer: Lukas Steiner <lstei...@rhrk.uni-kl.de>
Gerrit-Reviewer: Matthias Jung <jun...@eit.uni-kl.de>
Gerrit-Reviewer: kokoro <noreply+kok...@google.com>
Gerrit-CC: Jason Lowe-Power <power...@gmail.com>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
