Event descriptions should not end in "event"

[gem5.git] / src / mem / page_table.cc

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index fa6d5ddfb4579635462236f446f9ab8fd59a2f8c..b29a07078ab315002ede8504ad940185bc19e446 100644 (file)
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -90,8 +90,6 @@ PageTable::page_check(Addr addr, int64_t size) const
 }
 
 
-
-
 void
 PageTable::allocate(Addr vaddr, int64_t size)
 {
@@ -109,12 +107,7 @@ PageTable::allocate(Addr vaddr, int64_t size)
         }
 
         pTable[vaddr] = system->new_page();
-        pTableCache[2].paddr = pTableCache[1].paddr;
-        pTableCache[2].vaddr = pTableCache[1].vaddr;
-        pTableCache[1].paddr = pTableCache[0].paddr;
-        pTableCache[1].vaddr = pTableCache[0].vaddr;
-        pTableCache[0].paddr = pTable[vaddr];
-        pTableCache[0].vaddr = vaddr;
+        updateCache(vaddr, pTable[vaddr]);
     }
 }
 
@@ -126,16 +119,16 @@ PageTable::translate(Addr vaddr, Addr &paddr)
     Addr page_addr = pageAlign(vaddr);
     paddr = 0;
 
-    if (pTableCache[0].vaddr == vaddr) {
-        paddr = pTableCache[0].paddr;
+    if (pTableCache[0].vaddr == page_addr) {
+        paddr = pTableCache[0].paddr + pageOffset(vaddr);
         return true;
     }
-    if (pTableCache[1].vaddr == vaddr) {
-        paddr = pTableCache[1].paddr;
+    if (pTableCache[1].vaddr == page_addr) {
+        paddr = pTableCache[1].paddr + pageOffset(vaddr);
         return true;
     }
-    if (pTableCache[2].vaddr == vaddr) {
-        paddr = pTableCache[2].paddr;
+    if (pTableCache[2].vaddr == page_addr) {
+        paddr = pTableCache[2].paddr + pageOffset(vaddr);
         return true;
     }
 
@@ -145,6 +138,7 @@ PageTable::translate(Addr vaddr, Addr &paddr)
         return false;
     }
 
+    updateCache(page_addr, iter->second);
     paddr = iter->second + pageOffset(vaddr);
     return true;
 }
@@ -157,7 +151,7 @@ PageTable::translate(RequestPtr &req)
     assert(pageAlign(req->getVaddr() + req->getSize() - 1)
            == pageAlign(req->getVaddr()));
     if (!translate(req->getVaddr(), paddr)) {
-        return genPageTableFault(req->getVaddr());
+        return Fault(new PageTableFault(req->getVaddr()));
     }
     req->setPaddr(paddr);
     return page_check(req->getPaddr(), req->getSize());
@@ -170,11 +164,14 @@ PageTable::serialize(std::ostream &os)
 
     int count = 0;
 
-    m5::hash_map<Addr,Addr>::iterator iter;
-    m5::hash_map<Addr,Addr>::iterator end;
-    for (iter = pTable.begin(); iter != end; ++iter,++count) {
-        paramOut(os, csprintf("ptable.entry%dvaddr", count),iter->first);
-        paramOut(os, csprintf("ptable.entry%dpaddr", count),iter->second);
+    m5::hash_map<Addr,Addr>::iterator iter = pTable.begin();
+    m5::hash_map<Addr,Addr>::iterator end = pTable.end();
+    while (iter != end) {
+        paramOut(os, csprintf("ptable.entry%dvaddr", count), iter->first);
+        paramOut(os, csprintf("ptable.entry%dpaddr", count), iter->second);
+
+        ++iter;
+        ++count;
     }
     assert(count == pTable.size());
 }