From: Jason Power <power.jg@gmail.com>
Date: Fri, 17 Aug 2012 04:39:36 +0000 (-0500)
Subject: Ruby: Add RubySystem parameter to MemoryControl
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=44b4c9625331670d11f5bddb94c50a55c5864d7c;p=gem5.git

Ruby: Add RubySystem parameter to MemoryControl
This guarantees that RubySystem object is created before the MemoryController
object is created.
---

diff --git a/configs/ruby/MESI_CMP_directory.py b/configs/ruby/MESI_CMP_directory.py
index d877543c0..017fe3a4a 100644
--- a/configs/ruby/MESI_CMP_directory.py
+++ b/configs/ruby/MESI_CMP_directory.py
@@ -144,7 +144,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/configs/ruby/MI_example.py b/configs/ruby/MI_example.py
index 4fb55b89f..85544837d 100644
--- a/configs/ruby/MI_example.py
+++ b/configs/ruby/MI_example.py
@@ -115,7 +115,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/configs/ruby/MOESI_CMP_directory.py b/configs/ruby/MOESI_CMP_directory.py
index bce7be5d6..b238b7675 100644
--- a/configs/ruby/MOESI_CMP_directory.py
+++ b/configs/ruby/MOESI_CMP_directory.py
@@ -143,7 +143,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/configs/ruby/MOESI_CMP_token.py b/configs/ruby/MOESI_CMP_token.py
index 51cc5fb92..466f9bb8c 100644
--- a/configs/ruby/MOESI_CMP_token.py
+++ b/configs/ruby/MOESI_CMP_token.py
@@ -166,7 +166,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/configs/ruby/MOESI_hammer.py b/configs/ruby/MOESI_hammer.py
index 48129c0a4..56fe05298 100644
--- a/configs/ruby/MOESI_hammer.py
+++ b/configs/ruby/MOESI_hammer.py
@@ -164,7 +164,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/configs/ruby/Network_test.py b/configs/ruby/Network_test.py
index 6eae52e86..c4dd97e8d 100644
--- a/configs/ruby/Network_test.py
+++ b/configs/ruby/Network_test.py
@@ -116,7 +116,8 @@ def create_system(options, system, piobus, dma_ports, ruby_system):
         # Create the Ruby objects associated with the directory controller
         #
 
-        mem_cntrl = RubyMemoryControl(version = i)
+        mem_cntrl = RubyMemoryControl(version = i,
+                                      ruby_system = ruby_system)
 
         dir_size = MemorySize('0B')
         dir_size.value = mem_module_size
diff --git a/src/mem/ruby/system/MemoryControl.py b/src/mem/ruby/system/MemoryControl.py
index dafd0a789..c4c852932 100644
--- a/src/mem/ruby/system/MemoryControl.py
+++ b/src/mem/ruby/system/MemoryControl.py
@@ -35,5 +35,6 @@ class MemoryControl(SimObject):
     type = 'MemoryControl'
     cxx_class = 'MemoryControl'
     version = Param.Int("");
+    ruby_system = Param.RubySystem("")
 
     mem_bus_cycle_multiplier = Param.Int(10, "");