2c2
< * Copyright (c) 2015 ARM Limited
---
> * Copyright (c) 2015-2016 ARM Limited
44d43
< #include "sim/power/power_model.hh"
46,55d44
< ClockedObject::ClockedObject(const ClockedObjectParams *p) :
< SimObject(p), Clocked(*p->clk_domain),
< _currPwrState(p->default_p_state),
< prvEvalTick(0)
< {
< // Register the power_model with the object
< if (p->power_model)
< p->power_model->setClockedObject(this);
< }
<
86,92c75,81
< // No need to compute stats if in the same tick, update state
< // though. This can happen in cases like a) during start of the
< // simulation multiple state changes happens in init/startup phase,
< // b) one takes a decision to migrate state but decides to reverts
< // back to the original state in the 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.
---
> // No need to compute stats if in the same tick, update state though. This
> // can happen in cases like a) during start of the simulation multiple
> // state changes happens in init/startup phase, b) one takes a decision to
> // migrate state but decides to reverts back to the original state in the
> // 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.
140c129
< ret[i] = residencies[i] /
---
> ret[i] = residencies[i] / \