summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorSteve Reinhardt <stever@eecs.umich.edu>2003-10-29 00:41:24 -0800
committerSteve Reinhardt <stever@eecs.umich.edu>2003-10-29 00:41:24 -0800
commit1511370d09a2dc93a9f7f6154440d28ed6309b49 (patch)
tree9d35d22a257bb64628e3b501beeaaa5b9977fd08 /arch
parenta0f3ee7e1770138edd4ee65a2ce6ba2a017d792e (diff)
downloadgem5-1511370d09a2dc93a9f7f6154440d28ed6309b49.tar.xz
More progress on checkpointing... we can now write out a checkpoint and read it back in,
though most objects don't actually serialize any data. arch/alpha/alpha_memory.cc: arch/alpha/alpha_memory.hh: arch/alpha/isa_traits.hh: cpu/exec_context.cc: cpu/exec_context.hh: cpu/simple_cpu/simple_cpu.hh: dev/alpha_access.h: dev/alpha_console.cc: dev/alpha_console.hh: dev/console.cc: dev/console.hh: Change unserialize param from IniFile& to const IniFile*. cpu/simple_cpu/simple_cpu.cc: Change unserialize param from IniFile& to const IniFile*. Make unserialize call ExecContext::unserialize. sim/eventq.cc: Rename MainEventQueue (no spaces) for easier parsing in checkpoints. Disable event serialization for now, so we can focus on the easy stuff. sim/serialize.cc: Change paramIn and arrayParamIn param from IniFile& to const IniFile*. sim/serialize.hh: Change unserialize, paramIn, and arrayParamIn params from IniFile& to const IniFile*. --HG-- extra : convert_revision : 6e8853ed375eddec0e140c95a01dd51bd225f7b9
Diffstat (limited to 'arch')
-rw-r--r--arch/alpha/alpha_memory.cc2
-rw-r--r--arch/alpha/alpha_memory.hh2
-rw-r--r--arch/alpha/isa_traits.hh2
3 files changed, 3 insertions, 3 deletions
diff --git a/arch/alpha/alpha_memory.cc b/arch/alpha/alpha_memory.cc
index 82dd2afa5..2aad41cea 100644
--- a/arch/alpha/alpha_memory.cc
+++ b/arch/alpha/alpha_memory.cc
@@ -241,7 +241,7 @@ AlphaTlb::serialize(ostream &os)
}
void
-AlphaTlb::unserialize(IniFile &db, const string &section)
+AlphaTlb::unserialize(const IniFile *db, const string &section)
{
UNSERIALIZE_MEMBER(size);
UNSERIALIZE_MEMBER(nlu);
diff --git a/arch/alpha/alpha_memory.hh b/arch/alpha/alpha_memory.hh
index c94ee26c3..e6637893c 100644
--- a/arch/alpha/alpha_memory.hh
+++ b/arch/alpha/alpha_memory.hh
@@ -74,7 +74,7 @@ class AlphaTlb : public SimObject
// Checkpointing
virtual void serialize(std::ostream &os);
- virtual void unserialize(IniFile &db, const std::string &section);
+ virtual void unserialize(const IniFile *db, const std::string &section);
};
diff --git a/arch/alpha/isa_traits.hh b/arch/alpha/isa_traits.hh
index 5e2dac9f3..e27841c3c 100644
--- a/arch/alpha/isa_traits.hh
+++ b/arch/alpha/isa_traits.hh
@@ -225,7 +225,7 @@ class AlphaISA
static void serializeSpecialRegs(const Serializeable::Proxy &proxy,
const RegFile &regs);
- static void unserializeSpecialRegs(IniFile &db,
+ static void unserializeSpecialRegs(const IniFile *db,
const std::string &category,
ConfigNode *node,
RegFile &regs);