From 7cd2d8f687bd6909b92da5301a2d305f1fc33601 Mon Sep 17 00:00:00 2001
From: Derek Hower <drh5@cs.wisc.edu>
Date: Sat, 18 Jul 2009 18:20:03 -0500
Subject: ruby: removed all refs to old RubyConfig

---
 src/mem/slicc/ast/EnqueueStatementAST.cc |  2 +-
 src/mem/slicc/symbols/StateMachine.cc    |  7 ++++---
 src/mem/slicc/symbols/Type.cc            | 26 +-------------------------
 3 files changed, 6 insertions(+), 29 deletions(-)

(limited to 'src/mem/slicc')

diff --git a/src/mem/slicc/ast/EnqueueStatementAST.cc b/src/mem/slicc/ast/EnqueueStatementAST.cc
index 744dfe1eb..8be0378c9 100644
--- a/src/mem/slicc/ast/EnqueueStatementAST.cc
+++ b/src/mem/slicc/ast/EnqueueStatementAST.cc
@@ -77,7 +77,7 @@ void EnqueueStatementAST::generate(string& code, Type* return_type_ptr) const
   code += ".enqueue(out_msg";
 
   if (getPairs().exist("latency")) {
-    code += ", RubyConfig::get" + getPairs().lookup("latency") + "()";
+    code += ", m_LATENCY_" + getPairs().lookup("latency");
   }
 
   code += ");\n";
diff --git a/src/mem/slicc/symbols/StateMachine.cc b/src/mem/slicc/symbols/StateMachine.cc
index b2ec4d676..e042f9aa0 100644
--- a/src/mem/slicc/symbols/StateMachine.cc
+++ b/src/mem/slicc/symbols/StateMachine.cc
@@ -719,11 +719,12 @@ void StateMachine::printControllerC(ostream& out, string component)
       out << "{" << endl;
       out << "  DEBUG_MSG(GENERATED_COMP, HighPrio,\"executing\");" << endl;
 //added by SS
-//instead of rubyconfig:: --> it should point to m_latency...
+//it should point to m_latency...
 //so I should change the string output of this lookup
 
-      string c_code_string = action.lookupPair("c_code");
 
+      string c_code_string = action.lookupPair("c_code");
+/*
       size_t found = c_code_string.find("RubyConfig::get");
 
       if (found!=string::npos){ //found --> replace it with local access
@@ -741,7 +742,7 @@ void StateMachine::printControllerC(ostream& out, string component)
           }
         }
       }
-
+*/
       // add here:
       if (strncmp(component.c_str(), "L1Cache", 7) == 0) {
         if (c_code_string.find("writeCallback") != string::npos) {
diff --git a/src/mem/slicc/symbols/Type.cc b/src/mem/slicc/symbols/Type.cc
index 75f72af02..eb53cc7b9 100644
--- a/src/mem/slicc/symbols/Type.cc
+++ b/src/mem/slicc/symbols/Type.cc
@@ -583,7 +583,6 @@ void Type::printEnumC(string path) const
   out << endl;
   out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
   if (m_isMachineType) {
-    out << "#include \"mem/ruby/config/RubyConfig.hh\"" << endl;
     out << "#include \"mem/protocol/ControllerFactory.hh\"" << endl;
     for( int i = 0; i<size; i++ ) {
       out << "#include \"mem/protocol/" << m_enum_vec[i] << "_Controller.hh\"" << endl;
@@ -675,7 +674,7 @@ void Type::printEnumC(string path) const
     out << "  }" << endl;
     out << "}" << endl;
 
-    out << "/** \\brief returns the machine type for each base vector index used by NetDest and RubyConfig" << endl;
+    out << "/** \\brief returns the machine type for each base vector index used by NetDest" << endl;
     out << "  * " << endl;
     out << "  * \\return the MachineTYpe" << endl;
     out << "  */" << endl;
@@ -762,29 +761,6 @@ void Type::printEnumC(string path) const
 
     out << endl;
 
-//     out << "/** \\brief returns the total number of components for each machine" << endl;
-//     out << "  * \\return the total number of components for each machine" << endl;
-//     out << "  */" << endl;
-//     out << "int " << type_name << "_chip_count(const " << type_name << "& obj, int chip_id)" << endl;
-//     out << "{" << endl;
-//     out << "  switch(obj) {" << endl;
-
-//     // For each field
-//     for( int i = 0; i<size; i++ ) {
-//       out << "  case " << type_name << "_" << m_enum_vec[i] << ":" << endl;
-//       out << "    return RubyConfig::getNumberOfControllersPerTypePerChip(MachineType_base_level(MachineType_" << m_enum_vec[i] << "), chip_id);" << endl;
-//     }
-
-//     // total num
-//     out << "  case " << type_name << "_NUM:" << endl;
-//     // Trailer
-//     out << "  default:" << endl;
-//     out << "    ERROR_MSG(\"Invalid range for type " << type_name << "\");" << endl;
-//     out << "    return -1;" << endl;
-//     out << "  }" << endl;
-//     out << "}" << endl;
-
-
   }
 
   // Write the file
-- 
cgit v1.2.3