From e51b075a2706180bdc262cbcbdd5bafe5896ba12 Mon Sep 17 00:00:00 2001
From: Ali Saidi <saidi@eecs.umich.edu>
Date: Tue, 17 Oct 2006 19:38:36 -0400
Subject: add code to serialize se structures. Lisa is working on the python
 side of things and will test

src/mem/page_table.cc:
src/mem/page_table.hh:
    add code to serialize/unserialize page table
src/sim/process.cc:
src/sim/process.hh:
    add code to serialize/unserialize process

--HG--
extra : convert_revision : ee9eb5e2c38c5d317a2f381972c552d455e0db9e
---
 src/mem/page_table.cc | 37 +++++++++++++++++++++++++++++++++++++
 1 file changed, 37 insertions(+)

(limited to 'src/mem/page_table.cc')

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index 2b460306f..32da4282c 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -27,6 +27,7 @@
  *
  * Authors: Steve Reinhardt
  *          Ron Dreslinski
+ *          Ali Saidi
  */
 
 /**
@@ -97,6 +98,8 @@ PageTable::allocate(Addr vaddr, int64_t size)
     // starting address must be page aligned
     assert(pageOffset(vaddr) == 0);
 
+    DPRINTF(MMU, "Allocating Page: %#x-%#x\n", vaddr, vaddr+ size);
+
     for (; size > 0; size -= pageSize, vaddr += pageSize) {
         m5::hash_map<Addr,Addr>::iterator iter = pTable.find(vaddr);
 
@@ -159,3 +162,37 @@ PageTable::translate(RequestPtr &req)
     req->setPaddr(paddr);
     return page_check(req->getPaddr(), req->getSize());
 }
+
+void
+PageTable::serialize(std::ostream &os)
+{
+    paramOut(os, "ptable.size", pTable.size());
+    int count = 0;
+
+    m5::hash_map<Addr,Addr>::iterator iter;
+    while (iter != pTable.end()) {
+        paramOut(os, csprintf("ptable.entry%dvaddr", count),iter->first);
+        paramOut(os, csprintf("ptable.entry%dpaddr", count),iter->second);
+        ++count;
+    }
+    assert(count == pTable.size());
+}
+
+void
+PageTable::unserialize(Checkpoint *cp, const std::string &section)
+{
+    int i = 0, count;
+    paramIn(cp, section, "ptable.size", count);
+    Addr vaddr, paddr;
+
+    pTable.clear();
+
+    while(i < count) {
+        paramIn(cp, section, csprintf("ptable.entry%dvaddr", i), vaddr);
+        paramIn(cp, section, csprintf("ptable.entry%dpaddr", i), paddr);
+        pTable[vaddr] = paddr;
+        ++i;
+   }
+
+}
+
-- 
cgit v1.2.3


From 15770fb7b43fad1bcfb1fabcb80cc47f8e2d7f08 Mon Sep 17 00:00:00 2001
From: Lisa Hsu <hsul@eecs.umich.edu>
Date: Wed, 18 Oct 2006 18:01:33 -0400
Subject: need some initializations before doing the loop.

--HG--
extra : convert_revision : e5e8b16ae4f119c923d8c0d295aa9569d7a8fe5b
---
 src/mem/page_table.cc | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'src/mem/page_table.cc')

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index 32da4282c..fa6d5ddfb 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -167,13 +167,14 @@ void
 PageTable::serialize(std::ostream &os)
 {
     paramOut(os, "ptable.size", pTable.size());
+
     int count = 0;
 
     m5::hash_map<Addr,Addr>::iterator iter;
-    while (iter != pTable.end()) {
+    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);
-        ++count;
     }
     assert(count == pTable.size());
 }
-- 
cgit v1.2.3


From 5b246a0567193b05d8257fce8c43610ce5b8c253 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <binkertn@umich.edu>
Date: Thu, 19 Oct 2006 23:35:59 -0700
Subject: initialize end, clean up loop

--HG--
extra : convert_revision : e1c107f0c0fd5d535acd2d6c43571a5df57c9ed3
---
 src/mem/page_table.cc | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

(limited to 'src/mem/page_table.cc')

diff --git a/src/mem/page_table.cc b/src/mem/page_table.cc
index fa6d5ddfb..fe8094b88 100644
--- a/src/mem/page_table.cc
+++ b/src/mem/page_table.cc
@@ -170,11 +170,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());
 }
-- 
cgit v1.2.3