diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-13 23:19:42 -0400 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2006-06-13 23:19:42 -0400 |
| commit | 185ec39f792386d8b30f3288f2c2e4eaf0b43d02 (patch) | |
| tree | bd06995cf95f7085d4c328fed2f1cec2aec1a01a /src/sim/serialize.cc | |
| parent | 7709e6ba93be4b67b22e2f3f9c853a3e1ab4458b (diff) | |
| parent | e981a97dec3df921f3800fd9ae5ec01ed4e9d2b1 (diff) | |
| download | gem5-185ec39f792386d8b30f3288f2c2e4eaf0b43d02.tar.xz | |
Merge zizzer:/bk/newmem
into vm1.(none):/home/stever/bk/newmem
--HG--
extra : convert_revision : 6ebb12890c516a11733a04041f29c9964267a5ca
Diffstat (limited to 'src/sim/serialize.cc')
| -rw-r--r-- | src/sim/serialize.cc | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index 5270802d1..07e3b8a56 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -44,7 +44,6 @@ #include "base/output.hh" #include "base/str.hh" #include "base/trace.hh" -#include "sim/config_node.hh" #include "sim/eventq.hh" #include "sim/param.hh" #include "sim/serialize.hh" @@ -442,9 +441,8 @@ Serializable::create(Checkpoint *cp, const std::string §ion) } -Checkpoint::Checkpoint(const std::string &cpt_dir, const std::string &path, - const ConfigNode *_configNode) - : db(new IniFile), basePath(path), configNode(_configNode), cptDir(cpt_dir) +Checkpoint::Checkpoint(const std::string &cpt_dir, const std::string &path) + : db(new IniFile), basePath(path), cptDir(cpt_dir) { string filename = cpt_dir + "/" + Checkpoint::baseFilename; if (!db->load(filename)) { @@ -470,9 +468,6 @@ Checkpoint::findObj(const std::string §ion, const std::string &entry, if (!db->find(section, entry, path)) return false; - if ((value = configNode->resolveSimObject(path)) != NULL) - return true; - if ((value = objMap[path]) != NULL) return true; |