Giacomo Travaglini has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48140 )
Change subject: arch, arch-arm: Make BaseMMU translate methods virtual
......................................................................
arch, arch-arm: Make BaseMMU translate methods virtual
As we are shifting towards making the MMU the main translating
agent, we need to make those methods virtual to let all ISAs
move their TLB::translate* methods to the MMU class
JIRA: https://gem5.atlassian.net/browse/GEM5-790
Change-Id: I50c84784546e8148230d79efe4bf010d0e36d6ab
Signed-off-by: Giacomo Travaglini <[email protected]>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48140
Reviewed-by: Jason Lowe-Power <[email protected]>
Reviewed-by: Andreas Sandberg <[email protected]>
Maintainer: Jason Lowe-Power <[email protected]>
Maintainer: Andreas Sandberg <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/mmu.hh
M src/arch/generic/mmu.hh
2 files changed, 14 insertions(+), 8 deletions(-)
Approvals:
Jason Lowe-Power: Looks good to me, approved; Looks good to me, approved
Andreas Sandberg: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/mmu.hh b/src/arch/arm/mmu.hh
index a129831..14816d7 100644
--- a/src/arch/arm/mmu.hh
+++ b/src/arch/arm/mmu.hh
@@ -90,6 +90,7 @@
void init() override;
+ using BaseMMU::translateFunctional;
bool translateFunctional(ThreadContext *tc, Addr vaddr, Addr &paddr);
Fault translateFunctional(const RequestPtr &req, ThreadContext *tc,
@@ -103,6 +104,7 @@
Fault translateAtomic(const RequestPtr &req, ThreadContext *tc,
BaseMMU::Mode mode, bool stage2);
+ using BaseMMU::translateTiming;
void translateTiming(const RequestPtr &req, ThreadContext *tc,
BaseMMU::Translation *translation, BaseMMU::Mode mode, bool
stage2);
diff --git a/src/arch/generic/mmu.hh b/src/arch/generic/mmu.hh
index cc8b8b0..8bcb3a7 100644
--- a/src/arch/generic/mmu.hh
+++ b/src/arch/generic/mmu.hh
@@ -102,17 +102,21 @@
void demapPage(Addr vaddr, uint64_t asn);
- Fault translateAtomic(const RequestPtr &req, ThreadContext *tc,
- Mode mode);
+ virtual Fault
+ translateAtomic(const RequestPtr &req, ThreadContext *tc,
+ Mode mode);
- void translateTiming(const RequestPtr &req, ThreadContext *tc,
- Translation *translation, Mode mode);
+ virtual void
+ translateTiming(const RequestPtr &req, ThreadContext *tc,
+ Translation *translation, Mode mode);
- Fault translateFunctional(const RequestPtr &req, ThreadContext *tc,
- Mode mode);
+ virtual Fault
+ translateFunctional(const RequestPtr &req, ThreadContext *tc,
+ Mode mode);
- Fault finalizePhysical(const RequestPtr &req, ThreadContext *tc,
- Mode mode) const;
+ virtual Fault
+ finalizePhysical(const RequestPtr &req, ThreadContext *tc,
+ Mode mode) const;
virtual void takeOverFrom(BaseMMU *old_mmu);
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48140
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: I50c84784546e8148230d79efe4bf010d0e36d6ab
Gerrit-Change-Number: 48140
Gerrit-PatchSet: 3
Gerrit-Owner: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Andreas Sandberg <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[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
