505,507c505,506
< f = tlb->walkTrickBoxCheck(l1desc_addr, currState->isSecure,
< currState->vaddr, sizeof(uint32_t), currState->isFetch,
< currState->isWrite, TlbEntry::DomainType::NoAccess, L1);
---
> f = testWalk(l1desc_addr, sizeof(uint32_t),
> TlbEntry::DomainType::NoAccess, L1);
671,674c670,671
< Fault f = tlb->walkTrickBoxCheck(desc_addr, currState->isSecure,
< currState->vaddr, sizeof(uint64_t), currState->isFetch,
< currState->isWrite, TlbEntry::DomainType::NoAccess,
< start_lookup_level);
---
> Fault f = testWalk(desc_addr, sizeof(uint64_t),
> TlbEntry::DomainType::NoAccess, start_lookup_level);
916,919c913,914
< Fault f = tlb->walkTrickBoxCheck(desc_addr, currState->isSecure,
< currState->vaddr, sizeof(uint64_t), currState->isFetch,
< currState->isWrite, TlbEntry::DomainType::NoAccess,
< start_lookup_level);
---
> Fault f = testWalk(desc_addr, sizeof(uint64_t),
> TlbEntry::DomainType::NoAccess, start_lookup_level);
1440,1443c1435,1436
< currState->fault = tlb->walkTrickBoxCheck(
< l2desc_addr, currState->isSecure, currState->vaddr,
< sizeof(uint32_t), currState->isFetch, currState->isWrite,
< currState->l1Desc.domain(), L2);
---
> currState->fault = testWalk(l2desc_addr, sizeof(uint32_t),
> currState->l1Desc.domain(), L2);
1619,1624c1612,1614
< currState->fault = tlb->walkTrickBoxCheck(
< next_desc_addr, currState->vaddr,
< currState->vaddr, sizeof(uint64_t),
< currState->isFetch, currState->isWrite,
< TlbEntry::DomainType::Client,
< toLookupLevel(currState->longDesc.lookupLevel +1));
---
> currState->fault = testWalk(
> next_desc_addr, sizeof(uint64_t), TlbEntry::DomainType::Client,
> toLookupLevel(currState->longDesc.lookupLevel +1));
2098a2089,2097
> Fault
> TableWalker::testWalk(Addr pa, Addr size, TlbEntry::DomainType domain,
> LookupLevel lookup_level)
> {
> return tlb->testWalk(pa, size, currState->vaddr, currState->isSecure,
> currState->mode, domain, lookup_level);
> }
>
>