diff -r b8c31beb9d0e -r de4d73880c47 src/arch/arm/isa_traits.hh --- a/src/arch/arm/isa_traits.hh Mon Aug 23 11:32:44 2010 -0500 +++ b/src/arch/arm/isa_traits.hh Mon Aug 23 11:32:59 2010 -0500 @@ -86,11 +86,6 @@ 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 -r b8c31beb9d0e -r de4d73880c47 src/arch/arm/vtophys.hh --- a/src/arch/arm/vtophys.hh Mon Aug 23 11:32:44 2010 -0500 +++ b/src/arch/arm/vtophys.hh Mon Aug 23 11:32:59 2010 -0500 @@ -44,13 +44,6 @@ 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); }; diff -r b8c31beb9d0e -r de4d73880c47 src/arch/arm/vtophys.cc --- a/src/arch/arm/vtophys.cc Mon Aug 23 11:32:44 2010 -0500 +++ b/src/arch/arm/vtophys.cc Mon Aug 23 11:32:59 2010 -0500 @@ -45,17 +45,7 @@ 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