Gabe Black has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/40104 )
Change subject: arch: Stop using switching header files in ISA specific
files.
......................................................................
arch: Stop using switching header files in ISA specific files.
We know what ISA we want, we don't need to use the indirection.
Change-Id: I57eb2737bb4d9abb562b857ad2c3238c641199d2
---
M src/arch/arm/insts/tme64ruby.cc
M src/arch/arm/kvm/arm_cpu.cc
M src/arch/mips/locked_mem.hh
M src/arch/null/registers.hh
M src/arch/power/decoder.hh
M src/arch/riscv/locked_mem.hh
M src/arch/sparc/decoder.hh
7 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/arch/arm/insts/tme64ruby.cc
b/src/arch/arm/insts/tme64ruby.cc
index f8d9481..5e22deb 100644
--- a/src/arch/arm/insts/tme64ruby.cc
+++ b/src/arch/arm/insts/tme64ruby.cc
@@ -38,9 +38,9 @@
#include "arch/arm/faults.hh"
#include "arch/arm/htm.hh"
#include "arch/arm/insts/tme64.hh"
+#include "arch/arm/locked_mem.hh"
#include "arch/arm/registers.hh"
#include "arch/generic/memhelpers.hh"
-#include "arch/locked_mem.hh"
#include "debug/ArmTme.hh"
#include "mem/packet_access.hh"
#include "mem/request.hh"
diff --git a/src/arch/arm/kvm/arm_cpu.cc b/src/arch/arm/kvm/arm_cpu.cc
index f674c7e..e827c22 100644
--- a/src/arch/arm/kvm/arm_cpu.cc
+++ b/src/arch/arm/kvm/arm_cpu.cc
@@ -44,7 +44,7 @@
#include <memory>
#include "arch/arm/interrupts.hh"
-#include "arch/registers.hh"
+#include "arch/arm/registers.hh"
#include "cpu/kvm/base.hh"
#include "debug/Kvm.hh"
#include "debug/KvmContext.hh"
diff --git a/src/arch/mips/locked_mem.hh b/src/arch/mips/locked_mem.hh
index 153a991..73180af 100644
--- a/src/arch/mips/locked_mem.hh
+++ b/src/arch/mips/locked_mem.hh
@@ -47,7 +47,7 @@
* ISA-specific helper functions for locked memory accesses.
*/
-#include "arch/registers.hh"
+#include "arch/mips/registers.hh"
#include "base/logging.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/null/registers.hh b/src/arch/null/registers.hh
index db02afc..3e96472 100644
--- a/src/arch/null/registers.hh
+++ b/src/arch/null/registers.hh
@@ -40,7 +40,7 @@
#include "arch/generic/vec_pred_reg.hh"
#include "arch/generic/vec_reg.hh"
-#include "arch/types.hh"
+#include "arch/null/types.hh"
#include "base/types.hh"
namespace NullISA {
diff --git a/src/arch/power/decoder.hh b/src/arch/power/decoder.hh
index e7dbd24..bd32614 100644
--- a/src/arch/power/decoder.hh
+++ b/src/arch/power/decoder.hh
@@ -31,7 +31,7 @@
#include "arch/generic/decode_cache.hh"
#include "arch/generic/decoder.hh"
-#include "arch/types.hh"
+#include "arch/power/types.hh"
#include "cpu/static_inst.hh"
#include "debug/Decode.hh"
diff --git a/src/arch/riscv/locked_mem.hh b/src/arch/riscv/locked_mem.hh
index 10d1839..3a95780 100644
--- a/src/arch/riscv/locked_mem.hh
+++ b/src/arch/riscv/locked_mem.hh
@@ -49,7 +49,7 @@
#include <stack>
#include <unordered_map>
-#include "arch/registers.hh"
+#include "arch/riscv/registers.hh"
#include "base/logging.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/arch/sparc/decoder.hh b/src/arch/sparc/decoder.hh
index 0c9f719..340733d 100644
--- a/src/arch/sparc/decoder.hh
+++ b/src/arch/sparc/decoder.hh
@@ -32,7 +32,7 @@
#include "arch/generic/decode_cache.hh"
#include "arch/generic/decoder.hh"
#include "arch/sparc/registers.hh"
-#include "arch/types.hh"
+#include "arch/sparc/types.hh"
#include "cpu/static_inst.hh"
#include "debug/Decode.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40104
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: I57eb2737bb4d9abb562b857ad2c3238c641199d2
Gerrit-Change-Number: 40104
Gerrit-PatchSet: 1
Gerrit-Owner: Gabe Black <gabe.bl...@gmail.com>
Gerrit-MessageType: newchange
_______________________________________________
gem5-dev mailing list -- gem5-dev@gem5.org
To unsubscribe send an email to gem5-dev-le...@gem5.org
%(web_page_url)slistinfo%(cgiext)s/%(_internal_name)s
