diff options
| author | Nathan Binkert <nate@binkert.org> | 2009-05-11 10:38:45 -0700 |
|---|---|---|
| committer | Nathan Binkert <nate@binkert.org> | 2009-05-11 10:38:45 -0700 |
| commit | 24da30e317cdbf4b628141d69b2d17dac5ae3822 (patch) | |
| tree | 190e2e14e278190d776dfd65a489f70700f4c8b0 /src/mem/ruby/config | |
| parent | d8c592a05d884560b3cbbe04d9e1ed9cf6575eaa (diff) | |
| download | gem5-24da30e317cdbf4b628141d69b2d17dac5ae3822.tar.xz | |
ruby: Make ruby #includes use full paths to the files they're including.
This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths. Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.
Diffstat (limited to 'src/mem/ruby/config')
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.cc | 10 | ||||
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.hh | 6 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/mem/ruby/config/RubyConfig.cc b/src/mem/ruby/config/RubyConfig.cc index 0e94efb46..2d129bc7a 100644 --- a/src/mem/ruby/config/RubyConfig.cc +++ b/src/mem/ruby/config/RubyConfig.cc @@ -36,10 +36,10 @@ * */ -#include "RubyConfig.hh" -#include "protocol_name.hh" -#include "util.hh" -#include "Protocol.hh" +#include "mem/ruby/config/RubyConfig.hh" +#include "mem/protocol/protocol_name.hh" +#include "mem/gems_common/util.hh" +#include "mem/protocol/Protocol.hh" #define CHECK_POWER_OF_2(N) { if (!is_power_of_2(N)) { ERROR_MSG(#N " must be a power of 2."); }} #define CHECK_ZERO(N) { if (N != 0) { ERROR_MSG(#N " must be zero at initialization."); }} @@ -163,7 +163,7 @@ static void print_parameters(ostream& out) } \ -#include "config.hh" +#include "mem/ruby/config/config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG diff --git a/src/mem/ruby/config/RubyConfig.hh b/src/mem/ruby/config/RubyConfig.hh index bb12d6426..c0e8ae59e 100644 --- a/src/mem/ruby/config/RubyConfig.hh +++ b/src/mem/ruby/config/RubyConfig.hh @@ -40,9 +40,9 @@ #ifndef RUBYCONFIG_H #define RUBYCONFIG_H -#include "Global.hh" -#include "vardecl.hh" -#include "NodeID.hh" +#include "mem/ruby/common/Global.hh" +#include "mem/gems_common/ioutil/vardecl.hh" +#include "mem/ruby/system/NodeID.hh" #define MEMORY_LATENCY RubyConfig::memoryResponseLatency() #define ABORT_DELAY m_chip_ptr->getTransactionManager(m_version)->getAbortDelay() |