summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2006-10-17 19:38:36 -0400
committerAli Saidi <saidi@eecs.umich.edu>2006-10-17 19:38:36 -0400
commite51b075a2706180bdc262cbcbdd5bafe5896ba12 (patch)
treec31aeaf70784ae5567752ccf9681017576813d99
parent4fff6d460311d77e0056a546df41366d5a3b4604 (diff)
downloadgem5-e51b075a2706180bdc262cbcbdd5bafe5896ba12.tar.xz
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
-rw-r--r--src/mem/page_table.cc37
-rw-r--r--src/mem/page_table.hh2
-rw-r--r--src/sim/process.cc35
-rw-r--r--src/sim/process.hh3
4 files changed, 77 insertions, 0 deletions
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;
+ }
+
+}
+
diff --git a/src/mem/page_table.hh b/src/mem/page_table.hh
index fce063280..0e2b1f58c 100644
--- a/src/mem/page_table.hh
+++ b/src/mem/page_table.hh
@@ -95,6 +95,8 @@ class PageTable
*/
Fault translate(RequestPtr &req);
+ void serialize(std::ostream &os);
+ void unserialize(Checkpoint *cp, const std::string &section);
};
#endif
diff --git a/src/sim/process.cc b/src/sim/process.cc
index 46ccd2596..f3e289d41 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -240,6 +240,41 @@ Process::sim_fd(int tgt_fd)
return fd_map[tgt_fd];
}
+void
+Process::serialize(std::ostream &os)
+{
+ SERIALIZE_SCALAR(initialContextLoaded);
+ SERIALIZE_SCALAR(brk_point);
+ SERIALIZE_SCALAR(stack_base);
+ SERIALIZE_SCALAR(stack_size);
+ SERIALIZE_SCALAR(stack_min);
+ SERIALIZE_SCALAR(next_thread_stack_base);
+ SERIALIZE_SCALAR(mmap_start);
+ SERIALIZE_SCALAR(mmap_end);
+ SERIALIZE_SCALAR(nxm_start);
+ SERIALIZE_SCALAR(nxm_end);
+ SERIALIZE_ARRAY(fd_map, MAX_FD);
+
+ pTable->serialize(os);
+}
+
+void
+Process::unserialize(Checkpoint *cp, const std::string &section)
+{
+ UNSERIALIZE_SCALAR(initialContextLoaded);
+ UNSERIALIZE_SCALAR(brk_point);
+ UNSERIALIZE_SCALAR(stack_base);
+ UNSERIALIZE_SCALAR(stack_size);
+ UNSERIALIZE_SCALAR(stack_min);
+ UNSERIALIZE_SCALAR(next_thread_stack_base);
+ UNSERIALIZE_SCALAR(mmap_start);
+ UNSERIALIZE_SCALAR(mmap_end);
+ UNSERIALIZE_SCALAR(nxm_start);
+ UNSERIALIZE_SCALAR(nxm_end);
+ UNSERIALIZE_ARRAY(fd_map, MAX_FD);
+
+ pTable->unserialize(cp, section);
+}
//
diff --git a/src/sim/process.hh b/src/sim/process.hh
index b2777170f..5c37f725e 100644
--- a/src/sim/process.hh
+++ b/src/sim/process.hh
@@ -162,6 +162,9 @@ class Process : public SimObject
int sim_fd(int tgt_fd);
virtual void syscall(int64_t callnum, ThreadContext *tc) = 0;
+
+ void serialize(std::ostream &os);
+ void unserialize(Checkpoint *cp, const std::string &section);
};
//