summaryrefslogtreecommitdiff
path: root/sim/serialize.cc
diff options
context:
space:
mode:
authorKevin Lim <ktlim@umich.edu>2005-02-11 17:54:42 -0500
committerKevin Lim <ktlim@umich.edu>2005-02-11 17:54:42 -0500
commit79e83cea971bf346a5b0d6e88541e502a614c777 (patch)
treee1561f7044a4b3ee79a960d57451716af53387b5 /sim/serialize.cc
parentc4d0ebd25cc5f0657b99543ff2df30d1a86f3ad5 (diff)
parent10ee909fbd895b588bf01021af98e81a3ae40fc0 (diff)
downloadgem5-79e83cea971bf346a5b0d6e88541e502a614c777.tar.xz
Merge ktlim@zizzer.eecs.umich.edu:/bk/m5
into zamp.eecs.umich.edu:/z/ktlim2/m5 --HG-- extra : convert_revision : 11832134b169aa827a1d03c96ef89edddf4b3dab
Diffstat (limited to 'sim/serialize.cc')
-rw-r--r--sim/serialize.cc7
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] != '/')