From f213abb63af504ece14c22d55e1df2959b9e0aa1 Mon Sep 17 00:00:00 2001 From: Lukas Steiner Date: Fri, 15 Jan 2021 09:21:59 +0100 Subject: [PATCH] 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 Maintainer: Gabe Black Tested-by: kokoro --- util/systemc/gem5_within_systemc/sc_module.cc | 1 + util/tlm/src/sc_master_port.cc | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/util/systemc/gem5_within_systemc/sc_module.cc b/util/systemc/gem5_within_systemc/sc_module.cc index 9e6d5aa4c..a0f36c74d 100644 --- a/util/systemc/gem5_within_systemc/sc_module.cc +++ b/util/systemc/gem5_within_systemc/sc_module.cc @@ -71,6 +71,7 @@ void 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 2d569e871..0008e9bed 100644 --- a/util/tlm/src/sc_master_port.cc +++ b/util/tlm/src/sc_master_port.cc @@ -47,7 +47,7 @@ SCMasterPort::generatePacket(tlm::tlm_generic_payload& trans) Request::Flags flags; auto req = std::make_shared( trans.get_address(), trans.get_data_length(), flags, - owner.masterId); + owner.id); MemCmd cmd; -- 2.30.2