base,cpu,sim: Stop including arch/vtophys.hh when not using vtophys.

These #includes are leftovers from when vtophys was used much more
prevalently in the simulator.

Change-Id: Ib2e947bc95f1e21acc9eff8e856f38b31d3fd933
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/26225
Reviewed-by: Nikos Nikoleris <nikos.nikoleris@arm.com>
Maintainer: Gabe Black <gabeblack@google.com>
Tested-by: kokoro <noreply+kokoro@google.com>

diff --git a/src/base/remote_gdb.cc b/src/base/remote_gdb.cc
index 7c8241a40e0d3ce9f221c20c8e6ca269c7daa548..add903e78eb627ebff30a4aa9798f73485b7dbaa 100644 (file)
--- a/src/base/remote_gdb.cc
+++ b/src/base/remote_gdb.cc
@@ -138,7 +138,6 @@
 #include <sstream>
 #include <string>
 
-#include "arch/vtophys.hh"
 #include "base/intmath.hh"
 #include "base/socket.hh"
 #include "base/trace.hh"

diff --git a/src/cpu/checker/cpu.cc b/src/cpu/checker/cpu.cc
index 16fcc14decf69c8bd72854316efdd7c152fc5fbd..b62a5c605316613596b234cbc0a704304dc01383 100644 (file)
--- a/src/cpu/checker/cpu.cc
+++ b/src/cpu/checker/cpu.cc
@@ -44,7 +44,6 @@
 #include <string>
 
 #include "arch/generic/tlb.hh"
-#include "arch/vtophys.hh"
 #include "cpu/base.hh"
 #include "cpu/simple_thread.hh"
 #include "cpu/static_inst.hh"

diff --git a/src/cpu/checker/cpu_impl.hh b/src/cpu/checker/cpu_impl.hh
index 9a59d8b16c2852a0899e1fbdb382f438d93060eb..b48f6daefeeacd1f9dc8772655ce485a973a731b 100644 (file)
--- a/src/cpu/checker/cpu_impl.hh
+++ b/src/cpu/checker/cpu_impl.hh
@@ -46,7 +46,6 @@
 #include <string>
 
 #include "arch/isa_traits.hh"
-#include "arch/vtophys.hh"
 #include "base/refcnt.hh"
 #include "config/the_isa.hh"
 #include "cpu/base_dyn_inst.hh"

diff --git a/src/cpu/o3/fetch_impl.hh b/src/cpu/o3/fetch_impl.hh
index 7e61281b9e920c2e069e793db7e2367ee36fbec4..6a0184a4b6c719d8388c9b8bc3e469f15447abc8 100644 (file)
--- a/src/cpu/o3/fetch_impl.hh
+++ b/src/cpu/o3/fetch_impl.hh
@@ -51,7 +51,6 @@
 #include "arch/generic/tlb.hh"
 #include "arch/isa_traits.hh"
 #include "arch/utility.hh"
-#include "arch/vtophys.hh"
 #include "base/random.hh"
 #include "base/types.hh"
 #include "config/the_isa.hh"

diff --git a/src/cpu/simple/base.cc b/src/cpu/simple/base.cc
index 2f616f1ec1e7541d494d0f4d999e4099b637d31b..8f23babfebea7274c70454e509b5ebf841ef448a 100644 (file)
--- a/src/cpu/simple/base.cc
+++ b/src/cpu/simple/base.cc
@@ -43,7 +43,6 @@
 
 #include "arch/stacktrace.hh"
 #include "arch/utility.hh"
-#include "arch/vtophys.hh"
 #include "base/cp_annotate.hh"
 #include "base/cprintf.hh"
 #include "base/inifile.hh"

diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc
index 3c369b086cc5386af7c5ad6b4a7cdda891ef9978..1878dde4c2c9284a7f0827618506860f31fd28dc 100644 (file)
--- a/src/sim/pseudo_inst.cc
+++ b/src/sim/pseudo_inst.cc
@@ -49,7 +49,6 @@
 #include <string>
 #include <vector>
 
-#include "arch/vtophys.hh"
 #include "base/debug.hh"
 #include "base/output.hh"
 #include "config/the_isa.hh"