summaryrefslogtreecommitdiff
path: root/src/arch/arm
diff options
context:
space:
mode:
authorAli Saidi <Ali.Saidi@ARM.com>2010-11-08 13:58:22 -0600
committerAli Saidi <Ali.Saidi@ARM.com>2010-11-08 13:58:22 -0600
commit0ea794bcf453093f83c21a56333d78ba1b8dae33 (patch)
tree969727aba252ca3f2f910a6d380a743409e4594e /src/arch/arm
parent72b526227857c5eeb90b52fad18eb2d647a27403 (diff)
downloadgem5-0ea794bcf453093f83c21a56333d78ba1b8dae33.tar.xz
sim: Use forward declarations for ports.
Virtual ports need TLB data which means anything touching a file in the arch directory rebuilds any file that includes system.hh which in everything.
Diffstat (limited to 'src/arch/arm')
-rw-r--r--src/arch/arm/linux/system.cc4
-rw-r--r--src/arch/arm/stacktrace.cc1
-rw-r--r--src/arch/arm/system.cc1
3 files changed, 4 insertions, 2 deletions
diff --git a/src/arch/arm/linux/system.cc b/src/arch/arm/linux/system.cc
index 40658976b..ddf7f19f3 100644
--- a/src/arch/arm/linux/system.cc
+++ b/src/arch/arm/linux/system.cc
@@ -43,8 +43,10 @@
#include "arch/arm/isa_traits.hh"
#include "arch/arm/linux/atag.hh"
#include "arch/arm/linux/system.hh"
+#include "arch/arm/utility.hh"
#include "base/loader/object_file.hh"
#include "base/loader/symtab.hh"
+#include "cpu/thread_context.hh"
#include "mem/physical.hh"
using namespace ArmISA;
@@ -87,7 +89,7 @@ LinuxArmSystem::LinuxArmSystem(Params *p)
DPRINTF(Loader, "Boot atags was %d bytes in total\n", size << 2);
DDUMP(Loader, boot_data, size << 2);
- functionalPort.writeBlob(ParamsList, boot_data, size << 2);
+ functionalPort->writeBlob(ParamsList, boot_data, size << 2);
#ifndef NDEBUG
kernelPanicEvent = addKernelFuncEvent<BreakPCEvent>("panic");
diff --git a/src/arch/arm/stacktrace.cc b/src/arch/arm/stacktrace.cc
index 6b346b0ab..31376cdae 100644
--- a/src/arch/arm/stacktrace.cc
+++ b/src/arch/arm/stacktrace.cc
@@ -37,6 +37,7 @@
#include "base/trace.hh"
#include "cpu/base.hh"
#include "cpu/thread_context.hh"
+#include "mem/vport.hh"
#include "sim/system.hh"
using namespace std;
diff --git a/src/arch/arm/system.cc b/src/arch/arm/system.cc
index 756f64eb7..f6e265ae4 100644
--- a/src/arch/arm/system.cc
+++ b/src/arch/arm/system.cc
@@ -44,7 +44,6 @@
#include <iostream>
using namespace std;
-using namespace ArmISA;
using namespace Linux;
ArmSystem::ArmSystem(Params *p)