From f1735afad3afbdc532e1796e5db914a9e238a215 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Mon, 20 Sep 2021 20:55:06 -0700 Subject: [PATCH] misc: Include static_inst_fwd.hh in sim/faults.hh. We only need a StaticInstPtr type, so we don't need to include all of static_inst.hh. Also fix up some other files which were including some other things transitively through sim/faults.hh. Change-Id: I912a84963f33d99617f57d59517c402326f7a494 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50756 Tested-by: kokoro Reviewed-by: Giacomo Travaglini Maintainer: Giacomo Travaglini --- src/arch/generic/debugfaults.hh | 1 + src/cpu/o3/comm.hh | 1 + src/sim/faults.hh | 2 +- 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/arch/generic/debugfaults.hh b/src/arch/generic/debugfaults.hh index d3886e0eb6..f54bd7ca23 100644 --- a/src/arch/generic/debugfaults.hh +++ b/src/arch/generic/debugfaults.hh @@ -42,6 +42,7 @@ #include "base/logging.hh" #include "cpu/null_static_inst.hh" +#include "cpu/static_inst.hh" #include "cpu/thread_context.hh" #include "sim/faults.hh" diff --git a/src/cpu/o3/comm.hh b/src/cpu/o3/comm.hh index 013ef99b75..fc108484d3 100644 --- a/src/cpu/o3/comm.hh +++ b/src/cpu/o3/comm.hh @@ -46,6 +46,7 @@ #include "arch/pcstate.hh" #include "base/types.hh" +#include "config/the_isa.hh" #include "cpu/inst_seq.hh" #include "cpu/o3/dyn_inst_ptr.hh" #include "cpu/o3/limits.hh" diff --git a/src/sim/faults.hh b/src/sim/faults.hh index b1c358c66b..d2e091ef2e 100644 --- a/src/sim/faults.hh +++ b/src/sim/faults.hh @@ -43,7 +43,7 @@ #include "base/types.hh" #include "cpu/null_static_inst.hh" -#include "cpu/static_inst.hh" +#include "cpu/static_inst_fwd.hh" #include "mem/htm.hh" #include "sim/stats.hh"