Gabe Black has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/40179 )
Change subject: arch,dev,gpu-compute,sim: Rename isa_traits.hh page_size.hh.
......................................................................
arch,dev,gpu-compute,sim: Rename isa_traits.hh page_size.hh.
The only thing left in isa_traits.hh are two constants, one for the
number of bytes in a page, and one for how far to shift an address to
get the page number. To make it clear that this is the only thing
isa_traits.hh should be used for from this point forward (until it is
entirely eliminated), this change renames it to the much less generic
page_size.hh.
Also, because isa_traits.hh used to have *much* more stuff in it, it was
included in a lot of places it didn't need to be. This change also
clears out all these legacy includes while updating the actually needed
ones to the new name.
Change-Id: I939b01b117c53d620b6b0a98982f6f21dc2ada72
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/40179
Reviewed-by: Gabe Black <[email protected]>
Maintainer: Gabe Black <[email protected]>
Tested-by: kokoro <[email protected]>
---
M src/arch/SConscript
M src/arch/arm/decoder.cc
M src/arch/arm/freebsd/fs_workload.cc
M src/arch/arm/interrupts.hh
M src/arch/arm/isa/includes.isa
M src/arch/arm/linux/fs_workload.cc
M src/arch/arm/linux/process.cc
M src/arch/arm/locked_mem.hh
M src/arch/arm/nativetrace.cc
R src/arch/arm/page_size.hh
M src/arch/arm/pagetable.hh
M src/arch/arm/process.cc
M src/arch/arm/tlb.hh
M src/arch/arm/utility.cc
M src/arch/arm/utility.hh
M src/arch/mips/dsp.cc
M src/arch/mips/dsp.hh
M src/arch/mips/isa/includes.isa
M src/arch/mips/mt.hh
R src/arch/mips/page_size.hh
M src/arch/mips/process.cc
M src/arch/mips/tlb.hh
M src/arch/mips/utility.cc
M src/arch/mips/utility.hh
R src/arch/null/page_size.hh
M src/arch/power/isa/includes.isa
R src/arch/power/page_size.hh
M src/arch/power/pagetable.hh
M src/arch/power/process.cc
M src/arch/power/tlb.hh
M src/arch/riscv/decoder.hh
R src/arch/riscv/page_size.hh
M src/arch/riscv/pagetable.cc
M src/arch/riscv/process.cc
M src/arch/riscv/tlb.hh
M src/arch/sparc/handlers.hh
M src/arch/sparc/interrupts.hh
M src/arch/sparc/isa/includes.isa
M src/arch/sparc/nativetrace.cc
R src/arch/sparc/page_size.hh
M src/arch/sparc/pagetable.hh
M src/arch/sparc/process.cc
M src/arch/sparc/process.hh
M src/arch/x86/bios/e820.cc
M src/arch/x86/bios/intelmp.cc
M src/arch/x86/bios/smbios.cc
M src/arch/x86/faults.cc
M src/arch/x86/fs_workload.cc
M src/arch/x86/insts/badmicroop.cc
M src/arch/x86/isa/includes.isa
M src/arch/x86/linux/fs_workload.cc
M src/arch/x86/linux/se_workload.cc
M src/arch/x86/nativetrace.cc
R src/arch/x86/page_size.hh
M src/arch/x86/pagetable.cc
M src/arch/x86/pagetable.hh
M src/arch/x86/process.cc
M src/dev/sparc/iob.cc
M src/gpu-compute/compute_unit.cc
M src/gpu-compute/gpu_tlb.cc
M src/gpu-compute/shader.cc
M src/gpu-compute/tlb_coalescer.cc
M src/sim/system.hh
63 files changed, 43 insertions(+), 83 deletions(-)
Approvals:
Gabe Black: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass
diff --git a/src/arch/SConscript b/src/arch/SConscript
index 534045e..539acc0 100644
--- a/src/arch/SConscript
+++ b/src/arch/SConscript
@@ -59,8 +59,8 @@
Split('''
decoder.hh
isa.hh
- isa_traits.hh
locked_mem.hh
+ page_size.hh
registers.hh
remote_gdb.hh
types.hh
diff --git a/src/arch/arm/decoder.cc b/src/arch/arm/decoder.cc
index f45849c..d18cc83 100644
--- a/src/arch/arm/decoder.cc
+++ b/src/arch/arm/decoder.cc
@@ -41,7 +41,6 @@
#include "arch/arm/decoder.hh"
#include "arch/arm/isa.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/utility.hh"
#include "base/trace.hh"
#include "debug/Decoder.hh"
diff --git a/src/arch/arm/freebsd/fs_workload.cc
b/src/arch/arm/freebsd/fs_workload.cc
index eb5789f..959581b 100644
--- a/src/arch/arm/freebsd/fs_workload.cc
+++ b/src/arch/arm/freebsd/fs_workload.cc
@@ -32,7 +32,6 @@
#include "arch/arm/freebsd/fs_workload.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/utility.hh"
#include "arch/generic/freebsd/threadinfo.hh"
#include "base/loader/dtb_file.hh"
diff --git a/src/arch/arm/interrupts.hh b/src/arch/arm/interrupts.hh
index 4002f6c..e60878d 100644
--- a/src/arch/arm/interrupts.hh
+++ b/src/arch/arm/interrupts.hh
@@ -42,7 +42,6 @@
#define __ARCH_ARM_INTERRUPT_HH__
#include "arch/arm/faults.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/registers.hh"
#include "arch/arm/regs/misc.hh"
#include "arch/arm/utility.hh"
diff --git a/src/arch/arm/isa/includes.isa b/src/arch/arm/isa/includes.isa
index 58e6be9..16d4c1c 100644
--- a/src/arch/arm/isa/includes.isa
+++ b/src/arch/arm/isa/includes.isa
@@ -66,7 +66,6 @@
#include "arch/arm/insts/sve_mem.hh"
#include "arch/arm/insts/tme64.hh"
#include "arch/arm/insts/vfp.hh"
-#include "arch/arm/isa_traits.hh"
#include "enums/DecoderFlavor.hh"
#include "mem/packet.hh"
#include "sim/faults.hh"
@@ -86,7 +85,6 @@
#include "arch/arm/decoder.hh"
#include "arch/arm/faults.hh"
#include "arch/arm/insts/sve_macromem.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/regs/int.hh"
#include "arch/arm/utility.hh"
#include "base/cprintf.hh"
@@ -103,7 +101,6 @@
#include "arch/arm/interrupts.hh"
#include "arch/arm/isa.hh"
#include "arch/arm/htm.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/pauth_helpers.hh"
#include "arch/arm/reg_abi.hh"
#include "arch/arm/semihosting.hh"
diff --git a/src/arch/arm/linux/fs_workload.cc
b/src/arch/arm/linux/fs_workload.cc
index 3c29298..dc70765 100644
--- a/src/arch/arm/linux/fs_workload.cc
+++ b/src/arch/arm/linux/fs_workload.cc
@@ -40,7 +40,6 @@
#include "arch/arm/linux/fs_workload.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/linux/atag.hh"
#include "arch/arm/system.hh"
#include "arch/arm/utility.hh"
diff --git a/src/arch/arm/linux/process.cc b/src/arch/arm/linux/process.cc
index cba3d14..8b20e59 100644
--- a/src/arch/arm/linux/process.cc
+++ b/src/arch/arm/linux/process.cc
@@ -43,8 +43,8 @@
#include <sys/syscall.h>
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/linux/linux.hh"
+#include "arch/arm/page_size.hh"
#include "base/loader/object_file.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/arm/locked_mem.hh b/src/arch/arm/locked_mem.hh
index dcf2feb..b23a157 100644
--- a/src/arch/arm/locked_mem.hh
+++ b/src/arch/arm/locked_mem.hh
@@ -48,7 +48,6 @@
* ISA-specific helper functions for locked memory accesses.
*/
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/regs/misc.hh"
#include "arch/arm/utility.hh"
#include "debug/LLSC.hh"
diff --git a/src/arch/arm/nativetrace.cc b/src/arch/arm/nativetrace.cc
index f7392d1..be46448 100644
--- a/src/arch/arm/nativetrace.cc
+++ b/src/arch/arm/nativetrace.cc
@@ -40,7 +40,6 @@
#include "arch/arm/nativetrace.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/regs/cc.hh"
#include "arch/arm/regs/misc.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/page_size.hh
similarity index 95%
rename from src/arch/arm/isa_traits.hh
rename to src/arch/arm/page_size.hh
index 6c858cc..1fbd46a 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/page_size.hh
@@ -39,8 +39,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_ARM_ISA_TRAITS_HH__
-#define __ARCH_ARM_ISA_TRAITS_HH__
+#ifndef __ARCH_ARM_PAGE_SIZE_HH__
+#define __ARCH_ARM_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -50,4 +50,4 @@
const Addr PageBytes = 1ULL << PageShift;
} // namespace ArmISA
-#endif // __ARCH_ARM_ISA_TRAITS_HH__
+#endif // __ARCH_ARM_PAGE_SIZE_HH__
diff --git a/src/arch/arm/pagetable.hh b/src/arch/arm/pagetable.hh
index eb78018..a8c3a14 100644
--- a/src/arch/arm/pagetable.hh
+++ b/src/arch/arm/pagetable.hh
@@ -43,7 +43,7 @@
#include <cstdint>
-#include "arch/arm/isa_traits.hh"
+#include "arch/arm/page_size.hh"
#include "arch/arm/utility.hh"
#include "sim/serialize.hh"
diff --git a/src/arch/arm/process.cc b/src/arch/arm/process.cc
index 0bfbda1..a9cf4bd 100644
--- a/src/arch/arm/process.cc
+++ b/src/arch/arm/process.cc
@@ -40,7 +40,7 @@
#include "arch/arm/process.hh"
-#include "arch/arm/isa_traits.hh"
+#include "arch/arm/page_size.hh"
#include "arch/arm/regs/cc.hh"
#include "arch/arm/regs/misc.hh"
#include "arch/arm/types.hh"
diff --git a/src/arch/arm/tlb.hh b/src/arch/arm/tlb.hh
index ef01cff..213311b 100644
--- a/src/arch/arm/tlb.hh
+++ b/src/arch/arm/tlb.hh
@@ -43,7 +43,6 @@
#include "arch/arm/faults.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/pagetable.hh"
#include "arch/arm/utility.hh"
#include "arch/generic/tlb.hh"
diff --git a/src/arch/arm/utility.cc b/src/arch/arm/utility.cc
index 29e63c4..54ed5ae 100644
--- a/src/arch/arm/utility.cc
+++ b/src/arch/arm/utility.cc
@@ -41,8 +41,8 @@
#include "arch/arm/faults.hh"
#include "arch/arm/interrupts.hh"
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/mmu.hh"
+#include "arch/arm/page_size.hh"
#include "arch/arm/regs/cc.hh"
#include "arch/arm/regs/int.hh"
#include "arch/arm/system.hh"
diff --git a/src/arch/arm/utility.hh b/src/arch/arm/utility.hh
index 209d7e8..0d9e6b8 100644
--- a/src/arch/arm/utility.hh
+++ b/src/arch/arm/utility.hh
@@ -42,7 +42,6 @@
#ifndef __ARCH_ARM_UTILITY_HH__
#define __ARCH_ARM_UTILITY_HH__
-#include "arch/arm/isa_traits.hh"
#include "arch/arm/regs/cc.hh"
#include "arch/arm/regs/misc.hh"
#include "arch/arm/types.hh"
diff --git a/src/arch/mips/dsp.cc b/src/arch/mips/dsp.cc
index 9e97fc4..425cf50 100644
--- a/src/arch/mips/dsp.cc
+++ b/src/arch/mips/dsp.cc
@@ -28,7 +28,6 @@
#include "arch/mips/dsp.hh"
-#include "arch/mips/isa_traits.hh"
#include "base/bitfield.hh"
#include "base/logging.hh"
#include "cpu/static_inst.hh"
diff --git a/src/arch/mips/dsp.hh b/src/arch/mips/dsp.hh
index 5d3018d..ee2e37d 100644
--- a/src/arch/mips/dsp.hh
+++ b/src/arch/mips/dsp.hh
@@ -29,7 +29,6 @@
#ifndef __ARCH_MIPS_DSP_HH__
#define __ARCH_MIPS_DSP_HH__
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/types.hh"
#include "base/logging.hh"
#include "base/types.hh"
diff --git a/src/arch/mips/isa/includes.isa b/src/arch/mips/isa/includes.isa
index d17bcf6..48b0a10 100644
--- a/src/arch/mips/isa/includes.isa
+++ b/src/arch/mips/isa/includes.isa
@@ -36,7 +36,6 @@
#include <iostream>
#include <sstream>
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/mt_constants.hh"
#include "arch/mips/pra_constants.hh"
#include "cpu/static_inst.hh"
@@ -51,7 +50,6 @@
#include "arch/mips/dsp.hh"
#include "arch/mips/dt_constants.hh"
#include "arch/mips/faults.hh"
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/mt_constants.hh"
#include "arch/mips/pagetable.hh"
#include "arch/mips/pra_constants.hh"
@@ -73,7 +71,6 @@
#include "arch/mips/dsp.hh"
#include "arch/mips/dt_constants.hh"
#include "arch/mips/faults.hh"
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/mmu.hh"
#include "arch/mips/mt.hh"
#include "arch/mips/mt_constants.hh"
diff --git a/src/arch/mips/mt.hh b/src/arch/mips/mt.hh
index da4c51a..c42cd9a 100644
--- a/src/arch/mips/mt.hh
+++ b/src/arch/mips/mt.hh
@@ -38,7 +38,6 @@
#include <iostream>
#include "arch/mips/faults.hh"
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/mt_constants.hh"
#include "arch/mips/pra_constants.hh"
#include "arch/mips/registers.hh"
diff --git a/src/arch/mips/isa_traits.hh b/src/arch/mips/page_size.hh
similarity index 93%
rename from src/arch/mips/isa_traits.hh
rename to src/arch/mips/page_size.hh
index 541ed63..bdb13a6 100644
--- a/src/arch/mips/isa_traits.hh
+++ b/src/arch/mips/page_size.hh
@@ -27,8 +27,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_MIPS_ISA_TRAITS_HH__
-#define __ARCH_MIPS_ISA_TRAITS_HH__
+#ifndef __ARCH_MIPS_PAGE_SIZE_HH__
+#define __ARCH_MIPS_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -40,4 +40,4 @@
} // namespace MipsISA
-#endif // __ARCH_MIPS_ISA_TRAITS_HH__
+#endif // __ARCH_MIPS_PAGE_SIZE_HH__
diff --git a/src/arch/mips/process.cc b/src/arch/mips/process.cc
index 0439d09..ccabd3f 100644
--- a/src/arch/mips/process.cc
+++ b/src/arch/mips/process.cc
@@ -28,7 +28,7 @@
#include "arch/mips/process.hh"
-#include "arch/mips/isa_traits.hh"
+#include "arch/mips/page_size.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
#include "base/logging.hh"
diff --git a/src/arch/mips/tlb.hh b/src/arch/mips/tlb.hh
index 99c7280..36c294b 100644
--- a/src/arch/mips/tlb.hh
+++ b/src/arch/mips/tlb.hh
@@ -33,7 +33,6 @@
#include <map>
#include "arch/generic/tlb.hh"
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/pagetable.hh"
#include "arch/mips/utility.hh"
#include "base/statistics.hh"
diff --git a/src/arch/mips/utility.cc b/src/arch/mips/utility.cc
index 8159ed2..e892e71 100644
--- a/src/arch/mips/utility.cc
+++ b/src/arch/mips/utility.cc
@@ -30,7 +30,6 @@
#include <cmath>
-#include "arch/mips/isa_traits.hh"
#include "arch/mips/registers.hh"
#include "base/bitfield.hh"
#include "base/logging.hh"
diff --git a/src/arch/mips/utility.hh b/src/arch/mips/utility.hh
index f86e93a..4709692 100644
--- a/src/arch/mips/utility.hh
+++ b/src/arch/mips/utility.hh
@@ -29,7 +29,7 @@
#ifndef __ARCH_MIPS_UTILITY_HH__
#define __ARCH_MIPS_UTILITY_HH__
-#include "arch/mips/isa_traits.hh"
+#include "arch/mips/page_size.hh"
#include "arch/mips/types.hh"
#include "base/logging.hh"
#include "base/types.hh"
diff --git a/src/arch/null/isa_traits.hh b/src/arch/null/page_size.hh
similarity index 95%
rename from src/arch/null/isa_traits.hh
rename to src/arch/null/page_size.hh
index 136dcc8..ee6c7c4 100644
--- a/src/arch/null/isa_traits.hh
+++ b/src/arch/null/page_size.hh
@@ -35,8 +35,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_NULL_ISA_TRAITS_HH__
-#define __ARCH_NULL_ISA_TRAITS_HH__
+#ifndef __ARCH_NULL_PAGE_SIZE_HH__
+#define __ARCH_NULL_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -46,4 +46,4 @@
const Addr PageBytes = 1ULL << PageShift;
}
-#endif //__ARCH_NULL_ISA_TRAITS_HH__
+#endif //__ARCH_NULL_PAGE_SIZE_HH__
diff --git a/src/arch/power/isa/includes.isa
b/src/arch/power/isa/includes.isa
index 55b51cf..50ed449 100644
--- a/src/arch/power/isa/includes.isa
+++ b/src/arch/power/isa/includes.isa
@@ -43,7 +43,6 @@
#include "arch/power/insts/mem.hh"
#include "arch/power/insts/misc.hh"
#include "arch/power/insts/static_inst.hh"
-#include "arch/power/isa_traits.hh"
#include "cpu/static_inst.hh"
#include "mem/packet.hh"
@@ -55,7 +54,6 @@
#include "arch/power/decoder.hh"
#include "arch/power/faults.hh"
-#include "arch/power/isa_traits.hh"
#include "base/loader/symtab.hh"
#include "base/cprintf.hh"
#include "cpu/thread_context.hh"
@@ -68,7 +66,6 @@
#include "arch/generic/memhelpers.hh"
#include "arch/power/faults.hh"
-#include "arch/power/isa_traits.hh"
#include "arch/power/miscregs.hh"
#include "base/condcodes.hh"
#include "cpu/base.hh"
diff --git a/src/arch/power/isa_traits.hh b/src/arch/power/page_size.hh
similarity index 93%
rename from src/arch/power/isa_traits.hh
rename to src/arch/power/page_size.hh
index e6e7a67..690b846 100644
--- a/src/arch/power/isa_traits.hh
+++ b/src/arch/power/page_size.hh
@@ -28,8 +28,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_POWER_ISA_TRAITS_HH__
-#define __ARCH_POWER_ISA_TRAITS_HH__
+#ifndef __ARCH_POWER_PAGE_SIZE_HH__
+#define __ARCH_POWER_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -41,4 +41,4 @@
} // namespace PowerISA
-#endif // __ARCH_POWER_ISA_TRAITS_HH__
+#endif // __ARCH_POWER_PAGE_SIZE_HH__
diff --git a/src/arch/power/pagetable.hh b/src/arch/power/pagetable.hh
index f193987..6f0f40b 100644
--- a/src/arch/power/pagetable.hh
+++ b/src/arch/power/pagetable.hh
@@ -32,7 +32,7 @@
#ifndef __ARCH_POWER_PAGETABLE_H__
#define __ARCH_POWER_PAGETABLE_H__
-#include "arch/power/isa_traits.hh"
+#include "base/types.hh"
#include "sim/serialize.hh"
namespace PowerISA
diff --git a/src/arch/power/process.cc b/src/arch/power/process.cc
index 5cdd299..fb31227 100644
--- a/src/arch/power/process.cc
+++ b/src/arch/power/process.cc
@@ -29,7 +29,7 @@
#include "arch/power/process.hh"
-#include "arch/power/isa_traits.hh"
+#include "arch/power/page_size.hh"
#include "arch/power/types.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
diff --git a/src/arch/power/tlb.hh b/src/arch/power/tlb.hh
index 7dcc3c0..4cc7c98 100644
--- a/src/arch/power/tlb.hh
+++ b/src/arch/power/tlb.hh
@@ -35,7 +35,6 @@
#include <map>
#include "arch/generic/tlb.hh"
-#include "arch/power/isa_traits.hh"
#include "arch/power/pagetable.hh"
#include "base/statistics.hh"
#include "mem/request.hh"
diff --git a/src/arch/riscv/decoder.hh b/src/arch/riscv/decoder.hh
index 173b4c7..f1a9b2e 100644
--- a/src/arch/riscv/decoder.hh
+++ b/src/arch/riscv/decoder.hh
@@ -32,7 +32,6 @@
#include "arch/generic/decode_cache.hh"
#include "arch/generic/decoder.hh"
-#include "arch/riscv/isa_traits.hh"
#include "arch/riscv/types.hh"
#include "base/logging.hh"
#include "base/types.hh"
diff --git a/src/arch/riscv/isa_traits.hh b/src/arch/riscv/page_size.hh
similarity index 95%
rename from src/arch/riscv/isa_traits.hh
rename to src/arch/riscv/page_size.hh
index d07ffa2..e0ba3a4 100644
--- a/src/arch/riscv/isa_traits.hh
+++ b/src/arch/riscv/page_size.hh
@@ -39,8 +39,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_RISCV_ISA_TRAITS_HH__
-#define __ARCH_RISCV_ISA_TRAITS_HH__
+#ifndef __ARCH_RISCV_PAGE_SIZE_HH__
+#define __ARCH_RISCV_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -52,4 +52,4 @@
}
-#endif //__ARCH_RISCV_ISA_TRAITS_HH__
+#endif //__ARCH_RISCV_PAGE_SIZE_HH__
diff --git a/src/arch/riscv/pagetable.cc b/src/arch/riscv/pagetable.cc
index 9e4fef0..38776c3 100644
--- a/src/arch/riscv/pagetable.cc
+++ b/src/arch/riscv/pagetable.cc
@@ -30,7 +30,6 @@
#include "arch/riscv/pagetable.hh"
-#include "arch/riscv/isa_traits.hh"
#include "sim/serialize.hh"
namespace RiscvISA
diff --git a/src/arch/riscv/process.cc b/src/arch/riscv/process.cc
index edfbf4b..7c5af60 100644
--- a/src/arch/riscv/process.cc
+++ b/src/arch/riscv/process.cc
@@ -38,7 +38,7 @@
#include <vector>
#include "arch/riscv/isa.hh"
-#include "arch/riscv/isa_traits.hh"
+#include "arch/riscv/page_size.hh"
#include "arch/riscv/registers.hh"
#include "base/loader/elf_object.hh"
#include "base/loader/object_file.hh"
diff --git a/src/arch/riscv/tlb.hh b/src/arch/riscv/tlb.hh
index 9c7172a..1421396 100644
--- a/src/arch/riscv/tlb.hh
+++ b/src/arch/riscv/tlb.hh
@@ -36,7 +36,6 @@
#include "arch/generic/tlb.hh"
#include "arch/riscv/isa.hh"
-#include "arch/riscv/isa_traits.hh"
#include "arch/riscv/pagetable.hh"
#include "arch/riscv/pma_checker.hh"
#include "arch/riscv/utility.hh"
diff --git a/src/arch/sparc/handlers.hh b/src/arch/sparc/handlers.hh
index b5f05f5..2086f9c 100644
--- a/src/arch/sparc/handlers.hh
+++ b/src/arch/sparc/handlers.hh
@@ -29,7 +29,6 @@
#ifndef __ARCH_SPARC_HANDLERS_HH__
#define __ARCH_SPARC_HANDLERS_HH__
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/types.hh"
#include "sim/byteswap.hh"
diff --git a/src/arch/sparc/interrupts.hh b/src/arch/sparc/interrupts.hh
index 07ec2b2..3edac8c 100644
--- a/src/arch/sparc/interrupts.hh
+++ b/src/arch/sparc/interrupts.hh
@@ -31,7 +31,6 @@
#include "arch/generic/interrupts.hh"
#include "arch/sparc/faults.hh"
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/miscregs.hh"
#include "arch/sparc/registers.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/sparc/isa/includes.isa
b/src/arch/sparc/isa/includes.isa
index c2c44a7..afc2c4f 100644
--- a/src/arch/sparc/isa/includes.isa
+++ b/src/arch/sparc/isa/includes.isa
@@ -46,7 +46,6 @@
#include "arch/sparc/insts/trap.hh"
#include "arch/sparc/insts/unimp.hh"
#include "arch/sparc/insts/unknown.hh"
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/miscregs.hh"
#include "arch/sparc/registers.hh"
#include "base/condcodes.hh"
diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc
index 32ce10e..7f528a2 100644
--- a/src/arch/sparc/nativetrace.cc
+++ b/src/arch/sparc/nativetrace.cc
@@ -28,7 +28,6 @@
#include "arch/sparc/nativetrace.hh"
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/registers.hh"
#include "cpu/thread_context.hh"
#include "params/SparcNativeTrace.hh"
diff --git a/src/arch/sparc/isa_traits.hh b/src/arch/sparc/page_size.hh
similarity index 93%
rename from src/arch/sparc/isa_traits.hh
rename to src/arch/sparc/page_size.hh
index 895b7d5..e3c9b68 100644
--- a/src/arch/sparc/isa_traits.hh
+++ b/src/arch/sparc/page_size.hh
@@ -26,8 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_SPARC_ISA_TRAITS_HH__
-#define __ARCH_SPARC_ISA_TRAITS_HH__
+#ifndef __ARCH_SPARC_PAGE_SIZE_HH__
+#define __ARCH_SPARC_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -39,4 +39,4 @@
}
-#endif // __ARCH_SPARC_ISA_TRAITS_HH__
+#endif // __ARCH_SPARC_PAGE_SIZE_HH__
diff --git a/src/arch/sparc/pagetable.hh b/src/arch/sparc/pagetable.hh
index a20dc79..6af2e27 100644
--- a/src/arch/sparc/pagetable.hh
+++ b/src/arch/sparc/pagetable.hh
@@ -31,9 +31,9 @@
#include <cassert>
-#include "arch/sparc/isa_traits.hh"
#include "base/bitfield.hh"
#include "base/logging.hh"
+#include "base/types.hh"
#include "sim/serialize.hh"
namespace SparcISA
diff --git a/src/arch/sparc/process.cc b/src/arch/sparc/process.cc
index e40cb06..33ba756 100644
--- a/src/arch/sparc/process.cc
+++ b/src/arch/sparc/process.cc
@@ -30,8 +30,8 @@
#include "arch/sparc/asi.hh"
#include "arch/sparc/handlers.hh"
-#include "arch/sparc/isa_traits.hh"
#include "arch/sparc/miscregs.hh"
+#include "arch/sparc/page_size.hh"
#include "arch/sparc/registers.hh"
#include "arch/sparc/types.hh"
#include "base/loader/elf_object.hh"
diff --git a/src/arch/sparc/process.hh b/src/arch/sparc/process.hh
index 4d3ebfe..8c5bf1c 100644
--- a/src/arch/sparc/process.hh
+++ b/src/arch/sparc/process.hh
@@ -33,7 +33,7 @@
#include <string>
#include <vector>
-#include "arch/sparc/isa_traits.hh"
+#include "arch/sparc/page_size.hh"
#include "base/loader/object_file.hh"
#include "mem/page_table.hh"
#include "sim/process.hh"
diff --git a/src/arch/x86/bios/e820.cc b/src/arch/x86/bios/e820.cc
index a22f66c..51c6b9d 100644
--- a/src/arch/x86/bios/e820.cc
+++ b/src/arch/x86/bios/e820.cc
@@ -37,7 +37,6 @@
#include "arch/x86/bios/e820.hh"
-#include "arch/x86/isa_traits.hh"
#include "mem/port_proxy.hh"
#include "sim/byteswap.hh"
diff --git a/src/arch/x86/bios/intelmp.cc b/src/arch/x86/bios/intelmp.cc
index ba9ba20..8e6a0b1 100644
--- a/src/arch/x86/bios/intelmp.cc
+++ b/src/arch/x86/bios/intelmp.cc
@@ -37,7 +37,6 @@
#include "arch/x86/bios/intelmp.hh"
-#include "arch/x86/isa_traits.hh"
#include "base/logging.hh"
#include "base/types.hh"
#include "mem/port_proxy.hh"
diff --git a/src/arch/x86/bios/smbios.cc b/src/arch/x86/bios/smbios.cc
index ead87cf..e6f7934 100644
--- a/src/arch/x86/bios/smbios.cc
+++ b/src/arch/x86/bios/smbios.cc
@@ -40,7 +40,6 @@
#include "arch/x86/bios/smbios.hh"
-#include "arch/x86/isa_traits.hh"
#include "base/types.hh"
#include "mem/port_proxy.hh"
#include "params/X86SMBiosBiosInformation.hh"
diff --git a/src/arch/x86/faults.cc b/src/arch/x86/faults.cc
index c53babf..21ff032 100644
--- a/src/arch/x86/faults.cc
+++ b/src/arch/x86/faults.cc
@@ -42,7 +42,6 @@
#include "arch/x86/generated/decoder.hh"
#include "arch/x86/insts/static_inst.hh"
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/mmu.hh"
#include "base/loader/symtab.hh"
#include "base/trace.hh"
diff --git a/src/arch/x86/fs_workload.cc b/src/arch/x86/fs_workload.cc
index 7499e60..381ab4f 100644
--- a/src/arch/x86/fs_workload.cc
+++ b/src/arch/x86/fs_workload.cc
@@ -41,7 +41,6 @@
#include "arch/x86/bios/intelmp.hh"
#include "arch/x86/bios/smbios.hh"
#include "arch/x86/faults.hh"
-#include "arch/x86/isa_traits.hh"
#include "base/loader/object_file.hh"
#include "cpu/thread_context.hh"
#include "params/X86FsWorkload.hh"
diff --git a/src/arch/x86/insts/badmicroop.cc
b/src/arch/x86/insts/badmicroop.cc
index 9b4d32a..21707c6 100644
--- a/src/arch/x86/insts/badmicroop.cc
+++ b/src/arch/x86/insts/badmicroop.cc
@@ -39,7 +39,6 @@
#include "arch/generic/debugfaults.hh"
#include "arch/x86/generated/decoder.hh"
-#include "arch/x86/isa_traits.hh"
namespace {
diff --git a/src/arch/x86/isa/includes.isa b/src/arch/x86/isa/includes.isa
index 27ef988..300ffd4 100644
--- a/src/arch/x86/isa/includes.isa
+++ b/src/arch/x86/isa/includes.isa
@@ -60,7 +60,6 @@
#include "arch/x86/insts/micromediaop.hh"
#include "arch/x86/insts/microregop.hh"
#include "arch/x86/insts/static_inst.hh"
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/registers.hh"
#include "arch/x86/types.hh"
#include "arch/x86/utility.hh"
diff --git a/src/arch/x86/linux/fs_workload.cc
b/src/arch/x86/linux/fs_workload.cc
index bb9f39f..4f3dce4 100644
--- a/src/arch/x86/linux/fs_workload.cc
+++ b/src/arch/x86/linux/fs_workload.cc
@@ -37,7 +37,6 @@
#include "arch/x86/linux/fs_workload.hh"
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/regs/int.hh"
#include "base/trace.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/x86/linux/se_workload.cc
b/src/arch/x86/linux/se_workload.cc
index 7d2ae5a..67b8184 100644
--- a/src/arch/x86/linux/se_workload.cc
+++ b/src/arch/x86/linux/se_workload.cc
@@ -40,8 +40,8 @@
#include <sys/syscall.h>
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/linux/linux.hh"
+#include "arch/x86/page_size.hh"
#include "arch/x86/process.hh"
#include "arch/x86/registers.hh"
#include "arch/x86/se_workload.hh"
diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc
index 904b3ec..c6251fc 100644
--- a/src/arch/x86/nativetrace.cc
+++ b/src/arch/x86/nativetrace.cc
@@ -28,7 +28,6 @@
#include "arch/x86/nativetrace.hh"
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/regs/float.hh"
#include "arch/x86/regs/int.hh"
#include "cpu/thread_context.hh"
diff --git a/src/arch/x86/isa_traits.hh b/src/arch/x86/page_size.hh
similarity index 95%
rename from src/arch/x86/isa_traits.hh
rename to src/arch/x86/page_size.hh
index d1dd392..aceadd0 100644
--- a/src/arch/x86/isa_traits.hh
+++ b/src/arch/x86/page_size.hh
@@ -35,8 +35,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#ifndef __ARCH_X86_ISATRAITS_HH__
-#define __ARCH_X86_ISATRAITS_HH__
+#ifndef __ARCH_X86_PAGE_SIZE_HH__
+#define __ARCH_X86_PAGE_SIZE_HH__
#include "base/types.hh"
@@ -46,4 +46,4 @@
const Addr PageBytes = 1ULL << PageShift;
}
-#endif // __ARCH_X86_ISATRAITS_HH__
+#endif // __ARCH_X86_PAGE_SIZE_HH__
diff --git a/src/arch/x86/pagetable.cc b/src/arch/x86/pagetable.cc
index 1298cdb..1ccc9b8 100644
--- a/src/arch/x86/pagetable.cc
+++ b/src/arch/x86/pagetable.cc
@@ -39,7 +39,7 @@
#include <cmath>
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "sim/serialize.hh"
namespace X86ISA
diff --git a/src/arch/x86/pagetable.hh b/src/arch/x86/pagetable.hh
index 36dffd7..d56a8dd 100644
--- a/src/arch/x86/pagetable.hh
+++ b/src/arch/x86/pagetable.hh
@@ -41,7 +41,7 @@
#include <cstdint>
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "base/bitunion.hh"
#include "base/types.hh"
#include "base/trie.hh"
diff --git a/src/arch/x86/process.cc b/src/arch/x86/process.cc
index 2b25fb2..b46d4a3 100644
--- a/src/arch/x86/process.cc
+++ b/src/arch/x86/process.cc
@@ -45,7 +45,7 @@
#include <vector>
#include "arch/x86/fs_workload.hh"
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "arch/x86/regs/misc.hh"
#include "arch/x86/regs/segment.hh"
#include "arch/x86/se_workload.hh"
diff --git a/src/dev/sparc/iob.cc b/src/dev/sparc/iob.cc
index deec07f..fbc3b58 100644
--- a/src/dev/sparc/iob.cc
+++ b/src/dev/sparc/iob.cc
@@ -39,7 +39,6 @@
#include "arch/sparc/faults.hh"
#include "arch/sparc/interrupts.hh"
-#include "arch/sparc/isa_traits.hh"
#include "base/bitfield.hh"
#include "base/trace.hh"
#include "cpu/base.hh"
diff --git a/src/gpu-compute/compute_unit.cc
b/src/gpu-compute/compute_unit.cc
index 636fd55..bb1480b 100644
--- a/src/gpu-compute/compute_unit.cc
+++ b/src/gpu-compute/compute_unit.cc
@@ -35,7 +35,7 @@
#include <limits>
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "base/output.hh"
#include "debug/GPUDisp.hh"
#include "debug/GPUExec.hh"
diff --git a/src/gpu-compute/gpu_tlb.cc b/src/gpu-compute/gpu_tlb.cc
index f61f382..f0afd827 100644
--- a/src/gpu-compute/gpu_tlb.cc
+++ b/src/gpu-compute/gpu_tlb.cc
@@ -40,7 +40,7 @@
#include "arch/x86/faults.hh"
#include "arch/x86/insts/microldstop.hh"
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "arch/x86/pagetable.hh"
#include "arch/x86/pagetable_walker.hh"
#include "arch/x86/regs/misc.hh"
diff --git a/src/gpu-compute/shader.cc b/src/gpu-compute/shader.cc
index dcb0d8b..4905aa0 100644
--- a/src/gpu-compute/shader.cc
+++ b/src/gpu-compute/shader.cc
@@ -35,8 +35,8 @@
#include <limits>
-#include "arch/x86/isa_traits.hh"
#include "arch/x86/linux/linux.hh"
+#include "arch/x86/page_size.hh"
#include "base/chunk_generator.hh"
#include "debug/GPUAgentDisp.hh"
#include "debug/GPUDisp.hh"
diff --git a/src/gpu-compute/tlb_coalescer.cc
b/src/gpu-compute/tlb_coalescer.cc
index aaf470f..08f0f95 100644
--- a/src/gpu-compute/tlb_coalescer.cc
+++ b/src/gpu-compute/tlb_coalescer.cc
@@ -35,7 +35,7 @@
#include <cstring>
-#include "arch/x86/isa_traits.hh"
+#include "arch/x86/page_size.hh"
#include "base/logging.hh"
#include "debug/GPUTLB.hh"
#include "sim/process.hh"
diff --git a/src/sim/system.hh b/src/sim/system.hh
index d3dbc72..5c58524 100644
--- a/src/sim/system.hh
+++ b/src/sim/system.hh
@@ -48,7 +48,7 @@
#include <utility>
#include <vector>
-#include "arch/isa_traits.hh"
+#include "arch/page_size.hh"
#include "base/loader/memory_image.hh"
#include "base/loader/symtab.hh"
#include "base/statistics.hh"
--
To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/40179
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: I939b01b117c53d620b6b0a98982f6f21dc2ada72
Gerrit-Change-Number: 40179
Gerrit-PatchSet: 17
Gerrit-Owner: Gabe Black <[email protected]>
Gerrit-Reviewer: Alex Dutu <[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: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Jason Lowe-Power <[email protected]>
Gerrit-Reviewer: Matthew Poremba <[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
