diff options
author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-29 21:50:28 -0800 |
---|---|---|
committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-29 21:50:28 -0800 |
commit | 9a88c8e17dd562ab390635accc1d3d2073ab6c52 (patch) | |
tree | 485cf97066569297b2a7c84dc1fd5c693800d5ec /dev | |
parent | a9844046914e887d3f2aed63ec5f098cfb526142 (diff) | |
parent | 5a1eb9049d16d37448282362529d462d73558181 (diff) | |
download | gem5-9a88c8e17dd562ab390635accc1d3d2073ab6c52.tar.xz |
Merge.
--HG--
extra : convert_revision : 1552730090e0904fbc4e4c8f515b306355cb66f3
Diffstat (limited to 'dev')
-rw-r--r-- | dev/alpha_access.h | 4 | ||||
-rw-r--r-- | dev/alpha_console.cc | 6 | ||||
-rw-r--r-- | dev/alpha_console.hh | 2 | ||||
-rw-r--r-- | dev/console.cc | 2 | ||||
-rw-r--r-- | dev/console.hh | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/dev/alpha_access.h b/dev/alpha_access.h index c145fa2a3..eb551a359 100644 --- a/dev/alpha_access.h +++ b/dev/alpha_access.h @@ -44,7 +44,7 @@ typedef uint64_t UINT64; #include <ostream> #include <string> -class IniFile; +class Checkpoint; #endif @@ -82,7 +82,7 @@ struct AlphaAccess #ifndef CONSOLE void serialize(std::ostream &os); - void unserialize(const IniFile *db, const std::string §ion); + void unserialize(Checkpoint *cp, const std::string §ion); #endif }; diff --git a/dev/alpha_console.cc b/dev/alpha_console.cc index 969b1e4c3..6fe57edb5 100644 --- a/dev/alpha_console.cc +++ b/dev/alpha_console.cc @@ -188,7 +188,7 @@ AlphaAccess::serialize(ostream &os) } void -AlphaAccess::unserialize(const IniFile *db, const std::string §ion) +AlphaAccess::unserialize(Checkpoint *cp, const std::string §ion) { UNSERIALIZE_SCALAR(last_offset); UNSERIALIZE_SCALAR(version); @@ -216,9 +216,9 @@ AlphaConsole::serialize(ostream &os) } void -AlphaConsole::unserialize(const IniFile *db, const std::string §ion) +AlphaConsole::unserialize(Checkpoint *cp, const std::string §ion) { - alphaAccess->unserialize(db, section); + alphaAccess->unserialize(cp, section); } BEGIN_DECLARE_SIM_OBJECT_PARAMS(AlphaConsole) diff --git a/dev/alpha_console.hh b/dev/alpha_console.hh index e4aeb2417..9e774773e 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(const IniFile *db, const std::string §ion); + virtual void unserialize(Checkpoint *cp, const std::string §ion); }; #endif // __ALPHA_CONSOLE_HH__ diff --git a/dev/console.cc b/dev/console.cc index 749add532..2378f8c75 100644 --- a/dev/console.cc +++ b/dev/console.cc @@ -319,7 +319,7 @@ SimConsole::serialize(ostream &os) } void -SimConsole::unserialize(const IniFile *db, const std::string §ion) +SimConsole::unserialize(Checkpoint *cp, const std::string §ion) { } diff --git a/dev/console.hh b/dev/console.hh index 6746f90b6..fd02e7a9a 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(const IniFile *db, const std::string §ion); + virtual void unserialize(Checkpoint *cp, const std::string §ion); }; class ConsoleListener : public SimObject |