From 8376f7bca3814844ab9cc592ff8f32c702a18629 Mon Sep 17 00:00:00 2001
From: William Wang <William.Wang@ARM.com>
Date: Wed, 25 Aug 2010 19:10:43 -0500
Subject: ARM: Remove ALPHA KSeg functions.

These were erronously copied years ago into the ARM directory.
---
 src/arch/arm/isa_traits.hh |  5 -----
 src/arch/arm/vtophys.cc    | 12 +-----------
 src/arch/arm/vtophys.hh    |  7 -------
 3 files changed, 1 insertion(+), 23 deletions(-)

(limited to 'src/arch/arm')

diff --git a/src/arch/arm/isa_traits.hh b/src/arch/arm/isa_traits.hh
index 2744ec753..39232b9c7 100644
--- a/src/arch/arm/isa_traits.hh
+++ b/src/arch/arm/isa_traits.hh
@@ -86,11 +86,6 @@ namespace ArmISA
     const Addr USegBase = ULL(0x0);
     const Addr USegEnd = ULL(0x7FFFFFFF);
 
-    // Kernel Segment 0 - Unmapped
-    const Addr KSeg0End = ULL(0x9FFFFFFF);
-    const Addr KSeg0Base =  ULL(0x80000000);
-    const Addr KSeg0Mask = ULL(0x1FFFFFFF);
-
     const unsigned VABits = 32;
     const unsigned PABits = 32; // Is this correct?
     const Addr VAddrImplMask = (ULL(1) << VABits) - 1;
diff --git a/src/arch/arm/vtophys.cc b/src/arch/arm/vtophys.cc
index 086c034c8..01cbb3e79 100644
--- a/src/arch/arm/vtophys.cc
+++ b/src/arch/arm/vtophys.cc
@@ -45,17 +45,7 @@ using namespace ArmISA;
 Addr
 ArmISA::vtophys(Addr vaddr)
 {
-    Addr paddr = 0;
-    if (ArmISA::IsUSeg(vaddr))
-        DPRINTF(VtoPhys, "vtophys: invalid vaddr %#x", vaddr);
-    else if (ArmISA::IsKSeg0(vaddr))
-        paddr = ArmISA::KSeg02Phys(vaddr);
-    else
-        panic("vtophys: ptbr is not set on virtual lookup for vaddr %#x", vaddr);
-
-    DPRINTF(VtoPhys, "vtophys(%#x) -> %#x\n", vaddr, paddr);
-
-    return paddr;
+   fatal("VTOPHYS: Can't convert vaddr to paddr on ARM without a thread context");
 }
 
 Addr
diff --git a/src/arch/arm/vtophys.hh b/src/arch/arm/vtophys.hh
index edd21558f..16d8c7ceb 100644
--- a/src/arch/arm/vtophys.hh
+++ b/src/arch/arm/vtophys.hh
@@ -44,13 +44,6 @@ class FunctionalPort;
 namespace ArmISA {
     inline Addr PteAddr(Addr a) { return (a & PteMask) << PteShift; }
 
-    // User Virtual
-    inline bool IsUSeg(Addr a) { return USegBase <= a && a <= USegEnd; }
-
-    inline bool IsKSeg0(Addr a) { return KSeg0Base <= a && a <= KSeg0End; }
-
-    inline Addr KSeg02Phys(Addr addr) { return addr & KSeg0Mask; }
-
     Addr vtophys(Addr vaddr);
     Addr vtophys(ThreadContext *tc, Addr vaddr);
 };
-- 
cgit v1.2.3