summaryrefslogtreecommitdiff
path: root/arch/alpha
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-10-28 12:56:17 -0800
commite12e64a0718f6805c1203e1d11a39abaf0d9483b (patch)
tree3908a0650ad9a4022fb906c553c3648d31c1fcb4 /arch/alpha
parent18205206972932a236d0bf4f427918b57f9857f0 (diff)
parentb90f810575679442d78c0e9cd0c98a057ba4871b (diff)
downloadgem5-e12e64a0718f6805c1203e1d11a39abaf0d9483b.tar.xz
Merge zizzer:bk/m5 into isabel.reinhardt.house:/z/stever/ser/m5
--HG-- extra : convert_revision : 50aa3791d27a17c4ea2fb4aee1a67011bd2abec1
Diffstat (limited to 'arch/alpha')
-rw-r--r--arch/alpha/alpha_memory.cc24
-rw-r--r--arch/alpha/alpha_memory.hh5
2 files changed, 14 insertions, 15 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 83dd5accf..82dd2afa5 100644
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -192,13 +192,13 @@ AlphaTlb::flushAddr(Addr vaddr, uint8_t asn)
void
-AlphaTlb::serialize()
+AlphaTlb::serialize(ostream &os)
{
- nameOut();
-
- paramOut("size", size);
- paramOut("nlu", nlu);
+ SERIALIZE_MEMBER(size);
+ SERIALIZE_MEMBER(nlu);
+ // should just add serialize/unserialize methods to AlphaPTE
+#if 0
stringstream buf;
for (int i = 0; i < size; i++) {
buf.str("");
@@ -237,19 +237,18 @@ AlphaTlb::serialize()
ccprintf(buf, "pte%02d.asn", i);
paramOut(buf.str(), table[i].asn);
}
+#endif
}
void
-AlphaTlb::unserialize(IniFile &db, const string &category, ConfigNode *node)
+AlphaTlb::unserialize(IniFile &db, const string &section)
{
+ UNSERIALIZE_MEMBER(size);
+ UNSERIALIZE_MEMBER(nlu);
+
+#if 0
string data;
stringstream buf;
-
- db.findDefault(category,"size",data);
- to_number(data,size);
- db.findDefault(category,"nlu",data);
- to_number(data,nlu);
-
for (int i = 0; i < size; i++) {
buf.str("");
ccprintf(buf, "pte%02d.valid", i);
@@ -296,6 +295,7 @@ AlphaTlb::unserialize(IniFile &db, const string &category, ConfigNode *node)
db.findDefault(category, buf.str(), data);
to_number(data, table[i].asn);
}
+#endif
}
diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/alpha_memory.hh
index 9b7306bfd..c94ee26c3 100644
--- a/arch/alpha/alpha_memory.hh
+++ b/arch/alpha/alpha_memory.hh
@@ -73,9 +73,8 @@ class AlphaTlb : public SimObject
static void checkCacheability(MemReqPtr req);
// Checkpointing
- virtual void serialize();
- virtual void unserialize(IniFile &db, const std::string &category,
- ConfigNode *node);
+ virtual void serialize(std::ostream &os);
+ virtual void unserialize(IniFile &db, const std::string &section);
};