Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/48703 )
Change subject: arch,cpu: Rename arch/generic/types.hh to pcstate.hh.
......................................................................
arch,cpu: Rename arch/generic/types.hh to pcstate.hh.
Also get rid of some unnecessary includes of it.
Jira Issue: https://gem5.atlassian.net/browse/GEM5-1060
Change-Id: I7556afc06401b35b9105a0009a10be15c1888be3
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/48703
Reviewed-by: Hoa Nguyen <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/arm/pcstate.hh
R src/arch/generic/pcstate.hh
M src/arch/mips/pcstate.hh
M src/arch/null/pcstate.hh
M src/arch/null/vecregs.hh
M src/arch/power/pcstate.hh
M src/arch/riscv/pcstate.hh
M src/arch/sparc/pcstate.hh
M src/arch/x86/pcstate.hh
M src/cpu/inst_res.hh
M src/cpu/o3/cpu.hh
M src/cpu/o3/regfile.cc
12 files changed, 10 insertions(+), 14 deletions(-)
Approvals:
Hoa Nguyen: Looks good to me, approved
Gabe Black: Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/arm/pcstate.hh b/src/arch/arm/pcstate.hh
index b3d7c93..b6f46ce 100644
--- a/src/arch/arm/pcstate.hh
+++ b/src/arch/arm/pcstate.hh
@@ -41,7 +41,7 @@
#ifndef __ARCH_ARM_PCSTATE_HH__
#define __ARCH_ARM_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
#include "base/bitunion.hh"
#include "base/types.hh"
#include "debug/Decoder.hh"
diff --git a/src/arch/generic/types.hh b/src/arch/generic/pcstate.hh
similarity index 100%
rename from src/arch/generic/types.hh
rename to src/arch/generic/pcstate.hh
diff --git a/src/arch/mips/pcstate.hh b/src/arch/mips/pcstate.hh
index 2c58719..3c33069 100644
--- a/src/arch/mips/pcstate.hh
+++ b/src/arch/mips/pcstate.hh
@@ -29,7 +29,7 @@
#ifndef __ARCH_MIPS_PCSTATE_HH__
#define __ARCH_MIPS_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
namespace gem5
{
diff --git a/src/arch/null/pcstate.hh b/src/arch/null/pcstate.hh
index 5b790bb..265d15b 100644
--- a/src/arch/null/pcstate.hh
+++ b/src/arch/null/pcstate.hh
@@ -35,10 +35,10 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_NULL_TYPES_HH__
-#define __ARCH_NULL_TYPES_HH__
+#ifndef __ARCH_NULL_PCSTATE_HH__
+#define __ARCH_NULL_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
namespace gem5
{
@@ -51,4 +51,4 @@
} // namespace NullISA
} // namespace gem5
-#endif // __ARCH_NULL_TYPES_HH__
+#endif // __ARCH_NULL_PCSTATE_HH__
diff --git a/src/arch/null/vecregs.hh b/src/arch/null/vecregs.hh
index dcb2091..81c2f0d 100644
--- a/src/arch/null/vecregs.hh
+++ b/src/arch/null/vecregs.hh
@@ -40,7 +40,6 @@
#include <cstdint>
-#include "arch/generic/types.hh"
#include "arch/generic/vec_pred_reg.hh"
#include "arch/generic/vec_reg.hh"
diff --git a/src/arch/power/pcstate.hh b/src/arch/power/pcstate.hh
index d0757839..393c001 100644
--- a/src/arch/power/pcstate.hh
+++ b/src/arch/power/pcstate.hh
@@ -29,7 +29,7 @@
#ifndef __ARCH_POWER_PCSTATE_HH__
#define __ARCH_POWER_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
#include "arch/power/types.hh"
#include "enums/ByteOrder.hh"
diff --git a/src/arch/riscv/pcstate.hh b/src/arch/riscv/pcstate.hh
index bc60a07..06030b3 100644
--- a/src/arch/riscv/pcstate.hh
+++ b/src/arch/riscv/pcstate.hh
@@ -42,7 +42,7 @@
#ifndef __ARCH_RISCV_PCSTATE_HH__
#define __ARCH_RISCV_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
namespace gem5
{
diff --git a/src/arch/sparc/pcstate.hh b/src/arch/sparc/pcstate.hh
index 4431b38..a24ae59 100644
--- a/src/arch/sparc/pcstate.hh
+++ b/src/arch/sparc/pcstate.hh
@@ -29,7 +29,7 @@
#ifndef __ARCH_SPARC_PCSTATE_HH__
#define __ARCH_SPARC_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
namespace gem5
{
diff --git a/src/arch/x86/pcstate.hh b/src/arch/x86/pcstate.hh
index dd2dded..d04ec2c 100644
--- a/src/arch/x86/pcstate.hh
+++ b/src/arch/x86/pcstate.hh
@@ -38,7 +38,7 @@
#ifndef __ARCH_X86_PCSTATE_HH__
#define __ARCH_X86_PCSTATE_HH__
-#include "arch/generic/types.hh"
+#include "arch/generic/pcstate.hh"
#include "sim/serialize.hh"
namespace gem5
diff --git a/src/cpu/inst_res.hh b/src/cpu/inst_res.hh
index cfdaa15..68e189a 100644
--- a/src/cpu/inst_res.hh
+++ b/src/cpu/inst_res.hh
@@ -40,7 +40,6 @@
#include <type_traits>
-#include "arch/generic/types.hh"
#include "arch/generic/vec_reg.hh"
namespace gem5
diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh
index 4e82df0..f5197b2 100644
--- a/src/cpu/o3/cpu.hh
+++ b/src/cpu/o3/cpu.hh
@@ -49,7 +49,6 @@
#include <set>
#include <vector>
-#include "arch/generic/types.hh"
#include "arch/pcstate.hh"
#include "base/statistics.hh"
#include "config/the_isa.hh"
diff --git a/src/cpu/o3/regfile.cc b/src/cpu/o3/regfile.cc
index fed4125..df9dd78 100644
--- a/src/cpu/o3/regfile.cc
+++ b/src/cpu/o3/regfile.cc
@@ -42,7 +42,6 @@
#include "cpu/o3/regfile.hh"
#include "cpu/o3/free_list.hh"
-#include "arch/generic/types.hh"
#include "cpu/o3/free_list.hh"
namespace gem5
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/48703
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: I7556afc06401b35b9105a0009a10be15c1888be3
Gerrit-Change-Number: 48703
Gerrit-PatchSet: 3
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Bobby R. Bruce <[email protected]>
Gerrit-Reviewer: Daniel Carvalho <[email protected]>
Gerrit-Reviewer: Gabe Black <[email protected]>
Gerrit-Reviewer: Giacomo Travaglini <[email protected]>
Gerrit-Reviewer: Hoa Nguyen <[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
