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.

23 files changed, 65 insertions, 65 deletions

diff --git a/src/mem/ruby/common/Address.cc b/src/mem/ruby/common/Address.cc
index 5d38faae0..b4ad39294 100644
--- a/src/mem/ruby/common/Address.cc
+++ b/src/mem/ruby/common/Address.cc
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "Address.hh"
+#include "mem/ruby/common/Address.hh"
 
 void Address::output(ostream& out) const
 {
diff --git a/src/mem/ruby/common/Address.hh b/src/mem/ruby/common/Address.hh
index 3c3c5ad30..da218f177 100644
--- a/src/mem/ruby/common/Address.hh
+++ b/src/mem/ruby/common/Address.hh
@@ -25,10 +25,10 @@
 #define ADDRESS_H
 
 #include <iomanip>
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
 
 const int ADDRESS_WIDTH = 64; // address width in bytes
 
diff --git a/src/mem/ruby/common/BigSet.cc b/src/mem/ruby/common/BigSet.cc
index e16284f15..f55d7b79c 100644
--- a/src/mem/ruby/common/BigSet.cc
+++ b/src/mem/ruby/common/BigSet.cc
@@ -27,8 +27,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 Set::Set()
 {
diff --git a/src/mem/ruby/common/BigSet.hh b/src/mem/ruby/common/BigSet.hh
index 4eae01681..06ee6a66d 100644
--- a/src/mem/ruby/common/BigSet.hh
+++ b/src/mem/ruby/common/BigSet.hh
@@ -33,10 +33,10 @@
 #ifndef SET_H
 #define SET_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 enum PresenceBit {NotPresent, Present};
 
diff --git a/src/mem/ruby/common/Consumer.hh b/src/mem/ruby/common/Consumer.hh
index e8dada9ca..34cd7864c 100644
--- a/src/mem/ruby/common/Consumer.hh
+++ b/src/mem/ruby/common/Consumer.hh
@@ -39,8 +39,8 @@
 #ifndef CONSUMER_H
 #define CONSUMER_H
 
-#include "Global.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 class MessageBuffer;
 
diff --git a/src/mem/ruby/common/DataBlock.cc b/src/mem/ruby/common/DataBlock.cc
index c4d6d7a33..ce72bc7f4 100644
--- a/src/mem/ruby/common/DataBlock.cc
+++ b/src/mem/ruby/common/DataBlock.cc
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "DataBlock.hh"
+#include "mem/ruby/common/DataBlock.hh"
 
 DataBlock::DataBlock()
 {
diff --git a/src/mem/ruby/common/DataBlock.hh b/src/mem/ruby/common/DataBlock.hh
index aae364078..8711cb740 100644
--- a/src/mem/ruby/common/DataBlock.hh
+++ b/src/mem/ruby/common/DataBlock.hh
@@ -30,9 +30,9 @@
 #ifndef DATABLOCK_H
 #define DATABLOCK_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/gems_common/Vector.hh"
 
 class DataBlock {
 public:
diff --git a/src/mem/ruby/common/Debug.cc b/src/mem/ruby/common/Debug.cc
index 4c2263b0c..02f4069ee 100644
--- a/src/mem/ruby/common/Debug.cc
+++ b/src/mem/ruby/common/Debug.cc
@@ -35,9 +35,9 @@
 #include <fstream>
 #include <stdarg.h>
 
-#include "Global.hh"
-#include "Debug.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 class Debug;
 extern Debug* g_debug_ptr;
diff --git a/src/mem/ruby/common/Driver.cc b/src/mem/ruby/common/Driver.cc
index 019ac6403..2d6034b02 100644
--- a/src/mem/ruby/common/Driver.cc
+++ b/src/mem/ruby/common/Driver.cc
@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Driver.hh"
+#include "mem/ruby/common/Driver.hh"
 
 Driver::Driver()
 {
diff --git a/src/mem/ruby/common/Driver.hh b/src/mem/ruby/common/Driver.hh
index 1d5b883ac..c527e7d2b 100644
--- a/src/mem/ruby/common/Driver.hh
+++ b/src/mem/ruby/common/Driver.hh
@@ -30,10 +30,10 @@
 #ifndef DRIVER_H
 #define DRIVER_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/CacheRequestType.hh"
 
 class RubySystem;
 class SubBlock;
@@ -62,15 +62,15 @@ public:
   virtual void notifyTrapStart( int procID, const Address & handlerPC, int threadID, int smtThread ) { assert(0); } //called by Sequencer
   virtual void notifyTrapComplete( int procID, const Address & newPC, int smtThread ) {assert(0);  }  // called by Sequencer
   virtual int getOpalTransactionLevel(int procID, int thread) const {
-    cout << "Driver.hh getOpalTransactionLevel() " << endl;
+    cout << "mem/ruby/common/Driver.hh getOpalTransactionLevel() " << endl;
    return 0; }  //called by Sequencer
   virtual void addThreadDependency(int procID, int requestor_thread, int conflict_thread) const { assert(0);}
   virtual uint64 getOpalTime(int procID) const{ return 0; }  //called by Sequencer
   virtual uint64 getOpalTimestamp(int procID, int thread) const{
-    cout << "Driver.hh getOpalTimestamp " << endl;
+    cout << "mem/ruby/common/Driver.hh getOpalTimestamp " << endl;
  return 0; } // called by Sequencer
   virtual int inTransaction(int procID, int thread ) const{
-    cout << "Driver.hh inTransaction " << endl;
+    cout << "mem/ruby/common/Driver.hh inTransaction " << endl;
 return false; } //called by Sequencer
   virtual void printDebug(){}  //called by Sequencer
 
diff --git a/src/mem/ruby/common/Global.cc b/src/mem/ruby/common/Global.cc
index 73a26269a..7c7cab1e8 100644
--- a/src/mem/ruby/common/Global.cc
+++ b/src/mem/ruby/common/Global.cc
@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 RubyEventQueue* g_eventQueue_ptr = NULL;
 RubySystem* g_system_ptr = NULL;
diff --git a/src/mem/ruby/common/Global.hh b/src/mem/ruby/common/Global.hh
index e4014df9b..6b524bb70 100644
--- a/src/mem/ruby/common/Global.hh
+++ b/src/mem/ruby/common/Global.hh
@@ -78,8 +78,8 @@ typedef uint64 pa_t;
 typedef integer_t simtime_t;
 
 // external includes for all classes
-#include "std-includes.hh"
-#include "Debug.hh"
+#include "mem/gems_common/std-includes.hh"
+#include "mem/ruby/common/Debug.hh"
 
 // simple type declarations
 typedef Time LogicalTime;
diff --git a/src/mem/ruby/common/Histogram.cc b/src/mem/ruby/common/Histogram.cc
index 9c5e8e623..7f9a7027e 100644
--- a/src/mem/ruby/common/Histogram.cc
+++ b/src/mem/ruby/common/Histogram.cc
@@ -32,7 +32,7 @@
  *
  */
 
-#include "Histogram.hh"
+#include "mem/ruby/common/Histogram.hh"
 
 Histogram::Histogram(int binsize, int bins)
 {
diff --git a/src/mem/ruby/common/Histogram.hh b/src/mem/ruby/common/Histogram.hh
index e48efc35f..59afde867 100644
--- a/src/mem/ruby/common/Histogram.hh
+++ b/src/mem/ruby/common/Histogram.hh
@@ -37,8 +37,8 @@
 #ifndef HISTOGRAM_H
 #define HISTOGRAM_H
 
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
 
 class Histogram {
 public:
diff --git a/src/mem/ruby/common/Message.cc b/src/mem/ruby/common/Message.cc
index baad8ac9b..bf3307687 100644
--- a/src/mem/ruby/common/Message.cc
+++ b/src/mem/ruby/common/Message.cc
@@ -31,4 +31,4 @@
  * $Id$
  */
 
-#include "Message.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
diff --git a/src/mem/ruby/common/NetDest.cc b/src/mem/ruby/common/NetDest.cc
index 79a6078e9..951307395 100644
--- a/src/mem/ruby/common/NetDest.cc
+++ b/src/mem/ruby/common/NetDest.cc
@@ -36,9 +36,9 @@
  *
  */
 
-#include "NetDest.hh"
-#include "RubyConfig.hh"
-#include "Protocol.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/Protocol.hh"
 
 NetDest::NetDest()
 {
diff --git a/src/mem/ruby/common/NetDest.hh b/src/mem/ruby/common/NetDest.hh
index 04f7871f6..17ede03e9 100644
--- a/src/mem/ruby/common/NetDest.hh
+++ b/src/mem/ruby/common/NetDest.hh
@@ -44,13 +44,13 @@
 #ifndef NETDEST_H
 #define NETDEST_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "RubyConfig.hh"
-#include "Set.hh"
-#include "MachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/protocol/MachineType.hh"
 
 class Set;
 
diff --git a/src/mem/ruby/common/OptBigSet.cc b/src/mem/ruby/common/OptBigSet.cc
index 51214e936..b4c4e4789 100644
--- a/src/mem/ruby/common/OptBigSet.cc
+++ b/src/mem/ruby/common/OptBigSet.cc
@@ -39,8 +39,8 @@
 // modified (rewritten) 05/20/05 by Dan Gibson to accomimdate FASTER >32 bit
 // set sizes
 
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 #if __amd64__ || __LP64__
 #define __64BITS__
diff --git a/src/mem/ruby/common/OptBigSet.hh b/src/mem/ruby/common/OptBigSet.hh
index a57a07e13..45f06e6aa 100644
--- a/src/mem/ruby/common/OptBigSet.hh
+++ b/src/mem/ruby/common/OptBigSet.hh
@@ -45,10 +45,10 @@
 #ifndef SET_H
 #define SET_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 // gibson 05/20/05
 // enum PresenceBit {NotPresent, Present};
diff --git a/src/mem/ruby/common/Set.cc b/src/mem/ruby/common/Set.cc
index 1f5b49f90..ce4b4af04 100644
--- a/src/mem/ruby/common/Set.cc
+++ b/src/mem/ruby/common/Set.cc
@@ -36,8 +36,8 @@
  *
  */
 
-#include "Set.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 #ifdef OPTBIGSET
 #include "OptBigSet.cc"
diff --git a/src/mem/ruby/common/Set.hh b/src/mem/ruby/common/Set.hh
index 7c33c840d..ea16c66a5 100644
--- a/src/mem/ruby/common/Set.hh
+++ b/src/mem/ruby/common/Set.hh
@@ -44,20 +44,20 @@
 #define OPTBIGSET
 
 #ifdef OPTBIGSET
-#include "OptBigSet.hh"
+#include "mem/ruby/common/OptBigSet.hh"
 #else
 
 #ifdef BIGSET
-#include "BigSet.hh" // code to supports sets larger than 32
+#include "mem/ruby/common/BigSet.hh" // code to supports sets larger than 32
 #else
 
 #ifndef SET_H
 #define SET_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 class Set {
 public:
diff --git a/src/mem/ruby/common/SubBlock.cc b/src/mem/ruby/common/SubBlock.cc
index f79e33d9c..568d3106a 100644
--- a/src/mem/ruby/common/SubBlock.cc
+++ b/src/mem/ruby/common/SubBlock.cc
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
 
 SubBlock::SubBlock(const Address& addr, int size)
 {
diff --git a/src/mem/ruby/common/SubBlock.hh b/src/mem/ruby/common/SubBlock.hh
index 43f91e191..5831be35a 100644
--- a/src/mem/ruby/common/SubBlock.hh
+++ b/src/mem/ruby/common/SubBlock.hh
@@ -35,11 +35,11 @@
 #ifndef SubBlock_H
 #define SubBlock_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "RubyConfig.hh"
-#include "DataBlock.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/gems_common/Vector.hh"
 
 class SubBlock {
 public: