summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system/RubyMemoryControl.cc
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2012-09-10 12:21:01 -0500
committerNilay Vaish <nilay@cs.wisc.edu>2012-09-10 12:21:01 -0500
commitc5bf1390aa129fefa7102e2de2998c0e6b09b5b0 (patch)
treeabd84f95c72cc3c7652d7471fed0d8cca74a9987 /src/mem/ruby/system/RubyMemoryControl.cc
parent4e6f048ef0f201718ac1a24ff917fb4d42a2b181 (diff)
downloadgem5-c5bf1390aa129fefa7102e2de2998c0e6b09b5b0.tar.xz
Ruby System: Convert to Clocked Object
This patch moves Ruby System from being a SimObject to recently introduced ClockedObject.
Diffstat (limited to 'src/mem/ruby/system/RubyMemoryControl.cc')
-rw-r--r--src/mem/ruby/system/RubyMemoryControl.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mem/ruby/system/RubyMemoryControl.cc b/src/mem/ruby/system/RubyMemoryControl.cc
index f931e4618..cfdaaaef7 100644
--- a/src/mem/ruby/system/RubyMemoryControl.cc
+++ b/src/mem/ruby/system/RubyMemoryControl.cc
@@ -301,7 +301,7 @@ RubyMemoryControl::enqueueMemRef(MemoryNode& memRef)
DPRINTF(RubyMemory,
"New memory request%7d: %#08x %c arrived at %10d bank = %3x sched %c\n",
m_msg_counter, addr, memRef.m_is_mem_read ? 'R':'W',
- memRef.m_time * g_system_ptr->getClock(),
+ memRef.m_time * g_system_ptr->clockPeriod(),
bank, m_event.scheduled() ? 'Y':'N');
m_profiler_ptr->profileMemReq(bank);
@@ -377,7 +377,7 @@ void
RubyMemoryControl::enqueueToDirectory(MemoryNode req, int latency)
{
Time arrival_time = curTick() + (latency * clock);
- Time ruby_arrival_time = arrival_time / g_system_ptr->getClock();
+ Time ruby_arrival_time = arrival_time / g_system_ptr->clockPeriod();
req.m_time = ruby_arrival_time;
m_response_queue.push_back(req);