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 <gabe.black@gmail.com>
Maintainer: Gabe Black <gabe.black@gmail.com>
Tested-by: kokoro <noreply+kokoro@google.com>

src/arch/SConscript

@@ -59,8 +59,8 @@ env.SwitchingHeaders(
     Split('''
         decoder.hh
         isa.hh
-        isa_traits.hh
         locked_mem.hh
+        page_size.hh
         registers.hh
         remote_gdb.hh
         types.hh

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"

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"

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"

src/arch/arm/isa/includes.isa

@@ -66,7 +66,6 @@ output header {{
 #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 @@ output decoder {{
 #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 @@ output exec {{
 #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"

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"

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"

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"

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"

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 @@ namespace ArmISA
     const Addr PageBytes = 1ULL << PageShift;
 } // namespace ArmISA
 
-#endif // __ARCH_ARM_ISA_TRAITS_HH__
+#endif // __ARCH_ARM_PAGE_SIZE_HH__

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"
 

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"

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"

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"

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"

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"

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"

src/arch/mips/isa/includes.isa

@@ -36,7 +36,6 @@ output header {{
 #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 @@ output decoder {{
 #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 @@ output exec {{
 #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"

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"

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 @@ const Addr PageBytes = 1ULL << PageShift;
 
 } // namespace MipsISA
 
-#endif // __ARCH_MIPS_ISA_TRAITS_HH__
+#endif // __ARCH_MIPS_PAGE_SIZE_HH__

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"

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"

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"

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"

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 @@ namespace NullISA
     const Addr PageBytes = 1ULL << PageShift;
 }
 
-#endif //__ARCH_NULL_ISA_TRAITS_HH__
+#endif //__ARCH_NULL_PAGE_SIZE_HH__

src/arch/power/isa/includes.isa

@@ -43,7 +43,6 @@ output header {{
 #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 @@ output decoder {{
 
 #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 @@ output exec {{
 
 #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"

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 @@ const Addr PageBytes = 1ULL << PageShift;
 
 } // namespace PowerISA
 
-#endif // __ARCH_POWER_ISA_TRAITS_HH__
+#endif // __ARCH_POWER_PAGE_SIZE_HH__

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

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"

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"

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"

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 @@ const Addr PageBytes = 1ULL << PageShift;
 
 }
 
-#endif //__ARCH_RISCV_ISA_TRAITS_HH__
+#endif //__ARCH_RISCV_PAGE_SIZE_HH__

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

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"

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"

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"
 

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"

src/arch/sparc/isa/includes.isa

@@ -46,7 +46,6 @@ output header {{
 #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"

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"

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 @@ const Addr PageBytes = 1ULL << PageShift;
 
 }
 
-#endif // __ARCH_SPARC_ISA_TRAITS_HH__
+#endif // __ARCH_SPARC_PAGE_SIZE_HH__

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

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"

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"

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"
 

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"

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"

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"

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"

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 {
 

src/arch/x86/isa/includes.isa

@@ -60,7 +60,6 @@ output header {{
 #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"

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"

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"

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"

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 @@ namespace X86ISA
     const Addr PageBytes = 1ULL << PageShift;
 }
 
-#endif // __ARCH_X86_ISATRAITS_HH__
+#endif // __ARCH_X86_PAGE_SIZE_HH__

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

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"

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"

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"

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"

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"

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"

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"

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"