diff options
author | Nathan Binkert <nate@binkert.org> | 2010-04-15 16:24:12 -0700 |
---|---|---|
committer | Nathan Binkert <nate@binkert.org> | 2010-04-15 16:24:12 -0700 |
commit | e99828b06a1b694b7aca09682ae2b1be9089af88 (patch) | |
tree | e106d16b98b45695ffd993e2cd6684919723dc66 /src/sim/pseudo_inst.cc | |
parent | f7e6f19adabd0ce7e35cea8b5c3b070e2cd26c38 (diff) | |
download | gem5-e99828b06a1b694b7aca09682ae2b1be9089af88.tar.xz |
tick: rename Clock namespace to SimClock
Diffstat (limited to 'src/sim/pseudo_inst.cc')
-rw-r--r-- | src/sim/pseudo_inst.cc | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/src/sim/pseudo_inst.cc b/src/sim/pseudo_inst.cc index cf063818b..7a91bfbd4 100644 --- a/src/sim/pseudo_inst.cc +++ b/src/sim/pseudo_inst.cc @@ -93,7 +93,7 @@ quiesceNs(ThreadContext *tc, uint64_t ns) EndQuiesceEvent *quiesceEvent = tc->getQuiesceEvent(); - Tick resume = curTick + Clock::Int::ns * ns; + Tick resume = curTick + SimClock::Int::ns * ns; mainEventQueue.reschedule(quiesceEvent, resume, true); @@ -128,7 +128,8 @@ quiesceCycles(ThreadContext *tc, uint64_t cycles) uint64_t quiesceTime(ThreadContext *tc) { - return (tc->readLastActivate() - tc->readLastSuspend()) / Clock::Int::ns; + return (tc->readLastActivate() - tc->readLastSuspend()) / + SimClock::Int::ns; } #endif @@ -136,7 +137,7 @@ quiesceTime(ThreadContext *tc) uint64_t rpns(ThreadContext *tc) { - return curTick / Clock::Int::ns; + return curTick / SimClock::Int::ns; } void @@ -151,7 +152,7 @@ wakeCPU(ThreadContext *tc, uint64_t cpuid) void m5exit(ThreadContext *tc, Tick delay) { - Tick when = curTick + delay * Clock::Int::ns; + Tick when = curTick + delay * SimClock::Int::ns; Event *event = new SimLoopExitEvent("m5_exit instruction encountered", 0); mainEventQueue.schedule(event, when); } @@ -229,8 +230,8 @@ resetstats(ThreadContext *tc, Tick delay, Tick period) return; - Tick when = curTick + delay * Clock::Int::ns; - Tick repeat = period * Clock::Int::ns; + Tick when = curTick + delay * SimClock::Int::ns; + Tick repeat = period * SimClock::Int::ns; Stats::StatEvent(false, true, when, repeat); } @@ -242,8 +243,8 @@ dumpstats(ThreadContext *tc, Tick delay, Tick period) return; - Tick when = curTick + delay * Clock::Int::ns; - Tick repeat = period * Clock::Int::ns; + Tick when = curTick + delay * SimClock::Int::ns; + Tick repeat = period * SimClock::Int::ns; Stats::StatEvent(true, false, when, repeat); } @@ -255,8 +256,8 @@ dumpresetstats(ThreadContext *tc, Tick delay, Tick period) return; - Tick when = curTick + delay * Clock::Int::ns; - Tick repeat = period * Clock::Int::ns; + Tick when = curTick + delay * SimClock::Int::ns; + Tick repeat = period * SimClock::Int::ns; Stats::StatEvent(true, true, when, repeat); } @@ -267,8 +268,8 @@ m5checkpoint(ThreadContext *tc, Tick delay, Tick period) if (!tc->getCpuPtr()->params()->do_checkpoint_insts) return; - Tick when = curTick + delay * Clock::Int::ns; - Tick repeat = period * Clock::Int::ns; + Tick when = curTick + delay * SimClock::Int::ns; + Tick repeat = period * SimClock::Int::ns; Event *event = new SimLoopExitEvent("checkpoint", 0, repeat); mainEventQueue.schedule(event, when); |