From 98c94cfe3ce83634f3bad79ca18263f42e36ca6a Mon Sep 17 00:00:00 2001
From: Steve Reinhardt <steve.reinhardt@amd.com>
Date: Fri, 29 Jan 2010 20:29:17 -0800
Subject: ruby: Convert most Ruby objects to M5 SimObjects. The necessary
 companion conversion of Ruby objects generated by SLICC are converted to M5
 SimObjects in the following patch, so this patch alone does not compile.
 Conversion of Garnet network models is also handled in a separate patch; that
 code is temporarily disabled from compiling to allow testing of interim code.

---
 src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc | 2 +-
 src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh | 2 +-
 src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh | 2 +-
 src/mem/ruby/network/garnet-flexible-pipeline/SConscript       | 3 +++
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'src/mem/ruby/network/garnet-flexible-pipeline')

diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
index 5a6b610f9..b2a385843 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
@@ -44,7 +44,7 @@ GarnetNetwork::GarnetNetwork(const string & name)
 {
 }
 
-void GarnetNetwork::init(const vector<string> & argv)
+void GarnetNetwork::init()
 {
 //        printf("hello\n");
         Network::init(argv);
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
index c0e4ac6e4..fbebcc7bd 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
@@ -49,7 +49,7 @@ public:
 
         ~GarnetNetwork();
 
-        void init(const vector<string> & argv);
+        void init();
 
         //added by SS
         NetworkConfig* getNetworkConfig() { return m_network_config_ptr; }
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
index 2080ef022..b23e9a88a 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
@@ -48,7 +48,7 @@ class NetworkConfig {
                 bool m_using_network_testing;
         public:
                 NetworkConfig(){}
-                void init(const vector<string> & argv) {
+                void init() {
                   for (size_t i=0; i<argv.size(); i+=2) {
                    if (argv[i] == "flit_size")
                      m_flit_size = atoi(argv[i+1].c_str());
diff --git a/src/mem/ruby/network/garnet-flexible-pipeline/SConscript b/src/mem/ruby/network/garnet-flexible-pipeline/SConscript
index a376bf10f..e132741ca 100644
--- a/src/mem/ruby/network/garnet-flexible-pipeline/SConscript
+++ b/src/mem/ruby/network/garnet-flexible-pipeline/SConscript
@@ -30,6 +30,9 @@
 
 Import('*')
 
+# temporarily disable
+Return()
+
 if not env['RUBY']:
     Return()
 
-- 
cgit v1.2.3