style: bring this file into M5 style, use the new pte translate function.
This commit is contained in:
parent
a053055e17
commit
6798aa14ed
|
@ -40,22 +40,24 @@
|
||||||
|
|
||||||
using namespace std;
|
using namespace std;
|
||||||
|
|
||||||
namespace SparcISA
|
namespace SparcISA {
|
||||||
|
|
||||||
|
Addr
|
||||||
|
vtophys(Addr vaddr)
|
||||||
{
|
{
|
||||||
Addr vtophys(Addr vaddr)
|
// In SPARC it's almost always impossible to turn a VA->PA w/o a
|
||||||
{
|
// context The only times we can kinda do it are if we have a
|
||||||
// In SPARC it's almost always impossible to turn a VA->PA w/o a context
|
// SegKPM mapping and can find the real address in the tlb or we
|
||||||
// The only times we can kinda do it are if we have a SegKPM mapping
|
// have a physical adddress already (beacuse we are looking at the
|
||||||
// and can find the real address in the tlb or we have a physical
|
// hypervisor) Either case is rare, so we'll just panic.
|
||||||
// adddress already (beacuse we are looking at the hypervisor)
|
|
||||||
// Either case is rare, so we'll just panic.
|
|
||||||
|
|
||||||
panic("vtophys() without context on SPARC largly worthless\n");
|
panic("vtophys() without context on SPARC largly worthless\n");
|
||||||
M5_DUMMY_RETURN
|
M5_DUMMY_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
Addr vtophys(ThreadContext *tc, Addr addr)
|
Addr
|
||||||
{
|
vtophys(ThreadContext *tc, Addr addr)
|
||||||
|
{
|
||||||
// Here we have many options and are really implementing something like
|
// Here we have many options and are really implementing something like
|
||||||
// a fill handler to find the address since there isn't a multilevel
|
// a fill handler to find the address since there isn't a multilevel
|
||||||
// table for us to walk around.
|
// table for us to walk around.
|
||||||
|
@ -93,11 +95,15 @@ namespace SparcISA
|
||||||
if (addr_mask)
|
if (addr_mask)
|
||||||
addr = addr & VAddrAMask;
|
addr = addr & VAddrAMask;
|
||||||
|
|
||||||
tbe = dtb->lookup(addr, part_id, data_real, ctx_zero ? 0 : pri_context , false);
|
tbe = dtb->lookup(addr, part_id, data_real, ctx_zero ? 0 : pri_context ,
|
||||||
if (tbe) goto foundtbe;
|
false);
|
||||||
|
if (tbe)
|
||||||
|
goto foundtbe;
|
||||||
|
|
||||||
tbe = itb->lookup(addr, part_id, inst_real, ctx_zero ? 0 : pri_context, false);
|
tbe = itb->lookup(addr, part_id, inst_real, ctx_zero ? 0 : pri_context,
|
||||||
if (tbe) goto foundtbe;
|
false);
|
||||||
|
if (tbe)
|
||||||
|
goto foundtbe;
|
||||||
|
|
||||||
// We didn't find it in the tlbs, so lets look at the TSBs
|
// We didn't find it in the tlbs, so lets look at the TSBs
|
||||||
dtb->GetTsbPtr(tc, addr, ctx_zero ? 0 : pri_context, tsbs);
|
dtb->GetTsbPtr(tc, addr, ctx_zero ? 0 : pri_context, tsbs);
|
||||||
|
@ -105,20 +111,22 @@ namespace SparcISA
|
||||||
for (int x = 0; x < 4; x++) {
|
for (int x = 0; x < 4; x++) {
|
||||||
ttetag = betoh(mem->read<uint64_t>(tsbs[x]));
|
ttetag = betoh(mem->read<uint64_t>(tsbs[x]));
|
||||||
if (ttetag.valid() && ttetag.va() == va_tag) {
|
if (ttetag.valid() && ttetag.va() == va_tag) {
|
||||||
pte.populate(betoh(mem->read<uint64_t>(tsbs[x]) + sizeof(uint64_t)),
|
uint64_t entry = mem->read<uint64_t>(tsbs[x]) + sizeof(uint64_t);
|
||||||
PageTableEntry::sun4v); // I think it's sun4v at least!
|
// I think it's sun4v at least!
|
||||||
DPRINTF(VtoPhys, "Virtual(%#x)->Physical(%#x) found in TTE\n", addr,
|
pte.populate(betoh(entry), PageTableEntry::sun4v);
|
||||||
pte.paddrMask() | addr & pte.sizeMask());
|
DPRINTF(VtoPhys, "Virtual(%#x)->Physical(%#x) found in TTE\n",
|
||||||
|
addr, pte.translate(addr));
|
||||||
goto foundpte;
|
goto foundpte;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
panic("couldn't translate %#x\n", addr);
|
panic("couldn't translate %#x\n", addr);
|
||||||
|
|
||||||
foundtbe:
|
foundtbe:
|
||||||
pte = tbe->pte;
|
pte = tbe->pte;
|
||||||
DPRINTF(VtoPhys, "Virtual(%#x)->Physical(%#x) found in TLB\n", addr,
|
DPRINTF(VtoPhys, "Virtual(%#x)->Physical(%#x) found in TLB\n", addr,
|
||||||
pte.paddrMask() | addr & pte.sizeMask());
|
pte.translate(addr));
|
||||||
foundpte:
|
foundpte:
|
||||||
return pte.paddrMask() | addr & pte.sizeMask();
|
return pte.translate(addr);
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
} /* namespace SparcISA */
|
||||||
|
|
Loading…
Reference in a new issue