134,148d133
< /*
< i = lookupTable.find(tr);
< if (i != lookupTable.end()) {
< i->second->valid = false;
< if (i->second->used) {
< i->second->used = false;
< usedEntries--;
< }
< freeList.push_front(i->second);
< DPRINTF(TLB, "TLB: Found conflicting entry %#X , deleting it\n",
< i->second);
< lookupTable.erase(i);
< }
< */
<
167,173d151
< /*
< for (x = 0; x < size; x++) {
< if (!tlb[x].valid || !tlb[x].used) {
< new_entry = &tlb[x];
< break;
< }
< }*/
645c623
< if (!priv && !hpriv && !AsiIsUnPriv(asi)) {
---
> if (!priv && !hpriv && !asiIsUnPriv(asi)) {
651c629
< if (!hpriv && AsiIsHPriv(asi)) {
---
> if (!hpriv && asiIsHPriv(asi)) {
656c634
< if (AsiIsPrimary(asi)) {
---
> if (asiIsPrimary(asi)) {
659c637
< } else if (AsiIsSecondary(asi)) {
---
> } else if (asiIsSecondary(asi)) {
662c640
< } else if (AsiIsNucleus(asi)) {
---
> } else if (asiIsNucleus(asi)) {
672c650
< if (AsiIsLittle(asi))
---
> if (asiIsLittle(asi))
676,678c654,656
< //load differs from a regular one, other than what happens concerning
< //nfo and e bits in the TTE
< // if (AsiIsNoFault(asi))
---
> // load differs from a regular one, other than what happens concerning
> // nfo and e bits in the TTE
> // if (asiIsNoFault(asi))
681c659
< if (AsiIsPartialStore(asi))
---
> if (asiIsPartialStore(asi))
684c662
< if (AsiIsCmt(asi))
---
> if (asiIsCmt(asi))
687c665
< if (AsiIsInterrupt(asi))
---
> if (asiIsInterrupt(asi))
689c667
< if (AsiIsMmu(asi))
---
> if (asiIsMmu(asi))
691c669
< if (AsiIsScratchPad(asi))
---
> if (asiIsScratchPad(asi))
693c671
< if (AsiIsQueue(asi))
---
> if (asiIsQueue(asi))
695c673
< if (AsiIsSparcError(asi))
---
> if (asiIsSparcError(asi))
698,699c676,677
< if (!AsiIsReal(asi) && !AsiIsNucleus(asi) && !AsiIsAsIfUser(asi) &&
< !AsiIsTwin(asi) && !AsiIsBlock(asi) && !AsiIsNoFault(asi))
---
> if (!asiIsReal(asi) && !asiIsNucleus(asi) && !asiIsAsIfUser(asi) &&
> !asiIsTwin(asi) && !asiIsBlock(asi) && !asiIsNoFault(asi))
717c695
< if ((!lsu_dm && !hpriv && !red) || AsiIsReal(asi)) {
---
> if ((!lsu_dm && !hpriv && !red) || asiIsReal(asi)) {
722c700
< if (hpriv && (implicit || (!AsiIsAsIfUser(asi) && !AsiIsReal(asi)))) {
---
> if (hpriv && (implicit || (!asiIsAsIfUser(asi) && !asiIsReal(asi)))) {
755c733
< if (e->pte.nofault() && !AsiIsNoFault(asi)) {
---
> if (e->pte.nofault() && !asiIsNoFault(asi)) {
761c739
< if (e->pte.sideffect() && AsiIsNoFault(asi)) {
---
> if (e->pte.sideffect() && asiIsNoFault(asi)) {
1210c1188
< switch(bits(va,7,6)) {
---
> switch (bits(va,7,6)) {
1216c1194
< case 1: //demap context
---
> case 1: // demap context
1261c1239
< switch(bits(va,7,6)) {
---
> switch (bits(va,7,6)) {
1266c1244
< case 1: //demap context
---
> case 1: // demap context