101c101,106
< //TODO Deal with conflicting entries
---
> // If somebody beat us to it, just use that existing entry.
> TlbEntry *newEntry = trie.lookup(vpn);
> if (newEntry) {
> assert(newEntry->vaddr = vpn);
> return newEntry;
> }
103d107
< TlbEntry *newEntry = NULL;
105a110
>
113c118
< trie.insert(vpn, TlbEntryTrie::MaxBits - entry.logBytes, newEntry);
---
> trie.insert(vpn, TlbEntryTrie::MaxBits - entry.logBytes, newEntry);