sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: rename System.{hh,cc} to RubySystem.{hh,cc}

Browse source 
The eventual aim of this change is to pass RubySystem pointers through to
objects generated from the SLICC protocol code.

Because some of these objects need to dereference their RubySystem pointers,
they need access to the System.hh header file.

In src/mem/ruby/SConscript, the MakeInclude function creates single-line header
files in the build directory that do nothing except include the corresponding
header file from the source tree.

However, SLICC also generates a list of header files from its symbol table, and
writes it to mem/protocol/Types.hh in the build directory. This code assumes
that the header file name is the same as the class name.

The end result of this is the many of the generated slicc files try to include
RubySystem.hh, when the file they really need is System.hh. The path of least
resistence is just to rename System.hh to RubySystem.hh.

--HG--
rename : src/mem/ruby/system/System.cc => src/mem/ruby/system/RubySystem.cc
rename : src/mem/ruby/system/System.hh => src/mem/ruby/system/RubySystem.hh
This commit is contained in:
David Hashe 2015-09-16 12:03:03 -04:00
parent 3edadb0bd3
commit b6b972da99
37 changed files with 46 additions and 41 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
src/mem/ruby/common/Address.cc
View file

@ -27,7 +27,8 @@
*/ */
#include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Address.hh"
#include "mem/ruby/system/System.hh"
#include "mem/ruby/system/RubySystem.hh"
Addr Addr
bitSelect(Addr addr, unsigned int small, unsigned int big) bitSelect(Addr addr, unsigned int small, unsigned int big)

2
src/mem/ruby/common/DataBlock.cc
View file

@ -27,7 +27,7 @@
*/ */
#include "mem/ruby/common/DataBlock.hh" #include "mem/ruby/common/DataBlock.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
DataBlock::DataBlock(const DataBlock &cp) DataBlock::DataBlock(const DataBlock &cp)
{ {

2
src/mem/ruby/filters/BlockBloomFilter.cc
View file

@ -29,7 +29,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/ruby/filters/BlockBloomFilter.hh" #include "mem/ruby/filters/BlockBloomFilter.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/filters/BulkBloomFilter.cc
View file

@ -31,7 +31,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/ruby/filters/BulkBloomFilter.hh" #include "mem/ruby/filters/BulkBloomFilter.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/filters/LSB_CountingBloomFilter.cc
View file

@ -29,7 +29,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/ruby/filters/LSB_CountingBloomFilter.hh" #include "mem/ruby/filters/LSB_CountingBloomFilter.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/filters/MultiGrainBloomFilter.cc
View file

@ -29,7 +29,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/ruby/filters/MultiGrainBloomFilter.hh" #include "mem/ruby/filters/MultiGrainBloomFilter.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/filters/NonCountingBloomFilter.cc
View file

@ -29,7 +29,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "base/str.hh" #include "base/str.hh"
#include "mem/ruby/filters/NonCountingBloomFilter.hh" #include "mem/ruby/filters/NonCountingBloomFilter.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/network/MessageBuffer.cc
View file

@ -34,7 +34,7 @@
#include "base/stl_helpers.hh" #include "base/stl_helpers.hh"
#include "debug/RubyQueue.hh" #include "debug/RubyQueue.hh"
#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
using m5::stl_helpers::operator<<; using m5::stl_helpers::operator<<;

2
src/mem/ruby/network/Network.cc
View file

@ -29,7 +29,7 @@
#include "base/misc.hh" #include "base/misc.hh"
#include "mem/ruby/network/BasicLink.hh" #include "mem/ruby/network/BasicLink.hh"
#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
uint32_t Network::m_virtual_networks; uint32_t Network::m_virtual_networks;
uint32_t Network::m_control_msg_size; uint32_t Network::m_control_msg_size;

2
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
View file

@ -39,7 +39,7 @@
#include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/NetworkInterface_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/NetworkLink_d.hh"
#include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/Router_d.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
using m5::stl_helpers::deletePointers; using m5::stl_helpers::deletePointers;

3
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
View file

@ -29,7 +29,8 @@
*/ */
#include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh" #include "mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.hh"
#include "mem/ruby/system/System.hh"
#include "mem/ruby/system/RubySystem.hh"
OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr) OutVcState_d::OutVcState_d(int id, GarnetNetwork_d *network_ptr)
: m_time(0) : m_time(0)

2
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
View file

@ -39,7 +39,7 @@
#include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh" #include "mem/ruby/network/garnet/flexible-pipeline/NetworkInterface.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh" #include "mem/ruby/network/garnet/flexible-pipeline/NetworkLink.hh"
#include "mem/ruby/network/garnet/flexible-pipeline/Router.hh" #include "mem/ruby/network/garnet/flexible-pipeline/Router.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
using m5::stl_helpers::deletePointers; using m5::stl_helpers::deletePointers;

2
src/mem/ruby/network/simple/SimpleNetwork.cc
View file

@ -38,7 +38,7 @@
#include "mem/ruby/network/simple/Switch.hh" #include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh" #include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
using m5::stl_helpers::deletePointers; using m5::stl_helpers::deletePointers;

2
src/mem/ruby/network/simple/Throttle.cc
View file

@ -36,7 +36,7 @@
#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/Network.hh"
#include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/network/simple/Throttle.hh
View file

@ -44,7 +44,7 @@
#include "mem/ruby/common/Consumer.hh" #include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
class MessageBuffer; class MessageBuffer;
class Switch; class Switch;

2
src/mem/ruby/slicc_interface/AbstractController.cc
View file

@ -30,8 +30,8 @@
#include "debug/RubyQueue.hh" #include "debug/RubyQueue.hh"
#include "mem/protocol/MemoryMsg.hh" #include "mem/protocol/MemoryMsg.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh" #include "mem/ruby/system/Sequencer.hh"
#include "mem/ruby/system/System.hh"
#include "sim/system.hh" #include "sim/system.hh"
AbstractController::AbstractController(const Params *p) AbstractController::AbstractController(const Params *p)

2
src/mem/ruby/structures/BankedArray.cc
View file

@ -31,7 +31,7 @@
#include "base/intmath.hh" #include "base/intmath.hh"
#include "mem/ruby/structures/BankedArray.hh" #include "mem/ruby/structures/BankedArray.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
BankedArray::BankedArray(unsigned int banks, Cycles accessLatency, BankedArray::BankedArray(unsigned int banks, Cycles accessLatency,
unsigned int startIndexBit, RubySystem *rs) unsigned int startIndexBit, RubySystem *rs)

2
src/mem/ruby/structures/BankedArray.hh
View file

@ -35,7 +35,7 @@
#include <vector> #include <vector>
#include "mem/ruby/common/TypeDefines.hh" #include "mem/ruby/common/TypeDefines.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "sim/core.hh" #include "sim/core.hh"
class BankedArray class BankedArray

2
src/mem/ruby/structures/CacheMemory.cc
View file

@ -34,7 +34,7 @@
#include "debug/RubyStats.hh" #include "debug/RubyStats.hh"
#include "mem/protocol/AccessPermission.hh" #include "mem/protocol/AccessPermission.hh"
#include "mem/ruby/structures/CacheMemory.hh" #include "mem/ruby/structures/CacheMemory.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/structures/DirectoryMemory.cc
View file

@ -31,7 +31,7 @@
#include "debug/RubyStats.hh" #include "debug/RubyStats.hh"
#include "mem/ruby/slicc_interface/RubySlicc_Util.hh" #include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
#include "mem/ruby/structures/DirectoryMemory.hh" #include "mem/ruby/structures/DirectoryMemory.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/structures/Prefetcher.cc
View file

@ -29,7 +29,7 @@
#include "debug/RubyPrefetcher.hh" #include "debug/RubyPrefetcher.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/structures/Prefetcher.hh" #include "mem/ruby/structures/Prefetcher.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
Prefetcher* Prefetcher*
PrefetcherParams::create() PrefetcherParams::create()

2
src/mem/ruby/structures/Prefetcher.hh
View file

@ -38,7 +38,7 @@
#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/slicc_interface/AbstractController.hh"
#include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "params/Prefetcher.hh" #include "params/Prefetcher.hh"
#include "sim/sim_object.hh" #include "sim/sim_object.hh"
#include "sim/system.hh" #include "sim/system.hh"

2
src/mem/ruby/structures/RubyMemoryControl.cc
View file

@ -114,7 +114,7 @@
#include "mem/ruby/slicc_interface/Message.hh" #include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh" #include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/structures/RubyMemoryControl.hh" #include "mem/ruby/structures/RubyMemoryControl.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;

2
src/mem/ruby/structures/RubyMemoryControl.hh
View file

@ -39,7 +39,7 @@
#include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Address.hh"
#include "mem/ruby/profiler/MemCntrlProfiler.hh" #include "mem/ruby/profiler/MemCntrlProfiler.hh"
#include "mem/ruby/structures/MemoryNode.hh" #include "mem/ruby/structures/MemoryNode.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "params/RubyMemoryControl.hh" #include "params/RubyMemoryControl.hh"
// This constant is part of the definition of tFAW; see // This constant is part of the definition of tFAW; see

3
src/mem/ruby/structures/TimerTable.cc
View file

@ -27,7 +27,8 @@
*/ */
#include "mem/ruby/structures/TimerTable.hh" #include "mem/ruby/structures/TimerTable.hh"
#include "mem/ruby/system/System.hh"
#include "mem/ruby/system/RubySystem.hh"
TimerTable::TimerTable() TimerTable::TimerTable()
: m_next_time(0) : m_next_time(0)

5
src/mem/ruby/structures/WireBuffer.cc
View file

@ -35,7 +35,7 @@
#include "base/cprintf.hh" #include "base/cprintf.hh"
#include "base/stl_helpers.hh" #include "base/stl_helpers.hh"
#include "mem/ruby/structures/WireBuffer.hh" #include "mem/ruby/structures/WireBuffer.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
@ -121,7 +121,8 @@ WireBuffer::recycle()
push_heap(m_message_queue.begin(), m_message_queue.end(), push_heap(m_message_queue.begin(), m_message_queue.end(),
greater<MsgPtr>()); greater<MsgPtr>());
m_consumer_ptr-> m_consumer_ptr->
scheduleEventAbsolute(m_ruby_system->curCycle() + Cycles(1)); scheduleEventAbsolute(m_ruby_system->clockPeriod()
* (m_ruby_system->curCycle() + Cycles(1)));
} }
bool bool

2
src/mem/ruby/system/CacheRecorder.cc
View file

@ -29,8 +29,8 @@
#include "debug/RubyCacheTrace.hh" #include "debug/RubyCacheTrace.hh"
#include "mem/ruby/system/CacheRecorder.hh" #include "mem/ruby/system/CacheRecorder.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh" #include "mem/ruby/system/Sequencer.hh"
#include "mem/ruby/system/System.hh"
using namespace std; using namespace std;

2
src/mem/ruby/system/DMASequencer.cc
View file

@ -34,7 +34,7 @@
#include "debug/RubyStats.hh" #include "debug/RubyStats.hh"
#include "mem/protocol/SequencerMsg.hh" #include "mem/protocol/SequencerMsg.hh"
#include "mem/ruby/system/DMASequencer.hh" #include "mem/ruby/system/DMASequencer.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "sim/system.hh" #include "sim/system.hh"
DMASequencer::DMASequencer(const Params *p) DMASequencer::DMASequencer(const Params *p)

2
src/mem/ruby/system/DMASequencer.hh
View file

@ -37,7 +37,7 @@
#include "mem/protocol/RequestStatus.hh" #include "mem/protocol/RequestStatus.hh"
#include "mem/ruby/common/DataBlock.hh" #include "mem/ruby/common/DataBlock.hh"
#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "mem/simple_mem.hh" #include "mem/simple_mem.hh"
#include "mem/tport.hh" #include "mem/tport.hh"
#include "params/DMASequencer.hh" #include "params/DMASequencer.hh"

2
src/mem/ruby/system/RubyPort.hh
View file

@ -47,7 +47,7 @@
#include "mem/protocol/RequestStatus.hh" #include "mem/protocol/RequestStatus.hh"
#include "mem/ruby/network/MessageBuffer.hh" #include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#include "mem/mem_object.hh" #include "mem/mem_object.hh"
#include "mem/tport.hh" #include "mem/tport.hh"
#include "params/RubyPort.hh" #include "params/RubyPort.hh"

3
src/mem/ruby/system/System.cc → src/mem/ruby/system/RubySystem.cc
View file

@ -26,6 +26,8 @@
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/ */
#include "mem/ruby/system/RubySystem.hh"
#include <fcntl.h> #include <fcntl.h>
#include <zlib.h> #include <zlib.h>
@ -38,7 +40,6 @@
#include "debug/RubySystem.hh" #include "debug/RubySystem.hh"
#include "mem/ruby/common/Address.hh" #include "mem/ruby/common/Address.hh"
#include "mem/ruby/network/Network.hh" #include "mem/ruby/network/Network.hh"
#include "mem/ruby/system/System.hh"
#include "mem/simple_mem.hh" #include "mem/simple_mem.hh"
#include "sim/eventq.hh" #include "sim/eventq.hh"
#include "sim/simulate.hh" #include "sim/simulate.hh"

2
src/mem/ruby/system/System.hh → src/mem/ruby/system/RubySystem.hh
View file

@ -37,10 +37,10 @@
#include "base/callback.hh" #include "base/callback.hh"
#include "base/output.hh" #include "base/output.hh"
#include "mem/packet.hh"
#include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/slicc_interface/AbstractController.hh" #include "mem/ruby/slicc_interface/AbstractController.hh"
#include "mem/ruby/system/CacheRecorder.hh" #include "mem/ruby/system/CacheRecorder.hh"
#include "mem/packet.hh"
#include "params/RubySystem.hh" #include "params/RubySystem.hh"
#include "sim/clocked_object.hh" #include "sim/clocked_object.hh"

2
src/mem/ruby/system/RubySystem.py
View file

@ -33,7 +33,7 @@ from SimpleMemory import *
class RubySystem(ClockedObject): class RubySystem(ClockedObject):
type = 'RubySystem' type = 'RubySystem'
cxx_header = "mem/ruby/system/System.hh" cxx_header = "mem/ruby/system/RubySystem.hh"
randomization = Param.Bool(False, randomization = Param.Bool(False,
"insert random delays on message enqueue times"); "insert random delays on message enqueue times");
block_size_bytes = Param.UInt32(64, block_size_bytes = Param.UInt32(64,

4
src/mem/ruby/system/SConscript
View file

@ -33,12 +33,12 @@ Import('*')
if env['PROTOCOL'] == 'None': if env['PROTOCOL'] == 'None':
Return() Return()
SimObject('Sequencer.py')
SimObject('RubySystem.py') SimObject('RubySystem.py')
SimObject('Sequencer.py')
Source('CacheRecorder.cc') Source('CacheRecorder.cc')
Source('DMASequencer.cc') Source('DMASequencer.cc')
Source('RubyPort.cc') Source('RubyPort.cc')
Source('RubyPortProxy.cc') Source('RubyPortProxy.cc')
Source('RubySystem.cc')
Source('Sequencer.cc') Source('Sequencer.cc')
Source('System.cc')

2
src/mem/ruby/system/Sequencer.cc
View file

@ -38,8 +38,8 @@
#include "mem/protocol/RubyAccessMode.hh" #include "mem/protocol/RubyAccessMode.hh"
#include "mem/ruby/profiler/Profiler.hh" #include "mem/ruby/profiler/Profiler.hh"
#include "mem/ruby/slicc_interface/RubyRequest.hh" #include "mem/ruby/slicc_interface/RubyRequest.hh"
#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh" #include "mem/ruby/system/Sequencer.hh"
#include "mem/ruby/system/System.hh"
#include "mem/packet.hh" #include "mem/packet.hh"
#include "sim/system.hh" #include "sim/system.hh"

6
src/mem/slicc/symbols/StateMachine.py
View file

@ -464,7 +464,7 @@ void unset_tbe(${{self.TBEType.c_ident}}*& m_tbe_ptr);
#include "mem/protocol/${ident}_Event.hh" #include "mem/protocol/${ident}_Event.hh"
#include "mem/protocol/${ident}_State.hh" #include "mem/protocol/${ident}_State.hh"
#include "mem/protocol/Types.hh" #include "mem/protocol/Types.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
''') ''')
for include_path in includes: for include_path in includes:
@ -1029,7 +1029,7 @@ $c_ident::functionalWriteBuffers(PacketPtr& pkt)
code(''' code('''
#include "mem/protocol/Types.hh" #include "mem/protocol/Types.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
''') ''')
@ -1137,7 +1137,7 @@ ${ident}_Controller::wakeup()
#include "mem/protocol/${ident}_Event.hh" #include "mem/protocol/${ident}_Event.hh"
#include "mem/protocol/${ident}_State.hh" #include "mem/protocol/${ident}_State.hh"
#include "mem/protocol/Types.hh" #include "mem/protocol/Types.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
#define HASH_FUN(state, event) ((int(state)*${ident}_Event_NUM)+int(event)) #define HASH_FUN(state, event) ((int(state)*${ident}_Event_NUM)+int(event))

2
src/mem/slicc/symbols/Type.py
View file

@ -397,7 +397,7 @@ operator<<(std::ostream& out, const ${{self.c_ident}}& obj)
#include <memory> #include <memory>
#include "mem/protocol/${{self.c_ident}}.hh" #include "mem/protocol/${{self.c_ident}}.hh"
#include "mem/ruby/system/System.hh" #include "mem/ruby/system/RubySystem.hh"
using namespace std; using namespace std;
''') ''')