From 2805f3dee15ebe7fe136570ff2242cfb01bbaec3 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Sat, 16 Oct 2021 04:27:24 -0700 Subject: [PATCH] misc: Stop including arch/pcstate.hh. Change-Id: Ic9ea62ae9c59fd838175fd6af4c075101d46a0b1 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/52067 Tested-by: kokoro Maintainer: Gabe Black Reviewed-by: Daniel Carvalho --- src/arch/power/remote_gdb.cc | 1 + src/arch/sparc/nativetrace.cc | 1 + src/arch/x86/nativetrace.cc | 1 + src/base/remote_gdb.hh | 2 +- src/cpu/checker/cpu.hh | 2 +- src/cpu/checker/thread_context.hh | 2 +- src/cpu/inst_pb_trace.hh | 2 +- src/cpu/nop_static_inst.cc | 3 +-- src/cpu/o3/comm.hh | 2 +- src/cpu/o3/cpu.hh | 2 +- src/cpu/o3/decode.cc | 2 +- src/cpu/pred/bpred_unit.cc | 2 +- src/cpu/pred/btb.hh | 2 +- src/cpu/pred/indirect.hh | 2 +- src/cpu/simple_thread.hh | 2 +- src/cpu/thread_context.hh | 2 +- src/dev/arm/css/scmi_platform.hh | 1 + 17 files changed, 17 insertions(+), 14 deletions(-) diff --git a/src/arch/power/remote_gdb.cc b/src/arch/power/remote_gdb.cc index 702439d7ac..5955253124 100644 --- a/src/arch/power/remote_gdb.cc +++ b/src/arch/power/remote_gdb.cc @@ -142,6 +142,7 @@ #include "arch/power/gdb-xml/gdb_xml_power_fpu.hh" #include "arch/power/gdb-xml/gdb_xml_powerpc_32.hh" #include "arch/power/gdb-xml/gdb_xml_powerpc_64.hh" +#include "arch/power/pcstate.hh" #include "arch/power/regs/misc.hh" #include "cpu/thread_state.hh" #include "debug/GDBAcc.hh" diff --git a/src/arch/sparc/nativetrace.cc b/src/arch/sparc/nativetrace.cc index 0179fe4890..ff2b8f1a1c 100644 --- a/src/arch/sparc/nativetrace.cc +++ b/src/arch/sparc/nativetrace.cc @@ -28,6 +28,7 @@ #include "arch/sparc/nativetrace.hh" +#include "arch/sparc/pcstate.hh" #include "arch/sparc/regs/int.hh" #include "cpu/thread_context.hh" #include "params/SparcNativeTrace.hh" diff --git a/src/arch/x86/nativetrace.cc b/src/arch/x86/nativetrace.cc index abb1a32c9d..697fb18ab9 100644 --- a/src/arch/x86/nativetrace.cc +++ b/src/arch/x86/nativetrace.cc @@ -28,6 +28,7 @@ #include "arch/x86/nativetrace.hh" +#include "arch/x86/pcstate.hh" #include "arch/x86/regs/float.hh" #include "arch/x86/regs/int.hh" #include "cpu/thread_context.hh" diff --git a/src/base/remote_gdb.hh b/src/base/remote_gdb.hh index 2248d71d2f..59bccc564e 100644 --- a/src/base/remote_gdb.hh +++ b/src/base/remote_gdb.hh @@ -50,7 +50,7 @@ #include #include -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/cprintf.hh" #include "base/pollevent.hh" #include "base/socket.hh" diff --git a/src/cpu/checker/cpu.hh b/src/cpu/checker/cpu.hh index eb0978f763..b76c034b80 100644 --- a/src/cpu/checker/cpu.hh +++ b/src/cpu/checker/cpu.hh @@ -46,7 +46,7 @@ #include #include -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/statistics.hh" #include "cpu/base.hh" #include "cpu/exec_context.hh" diff --git a/src/cpu/checker/thread_context.hh b/src/cpu/checker/thread_context.hh index 115fd1db76..9e6c812463 100644 --- a/src/cpu/checker/thread_context.hh +++ b/src/cpu/checker/thread_context.hh @@ -42,7 +42,7 @@ #ifndef __CPU_CHECKER_THREAD_CONTEXT_HH__ #define __CPU_CHECKER_THREAD_CONTEXT_HH__ -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "config/the_isa.hh" #include "cpu/checker/cpu.hh" #include "cpu/simple_thread.hh" diff --git a/src/cpu/inst_pb_trace.hh b/src/cpu/inst_pb_trace.hh index cfcd47e948..ee0ed6443c 100644 --- a/src/cpu/inst_pb_trace.hh +++ b/src/cpu/inst_pb_trace.hh @@ -38,7 +38,7 @@ #ifndef __CPU_INST_PB_TRACE_HH__ #define __CPU_INST_PB_TRACE_HH__ -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/trace.hh" #include "base/types.hh" #include "cpu/static_inst_fwd.hh" diff --git a/src/cpu/nop_static_inst.cc b/src/cpu/nop_static_inst.cc index aa344819d4..4b73aa077c 100644 --- a/src/cpu/nop_static_inst.cc +++ b/src/cpu/nop_static_inst.cc @@ -28,8 +28,7 @@ #include "cpu/nop_static_inst.hh" -#include "arch/pcstate.hh" -#include "config/the_isa.hh" +#include "arch/generic/pcstate.hh" #include "cpu/static_inst.hh" namespace gem5 diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh index b2da358d31..f2c6e60615 100644 --- a/src/cpu/o3/comm.hh +++ b/src/cpu/o3/comm.hh @@ -44,7 +44,7 @@ #include -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/types.hh" #include "config/the_isa.hh" #include "cpu/inst_seq.hh" diff --git a/src/cpu/o3/cpu.hh b/src/cpu/o3/cpu.hh index ebbfd9a805..670b92fa0d 100644 --- a/src/cpu/o3/cpu.hh +++ b/src/cpu/o3/cpu.hh @@ -49,7 +49,7 @@ #include #include -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/statistics.hh" #include "config/the_isa.hh" #include "cpu/o3/comm.hh" diff --git a/src/cpu/o3/decode.cc b/src/cpu/o3/decode.cc index d10e19a2a3..362daee171 100644 --- a/src/cpu/o3/decode.cc +++ b/src/cpu/o3/decode.cc @@ -40,7 +40,7 @@ #include "cpu/o3/decode.hh" -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/trace.hh" #include "config/the_isa.hh" #include "cpu/inst_seq.hh" diff --git a/src/cpu/pred/bpred_unit.cc b/src/cpu/pred/bpred_unit.cc index b1b4503328..0940ae1a93 100644 --- a/src/cpu/pred/bpred_unit.cc +++ b/src/cpu/pred/bpred_unit.cc @@ -44,7 +44,7 @@ #include -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/compiler.hh" #include "base/trace.hh" #include "config/the_isa.hh" diff --git a/src/cpu/pred/btb.hh b/src/cpu/pred/btb.hh index ce1cb2170d..206ee8d911 100644 --- a/src/cpu/pred/btb.hh +++ b/src/cpu/pred/btb.hh @@ -29,7 +29,7 @@ #ifndef __CPU_PRED_BTB_HH__ #define __CPU_PRED_BTB_HH__ -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "base/logging.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/cpu/pred/indirect.hh b/src/cpu/pred/indirect.hh index ee17d2ccd4..7bec64f542 100644 --- a/src/cpu/pred/indirect.hh +++ b/src/cpu/pred/indirect.hh @@ -29,7 +29,7 @@ #ifndef __CPU_PRED_INDIRECT_BASE_HH__ #define __CPU_PRED_INDIRECT_BASE_HH__ -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "config/the_isa.hh" #include "cpu/inst_seq.hh" #include "params/IndirectPredictor.hh" diff --git a/src/cpu/simple_thread.hh b/src/cpu/simple_thread.hh index 797ef678c7..bddc1f5cba 100644 --- a/src/cpu/simple_thread.hh +++ b/src/cpu/simple_thread.hh @@ -48,9 +48,9 @@ #include "arch/decoder.hh" #include "arch/generic/htm.hh" #include "arch/generic/mmu.hh" +#include "arch/generic/pcstate.hh" #include "arch/generic/tlb.hh" #include "arch/isa.hh" -#include "arch/pcstate.hh" #include "arch/vecregs.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/cpu/thread_context.hh b/src/cpu/thread_context.hh index 985ffcd80d..3844d0ce73 100644 --- a/src/cpu/thread_context.hh +++ b/src/cpu/thread_context.hh @@ -47,7 +47,7 @@ #include "arch/generic/htm.hh" #include "arch/generic/isa.hh" -#include "arch/pcstate.hh" +#include "arch/generic/pcstate.hh" #include "arch/vecregs.hh" #include "base/types.hh" #include "config/the_isa.hh" diff --git a/src/dev/arm/css/scmi_platform.hh b/src/dev/arm/css/scmi_platform.hh index ad53b83ab1..581408dde2 100644 --- a/src/dev/arm/css/scmi_platform.hh +++ b/src/dev/arm/css/scmi_platform.hh @@ -38,6 +38,7 @@ #ifndef __DEV_ARM_CSS_SCMI_PLATFORM_H__ #define __DEV_ARM_CSS_SCMI_PLATFORM_H__ +#include "base/bitunion.hh" #include "dev/arm/css/scmi_protocols.hh" #include "dev/arm/css/scp.hh" #include "dev/dma_device.hh"