From a07fd8fe41a4f3274fbfa076cd6f41f502af87a2 Mon Sep 17 00:00:00 2001
From: Giacomo Travaglini <giacomo.travaglini@arm.com>
Date: Fri, 11 Sep 2020 22:14:28 +0100
Subject: [PATCH] cpu: Remove unused demapInstPage and demapDataPage

Change-Id: Iecc2ee8d91bfd3caf38e5f27e9689b7e0d488ed5
Signed-off-by: Giacomo Travaglini <giacomo.travaglini@arm.com>
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/34977
Reviewed-by: Gabe Black <gabeblack@google.com>
Reviewed-by: Jason Lowe-Power <power.jg@gmail.com>
Maintainer: Jason Lowe-Power <power.jg@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>
---
 src/cpu/base_dyn_inst.hh      | 10 ----------
 src/cpu/checker/cpu.hh        | 12 ------------
 src/cpu/minor/exec_context.hh | 12 ------------
 src/cpu/o3/cpu.hh             | 10 ----------
 src/cpu/simple_thread.hh      | 10 ----------
 5 files changed, 54 deletions(-)

diff --git a/src/cpu/base_dyn_inst.hh b/src/cpu/base_dyn_inst.hh
index f5018f308..9fe5b5342 100644
--- a/src/cpu/base_dyn_inst.hh
+++ b/src/cpu/base_dyn_inst.hh
@@ -296,16 +296,6 @@ class BaseDynInst : public ExecContext, public RefCounted
     {
         cpu->demapPage(vaddr, asn);
     }
-    void
-    demapInstPage(Addr vaddr, uint64_t asn)
-    {
-        cpu->demapPage(vaddr, asn);
-    }
-    void
-    demapDataPage(Addr vaddr, uint64_t asn)
-    {
-        cpu->demapPage(vaddr, asn);
-    }
 
     Fault initiateMemRead(Addr addr, unsigned size, Request::Flags flags,
             const std::vector<bool> &byte_enable) override;
diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh
index 49432f0e4..5213026fa 100644
--- a/src/cpu/checker/cpu.hh
+++ b/src/cpu/checker/cpu.hh
@@ -557,18 +557,6 @@ class CheckerCPU : public BaseCPU, public ExecContext
     AddressMonitor *getAddrMonitor() override
     { return BaseCPU::getCpuAddrMonitor(0); }
 
-    void
-    demapInstPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->itb->demapPage(vaddr, asn);
-    }
-
-    void
-    demapDataPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->dtb->demapPage(vaddr, asn);
-    }
-
     /**
      * Helper function used to generate the request for a single fragment of a
      * memory access.
diff --git a/src/cpu/minor/exec_context.hh b/src/cpu/minor/exec_context.hh
index 6dc14b2f3..153fe2910 100644
--- a/src/cpu/minor/exec_context.hh
+++ b/src/cpu/minor/exec_context.hh
@@ -451,18 +451,6 @@ class ExecContext : public ::ExecContext
         thread.setCCReg(reg.index(), val);
     }
 
-    void
-    demapInstPage(Addr vaddr, uint64_t asn)
-    {
-        thread.getITBPtr()->demapPage(vaddr, asn);
-    }
-
-    void
-    demapDataPage(Addr vaddr, uint64_t asn)
-    {
-        thread.getDTBPtr()->demapPage(vaddr, asn);
-    }
-
     BaseCPU *getCpuPtr() { return &cpu; }
 
   public:
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 230ed953a..57c855b98 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -197,16 +197,6 @@ class FullO3CPU : public BaseO3CPU
         mmu->demapPage(vaddr, asn);
     }
 
-    void demapInstPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->itb->demapPage(vaddr, asn);
-    }
-
-    void demapDataPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->dtb->demapPage(vaddr, asn);
-    }
-
     /** Ticks CPU, calling tick() on each stage, and checking the overall
      *  activity to see if the CPU should deschedule itself.
      */
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index ad50414ce..e2f8070ff 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -174,16 +174,6 @@ class SimpleThread : public ThreadState, public ThreadContext
         mmu->demapPage(vaddr, asn);
     }
 
-    void demapInstPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->itb->demapPage(vaddr, asn);
-    }
-
-    void demapDataPage(Addr vaddr, uint64_t asn)
-    {
-        mmu->dtb->demapPage(vaddr, asn);
-    }
-
     /*******************************************
      * ThreadContext interface functions.
      ******************************************/
-- 
2.30.2