diff options
| author | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-17 12:14:04 -0500 |
|---|---|---|
| committer | Ron Dreslinski <rdreslin@umich.edu> | 2005-02-17 12:14:04 -0500 |
| commit | 45ef238e3f54bd7e2b602def187085bd0b99aab5 (patch) | |
| tree | ea4057df1dac0768ebf36201468af632cdefedf1 /sim/serialize.cc | |
| parent | b8d65408c810ba490243fc32c7d5e6817c32c70b (diff) | |
| parent | cfe6ed7c484b62d07bae23c528f0e2e568cf0d65 (diff) | |
| download | gem5-45ef238e3f54bd7e2b602def187085bd0b99aab5.tar.xz | |
Merge zizzer:/z/m5/Bitkeeper/m5
into zizzer.eecs.umich.edu:/.automount/zazzer/z/rdreslin/m5bk/timing_L1
--HG--
extra : convert_revision : 88afcacc41f5b0fae0ed1ac1821b7ca88c407e85
Diffstat (limited to 'sim/serialize.cc')
| -rw-r--r-- | sim/serialize.cc | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/sim/serialize.cc b/sim/serialize.cc index 3a073f68d..846d191e0 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -38,6 +38,7 @@ #include "base/inifile.hh" #include "base/misc.hh" +#include "base/output.hh" #include "base/str.hh" #include "base/trace.hh" #include "sim/config_node.hh" @@ -333,11 +334,7 @@ SerializeParamContext::~SerializeParamContext() void SerializeParamContext::checkParams() { - if (serialize_dir.isValid()) { - checkpointDirBase = serialize_dir; - } else { - checkpointDirBase = outputDirectory + "cpt.%012d"; - } + checkpointDirBase = simout.resolve(serialize_dir); // guarantee that directory ends with a '/' if (checkpointDirBase[checkpointDirBase.size() - 1] != '/') |