diff options
| author | Lisa Hsu <Lisa.Hsu@amd.com> | 2010-01-18 14:33:02 -0800 |
|---|---|---|
| committer | Lisa Hsu <Lisa.Hsu@amd.com> | 2010-01-18 14:33:02 -0800 |
| commit | 0484432a7ca177d52fa98746b16c92805df73189 (patch) | |
| tree | 2ef87808c118539c446b3c5f09e342bf1b434af8 /src/sim | |
| parent | de904a6d396f01a42da5399b2798568c61abeeea (diff) | |
| parent | 4a40ac71f8679ea7c15efb45afd522bf4d3b3e73 (diff) | |
| download | gem5-0484432a7ca177d52fa98746b16c92805df73189.tar.xz | |
Automated merge with ssh://hsul@localhost:4444//repo/m5
Diffstat (limited to 'src/sim')
| -rw-r--r-- | src/sim/faults.cc | 4 | ||||
| -rw-r--r-- | src/sim/serialize.cc | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/src/sim/faults.cc b/src/sim/faults.cc index 0fe853785..6149a8335 100644 --- a/src/sim/faults.cc +++ b/src/sim/faults.cc @@ -40,7 +40,7 @@ #if !FULL_SYSTEM void FaultBase::invoke(ThreadContext * tc) { - fatal("fault (%s) detected @ PC %p", name(), tc->readPC()); + panic("fault (%s) detected @ PC %p", name(), tc->readPC()); } #else void FaultBase::invoke(ThreadContext * tc) @@ -54,7 +54,7 @@ void FaultBase::invoke(ThreadContext * tc) void UnimpFault::invoke(ThreadContext * tc) { - fatal("Unimpfault: %s\n", panicStr.c_str()); + panic("Unimpfault: %s\n", panicStr.c_str()); } #if !FULL_SYSTEM diff --git a/src/sim/serialize.cc b/src/sim/serialize.cc index 5ae9128e5..1663d18bc 100644 --- a/src/sim/serialize.cc +++ b/src/sim/serialize.cc @@ -422,7 +422,7 @@ Serializable::serializeAll(const string &cpt_dir) time_t t = time(NULL); if (!outstream.is_open()) fatal("Unable to open file %s for writing\n", cpt_file.c_str()); - outstream << "// checkpoint generated: " << ctime(&t); + outstream << "## checkpoint generated: " << ctime(&t); globals.serialize(outstream); SimObject::serializeAll(outstream); |