Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/42116 )
Change subject: cpu: Delete the unnecessary BaseO3CPU class.
......................................................................
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 <[email protected]>
Reviewed-by: Nathanael Premillieu <[email protected]>
Maintainer: Gabe Black <[email protected]>
---
M src/cpu/o3/cpu.cc
M src/cpu/o3/cpu.hh
2 files changed, 2 insertions(+), 16 deletions(-)
Approvals:
Nathanael Premillieu: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/cpu/o3/cpu.cc b/src/cpu/o3/cpu.cc
index b4c7718..9f2a630 100644
--- a/src/cpu/o3/cpu.cc
+++ b/src/cpu/o3/cpu.cc
@@ -64,14 +64,9 @@
struct BaseCPUParams;
-BaseO3CPU::BaseO3CPU(const BaseCPUParams ¶ms)
- : BaseCPU(params)
-{
-}
-
template <class Impl>
FullO3CPU<Impl>::FullO3CPU(const DerivO3CPUParams ¶ms)
- : 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 ff7e0ab..820a223 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -81,22 +81,13 @@
class Checkpoint;
class Process;
-struct BaseCPUParams;
-
-class BaseO3CPU : public BaseCPU
-{
- //Stuff that's pretty ISA independent will go here.
- public:
- BaseO3CPU(const BaseCPUParams ¶ms);
-};
-
/**
* 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.
17 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/42116
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: Idb6258a655b0fb614e94b0fc0e281696d5081ab0
Gerrit-Change-Number: 42116
Gerrit-PatchSet: 20
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Nathanael Premillieu <[email protected]>
Gerrit-Reviewer: kokoro <[email protected]>
Gerrit-MessageType: merged
_______________________________________________
gem5-dev mailing list -- [email protected]
To unsubscribe send an email to [email protected]
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s