From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Wed, 18 Nov 2020 14:51:49 +0000 (+0000)
Subject: fastmodel: Use BaseMMU in the CortexR52 wrapper
X-Git-Tag: develop-gem5-snapshot~447
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=1569f5e5cd2b0a29ce1206ef7fc6953e9a3253d5;p=gem5.git

fastmodel: Use BaseMMU in the CortexR52 wrapper

Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Change-Id: I569dc66a9dad54a374b0864ef2ffabd114aede7b
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/37715
Reviewed-by: Gabe Black <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---

diff --git a/src/arch/arm/fastmodel/CortexR52/thread_context.cc b/src/arch/arm/fastmodel/CortexR52/thread_context.cc
index 648a39a2b..e8e0aa73f 100644
--- a/src/arch/arm/fastmodel/CortexR52/thread_context.cc
+++ b/src/arch/arm/fastmodel/CortexR52/thread_context.cc
@@ -36,10 +36,10 @@ namespace FastModel
 {
 
 CortexR52TC::CortexR52TC(
-        ::BaseCPU *cpu, int id, System *system, ::BaseTLB *dtb, ::BaseTLB *itb,
+        ::BaseCPU *cpu, int id, System *system, ::BaseMMU *mmu,
         ::BaseISA *isa, iris::IrisConnectionInterface *iris_if,
         const std::string &iris_path) :
-    ThreadContext(cpu, id, system, dtb, itb, isa, iris_if, iris_path)
+    ThreadContext(cpu, id, system, mmu, isa, iris_if, iris_path)
 {}
 
 bool
diff --git a/src/arch/arm/fastmodel/CortexR52/thread_context.hh b/src/arch/arm/fastmodel/CortexR52/thread_context.hh
index 74ac1a0f6..41223c99b 100644
--- a/src/arch/arm/fastmodel/CortexR52/thread_context.hh
+++ b/src/arch/arm/fastmodel/CortexR52/thread_context.hh
@@ -44,7 +44,7 @@ class CortexR52TC : public Iris::ThreadContext
 
   public:
     CortexR52TC(::BaseCPU *cpu, int id, System *system,
-                ::BaseTLB *dtb, ::BaseTLB *itb, ::BaseISA *isa,
+                ::BaseMMU *mmu, ::BaseISA *isa,
                 iris::IrisConnectionInterface *iris_if,
                 const std::string &iris_path);