dev: consistently end device classes in 'Device'

[gem5.git] / src / arch / sparc / tlb_map.hh

diff --git a/src/arch/sparc/tlb_map.hh b/src/arch/sparc/tlb_map.hh
index 8285db939457e033fb3e1ad39a8a453bbdced795..c09e6eb952b1e025a1ef27e8cfe373098eedf967 100644 (file)
--- a/src/arch/sparc/tlb_map.hh
+++ b/src/arch/sparc/tlb_map.hh
@@ -31,9 +31,10 @@
 #ifndef __ARCH_SPARC_TLB_MAP_HH__
 #define __ARCH_SPARC_TLB_MAP_HH__
 
-#include "arch/sparc/pagetable.hh"
 #include <map>
 
+#include "arch/sparc/pagetable.hh"
+
 namespace SparcISA
 {
 
@@ -46,13 +47,14 @@ class TlbMap
   public:
     typedef RangeMap::iterator iterator;
 
-    iterator find(const TlbRange &r)
+    iterator
+    find(const TlbRange &r)
     {
         iterator i;
 
         i = tree.upper_bound(r);
 
-        if (i == tree.begin())
+        if (i == tree.begin()) {
             if (r.real == i->first.real &&
                 r.partitionId == i->first.partitionId &&
                 i->first.va < r.va + r.size &&
@@ -62,6 +64,7 @@ class TlbMap
             else
                 // Nothing could match, so return end()
                 return tree.end();
+        }
 
         i--;
 
@@ -78,7 +81,8 @@ class TlbMap
         return tree.end();
     }
 
-    bool intersect(const TlbRange &r)
+    bool
+    intersect(const TlbRange &r)
     {
         iterator i;
         i = find(r);
@@ -88,55 +92,65 @@ class TlbMap
     }
 
 
-    iterator insert(TlbRange &r, TlbEntry *d)
+    iterator
+    insert(TlbRange &r, TlbEntry *d)
     {
         if (intersect(r))
             return tree.end();
 
-        return tree.insert(std::make_pair<TlbRange,TlbEntry*>(r, d)).first;
+        return tree.insert(std::make_pair(r, d)).first;
     }
 
-    size_t erase(TlbRange k)
+    size_t
+    erase(TlbRange k)
     {
         return tree.erase(k);
     }
 
-    void erase(iterator p)
+    void
+    erase(iterator p)
     {
         tree.erase(p);
     }
 
-    void erase(iterator p, iterator q)
+    void
+    erase(iterator p, iterator q)
     {
         tree.erase(p,q);
     }
 
-    void clear()
+    void
+    clear()
     {
         tree.erase(tree.begin(), tree.end());
     }
 
-    iterator begin()
+    iterator
+    begin()
     {
         return tree.begin();
     }
 
-    iterator end()
+    iterator
+    end()
     {
         return tree.end();
     }
 
-    size_t size()
+    size_t
+    size()
     {
         return tree.size();
     }
 
-    bool empty()
+    bool
+    empty()
     {
         return tree.empty();
     }
 
-    void print()
+    void
+    print()
     {
         iterator i;
         i = tree.begin();