diff options
| author | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-26 23:03:51 -0800 |
|---|---|---|
| committer | Steve Reinhardt <stever@eecs.umich.edu> | 2003-10-26 23:03:51 -0800 |
| commit | 1c2930b1e1210aac75816c793748e48905a77ba1 (patch) | |
| tree | 0b80ae0911e49a71f8e83074dc4f07680a641254 /sim/serialize.cc | |
| parent | 1164494a58bbf8f747e1090f863fe1c0da15fe1b (diff) | |
| parent | 167928f12b293271dd397249999461a1bce8e9bf (diff) | |
| download | gem5-1c2930b1e1210aac75816c793748e48905a77ba1.tar.xz | |
Merge stever@zizzer:/bk/m5 into isabel.reinhardt.house:/z/stever/bk/m5
--HG--
extra : convert_revision : 25f6c41b709b4dabe1a2e0a180508db05aa4263f
Diffstat (limited to 'sim/serialize.cc')
| -rw-r--r-- | sim/serialize.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/sim/serialize.cc b/sim/serialize.cc index 6144c97d0..c90f1694e 100644 --- a/sim/serialize.cc +++ b/sim/serialize.cc @@ -100,8 +100,9 @@ Serializeable::childOut(const string &name, Serializeable *child) void Serializeable::setName(const string &name) { - if (objName != "") - panic("Cannot change object name"); + if (objName != "") { + cprintf("Renaming object '%s' to '%s'.\n", objName, name); + } objName = name; } @@ -160,7 +161,7 @@ Serializer::serialize(const string &f) add_objects(); while (!objects.empty()) { Serializeable *serial = objects.front(); - DPRINTF(Serialize, "Name Children of %s\n", serial->name()); + DPRINTF(Serialize, "Naming children of %s\n", serial->name()); serial->nameChildren(); objects.pop_front(); list.push_back(serial); @@ -174,7 +175,7 @@ Serializer::serialize(const string &f) add_objects(); while (!objects.empty()) { Serializeable *serial = objects.front(); - DPRINTF(Serialize, "Name Children of %s\n", serial->name()); + DPRINTF(Serialize, "Serializing %s\n", serial->name()); serial->serialize(); objects.pop_front(); list.push_back(serial); |