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.

12 files changed, 87 insertions, 87 deletions

diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.cc b/src/mem/ruby/profiler/AccessTraceForAddress.cc
index 13aa3bc59..48b28b735 100644
--- a/src/mem/ruby/profiler/AccessTraceForAddress.cc
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.cc
@@ -32,8 +32,8 @@
  *
  */
 
-#include "AccessTraceForAddress.hh"
-#include "Histogram.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/ruby/common/Histogram.hh"
 
 AccessTraceForAddress::AccessTraceForAddress()
 {
diff --git a/src/mem/ruby/profiler/AccessTraceForAddress.hh b/src/mem/ruby/profiler/AccessTraceForAddress.hh
index 8ed47c2ee..5bb0cc545 100644
--- a/src/mem/ruby/profiler/AccessTraceForAddress.hh
+++ b/src/mem/ruby/profiler/AccessTraceForAddress.hh
@@ -37,13 +37,13 @@
 #ifndef ACCESSTRACEFORADDRESS_H
 #define ACCESSTRACEFORADDRESS_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "CacheRequestType.hh"
-#include "AccessModeType.hh"
-#include "NodeID.hh"
-#include "Set.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Set.hh"
 class Histogram;
 
 class AccessTraceForAddress {
diff --git a/src/mem/ruby/profiler/AddressProfiler.cc b/src/mem/ruby/profiler/AddressProfiler.cc
index 2d14b458f..b0cc3cfd5 100644
--- a/src/mem/ruby/profiler/AddressProfiler.cc
+++ b/src/mem/ruby/profiler/AddressProfiler.cc
@@ -36,13 +36,13 @@
  *
  */
 
-#include "AddressProfiler.hh"
-#include "CacheMsg.hh"
-#include "AccessTraceForAddress.hh"
-#include "PrioHeap.hh"
-#include "Map.hh"
-#include "System.hh"
-#include "Profiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
 
 // Helper functions
 static AccessTraceForAddress& lookupTraceForAddress(const Address& addr, Map<Address, AccessTraceForAddress>* record_map);
diff --git a/src/mem/ruby/profiler/AddressProfiler.hh b/src/mem/ruby/profiler/AddressProfiler.hh
index 4895a7857..b000fb5d5 100644
--- a/src/mem/ruby/profiler/AddressProfiler.hh
+++ b/src/mem/ruby/profiler/AddressProfiler.hh
@@ -39,12 +39,12 @@
 #ifndef ADDRESSPROFILER_H
 #define ADDRESSPROFILER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "Histogram.hh"
-#include "Address.hh"
-#include "CacheMsg.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/protocol/AccessType.hh"
 
 class AccessTraceForAddress;
 class Set;
diff --git a/src/mem/ruby/profiler/CacheProfiler.cc b/src/mem/ruby/profiler/CacheProfiler.cc
index 666a99632..edc4bbd6d 100644
--- a/src/mem/ruby/profiler/CacheProfiler.cc
+++ b/src/mem/ruby/profiler/CacheProfiler.cc
@@ -36,12 +36,12 @@
  *
  */
 
-#include "CacheProfiler.hh"
-#include "AccessTraceForAddress.hh"
-#include "PrioHeap.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "Vector.hh"
+#include "mem/ruby/profiler/CacheProfiler.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/gems_common/Vector.hh"
 
 CacheProfiler::CacheProfiler(string description)
   : m_requestSize(-1)
diff --git a/src/mem/ruby/profiler/CacheProfiler.hh b/src/mem/ruby/profiler/CacheProfiler.hh
index 2d538d0e3..4dcff4243 100644
--- a/src/mem/ruby/profiler/CacheProfiler.hh
+++ b/src/mem/ruby/profiler/CacheProfiler.hh
@@ -39,12 +39,12 @@
 #ifndef CACHEPROFILER_H
 #define CACHEPROFILER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "Histogram.hh"
-#include "AccessModeType.hh"
-#include "PrefetchBit.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/protocol/GenericRequestType.hh"
 
 template <class TYPE> class Vector;
 
diff --git a/src/mem/ruby/profiler/Profiler.cc b/src/mem/ruby/profiler/Profiler.cc
index 456123a68..558402bf5 100644
--- a/src/mem/ruby/profiler/Profiler.cc
+++ b/src/mem/ruby/profiler/Profiler.cc
@@ -51,19 +51,19 @@
  *
  */
 
-#include "Profiler.hh"
-#include "CacheProfiler.hh"
-#include "AddressProfiler.hh"
-#include "System.hh"
-#include "Network.hh"
-#include "PrioHeap.hh"
-#include "CacheMsg.hh"
-#include "Driver.hh"
-#include "Protocol.hh"
-#include "util.hh"
-#include "Map.hh"
-#include "Debug.hh"
-#include "MachineType.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/profiler/CacheProfiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/protocol/MachineType.hh"
 
 // Allows use of times() library call, which determines virtual runtime
 #include <sys/times.h>
diff --git a/src/mem/ruby/profiler/Profiler.hh b/src/mem/ruby/profiler/Profiler.hh
index aa018029c..cb038a051 100644
--- a/src/mem/ruby/profiler/Profiler.hh
+++ b/src/mem/ruby/profiler/Profiler.hh
@@ -54,20 +54,20 @@
 #ifndef PROFILER_H
 #define PROFILER_H
 
-#include "Global.hh"
-#include "GenericMachineType.hh"
-#include "RubyConfig.hh"
-#include "Histogram.hh"
-#include "Consumer.hh"
-#include "AccessModeType.hh"
-#include "AccessType.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "PrefetchBit.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "CacheRequestType.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/GenericRequestType.hh"
 
 class CacheMsg;
 class CacheProfiler;
diff --git a/src/mem/ruby/profiler/StoreTrace.cc b/src/mem/ruby/profiler/StoreTrace.cc
index 7a1347a89..4d4e4798d 100644
--- a/src/mem/ruby/profiler/StoreTrace.cc
+++ b/src/mem/ruby/profiler/StoreTrace.cc
@@ -32,8 +32,8 @@
  *
  */
 
-#include "StoreTrace.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/profiler/StoreTrace.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 bool StoreTrace::s_init = false; // Total number of store lifetimes of all lines
 int64 StoreTrace::s_total_samples = 0; // Total number of store lifetimes of all lines
diff --git a/src/mem/ruby/profiler/StoreTrace.hh b/src/mem/ruby/profiler/StoreTrace.hh
index 821345aba..a71636364 100644
--- a/src/mem/ruby/profiler/StoreTrace.hh
+++ b/src/mem/ruby/profiler/StoreTrace.hh
@@ -37,10 +37,10 @@
 #ifndef StoreTrace_H
 #define StoreTrace_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "Histogram.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Histogram.hh"
 
 class StoreTrace {
 public:
diff --git a/src/mem/ruby/profiler/XactProfiler.cc b/src/mem/ruby/profiler/XactProfiler.cc
index 55fb86472..8a3a7cd79 100644
--- a/src/mem/ruby/profiler/XactProfiler.cc
+++ b/src/mem/ruby/profiler/XactProfiler.cc
@@ -26,13 +26,13 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "XactProfiler.hh"
-#include "CacheMsg.hh"
-#include "Map.hh"
-#include "Debug.hh"
-#include "MachineType.hh"
+#include "mem/ruby/profiler/XactProfiler.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/protocol/MachineType.hh"
 #include "TransactionInterfaceManager.hh"
-#include "Driver.hh"
+#include "mem/ruby/common/Driver.hh"
 #include "interface.hh"
 
 extern std::ostream * debug_cout_ptr;
diff --git a/src/mem/ruby/profiler/XactProfiler.hh b/src/mem/ruby/profiler/XactProfiler.hh
index 46584de65..b90e95c01 100644
--- a/src/mem/ruby/profiler/XactProfiler.hh
+++ b/src/mem/ruby/profiler/XactProfiler.hh
@@ -30,20 +30,20 @@
 #ifndef XACTPROFILER_H
 #define XACTPROFILER_H
 
-#include "Global.hh"
-#include "GenericMachineType.hh"
-#include "RubyConfig.hh"
-#include "Histogram.hh"
-#include "Consumer.hh"
-#include "AccessModeType.hh"
-#include "AccessType.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "PrefetchBit.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "CacheRequestType.hh"
-#include "GenericRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/GenericRequestType.hh"
 
 template <class KEY_TYPE, class VALUE_TYPE> class Map;