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 <odanrc@yahoo.com.br>
Reviewed-by: Andreas Sandberg <andreas.sandberg@arm.com>
Maintainer: Andreas Sandberg <andreas.sandberg@arm.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/cpu/pred/indirect.hh b/src/cpu/pred/indirect.hh
index f4e6e816dbdb2b0164e94a7c946804252593f467..5c070869e114bcf910cde571cc388cc4c2fb7e34 100644 (file)
--- 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 3d5d104100a6f40d1869e376f9a0ec6e93e7a2fd..8dd385342b92b3bb7d0964da455e8ffdb950db6f 100644 (file)
--- a/src/sim/vma.hh
+++ b/src/sim/vma.hh
@@ -31,8 +31,8 @@
 
 #include <string>
 
-#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"