summaryrefslogtreecommitdiff
path: root/src/mem/ruby/system
diff options
context:
space:
mode:
authorBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:19 -0800
committerBrad Beckmann <Brad.Beckmann@amd.com>2010-01-29 20:29:19 -0800
commite15abd17f92db574dfcbf3798f6352712f897ebc (patch)
tree67fe9c3b3c470c4c27837d7cfcc16e03be8f6015 /src/mem/ruby/system
parent63a60cc81ecd94d1a5ea4edb2a1c90de0e9eda80 (diff)
downloadgem5-e15abd17f92db574dfcbf3798f6352712f897ebc.tar.xz
ruby: Wrapped ruby events into m5 events
Wrapped ruby events using the m5 event object. Removed the prio_heap from ruby's event queue and instead schedule ruby events on the m5 event queue.
Diffstat (limited to 'src/mem/ruby/system')
-rw-r--r--src/mem/ruby/system/System.cc2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/mem/ruby/system/System.cc b/src/mem/ruby/system/System.cc
index 2dd978cad..ec7218680 100644
--- a/src/mem/ruby/system/System.cc
+++ b/src/mem/ruby/system/System.cc
@@ -105,7 +105,7 @@ RubySystem::RubySystem(const Params *p)
m_profiler_ptr = p->profiler;
m_tracer_ptr = p->tracer;
- g_eventQueue_ptr = new RubyEventQueue(m_clock);
+ g_eventQueue_ptr = new RubyEventQueue(p->eventq, m_clock);
g_system_ptr = this;
m_mem_vec_ptr = new MemoryVector;
m_mem_vec_ptr->setSize(m_memory_size_bytes);