Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/45864 )
Change subject: misc: Stop using BaseCPU::getSendFunctional.
......................................................................
misc: Stop using BaseCPU::getSendFunctional.
This method is no longer used, and has been replaced by the
ThreadContext::sendFunctional method.
Change-Id: I5a37f44d922245f681b6185c27232150a4eea4f0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/45864
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
Reviewed-by: Yu-hsin Wang <[email protected]>
Reviewed-by: Jason Lowe-Power <[email protected]>
---
M src/arch/arm/fastmodel/iris/thread_context.cc
M src/cpu/thread_state.cc
M src/mem/translating_port_proxy.cc
3 files changed, 3 insertions(+), 9 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, but someone else must approve
Yu-hsin Wang: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/fastmodel/iris/thread_context.cc
b/src/arch/arm/fastmodel/iris/thread_context.cc
index 043971f..3116139 100644
--- a/src/arch/arm/fastmodel/iris/thread_context.cc
+++ b/src/arch/arm/fastmodel/iris/thread_context.cc
@@ -479,8 +479,7 @@
{
if (FullSystem) {
assert(!physProxy && !virtProxy);
- physProxy.reset(new PortProxy(_cpu->getSendFunctional(),
- _cpu->cacheLineSize()));
+ physProxy.reset(new PortProxy(tc, _cpu->cacheLineSize()));
virtProxy.reset(new TranslatingPortProxy(tc));
} else {
assert(!virtProxy);
diff --git a/src/cpu/thread_state.cc b/src/cpu/thread_state.cc
index 187e82c..740f8a5 100644
--- a/src/cpu/thread_state.cc
+++ b/src/cpu/thread_state.cc
@@ -88,11 +88,7 @@
// switching the CPU in.
if (FullSystem) {
assert(physProxy == NULL);
- // This cannot be done in the constructor as the thread state
- // itself is created in the base cpu constructor and the
- // getSendFunctional is a virtual function
- physProxy = new PortProxy(baseCpu->getSendFunctional(),
- baseCpu->cacheLineSize());
+ physProxy = new PortProxy(tc, baseCpu->cacheLineSize());
assert(virtProxy == NULL);
virtProxy = new TranslatingPortProxy(tc);
diff --git a/src/mem/translating_port_proxy.cc
b/src/mem/translating_port_proxy.cc
index 27a2d67..e5117d0 100644
--- a/src/mem/translating_port_proxy.cc
+++ b/src/mem/translating_port_proxy.cc
@@ -53,8 +53,7 @@
TranslatingPortProxy::TranslatingPortProxy(
ThreadContext *tc, Request::Flags _flags) :
- PortProxy(tc->getCpuPtr()->getSendFunctional(),
- tc->getSystemPtr()->cacheLineSize()), _tc(tc),
+ PortProxy(tc, tc->getSystemPtr()->cacheLineSize()), _tc(tc),
pageBytes(tc->getSystemPtr()->getPageBytes()),
flags(_flags)
{}
2 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/45864
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: I5a37f44d922245f681b6185c27232150a4eea4f0
Gerrit-Change-Number: 45864
Gerrit-PatchSet: 4
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Yu-hsin Wang <[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
