summaryrefslogtreecommitdiff
path: root/src/arch/sparc/tlb_map.hh
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-12-12 17:55:27 -0500
committerAli Saidi <saidi@eecs.umich.edu>2006-12-12 17:55:27 -0500
commit139519ef87ceb4ab6c7f0246dd98b002e7bde3f9 (patch)
treeb03a6858969efa7f4c98c69c55e40786cb5ec0a9 /src/arch/sparc/tlb_map.hh
parent4947bf276eaa19d33c1af0bd0843dc23192fdd19 (diff)
downloadgem5-139519ef87ceb4ab6c7f0246dd98b002e7bde3f9.tar.xz
Fix bugs in tlbmap (and thus rangemap since the code is nearly identical)
Deal with block initializing stores (by doing nothing, at some point we might want to do the write hint 64 like thing) Fix tcc instruction igoner in legion-lock stuff to be correct in all cases Have console interrupts warn rather than panicing until we figure out what to do with interrupts src/arch/sparc/miscregfile.cc: src/arch/sparc/miscregfile.hh: add a magic miscreg which reads all the bits the tlb needs in one go src/arch/sparc/tlb.cc: initialized the context type and id to reasonable values and handle block init stores src/arch/sparc/tlb_map.hh: fix bug in tlb map code src/base/range_map.hh: fix bug in rangemap code and add range_multimap (these are probably useful for bus range stuff) src/cpu/exetrace.cc: fixup tcc ignore code to be correct src/dev/sparc/t1000.cc: make console interrupt stuff warn instead of panicing until we get interrupt stuff figured out src/unittest/rangemaptest.cc: fix up the rangemap unit test to catch the missing case --HG-- extra : convert_revision : 70604a8b5d0553aa0b0bd7649f775a0cfa8267a5
Diffstat (limited to 'src/arch/sparc/tlb_map.hh')
-rw-r--r--src/arch/sparc/tlb_map.hh11
1 files changed, 9 insertions, 2 deletions
diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh
index 226ef23a1..688daf5b9 100644
--- a/src/arch/sparc/tlb_map.hh
+++ b/src/arch/sparc/tlb_map.hh
@@ -53,8 +53,15 @@ class TlbMap
i = tree.upper_bound(r);
if (i == tree.begin())
- // Nothing could match, so return end()
- return tree.end();
+ if (r.real == i->first.real &&
+ r.partitionId == i->first.partitionId &&
+ i->first.va < r.va + r.size &&
+ i->first.va+i->first.size >= r.va &&
+ (r.real || r.contextId == i->first.contextId))
+ return i;
+ else
+ // Nothing could match, so return end()
+ return tree.end();
i--;