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.

6 files changed, 24 insertions, 24 deletions

diff --git a/src/mem/ruby/recorder/CacheRecorder.cc b/src/mem/ruby/recorder/CacheRecorder.cc
index ba7ca8966..21193ba68 100644
--- a/src/mem/ruby/recorder/CacheRecorder.cc
+++ b/src/mem/ruby/recorder/CacheRecorder.cc
@@ -32,10 +32,10 @@
  *
  */
 
-#include "CacheRecorder.hh"
-#include "TraceRecord.hh"
-#include "RubyEventQueue.hh"
-#include "PrioHeap.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/gems_common/PrioHeap.hh"
 
 CacheRecorder::CacheRecorder()
 {
diff --git a/src/mem/ruby/recorder/CacheRecorder.hh b/src/mem/ruby/recorder/CacheRecorder.hh
index b8b56ff09..0f69f8478 100644
--- a/src/mem/ruby/recorder/CacheRecorder.hh
+++ b/src/mem/ruby/recorder/CacheRecorder.hh
@@ -38,9 +38,9 @@
 #ifndef CACHERECORDER_H
 #define CACHERECORDER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
 
 template <class TYPE> class PrioHeap;
 class Address;
diff --git a/src/mem/ruby/recorder/TraceRecord.cc b/src/mem/ruby/recorder/TraceRecord.cc
index fd5f25ab9..ab1069582 100644
--- a/src/mem/ruby/recorder/TraceRecord.cc
+++ b/src/mem/ruby/recorder/TraceRecord.cc
@@ -32,11 +32,11 @@
  *
  */
 
-#include "TraceRecord.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "AbstractChip.hh"
-#include "CacheMsg.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/CacheMsg.hh"
 
 TraceRecord::TraceRecord(NodeID id, const Address& data_addr, const Address& pc_addr, CacheRequestType type, Time time)
 {
diff --git a/src/mem/ruby/recorder/TraceRecord.hh b/src/mem/ruby/recorder/TraceRecord.hh
index df526156b..cfe2ff9e3 100644
--- a/src/mem/ruby/recorder/TraceRecord.hh
+++ b/src/mem/ruby/recorder/TraceRecord.hh
@@ -39,10 +39,10 @@
 #ifndef TRACERECORD_H
 #define TRACERECORD_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
 class CacheMsg;
 
 class TraceRecord {
diff --git a/src/mem/ruby/recorder/Tracer.cc b/src/mem/ruby/recorder/Tracer.cc
index 0a4a290b3..896bfd31e 100644
--- a/src/mem/ruby/recorder/Tracer.cc
+++ b/src/mem/ruby/recorder/Tracer.cc
@@ -32,11 +32,11 @@
  *
  */
 
-#include "Tracer.hh"
-#include "TraceRecord.hh"
-#include "RubyEventQueue.hh"
-#include "PrioHeap.hh"
-#include "System.hh"
+#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/recorder/TraceRecord.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/system/System.hh"
 
 Tracer::Tracer()
 {
diff --git a/src/mem/ruby/recorder/Tracer.hh b/src/mem/ruby/recorder/Tracer.hh
index eb05ae12d..0f78f54b2 100644
--- a/src/mem/ruby/recorder/Tracer.hh
+++ b/src/mem/ruby/recorder/Tracer.hh
@@ -38,9 +38,9 @@
 #ifndef TRACER_H
 #define TRACER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
 #include "gzstream.hh"
 
 template <class TYPE> class PrioHeap;