From 634562f5dd1b8e4b01fd98d8f09a26d7d6b1c303 Mon Sep 17 00:00:00 2001 From: Gabe Black Date: Fri, 21 Aug 2020 18:22:32 -0700 Subject: [PATCH] misc: Replace some includes of arch/isa_traits.hh. In sim/vma.hh, the include was indirectly getting the definition of DPRINTF. It was replaced with an include of base/trace.hh which actually provides that definition. In the indirect branch predictor, it was being used to get the definition of TheISA::PCState. This should come from arch/types.hh instead. Change-Id: I6de08f196499c85b54edde09d654902cc766c2eb Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/33195 Reviewed-by: Daniel Carvalho Reviewed-by: Andreas Sandberg Maintainer: Andreas Sandberg Tested-by: kokoro --- src/cpu/pred/indirect.hh | 2 +- src/sim/vma.hh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/cpu/pred/indirect.hh b/src/cpu/pred/indirect.hh index f4e6e816d..5c070869e 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/isa_traits.hh" +#include "arch/types.hh" #include "config/the_isa.hh" #include "cpu/inst_seq.hh" #include "params/IndirectPredictor.hh" diff --git a/src/sim/vma.hh b/src/sim/vma.hh index 3d5d10410..8dd385342 100644 --- a/src/sim/vma.hh +++ b/src/sim/vma.hh @@ -31,8 +31,8 @@ #include -#include "arch/isa_traits.hh" #include "base/addr_range.hh" +#include "base/trace.hh" #include "base/types.hh" #include "debug/Vma.hh" #include "mem/se_translating_port_proxy.hh" -- 2.30.2