37a38
> #include "arch/sparc/tlb.hh"
632,633c633,634
< TlbEntry *entry = p->pTable->lookup(vaddr);
< panic_if(!entry, "Tried to execute unmapped address %#x.\n", vaddr);
---
> const EmulationPageTable::Entry *pte = p->pTable->lookup(vaddr);
> panic_if(!pte, "Tried to execute unmapped address %#x.\n", vaddr);
664a666,669
> TlbEntry entry(p->pTable->pid(), alignedvaddr, pte->paddr,
> pte->flags & EmulationPageTable::Uncacheable,
> pte->flags & EmulationPageTable::ReadOnly);
>
671c676
< insert(alignedvaddr, partition_id, context_id, false, entry->pte);
---
> insert(alignedvaddr, partition_id, context_id, false, entry.pte);
683,686c688,691
< TlbEntry *entry = p->pTable->lookup(vaddr);
< if (!entry && p->fixupStackFault(vaddr))
< entry = p->pTable->lookup(vaddr);
< panic_if(!entry, "Tried to access unmapped address %#x.\n", vaddr);
---
> const EmulationPageTable::Entry *pte = p->pTable->lookup(vaddr);
> if (!pte && p->fixupStackFault(vaddr))
> pte = p->pTable->lookup(vaddr);
> panic_if(!pte, "Tried to access unmapped address %#x.\n", vaddr);
747a753,756
> TlbEntry entry(p->pTable->pid(), alignedvaddr, pte->paddr,
> pte->flags & EmulationPageTable::Uncacheable,
> pte->flags & EmulationPageTable::ReadOnly);
>
754c763
< insert(alignedvaddr, partition_id, context_id, false, entry->pte);
---
> insert(alignedvaddr, partition_id, context_id, false, entry.pte);