From: Brad Beckmann <Brad.Beckmann@amd.com>
Date: Wed, 18 Nov 2009 21:55:58 +0000 (-0800)
Subject: ruby: getPort function fix
X-Git-Tag: stable_2012_02_02~1575^2~48
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=93f0069dd5d542883f93a75ca2d98a2008190693;p=gem5.git

ruby: getPort function fix
Fixed RubyMemory::getPort function to not pass in a -1 for the idx parameter
---

diff --git a/src/mem/rubymem.cc b/src/mem/rubymem.cc
index 9a1a7927d..74a6e390e 100644
--- a/src/mem/rubymem.cc
+++ b/src/mem/rubymem.cc
@@ -186,10 +186,19 @@ RubyMemory::getPort(const std::string &if_name, int idx)
             ruby_ports.size(),
             ruby_dma_ports.size());
 
+    //
+    // By default, getPort will be passed an idx of -1.  Of course this is an
+    // invalid ruby port index and must be a modified
+    //
+    if (idx == -1) {
+        idx = 0;
+    }
+
     // Accept request for "functional" port for backwards compatibility
     // with places where this function is called from C++.  I'd prefer
     // to move all these into Python someday.
     if (if_name == "functional") {
+        assert(idx < ruby_ports.size());
         return new Port(csprintf("%s-functional", name()), 
                         this,
                         ruby_ports[idx]);