cpu, fastmodel: Remove the old getDTBPtr/getITBPtr virtual methods

JIRA: https://gem5.atlassian.net/browse/GEM5-790

Change-Id: I6c6cdeaa3ae1433624e4e5b30b031d49e822f0e0
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34984
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Anthony Gutierrez <anthony.gutierrez@amd.com>

diff --git a/src/arch/arm/fastmodel/iris/thread_context.hh b/src/arch/arm/fastmodel/iris/thread_context.hh
index 5e5d7838e198183e39c2350bdb581fe07bd632ce..b7ea0b5c91ec43999390951449523bbe0e3358b3 100644 (file)
--- a/src/arch/arm/fastmodel/iris/thread_context.hh
+++ b/src/arch/arm/fastmodel/iris/thread_context.hh
@@ -191,16 +191,6 @@ class ThreadContext : public ::ThreadContext
     int contextId() const override { return _contextId; }
     void setContextId(int id) override { _contextId = id; }
 
-    BaseTLB *
-    getITBPtr() override
-    {
-        return _itb;
-    }
-    BaseTLB *
-    getDTBPtr() override
-    {
-        return _dtb;
-    }
     BaseMMU *
     getMMUPtr() override
     {

diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index 5213026fa503366c40430e58b880e573df16ac32..7eabe57d24666490e0de7437bf29a2b1d4b5fba9 100644 (file)
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -152,9 +152,6 @@ class CheckerCPU : public BaseCPU, public ExecContext
     // Primary thread being run.
     SimpleThread *thread;
 
-    BaseTLB* getITBPtr() { return mmu->itb; }
-    BaseTLB* getDTBPtr() { return mmu->dtb; }
-
     BaseMMU* getMMUPtr() { return mmu; }
 
     virtual Counter totalInsts() const override

diff --git a/src/cpu/checker/thread_context.hh b/src/cpu/checker/thread_context.hh
index 5a68be400d6b377d2fd7827e3d031cb40e7ea8b3..b9442e8d1a5e062a6756fa5eeb05f478ef28f180 100644 (file)
--- a/src/cpu/checker/thread_context.hh
+++ b/src/cpu/checker/thread_context.hh
@@ -127,10 +127,6 @@ class CheckerThreadContext : public ThreadContext
         actualTC->setThreadId(id);
     }
 
-    BaseTLB *getITBPtr() override { return actualTC->getITBPtr(); }
-
-    BaseTLB *getDTBPtr() override { return actualTC->getDTBPtr(); }
-
     BaseMMU *getMMUPtr() override { return actualTC->getMMUPtr(); }
 
     CheckerCPU *

diff --git a/src/cpu/o3/thread_context.hh b/src/cpu/o3/thread_context.hh
index d4353d15c6afb65f339cb56bdba98403686de44a..11de92744f056178e9e876d7ed9e7ce631f8fda8 100644 (file)
--- a/src/cpu/o3/thread_context.hh
+++ b/src/cpu/o3/thread_context.hh
@@ -98,12 +98,6 @@ class O3ThreadContext : public ThreadContext
     /** Pointer to the thread state that this TC corrseponds to. */
     O3ThreadState<Impl> *thread;
 
-    /** Returns a pointer to the ITB. */
-    BaseTLB *getITBPtr() override { return cpu->mmu->itb; }
-
-    /** Returns a pointer to the DTB. */
-    BaseTLB *getDTBPtr() override { return cpu->mmu->dtb; }
-
     /** Returns a pointer to the MMU. */
     BaseMMU *getMMUPtr() override { return cpu->mmu; }
 

diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index e2f8070ff0ad2041013e9ef63d9b991fd0de9c91..b17f29a251b149c9d65785b957a03c62050effa4 100644 (file)
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -206,10 +206,6 @@ class SimpleThread : public ThreadState, public ThreadContext
     ContextID contextId() const override { return ThreadState::contextId(); }
     void setContextId(ContextID id) override { ThreadState::setContextId(id); }
 
-    BaseTLB *getITBPtr() override { return mmu->itb; }
-
-    BaseTLB *getDTBPtr() override { return mmu->dtb; }
-
     BaseMMU *getMMUPtr() override { return mmu; }
 
     CheckerCPU *getCheckerCpuPtr() override { return NULL; }

diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh
index 9bd5cf56e93de19b846893f257cac35d879f8275..c50eb2693cb92ff3a4cce897b08d1e3d3d1aa31b 100644 (file)
--- a/src/cpu/thread_context.hh
+++ b/src/cpu/thread_context.hh
@@ -130,10 +130,6 @@ class ThreadContext : public PCEventScope
 
     virtual void setContextId(ContextID id) = 0;
 
-    virtual BaseTLB *getITBPtr() = 0;
-
-    virtual BaseTLB *getDTBPtr() = 0;
-
     virtual BaseMMU *getMMUPtr() = 0;
 
     virtual CheckerCPU *getCheckerCpuPtr() = 0;