diff -r bdd606534bdc src/sim/clocked_object.hh --- a/src/sim/clocked_object.hh Tue Dec 03 10:51:40 2013 -0600 +++ b/src/sim/clocked_object.hh Wed Dec 18 05:07:24 2013 -0500 @@ -1,5 +1,6 @@ /* * Copyright (c) 2012-2013 ARM Limited + * Copyright (c) 2013 Cornell University * All rights reserved * * The license below extends only to copyright in the software and shall @@ -35,6 +36,7 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * Authors: Andreas Hansson + * Christopher Torng */ /** @@ -118,6 +120,9 @@ ClockedObject(const ClockedObjectParams* p) : SimObject(p), tick(0), cycle(0), clockDomain(*p->clk_domain) { + // Register with the clock domain, so that if the clock domain + // frequency changes, we can update this object's tick. + clockDomain.registerWithClockDomain(this); } /** @@ -140,6 +145,15 @@ public: /** + * Update the tick to the current tick. + * + */ + inline void updateClockPeriod() const + { + update(); + } + + /** * Determine the tick when a cycle begins, by default the current * one, but the argument also enables the caller to determine a * future cycle. diff -r bdd606534bdc src/sim/clock_domain.cc --- a/src/sim/clock_domain.cc Tue Dec 03 10:51:40 2013 -0600 +++ b/src/sim/clock_domain.cc Wed Dec 18 05:07:24 2013 -0500 @@ -1,5 +1,6 @@ /* * Copyright (c) 2013 ARM Limited + * Copyright (c) 2013 Cornell University * All rights reserved * * The license below extends only to copyright in the software and shall @@ -37,6 +38,7 @@ * Authors: Vasileios Spiliopoulos * Akash Bagdia * Andreas Hansson + * Christopher Torng */ #include "debug/ClockDomain.hh" @@ -45,6 +47,7 @@ #include "params/SrcClockDomain.hh" #include "sim/clock_domain.hh" #include "sim/voltage_domain.hh" +#include "sim/clocked_object.hh" double ClockDomain::voltage() const @@ -65,6 +68,11 @@ fatal("%s has a clock period of zero\n", name()); } + // Align all members to the current tick + for (auto m = members.begin(); m != members.end(); ++m) { + (*m)->updateClockPeriod(); + } + _clockPeriod = clock_period; DPRINTF(ClockDomain, @@ -105,6 +113,11 @@ void DerivedClockDomain::updateClockPeriod() { + // Align all members to the current tick + for (auto m = members.begin(); m != members.end(); ++m) { + (*m)->updateClockPeriod(); + } + // recalculate the clock period, relying on the fact that changes // propagate downwards in the tree _clockPeriod = parent.clockPeriod() * clockDivider; diff -r bdd606534bdc src/sim/clock_domain.hh --- a/src/sim/clock_domain.hh Tue Dec 03 10:51:40 2013 -0600 +++ b/src/sim/clock_domain.hh Wed Dec 18 05:07:24 2013 -0500 @@ -1,5 +1,6 @@ /* * Copyright (c) 2013 ARM Limited + * Copyright (c) 2013 Cornell University * All rights reserved * * The license below extends only to copyright in the software and shall @@ -36,6 +37,7 @@ * * Authors: Vasileios Spiliopoulos * Akash Bagdia + * Christopher Torng */ /** @@ -46,6 +48,8 @@ #ifndef __SIM_CLOCK_DOMAIN_HH__ #define __SIM_CLOCK_DOMAIN_HH__ +#include + #include "base/statistics.hh" #include "params/ClockDomain.hh" #include "params/DerivedClockDomain.hh" @@ -57,6 +61,7 @@ */ class DerivedClockDomain; class VoltageDomain; +class ClockedObject; /** * The ClockDomain provides clock to group of clocked objects bundled @@ -86,6 +91,12 @@ */ std::vector children; + /** + * Pointers to members of this clock domain, so that when the clock + * period changes, we can update each member's tick. + */ + std::vector members; + public: typedef ClockDomainParams Params; @@ -102,6 +113,18 @@ inline Tick clockPeriod() const { return _clockPeriod; } /** + * Register a ClockedObject to this ClockDomain. + * + * @param ClockedObject to add as a member + */ + void registerWithClockDomain(ClockedObject *c) + { + assert(c != NULL); + assert(std::find(members.begin(), members.end(), c) == members.end()); + members.push_back(c); + } + + /** * Get the voltage domain. * * @return Voltage domain this clock domain belongs to @@ -145,6 +168,8 @@ */ void clockPeriod(Tick clock_period); + // Explicitly import the otherwise hidden clockPeriod + using ClockDomain::clockPeriod; }; /**