Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/52081 )
(
21 is the latest approved patch-set.
No files were changed between the latest approved patch-set and the
submitted one.
)Change subject: cpu: Stop including arch/decoder.hh.
......................................................................
cpu: Stop including arch/decoder.hh.
Stop including arch/decoder.hh, and fix up transitive includes.
Change-Id: I9ef2efd0ab427e17bea4382b89a097c17e619332
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52081
Reviewed-by: Daniel Carvalho <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/cpu/simple_thread.cc
M src/cpu/simple_thread.hh
M src/cpu/simple/noncaching.cc
M src/cpu/minor/fetch1.cc
M src/cpu/simple/timing.cc
M src/arch/arm/isa.cc
M src/cpu/o3/fetch.hh
M src/cpu/simple/atomic.cc
M src/cpu/simple/base.cc
9 files changed, 25 insertions(+), 2 deletions(-)
Approvals:
Daniel Carvalho: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/isa.cc b/src/arch/arm/isa.cc
index 2bc335b..f646109 100644
--- a/src/arch/arm/isa.cc
+++ b/src/arch/arm/isa.cc
@@ -37,6 +37,7 @@
#include "arch/arm/isa.hh"
+#include "arch/arm/decoder.hh"
#include "arch/arm/faults.hh"
#include "arch/arm/htm.hh"
#include "arch/arm/interrupts.hh"
@@ -47,6 +48,7 @@
#include "arch/arm/system.hh"
#include "arch/arm/tlbi_op.hh"
#include "arch/arm/utility.hh"
+#include "arch/generic/decoder.hh"
#include "base/cprintf.hh"
#include "cpu/base.hh"
#include "cpu/checker/cpu.hh"
diff --git a/src/cpu/minor/fetch1.cc b/src/cpu/minor/fetch1.cc
index 3a5b310..4829339 100644
--- a/src/cpu/minor/fetch1.cc
+++ b/src/cpu/minor/fetch1.cc
@@ -41,6 +41,7 @@
#include <iomanip>
#include <sstream>
+#include "arch/generic/decoder.hh"
#include "base/cast.hh"
#include "base/compiler.hh"
#include "base/logging.hh"
diff --git a/src/cpu/o3/fetch.hh b/src/cpu/o3/fetch.hh
index c625a61..392e7cb 100644
--- a/src/cpu/o3/fetch.hh
+++ b/src/cpu/o3/fetch.hh
@@ -41,7 +41,7 @@
#ifndef __CPU_O3_FETCH_HH__
#define __CPU_O3_FETCH_HH__
-#include "arch/decoder.hh"
+#include "arch/generic/decoder.hh"
#include "arch/generic/mmu.hh"
#include "base/statistics.hh"
#include "config/the_isa.hh"
diff --git a/src/cpu/simple/atomic.cc b/src/cpu/simple/atomic.cc
index eee0564..d9738d2 100644
--- a/src/cpu/simple/atomic.cc
+++ b/src/cpu/simple/atomic.cc
@@ -41,6 +41,7 @@
#include "cpu/simple/atomic.hh"
+#include "arch/generic/decoder.hh"
#include "base/output.hh"
#include "config/the_isa.hh"
#include "cpu/exetrace.hh"
diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index ad98ed9..4cc8e1f 100644
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -41,6 +41,7 @@
#include "cpu/simple/base.hh"
+#include "arch/generic/decoder.hh"
#include "base/cprintf.hh"
#include "base/inifile.hh"
#include "base/loader/symtab.hh"
diff --git a/src/cpu/simple/noncaching.cc b/src/cpu/simple/noncaching.cc
index f6ef530..6458bee 100644
--- a/src/cpu/simple/noncaching.cc
+++ b/src/cpu/simple/noncaching.cc
@@ -39,6 +39,8 @@
#include <cassert>
+#include "arch/generic/decoder.hh"
+
namespace gem5
{
diff --git a/src/cpu/simple/timing.cc b/src/cpu/simple/timing.cc
index 0ae1a61..da3e0c0 100644
--- a/src/cpu/simple/timing.cc
+++ b/src/cpu/simple/timing.cc
@@ -41,6 +41,7 @@
#include "cpu/simple/timing.hh"
+#include "arch/generic/decoder.hh"
#include "base/compiler.hh"
#include "config/the_isa.hh"
#include "cpu/exetrace.hh"
diff --git a/src/cpu/simple_thread.cc b/src/cpu/simple_thread.cc
index 3c4eae7..7b572ef 100644
--- a/src/cpu/simple_thread.cc
+++ b/src/cpu/simple_thread.cc
@@ -42,6 +42,7 @@
#include <string>
+#include "arch/generic/decoder.hh"
#include "base/callback.hh"
#include "base/compiler.hh"
#include "base/cprintf.hh"
diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh
index 50e9f30..0f25e17 100644
--- a/src/cpu/simple_thread.hh
+++ b/src/cpu/simple_thread.hh
@@ -45,7 +45,6 @@
#include <algorithm>
#include <vector>
-#include "arch/decoder.hh"
#include "arch/generic/htm.hh"
#include "arch/generic/mmu.hh"
#include "arch/generic/pcstate.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/52081
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: I9ef2efd0ab427e17bea4382b89a097c17e619332
Gerrit-Change-Number: 52081
Gerrit-PatchSet: 23
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[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
