From 4ba06c8f2565eadd6f0d248c8aa1b02b3a1222aa Mon Sep 17 00:00:00 2001
From: Gabe Black <gabe.black@gmail.com>
Date: Wed, 3 Mar 2021 04:31:23 -0800
Subject: [PATCH] cpu: Delete the unnecessary BaseO3CPU class.

This class has no content, and is not used for anything except as an
extra layer between FullO3CPU and BaseCPU.

Change-Id: Idb6258a655b0fb614e94b0fc0e281696d5081ab0
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/42116
Tested-by: kokoro <noreply+kokoro@google.com>
Reviewed-by: Nathanael Premillieu <nathanael.premillieu@huawei.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
---
 src/cpu/o3/cpu.cc |  7 +------
 src/cpu/o3/cpu.hh | 11 +----------
 2 files changed, 2 insertions(+), 16 deletions(-)

diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index b4c77180a4..9f2a63094e 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -64,14 +64,9 @@
 
 struct BaseCPUParams;
 
-BaseO3CPU::BaseO3CPU(const BaseCPUParams &params)
-    : BaseCPU(params)
-{
-}
-
 template <class Impl>
 FullO3CPU<Impl>::FullO3CPU(const DerivO3CPUParams &params)
-    : BaseO3CPU(params),
+    : BaseCPU(params),
       mmu(params.mmu),
       tickEvent([this]{ tick(); }, "FullO3CPU tick",
                 false, Event::CPU_Tick_Pri),
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index ff7e0ab66b..820a223a74 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -81,22 +81,13 @@ class O3ThreadContext;
 class Checkpoint;
 class Process;
 
-struct BaseCPUParams;
-
-class BaseO3CPU : public BaseCPU
-{
-    //Stuff that's pretty ISA independent will go here.
-  public:
-    BaseO3CPU(const BaseCPUParams &params);
-};
-
 /**
  * FullO3CPU class, has each of the stages (fetch through commit)
  * within it, as well as all of the time buffers between stages.  The
  * tick() function for the CPU is defined here.
  */
 template <class Impl>
-class FullO3CPU : public BaseO3CPU
+class FullO3CPU : public BaseCPU
 {
   public:
     // Typedefs from the Impl here.