From daebe18e897b3dc87f2e8b156ce03691c8b930c7 Mon Sep 17 00:00:00 2001 From: Lisa Hsu Date: Tue, 12 Jan 2010 10:17:19 -0800 Subject: faults: i think these fault invocations should be panic and not fatal. it definitely made implementing a trace cpu easier this way. --- src/sim/faults.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'src/sim') 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 -- cgit v1.2.3 From 4a40ac71f8679ea7c15efb45afd522bf4d3b3e73 Mon Sep 17 00:00:00 2001 From: Lisa Hsu Date: Mon, 18 Jan 2010 14:30:31 -0800 Subject: util: make a generic checkpoint aggregator that can aggregate different cpts into one multi-programmed cpt. Make minor changes to serialization/unserialization to get it to work properly. Note that checkpoints were made with a comment at the beginning with // - this must be changed to ## to work properly with the python config parser in the aggregator. --- src/sim/serialize.cc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/sim') 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); -- cgit v1.2.3