From 1511370d09a2dc93a9f7f6154440d28ed6309b49 Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <stever@eecs.umich.edu>
Date: Wed, 29 Oct 2003 00:41:24 -0800
Subject: 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
---
 dev/alpha_access.h   | 2 +-
 dev/alpha_console.cc | 4 ++--
 dev/alpha_console.hh | 2 +-
 dev/console.cc       | 4 +---
 dev/console.hh       | 2 +-
 5 files changed, 6 insertions(+), 8 deletions(-)

(limited to 'dev')

diff --git a/dev/alpha_access.h b/dev/alpha_access.h
index 4bba39c4f..c145fa2a3 100644
--- a/dev/alpha_access.h
+++ b/dev/alpha_access.h
@@ -82,7 +82,7 @@ struct AlphaAccess
 
 #ifndef CONSOLE
     void serialize(std::ostream &os);
-    void unserialize(IniFile &db, const std::string &section);
+    void unserialize(const IniFile *db, const std::string &section);
 #endif
 };
 
diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc
index 00dab4bad..9bf74bce4 100644
--- a/dev/alpha_console.cc
+++ b/dev/alpha_console.cc
@@ -188,7 +188,7 @@ AlphaAccess::serialize(ostream &os)
 }
 
 void
-AlphaAccess::unserialize(IniFile &db, const std::string &section)
+AlphaAccess::unserialize(const IniFile *db, const std::string &section)
 {
     UNSERIALIZE_MEMBER(last_offset);
     UNSERIALIZE_MEMBER(version);
@@ -216,7 +216,7 @@ AlphaConsole::serialize(ostream &os)
 }
 
 void
-AlphaConsole::unserialize(IniFile &db, const std::string &section)
+AlphaConsole::unserialize(const IniFile *db, const std::string &section)
 {
     alphaAccess->unserialize(db, section);
 }
diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh
index caa571cec..e4aeb2417 100644
--- a/dev/alpha_console.hh
+++ b/dev/alpha_console.hh
@@ -101,7 +101,7 @@ class AlphaConsole : public MmapDevice
      * standard serialization routines for 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);
 };
 
 #endif // __ALPHA_CONSOLE_HH__
diff --git a/dev/console.cc b/dev/console.cc
index a84f4a666..749add532 100644
--- a/dev/console.cc
+++ b/dev/console.cc
@@ -316,13 +316,11 @@ SimConsole::setInt(int bits)
 void
 SimConsole::serialize(ostream &os)
 {
-    panic("Unimplemented");
 }
 
 void
-SimConsole::unserialize(IniFile &db, const std::string &section)
+SimConsole::unserialize(const IniFile *db, const std::string &section)
 {
-    panic("Unimplemented");
 }
 
 
diff --git a/dev/console.hh b/dev/console.hh
index 5d9ea5302..6746f90b6 100644
--- a/dev/console.hh
+++ b/dev/console.hh
@@ -129,7 +129,7 @@ class SimConsole : public SimObject
     void setInt(int bits);
 
     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);
 };
 
 class ConsoleListener : public SimObject
-- 
cgit v1.2.3