summaryrefslogtreecommitdiff
path: root/src/arch
diff options
context:
space:
mode:
authorGabe Black <gblack@eecs.umich.edu>2012-01-30 21:07:57 -0800
committerGabe Black <gblack@eecs.umich.edu>2012-01-30 21:07:57 -0800
commite88165a431a90cf7e33e205794caed898ca6fcb1 (patch)
tree741d1c85c83957add6250af0a208d1b976023e29 /src/arch
parent39f314cc151b0a05ee0e654d52bad1c906fac668 (diff)
parentade53def9252a36a39b2c4bd61196355906f0505 (diff)
downloadgem5-e88165a431a90cf7e33e205794caed898ca6fcb1.tar.xz
Merge with main repository.
Diffstat (limited to 'src/arch')
-rw-r--r--src/arch/arm/vtophys.hh1
-rw-r--r--src/arch/mips/vtophys.hh1
-rw-r--r--src/arch/power/vtophys.hh1
-rw-r--r--src/arch/sparc/vtophys.hh4
4 files changed, 0 insertions, 7 deletions
diff --git a/src/arch/arm/vtophys.hh b/src/arch/arm/vtophys.hh
index a85209a4a..12a6c6ec6 100644
--- a/src/arch/arm/vtophys.hh
+++ b/src/arch/arm/vtophys.hh
@@ -38,7 +38,6 @@
#include "arch/arm/utility.hh"
class ThreadContext;
-class FunctionalPort;
namespace ArmISA {
inline Addr PteAddr(Addr a) { return (a & PteMask) << PteShift; }
diff --git a/src/arch/mips/vtophys.hh b/src/arch/mips/vtophys.hh
index 37a7378a8..a3fbdd457 100644
--- a/src/arch/mips/vtophys.hh
+++ b/src/arch/mips/vtophys.hh
@@ -38,7 +38,6 @@
#include "arch/mips/utility.hh"
class ThreadContext;
-class FunctionalPort;
namespace MipsISA {
Addr vtophys(Addr vaddr);
diff --git a/src/arch/power/vtophys.hh b/src/arch/power/vtophys.hh
index a2582b296..51696d9b2 100644
--- a/src/arch/power/vtophys.hh
+++ b/src/arch/power/vtophys.hh
@@ -40,7 +40,6 @@
#include "arch/power/utility.hh"
class ThreadContext;
-class FunctionalPort;
namespace PowerISA {
diff --git a/src/arch/sparc/vtophys.hh b/src/arch/sparc/vtophys.hh
index f55967b53..7c1d23e80 100644
--- a/src/arch/sparc/vtophys.hh
+++ b/src/arch/sparc/vtophys.hh
@@ -36,13 +36,9 @@
#include "arch/sparc/pagetable.hh"
class ThreadContext;
-class FunctionalPort;
namespace SparcISA {
-PageTableEntry
-kernel_pte_lookup(FunctionalPort *mem, Addr ptbr, SparcISA::VAddr vaddr);
-
Addr vtophys(Addr vaddr);
Addr vtophys(ThreadContext *tc, Addr vaddr);