sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

alpha: Get rid fo the namespace called EV5.

Browse source 
We're never going to do an alpha platform other than the one we've got.
This commit is contained in:
Nathan Binkert 2008-09-27 21:03:45 -07:00
parent 819023b8e2
commit 0b30c345f1
11 changed files with 35 additions and 39 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

44
src/arch/alpha/ev5.cc
View file

@ -44,9 +44,9 @@
#include "sim/debug.hh" #include "sim/debug.hh"
#include "sim/sim_exit.hh" #include "sim/sim_exit.hh"
#if FULL_SYSTEM using namespace AlphaISA;
using namespace EV5; #if FULL_SYSTEM
//////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////
// //
@ -146,13 +146,13 @@ SimpleThread::hwrei()
int int
AlphaISA::MiscRegFile::getInstAsid() AlphaISA::MiscRegFile::getInstAsid()
{ {
return EV5::ITB_ASN_ASN(ipr[IPR_ITB_ASN]); return AlphaISA::ITB_ASN_ASN(ipr[IPR_ITB_ASN]);
} }
int int
AlphaISA::MiscRegFile::getDataAsid() AlphaISA::MiscRegFile::getDataAsid()
{ {
return EV5::DTB_ASN_ASN(ipr[IPR_DTB_ASN]); return AlphaISA::DTB_ASN_ASN(ipr[IPR_DTB_ASN]);
} }
#endif #endif
@ -168,7 +168,7 @@ AlphaISA::initIPRs(ThreadContext *tc, int cpuId)
tc->setMiscRegNoEffect(i, 0); tc->setMiscRegNoEffect(i, 0);
} }
tc->setMiscRegNoEffect(IPR_PAL_BASE, EV5::PalBase); tc->setMiscRegNoEffect(IPR_PAL_BASE, AlphaISA::PalBase);
tc->setMiscRegNoEffect(IPR_MCSR, 0x6); tc->setMiscRegNoEffect(IPR_MCSR, 0x6);
tc->setMiscRegNoEffect(IPR_PALtemp16, cpuId); tc->setMiscRegNoEffect(IPR_PALtemp16, cpuId);
} }
@ -477,27 +477,27 @@ AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ThreadContext *tc)
ipr[idx] = val; ipr[idx] = val;
tc->getDTBPtr()->flushAddr(val, tc->getDTBPtr()->flushAddr(val,
EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN])); AlphaISA::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]));
break; break;
case AlphaISA::IPR_DTB_TAG: { case AlphaISA::IPR_DTB_TAG: {
struct AlphaISA::TlbEntry entry; struct AlphaISA::TlbEntry entry;
// FIXME: granularity hints NYI... // FIXME: granularity hints NYI...
if (EV5::DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0) if (AlphaISA::DTB_PTE_GH(ipr[AlphaISA::IPR_DTB_PTE]) != 0)
panic("PTE GH field != 0"); panic("PTE GH field != 0");
// write entire quad // write entire quad
ipr[idx] = val; ipr[idx] = val;
// construct PTE for new entry // construct PTE for new entry
entry.ppn = EV5::DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]); entry.ppn = AlphaISA::DTB_PTE_PPN(ipr[AlphaISA::IPR_DTB_PTE]);
entry.xre = EV5::DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]); entry.xre = AlphaISA::DTB_PTE_XRE(ipr[AlphaISA::IPR_DTB_PTE]);
entry.xwe = EV5::DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]); entry.xwe = AlphaISA::DTB_PTE_XWE(ipr[AlphaISA::IPR_DTB_PTE]);
entry.fonr = EV5::DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]); entry.fonr = AlphaISA::DTB_PTE_FONR(ipr[AlphaISA::IPR_DTB_PTE]);
entry.fonw = EV5::DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]); entry.fonw = AlphaISA::DTB_PTE_FONW(ipr[AlphaISA::IPR_DTB_PTE]);
entry.asma = EV5::DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]); entry.asma = AlphaISA::DTB_PTE_ASMA(ipr[AlphaISA::IPR_DTB_PTE]);
entry.asn = EV5::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]); entry.asn = AlphaISA::DTB_ASN_ASN(ipr[AlphaISA::IPR_DTB_ASN]);
// insert new TAG/PTE value into data TLB // insert new TAG/PTE value into data TLB
tc->getDTBPtr()->insert(val, entry); tc->getDTBPtr()->insert(val, entry);
@ -508,20 +508,20 @@ AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ThreadContext *tc)
struct AlphaISA::TlbEntry entry; struct AlphaISA::TlbEntry entry;
// FIXME: granularity hints NYI... // FIXME: granularity hints NYI...
if (EV5::ITB_PTE_GH(val) != 0) if (AlphaISA::ITB_PTE_GH(val) != 0)
panic("PTE GH field != 0"); panic("PTE GH field != 0");
// write entire quad // write entire quad
ipr[idx] = val; ipr[idx] = val;
// construct PTE for new entry // construct PTE for new entry
entry.ppn = EV5::ITB_PTE_PPN(val); entry.ppn = AlphaISA::ITB_PTE_PPN(val);
entry.xre = EV5::ITB_PTE_XRE(val); entry.xre = AlphaISA::ITB_PTE_XRE(val);
entry.xwe = 0; entry.xwe = 0;
entry.fonr = EV5::ITB_PTE_FONR(val); entry.fonr = AlphaISA::ITB_PTE_FONR(val);
entry.fonw = EV5::ITB_PTE_FONW(val); entry.fonw = AlphaISA::ITB_PTE_FONW(val);
entry.asma = EV5::ITB_PTE_ASMA(val); entry.asma = AlphaISA::ITB_PTE_ASMA(val);
entry.asn = EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]); entry.asn = AlphaISA::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]);
// insert new TAG/PTE value into data TLB // insert new TAG/PTE value into data TLB
tc->getITBPtr()->insert(ipr[AlphaISA::IPR_ITB_TAG], entry); tc->getITBPtr()->insert(ipr[AlphaISA::IPR_ITB_TAG], entry);
@ -547,7 +547,7 @@ AlphaISA::MiscRegFile::setIpr(int idx, uint64_t val, ThreadContext *tc)
ipr[idx] = val; ipr[idx] = val;
tc->getITBPtr()->flushAddr(val, tc->getITBPtr()->flushAddr(val,
EV5::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN])); AlphaISA::ITB_ASN_ASN(ipr[AlphaISA::IPR_ITB_ASN]));
break; break;
default: default:

7
src/arch/alpha/ev5.hh
View file

@ -36,10 +36,7 @@
#include "config/alpha_tlaser.hh" #include "config/alpha_tlaser.hh"
#include "arch/alpha/isa_traits.hh" #include "arch/alpha/isa_traits.hh"
namespace EV5 { namespace AlphaISA {
//It seems like a safe assumption EV5 only applies to alpha
using namespace AlphaISA;
#if ALPHA_TLASER #if ALPHA_TLASER
const uint64_t AsnMask = ULL(0x7f); const uint64_t AsnMask = ULL(0x7f);
@ -120,6 +117,6 @@ inline int Ra(AlphaISA::MachInst inst) { return inst >> 21 & 0x1f; }
const Addr PalBase = 0x4000; const Addr PalBase = 0x4000;
const Addr PalMax = 0x10000; const Addr PalMax = 0x10000;
/* namespace EV5 */ } } // namespace AlphaISA
#endif // __ARCH_ALPHA_EV5_HH__ #endif // __ARCH_ALPHA_EV5_HH__

4
src/arch/alpha/faults.cc
View file

@ -148,8 +148,8 @@ void DtbFault::invoke(ThreadContext * tc)
// set MM_STAT register flags // set MM_STAT register flags
tc->setMiscRegNoEffect(AlphaISA::IPR_MM_STAT, tc->setMiscRegNoEffect(AlphaISA::IPR_MM_STAT,
(((EV5::Opcode(tc->getInst()) & 0x3f) << 11) (((AlphaISA::Opcode(tc->getInst()) & 0x3f) << 11)
| ((EV5::Ra(tc->getInst()) & 0x1f) << 6) | ((AlphaISA::Ra(tc->getInst()) & 0x1f) << 6)
| (flags & 0x3f))); | (flags & 0x3f)));
// set VA_FORM register with faulting formatted address // set VA_FORM register with faulting formatted address

2
src/arch/alpha/isa/fp.isa
View file

@ -46,7 +46,7 @@ output exec {{
inline Fault checkFpEnableFault(%(CPU_exec_context)s *xc) inline Fault checkFpEnableFault(%(CPU_exec_context)s *xc)
{ {
Fault fault = NoFault; // dummy... this ipr access should not fault Fault fault = NoFault; // dummy... this ipr access should not fault
if (!EV5::ICSR_FPE(xc->readMiscReg(AlphaISA::IPR_ICSR))) { if (!AlphaISA::ICSR_FPE(xc->readMiscReg(AlphaISA::IPR_ICSR))) {
fault = new FloatEnableFault; fault = new FloatEnableFault;
} }
return fault; return fault;

2
src/arch/alpha/system.cc
View file

@ -190,7 +190,7 @@ AlphaSystem::setAlphaAccess(Addr access)
{ {
Addr addr = 0; Addr addr = 0;
if (consoleSymtab->findAddress("m5AlphaAccess", addr)) { if (consoleSymtab->findAddress("m5AlphaAccess", addr)) {
virtPort.write(addr, htog(EV5::Phys2K0Seg(access))); virtPort.write(addr, htog(AlphaISA::Phys2K0Seg(access)));
} else } else
panic("could not find m5AlphaAccess\n"); panic("could not find m5AlphaAccess\n");
} }

1
src/arch/alpha/tlb.cc
View file

@ -43,7 +43,6 @@
#include "cpu/thread_context.hh" #include "cpu/thread_context.hh"
using namespace std; using namespace std;
using namespace EV5;
namespace AlphaISA { namespace AlphaISA {
/////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////

4
src/arch/alpha/tlb.hh
View file

@ -88,8 +88,8 @@ namespace AlphaISA
// static helper functions... really EV5 VM traits // static helper functions... really EV5 VM traits
static bool validVirtualAddress(Addr vaddr) { static bool validVirtualAddress(Addr vaddr) {
// unimplemented bits must be all 0 or all 1 // unimplemented bits must be all 0 or all 1
Addr unimplBits = vaddr & EV5::VAddrUnImplMask; Addr unimplBits = vaddr & AlphaISA::VAddrUnImplMask;
return (unimplBits == 0) || (unimplBits == EV5::VAddrUnImplMask); return (unimplBits == 0) || (unimplBits == AlphaISA::VAddrUnImplMask);
} }
static Fault checkCacheability(RequestPtr &req, bool itb = false); static Fault checkCacheability(RequestPtr &req, bool itb = false);

2
src/arch/alpha/vtophys.cc
View file

@ -92,7 +92,7 @@ AlphaISA::vtophys(ThreadContext *tc, Addr addr)
Addr paddr = 0; Addr paddr = 0;
//@todo Andrew couldn't remember why he commented some of this code //@todo Andrew couldn't remember why he commented some of this code
//so I put it back in. Perhaps something to do with gdb debugging? //so I put it back in. Perhaps something to do with gdb debugging?
if (AlphaISA::PcPAL(vaddr) && (vaddr < EV5::PalMax)) { if (AlphaISA::PcPAL(vaddr) && (vaddr < AlphaISA::PalMax)) {
paddr = vaddr & ~ULL(1); paddr = vaddr & ~ULL(1);
} else { } else {
if (AlphaISA::IsK0Seg(vaddr)) { if (AlphaISA::IsK0Seg(vaddr)) {

4
src/arch/mips/mips_core_specific.cc
View file

@ -113,13 +113,13 @@ MipsISA::processInterrupts(CPU *cpu)
/*int /*int
MipsISA::MiscRegFile::getInstAsid() MipsISA::MiscRegFile::getInstAsid()
{ {
return EV5::ITB_ASN_ASN(ipr[IPR_ITB_ASN]); return AlphaISA::ITB_ASN_ASN(ipr[IPR_ITB_ASN]);
} }
int int
MipsISA::MiscRegFile::getDataAsid() MipsISA::MiscRegFile::getDataAsid()
{ {
return EV5::DTB_ASN_ASN(ipr[IPR_DTB_ASN]); return AlphaISA::DTB_ASN_ASN(ipr[IPR_DTB_ASN]);
}*/ }*/

2
src/arch/mips/system.cc
View file

@ -185,7 +185,7 @@ MipsSystem::setMipsAccess(Addr access)
{ {
Addr addr = 0; Addr addr = 0;
if (consoleSymtab->findAddress("m5MipsAccess", addr)) { if (consoleSymtab->findAddress("m5MipsAccess", addr)) {
// virtPort.write(addr, htog(EV5::Phys2K0Seg(access))); // virtPort.write(addr, htog(AlphaISA::Phys2K0Seg(access)));
} else } else
panic("could not find m5MipsAccess\n"); panic("could not find m5MipsAccess\n");
} }

2
src/kern/tru64/tru64_events.cc
View file

@ -61,7 +61,7 @@ BadAddrEvent::process(ThreadContext *tc)
tc->getPhysPort()->getPeerAddressRanges(resp, snoop); tc->getPhysPort()->getPeerAddressRanges(resp, snoop);
for(iter = resp.begin(); iter != resp.end(); iter++) for(iter = resp.begin(); iter != resp.end(); iter++)
{ {
if (*iter == (TheISA::K0Seg2Phys(a0) & EV5::PAddrImplMask)) if (*iter == (TheISA::K0Seg2Phys(a0) & AlphaISA::PAddrImplMask))
found = true; found = true;
} }