sim-se: Add default to SyscallDesc constructor

[gem5.git] / src / sim / clocked_object.cc

diff --git a/src/sim/clocked_object.cc b/src/sim/clocked_object.cc
index f0b176509bda745aebf5db348a7b893af2258fbe..56389119ac1a13dc04686b967aef53dfbbbd08df 100644 (file)
--- a/src/sim/clocked_object.cc
+++ b/src/sim/clocked_object.cc
@@ -49,8 +49,8 @@ ClockedObject::ClockedObject(const ClockedObjectParams *p) :
     prvEvalTick(0)
 {
     // Register the power_model with the object
-    if (p->power_model)
-        p->power_model->setClockedObject(this);
+    for (auto & power_model: p->power_model)
+        power_model->setClockedObject(this);
 }
 
 void
@@ -90,9 +90,10 @@ ClockedObject::pwrState(Enums::PwrState p)
     // same tick if other conditions are not met elsewhere.
     // Any state change related stats would have been recorded on previous call
     // to the pwrState() function.
-    if (prvEvalTick == curTick()) {
-        warn("ClockedObject: More than one power state change request "\
-             "encountered within the same simulation tick");
+    if (prvEvalTick == curTick() && curTick() != 0) {
+       warn("ClockedObject %s: More than one power state change request "\
+             "encountered within the same simulation tick %d",
+             name(), prvEvalTick);
         _currPwrState = p;
         return;
     }