changeset 6342ddf6d733 in /z/repo/gem5
details: http://repo.gem5.org/gem5?cmd=changeset;node=6342ddf6d733
description:
ruby: rename System.{hh,cc} to RubySystem.{hh,cc}
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.
diffstat:
src/mem/ruby/common/Address.cc | 3 +-
src/mem/ruby/common/DataBlock.cc | 2 +-
src/mem/ruby/filters/BlockBloomFilter.cc | 2 +-
src/mem/ruby/filters/BulkBloomFilter.cc | 2 +-
src/mem/ruby/filters/LSB_CountingBloomFilter.cc | 2 +-
src/mem/ruby/filters/MultiGrainBloomFilter.cc | 2 +-
src/mem/ruby/filters/NonCountingBloomFilter.cc | 2 +-
src/mem/ruby/network/MessageBuffer.cc | 2 +-
src/mem/ruby/network/Network.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc | 2 +-
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc | 3 +-
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc | 2 +-
src/mem/ruby/network/simple/SimpleNetwork.cc | 2 +-
src/mem/ruby/network/simple/Throttle.cc | 2 +-
src/mem/ruby/network/simple/Throttle.hh | 2 +-
src/mem/ruby/slicc_interface/AbstractController.cc | 2 +-
src/mem/ruby/structures/BankedArray.cc | 2 +-
src/mem/ruby/structures/BankedArray.hh | 2 +-
src/mem/ruby/structures/CacheMemory.cc | 2 +-
src/mem/ruby/structures/DirectoryMemory.cc | 2 +-
src/mem/ruby/structures/Prefetcher.cc | 2 +-
src/mem/ruby/structures/Prefetcher.hh | 2 +-
src/mem/ruby/structures/RubyMemoryControl.cc | 2 +-
src/mem/ruby/structures/RubyMemoryControl.hh | 2 +-
src/mem/ruby/structures/TimerTable.cc | 3 +-
src/mem/ruby/structures/WireBuffer.cc | 5 +-
src/mem/ruby/system/CacheRecorder.cc | 2 +-
src/mem/ruby/system/DMASequencer.cc | 2 +-
src/mem/ruby/system/DMASequencer.hh | 2 +-
src/mem/ruby/system/RubyPort.hh | 2 +-
src/mem/ruby/system/RubySystem.cc | 567
++++++++++
src/mem/ruby/system/RubySystem.hh | 164 ++
src/mem/ruby/system/RubySystem.py | 2 +-
src/mem/ruby/system/SConscript | 4 +-
src/mem/ruby/system/Sequencer.cc | 2 +-
src/mem/ruby/system/System.cc | 566 ---------
src/mem/ruby/system/System.hh | 164 --
src/mem/slicc/symbols/StateMachine.py | 6 +-
src/mem/slicc/symbols/Type.py | 2 +-
39 files changed, 774 insertions(+), 769 deletions(-)
diffs (truncated from 1937 to 300 lines):
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/common/Address.cc
--- a/src/mem/ruby/common/Address.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/common/Address.cc Wed Sep 16 12:03:03 2015 -0400
@@ -27,7 +27,8 @@
*/
#include "mem/ruby/common/Address.hh"
-#include "mem/ruby/system/System.hh"
+
+#include "mem/ruby/system/RubySystem.hh"
Addr
bitSelect(Addr addr, unsigned int small, unsigned int big)
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/common/DataBlock.cc
--- a/src/mem/ruby/common/DataBlock.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/common/DataBlock.cc Wed Sep 16 12:03:03 2015 -0400
@@ -27,7 +27,7 @@
*/
#include "mem/ruby/common/DataBlock.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
DataBlock::DataBlock(const DataBlock &cp)
{
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/filters/BlockBloomFilter.cc
--- a/src/mem/ruby/filters/BlockBloomFilter.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/filters/BlockBloomFilter.cc Wed Sep 16 12:03:03 2015 -0400
@@ -29,7 +29,7 @@
#include "base/intmath.hh"
#include "base/str.hh"
#include "mem/ruby/filters/BlockBloomFilter.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/filters/BulkBloomFilter.cc
--- a/src/mem/ruby/filters/BulkBloomFilter.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/filters/BulkBloomFilter.cc Wed Sep 16 12:03:03 2015 -0400
@@ -31,7 +31,7 @@
#include "base/intmath.hh"
#include "base/str.hh"
#include "mem/ruby/filters/BulkBloomFilter.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/filters/LSB_CountingBloomFilter.cc
--- a/src/mem/ruby/filters/LSB_CountingBloomFilter.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/filters/LSB_CountingBloomFilter.cc Wed Sep 16 12:03:03
2015 -0400
@@ -29,7 +29,7 @@
#include "base/intmath.hh"
#include "base/str.hh"
#include "mem/ruby/filters/LSB_CountingBloomFilter.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/filters/MultiGrainBloomFilter.cc
--- a/src/mem/ruby/filters/MultiGrainBloomFilter.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/filters/MultiGrainBloomFilter.cc Wed Sep 16 12:03:03
2015 -0400
@@ -29,7 +29,7 @@
#include "base/intmath.hh"
#include "base/str.hh"
#include "mem/ruby/filters/MultiGrainBloomFilter.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/filters/NonCountingBloomFilter.cc
--- a/src/mem/ruby/filters/NonCountingBloomFilter.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/filters/NonCountingBloomFilter.cc Wed Sep 16 12:03:03
2015 -0400
@@ -29,7 +29,7 @@
#include "base/intmath.hh"
#include "base/str.hh"
#include "mem/ruby/filters/NonCountingBloomFilter.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/network/MessageBuffer.cc
--- a/src/mem/ruby/network/MessageBuffer.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/MessageBuffer.cc Wed Sep 16 12:03:03 2015 -0400
@@ -34,7 +34,7 @@
#include "base/stl_helpers.hh"
#include "debug/RubyQueue.hh"
#include "mem/ruby/network/MessageBuffer.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
using m5::stl_helpers::operator<<;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/network/Network.cc
--- a/src/mem/ruby/network/Network.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/Network.cc Wed Sep 16 12:03:03 2015 -0400
@@ -29,7 +29,7 @@
#include "base/misc.hh"
#include "mem/ruby/network/BasicLink.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_control_msg_size;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Wed Sep
16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/GarnetNetwork_d.cc Wed Sep
16 12:03:03 2015 -0400
@@ -39,7 +39,7 @@
#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/Router_d.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc
--- a/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Wed Sep
16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/garnet/fixed-pipeline/OutVcState_d.cc Wed Sep
16 12:03:03 2015 -0400
@@ -29,7 +29,8 @@
*/
#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)
: m_time(0)
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc
--- a/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Wed Sep
16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/garnet/flexible-pipeline/GarnetNetwork.cc Wed Sep
16 12:03:03 2015 -0400
@@ -39,7 +39,7 @@
#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/Router.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/network/simple/SimpleNetwork.cc
--- a/src/mem/ruby/network/simple/SimpleNetwork.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/network/simple/SimpleNetwork.cc Wed Sep 16 12:03:03
2015 -0400
@@ -38,7 +38,7 @@
#include "mem/ruby/network/simple/Switch.hh"
#include "mem/ruby/network/simple/Throttle.hh"
#include "mem/ruby/profiler/Profiler.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
using m5::stl_helpers::deletePointers;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/network/simple/Throttle.cc
--- a/src/mem/ruby/network/simple/Throttle.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/simple/Throttle.cc Wed Sep 16 12:03:03 2015 -0400
@@ -36,7 +36,7 @@
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/network/Network.hh"
#include "mem/ruby/slicc_interface/Message.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/network/simple/Throttle.hh
--- a/src/mem/ruby/network/simple/Throttle.hh Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/network/simple/Throttle.hh Wed Sep 16 12:03:03 2015 -0400
@@ -44,7 +44,7 @@
#include "mem/ruby/common/Consumer.hh"
#include "mem/ruby/network/Network.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
class MessageBuffer;
class Switch;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/slicc_interface/AbstractController.cc
--- a/src/mem/ruby/slicc_interface/AbstractController.cc Wed Sep 16
12:01:39 2015 -0400
+++ b/src/mem/ruby/slicc_interface/AbstractController.cc Wed Sep 16
12:03:03 2015 -0400
@@ -30,8 +30,8 @@
#include "debug/RubyQueue.hh"
#include "mem/protocol/MemoryMsg.hh"
+#include "mem/ruby/system/RubySystem.hh"
#include "mem/ruby/system/Sequencer.hh"
-#include "mem/ruby/system/System.hh"
#include "sim/system.hh"
AbstractController::AbstractController(const Params *p)
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/BankedArray.cc
--- a/src/mem/ruby/structures/BankedArray.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/BankedArray.cc Wed Sep 16 12:03:03 2015 -0400
@@ -31,7 +31,7 @@
#include "base/intmath.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,
unsigned int startIndexBit, RubySystem *rs)
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/BankedArray.hh
--- a/src/mem/ruby/structures/BankedArray.hh Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/BankedArray.hh Wed Sep 16 12:03:03 2015 -0400
@@ -35,7 +35,7 @@
#include <vector>
#include "mem/ruby/common/TypeDefines.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
#include "sim/core.hh"
class BankedArray
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/CacheMemory.cc
--- a/src/mem/ruby/structures/CacheMemory.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/CacheMemory.cc Wed Sep 16 12:03:03 2015 -0400
@@ -34,7 +34,7 @@
#include "debug/RubyStats.hh"
#include "mem/protocol/AccessPermission.hh"
#include "mem/ruby/structures/CacheMemory.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/DirectoryMemory.cc
--- a/src/mem/ruby/structures/DirectoryMemory.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/structures/DirectoryMemory.cc Wed Sep 16 12:03:03
2015 -0400
@@ -31,7 +31,7 @@
#include "debug/RubyStats.hh"
#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
#include "mem/ruby/structures/DirectoryMemory.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/Prefetcher.cc
--- a/src/mem/ruby/structures/Prefetcher.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/Prefetcher.cc Wed Sep 16 12:03:03 2015 -0400
@@ -29,7 +29,7 @@
#include "debug/RubyPrefetcher.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/structures/Prefetcher.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
Prefetcher*
PrefetcherParams::create()
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/Prefetcher.hh
--- a/src/mem/ruby/structures/Prefetcher.hh Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/Prefetcher.hh Wed Sep 16 12:03:03 2015 -0400
@@ -38,7 +38,7 @@
#include "mem/ruby/network/MessageBuffer.hh"
#include "mem/ruby/slicc_interface/AbstractController.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 "sim/sim_object.hh"
#include "sim/system.hh"
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/structures/RubyMemoryControl.cc
--- a/src/mem/ruby/structures/RubyMemoryControl.cc Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/structures/RubyMemoryControl.cc Wed Sep 16 12:03:03
2015 -0400
@@ -114,7 +114,7 @@
#include "mem/ruby/slicc_interface/Message.hh"
#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
#include "mem/ruby/structures/RubyMemoryControl.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
using namespace std;
diff -r 43857904aff3 -r 6342ddf6d733
src/mem/ruby/structures/RubyMemoryControl.hh
--- a/src/mem/ruby/structures/RubyMemoryControl.hh Wed Sep 16 12:01:39
2015 -0400
+++ b/src/mem/ruby/structures/RubyMemoryControl.hh Wed Sep 16 12:03:03
2015 -0400
@@ -39,7 +39,7 @@
#include "mem/ruby/common/Address.hh"
#include "mem/ruby/profiler/MemCntrlProfiler.hh"
#include "mem/ruby/structures/MemoryNode.hh"
-#include "mem/ruby/system/System.hh"
+#include "mem/ruby/system/RubySystem.hh"
#include "params/RubyMemoryControl.hh"
// This constant is part of the definition of tFAW; see
diff -r 43857904aff3 -r 6342ddf6d733 src/mem/ruby/structures/TimerTable.cc
--- a/src/mem/ruby/structures/TimerTable.cc Wed Sep 16 12:01:39 2015 -0400
+++ b/src/mem/ruby/structures/TimerTable.cc Wed Sep 16 12:03:03 2015 -0400
@@ -27,7 +27,8 @@
*/
#include "mem/ruby/structures/TimerTable.hh"
-#include "mem/ruby/system/System.hh"
+
_______________________________________________
gem5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/gem5-dev
