diff options
author | David Hashe <david.hashe@amd.com> | 2015-09-16 12:03:03 -0400 |
---|---|---|
committer | David Hashe <david.hashe@amd.com> | 2015-09-16 12:03:03 -0400 |
commit | b6b972da99c22903671fd86c5d02dcc6657a18b8 (patch) | |
tree | 0286c23b1f6e9c16a4c123c60a1155ebe75698e0 /src/mem/ruby/common | |
parent | 3edadb0bd3f74eeaadf45a40e08248707cc138a0 (diff) | |
download | gem5-b6b972da99c22903671fd86c5d02dcc6657a18b8.tar.xz |
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.
--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
Diffstat (limited to 'src/mem/ruby/common')
-rw-r--r-- | src/mem/ruby/common/Address.cc | 3 | ||||
-rw-r--r-- | src/mem/ruby/common/DataBlock.cc | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc index 8d8800501..d9fadf128 100644 --- a/src/mem/ruby/common/Address.cc +++ b/src/mem/ruby/common/Address.cc @@ -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 --git a/src/mem/ruby/common/DataBlock.cc b/src/mem/ruby/common/DataBlock.cc index 2a292444a..fb2e956e0 100644 --- a/src/mem/ruby/common/DataBlock.cc +++ b/src/mem/ruby/common/DataBlock.cc @@ -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) { |