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 d877543c0c9f4e9246137e1e89ac48d28c8d4293..017fe3a4a93d70aac9523d0a7619478f6c1806ff 100644 (file)
--- 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 4fb55b89f8f4a58cfeb3fd9265da48342a9a4abc..85544837d108684737431b2ea2d641bc91d05178 100644 (file)
--- 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 bce7be5d6ac6ecc0a3e5151f75719cc8ca86a94b..b238b767509bdefcba80ef6deef2df2bb5dd9fca 100644 (file)
--- 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 51cc5fb92f50a48aafb7093e18a60e78bcac5d57..466f9bb8c8c91e39c5ffcb55b531f5a917deb120 100644 (file)
--- 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 48129c0a4e0156c821081cbcf1204a57d797c19e..56fe05298f66222be4eba3d4ba93bebb9e9f497c 100644 (file)
--- 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 6eae52e863e801559a442b2354627310e74f3904..c4dd97e8da63baf631cdeb2b609670d5acee13f2 100644 (file)
--- 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 dafd0a789d4a8f16d4386ebe8cf22e1ecca23d06..c4c8529329714a2299444d92ad3d6117c1fbd1c4 100644 (file)
--- 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, "");