changeset 7c972b9aea16 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=7c972b9aea16
description:
arm: Cleanup arch headers to remove dma_device.hh dependency
Break the dependency on dma_device.hh by forward-declaring DmaPort in
the relevant header.
diffstat:
src/arch/arm/stage2_mmu.cc | 1 +
src/arch/arm/stage2_mmu.hh | 1 +
src/arch/arm/table_walker.cc | 3 ++-
src/arch/arm/table_walker.hh | 3 ++-
src/arch/arm/tlb.cc | 3 ++-
src/arch/arm/tlb.hh | 1 -
6 files changed, 8 insertions(+), 4 deletions(-)
diffs (98 lines):
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/stage2_mmu.cc
--- a/src/arch/arm/stage2_mmu.cc Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/stage2_mmu.cc Sun Jun 21 20:48:33 2015 +0100
@@ -38,6 +38,7 @@
*/
#include "arch/arm/stage2_mmu.hh"
+
#include "arch/arm/faults.hh"
#include "arch/arm/system.hh"
#include "arch/arm/table_walker.hh"
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/stage2_mmu.hh
--- a/src/arch/arm/stage2_mmu.hh Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/stage2_mmu.hh Sun Jun 21 20:48:33 2015 +0100
@@ -42,6 +42,7 @@
#include "arch/arm/faults.hh"
#include "arch/arm/tlb.hh"
+#include "dev/dma_device.hh"
#include "mem/request.hh"
#include "params/ArmStage2MMU.hh"
#include "sim/eventq.hh"
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/table_walker.cc
--- a/src/arch/arm/table_walker.cc Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/table_walker.cc Sun Jun 21 20:48:33 2015 +0100
@@ -37,13 +37,13 @@
* Authors: Ali Saidi
* Giacomo Gabrielli
*/
+#include "arch/arm/table_walker.hh"
#include <memory>
#include "arch/arm/faults.hh"
#include "arch/arm/stage2_mmu.hh"
#include "arch/arm/system.hh"
-#include "arch/arm/table_walker.hh"
#include "arch/arm/tlb.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
@@ -51,6 +51,7 @@
#include "debug/Drain.hh"
#include "debug/TLB.hh"
#include "debug/TLBVerbose.hh"
+#include "dev/dma_device.hh"
#include "sim/system.hh"
using namespace ArmISA;
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/table_walker.hh
--- a/src/arch/arm/table_walker.hh Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/table_walker.hh Sun Jun 21 20:48:33 2015 +0100
@@ -46,13 +46,14 @@
#include "arch/arm/miscregs.hh"
#include "arch/arm/system.hh"
#include "arch/arm/tlb.hh"
-#include "dev/dma_device.hh"
#include "mem/request.hh"
#include "params/ArmTableWalker.hh"
#include "sim/eventq.hh"
class ThreadContext;
+class DmaPort;
+
namespace ArmISA {
class Translation;
class TLB;
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/tlb.cc
--- a/src/arch/arm/tlb.cc Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/tlb.cc Sun Jun 21 20:48:33 2015 +0100
@@ -42,6 +42,8 @@
* Steve Reinhardt
*/
+#include "arch/arm/tlb.hh"
+
#include <memory>
#include <string>
#include <vector>
@@ -52,7 +54,6 @@
#include "arch/arm/table_walker.hh"
#include "arch/arm/stage2_lookup.hh"
#include "arch/arm/stage2_mmu.hh"
-#include "arch/arm/tlb.hh"
#include "arch/arm/utility.hh"
#include "base/inifile.hh"
#include "base/str.hh"
diff -r ebb3d0737aa7 -r 7c972b9aea16 src/arch/arm/tlb.hh
--- a/src/arch/arm/tlb.hh Tue Jun 09 09:21:18 2015 -0400
+++ b/src/arch/arm/tlb.hh Sun Jun 21 20:48:33 2015 +0100
@@ -50,7 +50,6 @@
#include "arch/arm/vtophys.hh"
#include "arch/generic/tlb.hh"
#include "base/statistics.hh"
-#include "dev/dma_device.hh"
#include "mem/request.hh"
#include "params/ArmTLB.hh"
#include "sim/probe/pmu.hh"
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
