From 6cff0dd218941eabf2b9cf3a7ce6d641ea7884cb Mon Sep 17 00:00:00 2001 From: Giacomo Travaglini Date: Mon, 3 Feb 2020 10:17:34 +0000 Subject: arch-arm: Split translateFs to distinguish when MMU is on/off This patch is splitting the big translateFs method so that it is using different methods when the MMU is on/off Change-Id: I198851bdbedf8a8e69730693ff87ffb9ed535ea3 Signed-off-by: Giacomo Travaglini Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/24985 Reviewed-by: Nikos Nikoleris Tested-by: kokoro --- src/arch/arm/tlb.hh | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'src/arch/arm/tlb.hh') diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh index 6314ef2d6..a344cd490 100644 --- a/src/arch/arm/tlb.hh +++ b/src/arch/arm/tlb.hh @@ -44,6 +44,7 @@ #define __ARCH_ARM_TLB_HH__ +#include "arch/arm/faults.hh" #include "arch/arm/isa_traits.hh" #include "arch/arm/pagetable.hh" #include "arch/arm/utility.hh" @@ -351,6 +352,12 @@ class TLB : public BaseTLB return _attr; } + Fault translateMmuOff(ThreadContext *tc, const RequestPtr &req, Mode mode, + TLB::ArmTranslationType tranType, Addr vaddr, bool long_desc_format); + Fault translateMmuOn(ThreadContext *tc, const RequestPtr &req, Mode mode, + Translation *translation, bool &delay, bool timing, bool functional, + Addr vaddr, ArmFault::TranMethod tranMethod); + Fault translateFs(const RequestPtr &req, ThreadContext *tc, Mode mode, Translation *translation, bool &delay, bool timing, ArmTranslationType tranType, bool functional = false); -- cgit v1.2.3