diff options
Diffstat (limited to 'src/mem/slicc/symbols')
| -rw-r--r-- | src/mem/slicc/symbols/StateMachine.cc | 7 | ||||
| -rw-r--r-- | src/mem/slicc/symbols/Type.cc | 26 |
2 files changed, 5 insertions, 28 deletions
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 |