ruby: Make ruby #includes use full paths to the files they're including.
authorNathan Binkert <nate@binkert.org>
Mon, 11 May 2009 17:38:45 +0000 (10:38 -0700)
committerNathan Binkert <nate@binkert.org>
Mon, 11 May 2009 17:38:45 +0000 (10:38 -0700)
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.

344 files changed:
src/mem/gems_common/Allocator.hh
src/mem/gems_common/Map.hh
src/mem/gems_common/PrioHeap.hh
src/mem/gems_common/RefCnt_tester.cc
src/mem/gems_common/RefCountable.hh
src/mem/gems_common/Vector.hh
src/mem/gems_common/ioutil/attrlex.ll
src/mem/gems_common/ioutil/attrparse.yy
src/mem/gems_common/ioutil/confio.cc
src/mem/gems_common/ioutil/confio.hh
src/mem/gems_common/ioutil/initvar.cc
src/mem/gems_common/ioutil/vardecl.hh
src/mem/gems_common/util.cc
src/mem/gems_common/util.hh
src/mem/ruby/buffers/MessageBuffer.cc
src/mem/ruby/buffers/MessageBuffer.hh
src/mem/ruby/buffers/MessageBufferNode.cc
src/mem/ruby/buffers/MessageBufferNode.hh
src/mem/ruby/common/Address.cc
src/mem/ruby/common/Address.hh
src/mem/ruby/common/BigSet.cc
src/mem/ruby/common/BigSet.hh
src/mem/ruby/common/Consumer.hh
src/mem/ruby/common/DataBlock.cc
src/mem/ruby/common/DataBlock.hh
src/mem/ruby/common/Debug.cc
src/mem/ruby/common/Driver.cc
src/mem/ruby/common/Driver.hh
src/mem/ruby/common/Global.cc
src/mem/ruby/common/Global.hh
src/mem/ruby/common/Histogram.cc
src/mem/ruby/common/Histogram.hh
src/mem/ruby/common/Message.cc
src/mem/ruby/common/NetDest.cc
src/mem/ruby/common/NetDest.hh
src/mem/ruby/common/OptBigSet.cc
src/mem/ruby/common/OptBigSet.hh
src/mem/ruby/common/Set.cc
src/mem/ruby/common/Set.hh
src/mem/ruby/common/SubBlock.cc
src/mem/ruby/common/SubBlock.hh
src/mem/ruby/config/RubyConfig.cc
src/mem/ruby/config/RubyConfig.hh
src/mem/ruby/eventqueue/RubyEventQueue.cc
src/mem/ruby/eventqueue/RubyEventQueue.hh
src/mem/ruby/eventqueue/RubyEventQueueNode.cc
src/mem/ruby/eventqueue/RubyEventQueueNode.hh
src/mem/ruby/init.cc
src/mem/ruby/network/Network.hh
src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh
src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh
src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh
src/mem/ruby/network/garnet-flexible-pipeline/Router.cc
src/mem/ruby/network/garnet-flexible-pipeline/Router.hh
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh
src/mem/ruby/network/garnet-flexible-pipeline/flit.cc
src/mem/ruby/network/garnet-flexible-pipeline/flit.hh
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh
src/mem/ruby/network/orion/NetworkPower.cc
src/mem/ruby/network/orion/SIM_power.hh
src/mem/ruby/network/orion/power_arbiter.cc
src/mem/ruby/network/orion/power_arbiter.hh
src/mem/ruby/network/orion/power_array.cc
src/mem/ruby/network/orion/power_bus.cc
src/mem/ruby/network/orion/power_crossbar.cc
src/mem/ruby/network/orion/power_ll.cc
src/mem/ruby/network/orion/power_router_init.cc
src/mem/ruby/network/orion/power_router_init.hh
src/mem/ruby/network/orion/power_static.cc
src/mem/ruby/network/orion/power_static.hh
src/mem/ruby/network/orion/power_utils.cc
src/mem/ruby/network/simple/PerfectSwitch.cc
src/mem/ruby/network/simple/PerfectSwitch.hh
src/mem/ruby/network/simple/SimpleNetwork.cc
src/mem/ruby/network/simple/SimpleNetwork.hh
src/mem/ruby/network/simple/Switch.cc
src/mem/ruby/network/simple/Switch.hh
src/mem/ruby/network/simple/Throttle.cc
src/mem/ruby/network/simple/Throttle.hh
src/mem/ruby/network/simple/Topology.cc
src/mem/ruby/network/simple/Topology.hh
src/mem/ruby/profiler/AccessTraceForAddress.cc
src/mem/ruby/profiler/AccessTraceForAddress.hh
src/mem/ruby/profiler/AddressProfiler.cc
src/mem/ruby/profiler/AddressProfiler.hh
src/mem/ruby/profiler/CacheProfiler.cc
src/mem/ruby/profiler/CacheProfiler.hh
src/mem/ruby/profiler/Profiler.cc
src/mem/ruby/profiler/Profiler.hh
src/mem/ruby/profiler/StoreTrace.cc
src/mem/ruby/profiler/StoreTrace.hh
src/mem/ruby/profiler/XactProfiler.cc
src/mem/ruby/profiler/XactProfiler.hh
src/mem/ruby/recorder/CacheRecorder.cc
src/mem/ruby/recorder/CacheRecorder.hh
src/mem/ruby/recorder/TraceRecord.cc
src/mem/ruby/recorder/TraceRecord.hh
src/mem/ruby/recorder/Tracer.cc
src/mem/ruby/recorder/Tracer.hh
src/mem/ruby/slicc_interface/AbstractCacheEntry.cc
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh
src/mem/ruby/slicc_interface/AbstractChip.cc
src/mem/ruby/slicc_interface/AbstractChip.hh
src/mem/ruby/slicc_interface/Message.hh
src/mem/ruby/slicc_interface/NetworkMessage.hh
src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh
src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc
src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh
src/mem/ruby/slicc_interface/RubySlicc_Util.hh
src/mem/ruby/slicc_interface/RubySlicc_includes.hh
src/mem/ruby/system/AbstractBloomFilter.hh
src/mem/ruby/system/AbstractMemOrCache.hh
src/mem/ruby/system/AbstractReplacementPolicy.hh
src/mem/ruby/system/BlockBloomFilter.cc
src/mem/ruby/system/BlockBloomFilter.hh
src/mem/ruby/system/BulkBloomFilter.cc
src/mem/ruby/system/BulkBloomFilter.hh
src/mem/ruby/system/CacheMemory.hh
src/mem/ruby/system/DirectoryMemory.cc
src/mem/ruby/system/DirectoryMemory.hh
src/mem/ruby/system/GenericBloomFilter.cc
src/mem/ruby/system/GenericBloomFilter.hh
src/mem/ruby/system/H3BloomFilter.cc
src/mem/ruby/system/H3BloomFilter.hh
src/mem/ruby/system/LRUPolicy.hh
src/mem/ruby/system/LSB_CountingBloomFilter.cc
src/mem/ruby/system/LSB_CountingBloomFilter.hh
src/mem/ruby/system/MachineID.hh
src/mem/ruby/system/MemoryControl.cc
src/mem/ruby/system/MemoryControl.hh
src/mem/ruby/system/MemoryNode.cc
src/mem/ruby/system/MemoryNode.hh
src/mem/ruby/system/MultiBitSelBloomFilter.cc
src/mem/ruby/system/MultiBitSelBloomFilter.hh
src/mem/ruby/system/MultiGrainBloomFilter.cc
src/mem/ruby/system/MultiGrainBloomFilter.hh
src/mem/ruby/system/NodeID.hh
src/mem/ruby/system/NodePersistentTable.cc
src/mem/ruby/system/NodePersistentTable.hh
src/mem/ruby/system/NonCountingBloomFilter.cc
src/mem/ruby/system/NonCountingBloomFilter.hh
src/mem/ruby/system/PerfectCacheMemory.hh
src/mem/ruby/system/PersistentArbiter.cc
src/mem/ruby/system/PersistentArbiter.hh
src/mem/ruby/system/PersistentTable.cc
src/mem/ruby/system/PersistentTable.hh
src/mem/ruby/system/PseudoLRUPolicy.hh
src/mem/ruby/system/Sequencer.cc
src/mem/ruby/system/Sequencer.hh
src/mem/ruby/system/StoreBuffer.cc
src/mem/ruby/system/StoreBuffer.hh
src/mem/ruby/system/StoreCache.cc
src/mem/ruby/system/StoreCache.hh
src/mem/ruby/system/System.cc
src/mem/ruby/system/System.hh
src/mem/ruby/system/TBETable.hh
src/mem/ruby/system/TimerTable.cc
src/mem/ruby/system/TimerTable.hh
src/mem/ruby/tester/BarrierGenerator.cc
src/mem/ruby/tester/BarrierGenerator.hh
src/mem/ruby/tester/Check.cc
src/mem/ruby/tester/Check.hh
src/mem/ruby/tester/CheckTable.cc
src/mem/ruby/tester/CheckTable.hh
src/mem/ruby/tester/DetermGETXGenerator.cc
src/mem/ruby/tester/DetermGETXGenerator.hh
src/mem/ruby/tester/DetermInvGenerator.cc
src/mem/ruby/tester/DetermInvGenerator.hh
src/mem/ruby/tester/DetermSeriesGETSGenerator.cc
src/mem/ruby/tester/DetermSeriesGETSGenerator.hh
src/mem/ruby/tester/DeterministicDriver.cc
src/mem/ruby/tester/DeterministicDriver.hh
src/mem/ruby/tester/Instruction.cc
src/mem/ruby/tester/Instruction.hh
src/mem/ruby/tester/RaceyDriver.cc
src/mem/ruby/tester/RaceyDriver.hh
src/mem/ruby/tester/RequestGenerator.cc
src/mem/ruby/tester/RequestGenerator.hh
src/mem/ruby/tester/SpecifiedGenerator.cc
src/mem/ruby/tester/SpecifiedGenerator.hh
src/mem/ruby/tester/SyntheticDriver.cc
src/mem/ruby/tester/SyntheticDriver.hh
src/mem/ruby/tester/Tester.cc
src/mem/ruby/tester/Tester.hh
src/mem/ruby/tester/XactAbortRequestGenerator.cc
src/mem/ruby/tester/XactAbortRequestGenerator.hh
src/mem/ruby/tester/XactRequestGenerator.cc
src/mem/ruby/tester/XactRequestGenerator.hh
src/mem/ruby/tester/main.cc
src/mem/ruby/tester/main.hh
src/mem/ruby/tester/test_framework.cc
src/mem/ruby/tester/test_framework.hh
src/mem/slicc/ast/AST.cc
src/mem/slicc/ast/AST.hh
src/mem/slicc/ast/ASTs.hh
src/mem/slicc/ast/ActionDeclAST.cc
src/mem/slicc/ast/ActionDeclAST.hh
src/mem/slicc/ast/AssignStatementAST.cc
src/mem/slicc/ast/AssignStatementAST.hh
src/mem/slicc/ast/CheckAllocateStatementAST.cc
src/mem/slicc/ast/CheckAllocateStatementAST.hh
src/mem/slicc/ast/CheckStopSlotsStatementAST.cc
src/mem/slicc/ast/CheckStopSlotsStatementAST.hh
src/mem/slicc/ast/ChipComponentAccessAST.cc
src/mem/slicc/ast/ChipComponentAccessAST.hh
src/mem/slicc/ast/CopyHeadStatementAST.cc
src/mem/slicc/ast/CopyHeadStatementAST.hh
src/mem/slicc/ast/DeclAST.cc
src/mem/slicc/ast/DeclAST.hh
src/mem/slicc/ast/DeclListAST.cc
src/mem/slicc/ast/DeclListAST.hh
src/mem/slicc/ast/EnqueueStatementAST.cc
src/mem/slicc/ast/EnqueueStatementAST.hh
src/mem/slicc/ast/EnumDeclAST.cc
src/mem/slicc/ast/EnumDeclAST.hh
src/mem/slicc/ast/EnumExprAST.cc
src/mem/slicc/ast/EnumExprAST.hh
src/mem/slicc/ast/ExprAST.cc
src/mem/slicc/ast/ExprAST.hh
src/mem/slicc/ast/ExprStatementAST.cc
src/mem/slicc/ast/ExprStatementAST.hh
src/mem/slicc/ast/FormalParamAST.cc
src/mem/slicc/ast/FormalParamAST.hh
src/mem/slicc/ast/FuncCallExprAST.cc
src/mem/slicc/ast/FuncCallExprAST.hh
src/mem/slicc/ast/FuncDeclAST.cc
src/mem/slicc/ast/FuncDeclAST.hh
src/mem/slicc/ast/IfStatementAST.cc
src/mem/slicc/ast/IfStatementAST.hh
src/mem/slicc/ast/InPortDeclAST.cc
src/mem/slicc/ast/InPortDeclAST.hh
src/mem/slicc/ast/InfixOperatorExprAST.cc
src/mem/slicc/ast/InfixOperatorExprAST.hh
src/mem/slicc/ast/LiteralExprAST.cc
src/mem/slicc/ast/LiteralExprAST.hh
src/mem/slicc/ast/Location.cc
src/mem/slicc/ast/Location.hh
src/mem/slicc/ast/MachineAST.cc
src/mem/slicc/ast/MachineAST.hh
src/mem/slicc/ast/MemberExprAST.cc
src/mem/slicc/ast/MemberExprAST.hh
src/mem/slicc/ast/MethodCallExprAST.cc
src/mem/slicc/ast/MethodCallExprAST.hh
src/mem/slicc/ast/ObjDeclAST.cc
src/mem/slicc/ast/ObjDeclAST.hh
src/mem/slicc/ast/OutPortDeclAST.cc
src/mem/slicc/ast/OutPortDeclAST.hh
src/mem/slicc/ast/PairAST.cc
src/mem/slicc/ast/PairAST.hh
src/mem/slicc/ast/PairListAST.cc
src/mem/slicc/ast/PairListAST.hh
src/mem/slicc/ast/PeekStatementAST.cc
src/mem/slicc/ast/PeekStatementAST.hh
src/mem/slicc/ast/ReturnStatementAST.cc
src/mem/slicc/ast/ReturnStatementAST.hh
src/mem/slicc/ast/StatementAST.cc
src/mem/slicc/ast/StatementAST.hh
src/mem/slicc/ast/StatementListAST.cc
src/mem/slicc/ast/StatementListAST.hh
src/mem/slicc/ast/TransitionDeclAST.cc
src/mem/slicc/ast/TransitionDeclAST.hh
src/mem/slicc/ast/TypeAST.cc
src/mem/slicc/ast/TypeAST.hh
src/mem/slicc/ast/TypeDeclAST.cc
src/mem/slicc/ast/TypeDeclAST.hh
src/mem/slicc/ast/TypeFieldAST.cc
src/mem/slicc/ast/TypeFieldAST.hh
src/mem/slicc/ast/TypeFieldEnumAST.cc
src/mem/slicc/ast/TypeFieldEnumAST.hh
src/mem/slicc/ast/TypeFieldMemberAST.cc
src/mem/slicc/ast/TypeFieldMemberAST.hh
src/mem/slicc/ast/TypeFieldMethodAST.cc
src/mem/slicc/ast/TypeFieldMethodAST.hh
src/mem/slicc/ast/VarExprAST.cc
src/mem/slicc/ast/VarExprAST.hh
src/mem/slicc/generator/fileio.cc
src/mem/slicc/generator/fileio.hh
src/mem/slicc/generator/html_gen.cc
src/mem/slicc/generator/html_gen.hh
src/mem/slicc/generator/mif_gen.cc
src/mem/slicc/generator/mif_gen.hh
src/mem/slicc/main.cc
src/mem/slicc/main.hh
src/mem/slicc/parser/lexer.ll
src/mem/slicc/parser/parser.yy
src/mem/slicc/slicc_global.hh
src/mem/slicc/symbols/Action.hh
src/mem/slicc/symbols/Event.hh
src/mem/slicc/symbols/Func.cc
src/mem/slicc/symbols/Func.hh
src/mem/slicc/symbols/State.hh
src/mem/slicc/symbols/StateMachine.cc
src/mem/slicc/symbols/StateMachine.hh
src/mem/slicc/symbols/Symbol.cc
src/mem/slicc/symbols/Symbol.hh
src/mem/slicc/symbols/SymbolTable.cc
src/mem/slicc/symbols/SymbolTable.hh
src/mem/slicc/symbols/Transition.cc
src/mem/slicc/symbols/Transition.hh
src/mem/slicc/symbols/Type.cc
src/mem/slicc/symbols/Type.hh
src/mem/slicc/symbols/Var.cc
src/mem/slicc/symbols/Var.hh

index 10969660106278f3a63f3cb44c406b9d3505e587..76333fd5f11ea815b593c55c7f2576da8f68415b 100644 (file)
@@ -23,7 +23,7 @@
 #ifndef ALLOCATOR_H
 #define ALLOCATOR_H
 
-#include "Vector.hh"
+#include "mem/gems_common/Vector.hh"
 
 template <class TYPE>
 class Allocator {
index 1ecd13d6454cdcc947ef554b184905657e96b82d..6b145a90a9fc29c5e4091d5ef54dd8a95b735eee 100644 (file)
@@ -34,7 +34,7 @@
 #ifndef MAP_H
 #define MAP_H
 
-#include "Vector.hh"
+#include "mem/gems_common/Vector.hh"
 
 namespace __gnu_cxx {
   template <> struct hash <std::string>
index d549f094424ae62e283ed4589a6b3f1fefb00bec..acdcc0eba6f7c08c66a6c0ac9f96b19f23b58df9 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef PRIOHEAP_H
 #define PRIOHEAP_H
 
-#include "Vector.hh"
+#include "mem/gems_common/Vector.hh"
 
 typedef unsigned int HeapIndex;
 
index 574f8fe3c37c0c63b4c9cb8062bb1e5bfbf22e60..58828604a3cfb3d9fcbd8adbdaf030c5b2fbe46b 100644 (file)
@@ -30,8 +30,8 @@
  * Code used to test the RefCnt class
  */
 
-#include "RefCnt.hh"
-#include "RefCountable.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
 
 class Foo : public RefCountable {
 public:
index 88aba07e66bad0eec674c62604a1feb75b6c10e5..32fb924cf4207df5bc848cbd9cbec5ffd7b1212d 100644 (file)
@@ -33,7 +33,7 @@
 #ifndef REFCOUNTABLE_H
 #define REFCOUNTABLE_H
 
-#include "RefCnt.hh"
+#include "mem/gems_common/RefCnt.hh"
 
 class RefCountable {
 public:
index 744dc698cdf0b0e05370b9480fd810bd487b72fb..7e648e7c9aeafe77ecaf79ec0456de1160944322 100644 (file)
@@ -38,7 +38,7 @@
 #ifndef VECTOR_H
 #define VECTOR_H
 
-#include "std-includes.hh"
+#include "mem/gems_common/std-includes.hh"
 
 template <class TYPE>
 class Vector
index 068591b079fab20e597dd222f83ed1e189c7937d..3d142eef1dd1847cc3b4c60c101d50da90c0d52b 100644 (file)
@@ -68,7 +68,7 @@ WHITESPACE      [ \t]
 
 %{
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 using namespace std;
 #include <string>
@@ -80,12 +80,12 @@ using namespace std;
 // #include "simics/api.h"
 // };
 
-#include "FakeSimicsDataTypes.hh"
+#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
 
 // CM: simics 1.6.5 API redefines fwrite, much to my chagrin
 #undef   fwrite
 #undef   printf
-#include "attrparse.h"
+#include "mem/gems_common/ioutil/attrparse.hh"
 
 #define MAX_INCLUDE_DEPTH 10
 
index 987e0cb3bc3f8cc00e773fb333e0f7802dfe5f6e..b6d0a9b72e890844509a2fffc1b58928d6e86a7a 100644 (file)
@@ -65,7 +65,7 @@
 /* Includes                                                               */
 /*------------------------------------------------------------------------*/
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 using namespace std;
 #include <string>
@@ -77,9 +77,9 @@ using namespace std;
 // #include "simics/api.h"
 // };
 
-#include "FakeSimicsDataTypes.hh"
+#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
 
-#include "confio.hh"
+#include "mem/gems_common/ioutil/confio.hh"
 
 // CM FIX: if I wasn't working on a paper: I'd re-write the grammer to
 //         be left (or right) recursive, which ever is more efficient
index 54a96527eb4c13734493753482cbef75704a306e..db2bf0a35bb408e31a9c57350a326176d038d8e8 100644 (file)
@@ -34,7 +34,7 @@
 /* Includes                                                               */
 /*------------------------------------------------------------------------*/
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 #define SIM_HALT   ASSERT(0)
 
 using namespace std;
@@ -59,7 +59,7 @@ using namespace std;
 // #endif
 // };
 
-#include "confio.hh"
+#include "mem/gems_common/ioutil/confio.hh"
 
 /*------------------------------------------------------------------------*/
 /* Macro declarations                                                     */
index 143c4da8b7ad69b3913fbaa530d8720511bb8e8f..1e9718c1662a4d48912639da442072f137ba9ccb 100644 (file)
@@ -33,7 +33,7 @@
 /* Includes                                                               */
 /*------------------------------------------------------------------------*/
 
-#include "FakeSimicsDataTypes.hh"
+#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
 
 /*------------------------------------------------------------------------*/
 /* Macro declarations                                                     */
index b6b7ff9e007a04c20502fa4588c1151a9403f6e2..62fe3b6afe5b56185d5356cc88cbd7745361f657 100644 (file)
@@ -70,10 +70,10 @@ using namespace std;
 // #endif
 // };
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
-#include "confio.hh"
-#include "initvar.hh"
+#include "mem/gems_common/ioutil/confio.hh"
+#include "mem/gems_common/ioutil/initvar.hh"
 
 /*------------------------------------------------------------------------*/
 /* Variable declarations                                                  */
@@ -94,7 +94,7 @@ using namespace std;
    char  *NAME;
 #define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) \
    PTYPE  NAME[ARRAY_SIZE];
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
@@ -151,7 +151,7 @@ initvar_t::~initvar_t( )
       NAME = NULL;           \
    }
 #define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE )
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
@@ -204,7 +204,7 @@ void initvar_t::init_config_reader( const char *initString )
                                      initvar_get_attr, (void *) name,   \
                                      initvar_set_attr, (void *) name );
 
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
@@ -380,7 +380,7 @@ static attr_value_t initvar_get_attr( void *ptr, void *obj )
     return (ret);                                         \
   }
 
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
@@ -464,7 +464,7 @@ static set_error_t initvar_set_attr( void *ptr, void *obj,
     return Sim_Set_Ok;                                        \
   }
 
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
@@ -564,7 +564,7 @@ void initvar_t::list_param( FILE *fp )
   }                                                     \
   fprintf( fp, ")\n" );
 
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
index 150868e18989d8b93748fa89d0090ad57c894e6c..607bc54f6f5c88c804c893fbaba5dfb1c41c5f34 100644 (file)
@@ -59,7 +59,7 @@
    extern char  *NAME;
 #define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) \
    extern PTYPE  NAME[ARRAY_SIZE];
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
 #undef PARAM
 #undef PARAM_UINT
 #undef PARAM_ULONG
index c5b8f22b55f86040413f3d9c138b63ab39c5beb2..f1535bdcfeb5e4b94ad6bbb0e13e5d9941072595 100644 (file)
@@ -31,7 +31,7 @@
  */
 
 #include "assert.h"
-#include "util.hh"
+#include "mem/gems_common/util.hh"
 
 // Split a string into a head and tail strings on the specified
 // character.  Return the head and the string passed in is modified by
index d9e9fec3e9583fd2a8d266384df898d902da7a64..7b32f24e8c0b8a49ad8d5f119319197caa73440e 100644 (file)
@@ -33,7 +33,7 @@
 #ifndef UTIL_H
 #define UTIL_H
 
-#include "std-includes.hh"
+#include "mem/gems_common/std-includes.hh"
 
 string string_split(string& str, char split_character);
 string bool_to_string(bool value);
index ff2547f0fe9a67a9ca275c3449224f24dbf8f480..eeba0def2e2ef842ac91f58ba1c6f4de1f6f41d0 100644 (file)
@@ -31,8 +31,8 @@
  * $Id$
  */
 
-#include "MessageBuffer.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 MessageBuffer::MessageBuffer()
 {
index ea9933f8c70385ce97e14de66f07231657cb0dd6..b58203a934d0c90437caac92dc8ebbbf50babcbe 100644 (file)
 #ifndef MESSAGEBUFFER_H
 #define MESSAGEBUFFER_H
 
-#include "Global.hh"
-#include "MessageBufferNode.hh"
-#include "Consumer.hh"
-#include "RubyEventQueue.hh"
-#include "Message.hh"
-#include "PrioHeap.hh"
-#include "util.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/buffers/MessageBufferNode.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/gems_common/util.hh"
 
 class Chip;
 
index 31117dd0ee071a79f7a2f771dba6849c8032b8e7..22b077363b98efc36f6c9a4a1f62f7c5d68d0885 100644 (file)
@@ -27,7 +27,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "MessageBufferNode.hh"
+#include "mem/ruby/buffers/MessageBufferNode.hh"
 
 void MessageBufferNode::print(ostream& out) const
 {
index c562c45eb42f87d5da5d87a7e519da1c5e42c1b7..cb64974d5250bc51f2a81557fcce004473864621 100644 (file)
@@ -30,8 +30,8 @@
 #ifndef MESSAGEBUFFERNODE_H
 #define MESSAGEBUFFERNODE_H
 
-#include "Global.hh"
-#include "Message.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class MessageBufferNode {
 public:
index 5d38faae0dc1488690fc4d92689b56972a551c34..b4ad39294cd0f08c0c813af18338ec4cc43c98ab 100644 (file)
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "Address.hh"
+#include "mem/ruby/common/Address.hh"
 
 void Address::output(ostream& out) const
 {
index 3c3c5ad301114adf46c14080d709b724c7d145e3..da218f1776bac396d28239979255df219c4ff4a7 100644 (file)
 #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
 
index e16284f15d0aed3202f34c686609f15244606138..f55d7b79c4a8ab8179f76516448dc593e18b4ea2 100644 (file)
@@ -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()
 {
index 4eae01681f504fcf138bd37a67748efb4edce1b3..06ee6a66dbcadda801024dd826d006738d3f348f 100644 (file)
 #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};
 
index e8dada9cae8f885a2acb410f802694f65069e6e9..34cd7864c2b15d38773292ae20e904bb3e8eb76f 100644 (file)
@@ -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;
 
index c4d6d7a332b24b26c8b53ebc3b2f3b3a9db31e28..ce72bc7f46a9f2fd9055ed3e83f7f19c50f3d0eb 100644 (file)
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "DataBlock.hh"
+#include "mem/ruby/common/DataBlock.hh"
 
 DataBlock::DataBlock()
 {
index aae364078c8b02ccb412f77f846703441f2d61df..8711cb7404ff4f06677caa4db333bc725a8ad746 100644 (file)
@@ -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:
index 4c2263b0c9ddc6f1978b04bb48ff9ffe6e31ff6e..02f4069ee882a9098ba7c8eb3fa2572bc8b94e58 100644 (file)
@@ -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;
index 019ac6403b4b6d20db4bef7732e9fe935c3fd9bf..2d6034b02bd3dec9d44da0237a741bbb0714f935 100644 (file)
@@ -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()
 {
index 1d5b883ac775c8b63e9e9f0a5e1ecbd2f6a1b7bd..c527e7d2b5dfd445d07f313b8a7e1792945a309d 100644 (file)
 #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
 
index 73a26269af07e68c6e08a779ffd6491399b349e4..7c7cab1e882dbbb95a77d412010a2282792eb654 100644 (file)
@@ -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;
index e4014df9b5954a2890b8990de970fab17fa9df0c..6b524bb700cbb26ab10d07c471ed5f24c90eea45 100644 (file)
@@ -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;
index 9c5e8e623b6100c080b28658ad4637a37f0c1fe7..7f9a7027e5d852faa0f821fd6689d17e42003c8e 100644 (file)
@@ -32,7 +32,7 @@
  *
  */
 
-#include "Histogram.hh"
+#include "mem/ruby/common/Histogram.hh"
 
 Histogram::Histogram(int binsize, int bins)
 {
index e48efc35f8c497170eac7fcfb209d38945a1f562..59afde8677ca2fe6a8f18a60988f1bbe3bfd7c31 100644 (file)
@@ -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:
index baad8ac9b18bda8e3aa16ab3661f58ebea15d248..bf3307687cdd7de7d42aca7eb5065b6e67c17475 100644 (file)
@@ -31,4 +31,4 @@
  * $Id$
  */
 
-#include "Message.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
index 79a6078e94169eca2836880d899a3128b24b5f57..951307395c6f6f701ecb584a7d1e1a4b5da28a32 100644 (file)
@@ -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()
 {
index 04f7871f63add79c9cef0a1230518f609529422d..17ede03e942ce0aa92de867a3fe8572447330fb2 100644 (file)
 #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;
 
index 51214e93688a1fa3616cdd364ba315898de0b37f..b4c4e47897c24e4d84000d34427442f136239c9d 100644 (file)
@@ -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__
index a57a07e13b8baf9502ff5415805209b1de863650..45f06e6aa97a0e8a80687e58de7716c8af41df26 100644 (file)
 #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};
index 1f5b49f9046a9bb694fcf4f21a38ed3e8007f6ae..ce4b4af0404616fc80e32cfe4bc028240cc1f601 100644 (file)
@@ -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"
index 7c33c840db40c699570e5f7e9bae1bf8c0151f3d..ea16c66a50e91989925ef9b3d29cc464f017dcb5 100644 (file)
 #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:
index f79e33d9cb9949d67f3dba96c30285af53749c96..568d3106a1407fd679b989c7bba2ecb47f1d81e1 100644 (file)
@@ -31,7 +31,7 @@
  * $Id$
  */
 
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
 
 SubBlock::SubBlock(const Address& addr, int size)
 {
index 43f91e191dd7015147b332a0e33559061629d89f..5831be35a62d3b177ccf6577f650012f89ddb3b7 100644 (file)
 #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:
index 0e94efb4688b64c5a24b36bc644fd752f74d2822..2d129bc7ac7b911f73e5ea4860dba1f9f85103e7 100644 (file)
  *
  */
 
-#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
index bb12d6426b036883a64f9102490861ed8f683053..c0e8ae59ebbc30e058424094a84873f6bbf908df 100644 (file)
@@ -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()
index b267eb1d33864815879f65ae94bf4513f0e1e3a4..1ac32ccf21d71a7bddb66a302597c95e450fbce1 100644 (file)
  * $Id$
  */
 
-#include "RubyEventQueue.hh"
-#include "RubyConfig.hh"
-#include "Consumer.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "PrioHeap.hh"
-#include "RubyEventQueueNode.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
 
 // Class public method definitions
 
index dc8161cf1cc08e07f5740f685388100c3ee11c2a..7b2006535a9938438383ee094cf3078ad44793c6 100644 (file)
@@ -59,8 +59,8 @@
 #ifndef RUBYEVENTQUEUE_H
 #define RUBYEVENTQUEUE_H
 
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
 
 class Consumer;
 template <class TYPE> class PrioHeap;
index 086465558a527d9c1c8d550b24c09406d6bd4cf4..2783f5edebc1bb5f697c8f177fca42bae8971597 100644 (file)
@@ -32,7 +32,7 @@
  *
  */
 
-#include "RubyEventQueueNode.hh"
+#include "mem/ruby/eventqueue/RubyEventQueueNode.hh"
 
 void RubyEventQueueNode::print(ostream& out) const
 {
index 2ed5a1d9a33f86a0fb9c811b20ed801fd9f1e621..fa66ab9a65fd06408737b0b3d7e2df37951a92e2 100644 (file)
@@ -35,7 +35,7 @@
 #ifndef RUBYEVENTQUEUENODE_H
 #define RUBYEVENTQUEUENODE_H
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 class Consumer;
 
 class RubyEventQueueNode {
index a2e874df8179c4162ec1af76e48cb5a187565867..22a048b5b13b19982415cf0eda8948769ead0498 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "RubyEventQueue.hh"
-#include "System.hh"
-#include "Debug.hh"
-#include "Profiler.hh"
-#include "Tester.hh"
-#include "init.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Debug.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/init.hh"
 
 using namespace std;
 #include <string>
 #include <map>
 #include <stdlib.h>
 
-#include "confio.hh"
-#include "initvar.hh"
+#include "mem/gems_common/ioutil/confio.hh"
+#include "mem/gems_common/ioutil/initvar.hh"
 
 // A generated file containing the default parameters in string form
 // The defaults are stored in the variable global_default_param
-#include "default_param.hh"
+#include "mem/protocol/default_param.hh"
 
 static initvar_t *ruby_initvar_obj = NULL;
 
index 662e54e9323a29ac6da9a3db90fcb024c3f6ec1b..f97ecce29dc11c1a68bed7a2ab3a6e764c93d3e0 100644 (file)
@@ -46,9 +46,9 @@
 #ifndef NETWORK_H
 #define NETWORK_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "MessageSizeType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/MessageSizeType.hh"
 
 class NetDest;
 class MessageBuffer;
index e3a9b7d2d4375f8ae9775a08cfeec0f5d8165284..28da0ac736d092a105f1983860ac2d3bb0f90c93 100644 (file)
@@ -7,7 +7,7 @@
 #ifndef CREDIT_LINK_D_H
 #define CREDIT_LINK_D_H
 
-#include "NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
 
 class CreditLink_d : public NetworkLink_d {
 public:
index 43f9a31bde82085977b44cef75bed688251f60da..28d22c89ded8d47fcf142421045a36903109a300 100644 (file)
  *
  * */
 
-#include "GarnetNetwork_d.hh"
-#include "MachineType.hh"
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "Router_d.hh"
-#include "Topology.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 GarnetNetwork_d::GarnetNetwork_d(int nodes)
 {
index 34486eab8d2e917adb63f294d1b07c848f92db46..f1dd5d2c71832b2999cc4684ccd0cef43f8df4a7 100644 (file)
 #ifndef GARNETNETWORK_D_H
 #define GARNETNETWORK_D_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
 
 class NetworkInterface_d;
 class MessageBuffer;
index bedd801d5048390b0d6d3fffc848987e27e9fb70..0ae32de13089c7cde05664e434b5cc13134e13ac 100644 (file)
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "InputUnit_d.hh"
-#include "Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
 
 InputUnit_d::InputUnit_d(int id, Router_d *router)
 {
index c22363fb1fa3e426cc56de1ef09e2c6a5f5d490b..fafa291357883861b976c916fc18e81a0448987c 100644 (file)
 #ifndef INPUT_UNIT_D_H
 #define INPUT_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
-#include "Consumer.hh"
-#include "Vector.hh"
-#include "VirtualChannel_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
index 6a212ce99a7641d2867710f17d5897c6400083d3..4cc73a3d47a1bf6e3e1b6b814c05bc15cb807460 100644 (file)
@@ -36,8 +36,8 @@
 #ifndef NETWORK_HEADER_H
 #define NETWORK_HEADER_H
 
-#include "Global.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 using namespace std;
 using namespace __gnu_cxx;
index edf2d4b957357bf3b8780b6721d37d45bf62a01b..e36504356f1dbb5c80ebe3da1623e39ce48e37b6 100644 (file)
  *
  * */
 
-#include "NetworkInterface_d.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer_d.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 NetworkInterface_d::NetworkInterface_d(int id, int virtual_networks, GarnetNetwork_d *network_ptr)
 {
index c776d343c5af26c80e4310978a2648af802b2b11..00aaff8d3c143ea6c0ab86653ebc3fb0b81348c5 100644 (file)
 #ifndef NET_INTERFACE_D_H
 #define NET_INTERFACE_D_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork_d.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "Message.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "OutVcState_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
 
 class NetworkMessage;
 class MessageBuffer;
index 26794ebf29246a91da05946a03f4bafdc91fdc39..931f0f3a708711f348445b615590ad5d5955bd82 100644 (file)
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "NetworkLink_d.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 NetworkLink_d::NetworkLink_d(int id)
 {
index 40695331e59a9a8fb76a34b33bf9463c692e8632..28b613faa98408535b1a0bbddc9abd8fb6262f3f 100644 (file)
 #ifndef NETWORK_LINK_D_H
 #define NETWORK_LINK_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "PrioHeap.hh"
-#include "power_bus.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
 
 class GarnetNetwork_d;
 
index c85abfd3a193d703055ffbfaabe8325210f6a6c3..4fd040099dbfeba462eeb3eaf637343ef633b8d8 100644 (file)
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "OutVcState_d.hh"
-#include "NetworkConfig.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 OutVcState_d::OutVcState_d(int id)
 {
index 8c07ec796ad5d4e85d2da7426e80d7eacceb92c6..0bb3d8ced01b163fa7fbc156e74fd7aa39340c3d 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef OUT_VC_STATE_D_H
 #define OUT_VC_STATE_D_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class OutVcState_d {
 public:
index 43096c314ab6688b508463aed9f9cbd04ad0c0a5..1b8b8097bd912c24e304b7904e7aa0a5348b2bf6 100644 (file)
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "OutputUnit_d.hh"
-#include "Router_d.hh"
-#include "NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
 
 OutputUnit_d::OutputUnit_d(int id, Router_d *router)
 {
index f23c06559d3fbbda1b1743cb94a0e03c2c77559d..62de62a4fdc3ddbc912fd5c902a0c7e842b29d23 100644 (file)
 #ifndef OUTPUT_UNIT_D_H
 #define OUTPUT_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
-#include "OutVcState_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
 
 class Router_d;
 
index 4f61487c76cc67d54b859c788ff4131d67c70e98..60c9d36a9ca3781c017980d24015f41aa8ef49ee 100644 (file)
  *
  * */
 
-#include "Router_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink_d.hh"
-#include "CreditLink_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "RoutingUnit_d.hh"
-#include "VCallocator_d.hh"
-#include "SWallocator_d.hh"
-#include "Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
 
 Router_d::Router_d(int id, GarnetNetwork_d *network_ptr)
 {
index 215055ea67770c4defc1aac4ceed07e880cab88a..87b3f38e2d5ece19cf831b0acca16aa3f99ec3e9 100644 (file)
 #ifndef ROUTER_D_H
 #define ROUTER_D_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
-#include "power_router_init.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
 
 class GarnetNetwork_d;
 class NetworkLink_d;
index ccced1d0525831dc17173ee632059cc93d3cf9c9..488741055f2b1f3a939a354e767c7a5cbf10ff20 100644 (file)
  *
  * */
 
-#include "RoutingUnit_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 RoutingUnit_d::RoutingUnit_d(Router_d *router)
 {
index f6eb9f9067715b69466e543ca3f14d0a55394a78..093fd7abe99460e1132f4865b6119caeee85e9fc 100644 (file)
 #ifndef ROUTING_UNIT_D_H
 #define ROUTING_UNIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flit_d.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class InputUnit_d;
 class Router_d;
index 7f6507047430964cc69069478f3b6c50affe3e26..02dee31a495ad60dadb6df5312329daebc1d534b 100644 (file)
  *
  * */
 
-#include "SWallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 SWallocator_d::SWallocator_d(Router_d *router)
 {
index ed8389650fd71bbdc9f6c09da17563400b363786..16485c5392e60caad45163716d180e023adc9973 100644 (file)
@@ -36,8 +36,8 @@
 #ifndef SW_ALLOCATOR_D_H
 #define SW_ALLOCATOR_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
index be5469696367f1c5320b781780b9ccb1f999cafa..e1ca648644a3dce5aab33138c962937cbc9d3644 100644 (file)
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "Switch_d.hh"
-#include "Router_d.hh"
-#include "OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
 
 Switch_d::Switch_d(Router_d *router)
 {
index 63f3995f59ba336a4a10cf1ea0d192fbfa640524..0b45172b55aeb887052a66d3575ff6f5c172464e 100644 (file)
@@ -36,9 +36,9 @@
 #ifndef SWITCH_D_H
 #define SWITCH_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 class Router_d;
 class OutputUnit_d;
index b444ebc020b7b8257684cec0c62999532bc44b02..dc6d170e518d227679b6ad44d0c4e5b738559751 100644 (file)
  *
  * */
 
-#include "NetworkConfig.hh"
-#include "VCallocator_d.hh"
-#include "Router_d.hh"
-#include "InputUnit_d.hh"
-#include "OutputUnit_d.hh"
-#include "GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
 
 VCallocator_d::VCallocator_d(Router_d *router)
 {
index fc1bf1340b65ad8fc173759747a2874f39f54fad..8b40d602d17c84339652eb9c262b7a76790fff90 100644 (file)
@@ -36,8 +36,8 @@
 #ifndef VC_ALLOCATOR_D_H
 #define VC_ALLOCATOR_D_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router_d;
 class InputUnit_d;
index 60c6bef2a61c4d209da692ffd30719783ba053ec..2e4473a29ffb4a624214d396f31ece25daecb124 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "VirtualChannel_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh"
 
 VirtualChannel_d::VirtualChannel_d(int id)
 {
index 1118371226097b792a136e1311b04334860d1af3..8c32482ea91ca3f08a5afa5db70bf75b3f35be40 100644 (file)
@@ -36,8 +36,8 @@
 #ifndef VIRTUAL_CHANNEL_D_H
 #define VIRTUAL_CHANNEL_D_H
 
-#include "NetworkHeader.hh"
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 class VirtualChannel_d {
 public:
index e5e7226a2461c3236084576cc19c589468753fdd..f3ddca0f2798f0417f5e5ed142f4d065c4f75772 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flitBuffer_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh"
 
 flitBuffer_d::flitBuffer_d()
 {
index 7e7d07a5aa2b5674ef42e5be98123c7e91ed2eec..5ac69b22ee7630c1c608aa503cfac73d67c02340 100644 (file)
@@ -36,9 +36,9 @@
 #ifndef FLIT_BUFFER_D_H
 #define FLIT_BUFFER_D_H
 
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
 
 class flitBuffer_d {
 public:
index e049c55373a4b79f49aea0b0c9d5802df2b4a836..3defb8029df13801f698eb4f4cfb53eb287649f7 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flit_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/flit_d.hh"
 
 flit_d::flit_d(int id, int  vc, int vnet, int size, MsgPtr msg_ptr)
 {
index 9a47e964f05bd4f1198513cd5a8c108e8d47c615..4d69984d2cab0ed0c02697e775ade558d397069f 100644 (file)
@@ -37,8 +37,8 @@
 #ifndef FLIT_D_H
 #define FLIT_D_H
 
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 class flit_d {
 public:
index 773d0032365681a3b7d3dfe4f318e85d99753fae..e668583568b525c07ee1ac5f61cfc5aa730c796a 100644 (file)
@@ -35,9 +35,9 @@
 #ifndef FLEXIBLE_CONSUMER_H
 #define FLEXIBLE_CONSUMER_H
 
-#include "Consumer.hh"
-#include "NetworkHeader.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class FlexibleConsumer : public Consumer {
 public:
index 3d7c555b583f5cfefd2ee04f0ccea348ce640cb7..a2482c3309e7393150abb10279c32d2a5d221eba 100644 (file)
  *
  * */
 
-#include "GarnetNetwork.hh"
-#include "MachineType.hh"
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "Router.hh"
-#include "Topology.hh"
-#include "SimpleNetwork.hh"
-#include "GarnetNetwork_d.hh"
-#include "NetworkLink.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 // calls new to abstract away from the network
 Network* Network::createNetwork(int nodes)
index cb9a8908afa623418b07f53bf9ccbd2f6fe2d0f7..52cdaa5d657452b6cb9060862ef6422470da7ba0 100644 (file)
 #ifndef GARNET_NETWORK_H
 #define GARNET_NETWORK_H
 
-#include "NetworkHeader.hh"
-#include "Vector.hh"
-#include "NetworkConfig.hh"
-#include "Network.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/Network.hh"
 
 class NetworkInterface;
 class MessageBuffer;
index 52090cb2b0422c136ce7757b9e32245721b94f74..cecaf867e3f4ba197202b0ca974af0899dd1d658 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
 
 InVcState::InVcState(int id)
 {
index efbd0d513e525b602ac54ff7d45902e1c3de7ae2..af48674e9a5d4b105999b090a87bc1e6b62e975c 100644 (file)
@@ -37,7 +37,7 @@
 #ifndef IN_VC_STATE_H
 #define IN_VC_STATE_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class InVcState {
 public:
index b35dfba674a4ecd8068af1d511fd57653d330a45..433e2f6863fc08db3df3fa38fabe7db68a42857b 100644 (file)
@@ -38,9 +38,9 @@
 #ifndef NETWORKCONFIG_H
 #define NETWORKCONFIG_H
 
-#include "NetworkHeader.hh"
-#include "util.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 class NetworkConfig {
         public:
index 3dfb5b4b9d1b59fdf6081aaead09cce751c0df1d..b7bd2393c74b0fcbd757ec272adcb65f00e80aa7 100644 (file)
  *
  * */
 
-#include "NetworkInterface.hh"
-#include "MessageBuffer.hh"
-#include "flitBuffer.hh"
-#include "NetworkMessage.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
 
 NetworkInterface::NetworkInterface(int id, int virtual_networks, GarnetNetwork *network_ptr)
 {
index d7932432b3aac8307fa89cc96191aa9c53834e06..3b98226c8cc35a0bddfaebdefc3f891ad18d07f1 100644 (file)
 #ifndef NET_INTERFACE_H
 #define NET_INTERFACE_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "Vector.hh"
-#include "FlexibleConsumer.hh"
-#include "Message.hh"
-#include "NetworkLink.hh"
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 class NetworkMessage;
 class MessageBuffer;
index e586ece9eaba72b52b351a2f54684095b6e9da6d..a170047ac86c71b3fdf75f95d2b2722ba7360cfd 100644 (file)
@@ -33,9 +33,9 @@
  *
  * */
 
-#include "NetworkLink.hh"
-#include "NetworkConfig.hh"
-#include "GarnetNetwork.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
 
 NetworkLink::NetworkLink(int id, int latency, GarnetNetwork *net_ptr)
 {
index cdea89d7976bfda463b336773d85a3eccc7410ef..a8278ae4cecbd770d4d471ed721a81a4495f3fb3 100644 (file)
 #ifndef NETWORK_LINK_H
 #define NETWORK_LINK_H
 
-#include "NetworkHeader.hh"
-#include "FlexibleConsumer.hh"
-#include "flitBuffer.hh"
-#include "PrioHeap.hh"
-#include "NetDest.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class GarnetNetwork;
 
index 5d43a7821121581403231b4ee9d493fb3459e147..9a95971eb1a5c765d34652d514efada9a4ab9d1d 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 OutVcState::OutVcState(int id)
 {
index 81120ee8c3b8937f4a2f3f584d66f9c0156e57d4..074d97d2e8ed3a2b40c9965a2bd9f68290fb64b9 100644 (file)
@@ -36,7 +36,7 @@
 #ifndef OUT_VC_STATE_H
 #define OUT_VC_STATE_H
 
-#include "NetworkHeader.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
 
 class OutVcState {
 public:
index 4809d43ed174e716cf13c5e04c51eb97fd10679b..2ee8fc5aa7d943ea9ffbe75387f3b6705a7b4de0 100644 (file)
  *
  * */
 
-#include "Router.hh"
-#include "NetworkMessage.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
-#include "VCarbiter.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
 
 Router::Router(int id, GarnetNetwork *network_ptr)
 {
index c0d91e0dd97df342a06f448fe2654f03921fa5a8..ce7dd4a8f1e8d24c21353d35d2d5de03f5ada263 100644 (file)
 #ifndef ROUTER_H
 #define ROUTER_H
 
-#include "NetworkHeader.hh"
-#include "GarnetNetwork.hh"
-#include "FlexibleConsumer.hh"
-#include "PrioHeap.hh"
-#include "NetworkLink.hh"
-#include "NetDest.hh"
-#include "flitBuffer.hh"
-#include "InVcState.hh"
-#include "OutVcState.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/InVcState.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh"
 
 class VCarbiter;
 
index 7ebd83de373349d0e0be845bd916eb5bf8cf7c52..271d6dd380a8a7d8eaa1ca383747907a2b029eb8 100644 (file)
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "VCarbiter.hh"
-#include "Router.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/Router.hh"
 
 VCarbiter::VCarbiter(Router *router)
 {
index 10368f2b478cca34e2a2e4f8a8baf6181edd3be4..6dcb808732620325846c8c4939e921c0a2d3f669 100644 (file)
@@ -36,8 +36,8 @@
 #ifndef VC_ARBITER_H
 #define VC_ARBITER_H
 
-#include "NetworkHeader.hh"
-#include "Consumer.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/common/Consumer.hh"
 
 class Router;
 
index f3cba2035bd966b464a46ce6a0711bf0e48bb00b..51b8af6c6a236f81ea3936af89513ce06ac99264 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flit.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
 
 flit::flit(int id, int  vc, int vnet, int size, MsgPtr msg_ptr)
 {
index fc8042cfcba0a08c348a845e79f5e6f3330b45c4..b9ee9a8077d5495eef3d329317c1209f9a389107 100644 (file)
@@ -33,8 +33,8 @@
  *
  * */
 
-#include "NetworkHeader.hh"
-#include "Message.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
 
 #ifndef FLIT_H
 #define FLIT_H
index e0fb26e0a3b8ba7c1931e5071af693ee768c7104..a0bb71c9dd64953cff3e0be2e16cee55bae3a4f4 100644 (file)
@@ -33,7 +33,7 @@
  *
  * */
 
-#include "flitBuffer.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh"
 
 flitBuffer::flitBuffer()
 {
index 1eb122a51b138a7e71a6da385d83010913a804b2..fa011ecaf3add9925a3e7033d5fddbbb7af2b1f4 100644 (file)
@@ -36,9 +36,9 @@
 #ifndef FLIT_BUFFER_H
 #define FLIT_BUFFER_H
 
-#include "NetworkHeader.hh"
-#include "PrioHeap.hh"
-#include "flit.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh"
+#include "mem/gems_common/PrioHeap.hh"
+#include "mem/ruby/network/garnet-flexible-pipeline/flit.hh"
 
 class flitBuffer {
 public:
index 6e5994071e70dcddcbe32de82212b20b120ea90f..9d10d5136938acf1fabf4c76b050bdf23c712575 100644 (file)
 #include <stdio.h>
 #include <math.h>
 
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_crossbar.hh"
-#include "power_arbiter.hh"
-#include "power_bus.hh"
-#include "NetworkPower.hh"
-#include "Router_d.hh"
-#include "NetworkLink_d.hh"
-#include "GarnetNetwork_d.hh"
-#include "SIM_port.hh"
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/NetworkPower.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/Router_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh"
+#include "mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 
 /* --------- Static energy calculation functions ------------ */
 
index 1f0ddd36ce6aa33842e4ebd1d2b713bda22001be..250e710e3f6cc0c3812d02c45c4ab1ddabc815dd 100644 (file)
@@ -30,7 +30,7 @@
 #define _SIM_POWER_H
 
 #include <sys/types.h>
-#include "SIM_power_test.hh"
+#include "mem/ruby/network/orion/SIM_power_test.hh"
 
 #define SIM_NO_MODEL    0
 
index ba68fbe1c26547092519e7b470be319b8fb5bc93..d382ebfb2ece058228e91ff5b7dae3c15de24330 100644 (file)
 
 #include <stdio.h>
 
-#include "power_arbiter.hh"
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 
 
index 671608c2f04f262da01863c5f652cfcfada0be64..f2c3a9eab3bc68ee8f3d562014873dbd93fb6878 100644 (file)
@@ -32,7 +32,7 @@
 #ifndef _POWER_ARBITER_H
 #define _POWER_ARBITER_H
 
-#include "power_array.hh"
+#include "mem/ruby/network/orion/power_array.hh"
 
 typedef enum {
         RR_ARBITER =1,
index 225f4537704ff39399a6c7c00d21ae805a9159ad..9ac08ffb0ca07085ad15e19b988828d2349df78c 100644 (file)
 #include <stdio.h>
 #include <math.h>
 
-#include "power_array.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* local macros */
 
index 032c3c51944537f4ca0ade172de16e0381bf9c71..7060752a5c86a7c5bd165fd934c919a9e5f25841 100644 (file)
 
 #include <stdio.h>
 
-#include "power_bus.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_bus.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* ------- bus(link) model ---------- */
 
index d3e2232ae5c00a0f178325cdfc43f5edface17e6..a9f3e2e39d880fe46ff54faec650bb35203433db 100644 (file)
 #include <stdio.h>
 #include <math.h>
 
-#include "power_ll.hh"
-#include "power_crossbar.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /*-------------------- CROSSBAR power model -------------------*/
 
index 3628989d040951e0789c0ec679c345a46ea9c75c..aab98cc8c6b8bef30332abcbb418b374d3c1e822 100644 (file)
 #include <math.h>
 #include <assert.h>
 
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
 
 /*----------------------------------------------------------------------*/
 
index be58fbdbf884ba5c5fc1f3776e44afca3d837386..9a8bc7f28fcb72596b9936932a50f038f38f8dfb 100644 (file)
 
 #include <stdio.h>
 
-#include "power_router_init.hh"
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
-#include "power_ll.hh"
-#include "parm_technology.hh"
-#include "SIM_port.hh"
-#include "power_static.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/power_router_init.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
+#include "mem/ruby/network/orion/power_ll.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/SIM_port.hh"
+#include "mem/ruby/network/orion/power_static.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 
 /* -------------------------------------------------------------------------------------------- */
 // Set buffer parameters
index 2d95cea0bc4907383ed86261988a154a24a9fce1..df0b8fb184d843fbbab943f0746eb32c79686b1f 100644 (file)
@@ -29,9 +29,9 @@
 #ifndef _POWER_ROUTER_INIT_H
 #define _POWER_ROUTER_INIT_H
 
-#include "power_array.hh"
-#include "power_arbiter.hh"
-#include "power_crossbar.hh"
+#include "mem/ruby/network/orion/power_array.hh"
+#include "mem/ruby/network/orion/power_arbiter.hh"
+#include "mem/ruby/network/orion/power_crossbar.hh"
 
 /* ------------ Models ------------------------ */
 /*typedef enum {
index c0ae394a69786158542694f50e282dbf04a08914..ded399000655da02e637f3dd382e07edc41cb6c0 100644 (file)
@@ -26,7 +26,7 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "power_static.hh"
+#include "mem/ruby/network/orion/power_static.hh"
 
 #if (PARM_TECH_POINT == 18)
 double NMOS_TAB[1] = {20.5e-9};
index 6bc58ca01e99fc389effe52a3adcd8b176a18b9c..09f989aa2a8bbe542890862db8525df6e73eb38d 100644 (file)
@@ -29,7 +29,7 @@
 #ifndef _POWER_STATIC_H
 #define _POWER_STATIC_H
 
-#include "parm_technology.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
 
 extern double NMOS_TAB[1];
 extern double PMOS_TAB[1];
index 1f592fff0036d0b8ef430ffb72a82a78ae00e30f..be308be882c537547eed19206b22e98a1e852c71 100644 (file)
@@ -27,8 +27,8 @@
  */
 
 #include <stdio.h>
-#include "parm_technology.hh"
-#include "power_utils.hh"
+#include "mem/ruby/network/orion/parm_technology.hh"
+#include "mem/ruby/network/orion/power_utils.hh"
 #include <assert.h>
 #include <math.h>
 
index a88a29e835649f8fc22e5a54693bd2846c0e50c1..02725148fbe965307210899ae6066c89a8bf99c0 100644 (file)
  */
 
 
-#include "PerfectSwitch.hh"
-#include "NetworkMessage.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "SimpleNetwork.hh"
-#include "util.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
 
 const int PRIORITY_SWITCH_LIMIT = 128;
 
index 4d381ccc904373b9b9f57dae3ea44f6e301191ec..9cc28fff8389901bdc253eee2cdca9b54ea4ca6c 100644 (file)
 #ifndef PerfectSwitch_H
 #define PerfectSwitch_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class MessageBuffer;
 class NetDest;
index 549503e472c3b0adbebd8737959390fd1fd71a64..1258edb60af30192db533884bdf6eebf916c4b75 100644 (file)
  *
  */
 
-#include "SimpleNetwork.hh"
-#include "Profiler.hh"
-#include "System.hh"
-#include "Switch.hh"
-#include "NetDest.hh"
-#include "Topology.hh"
-#include "TopologyType.hh"
-#include "MachineType.hh"
-#include "MessageBuffer.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/network/simple/SimpleNetwork.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
 
 // ***BIG HACK*** - This is actually code that _should_ be in Network.C
 
index a28904227de9ae9e7b2a8db118062616418f3c98..8d2f64b7a469f5246c01fd82c38581331737252a 100644 (file)
 #ifndef SIMPLENETWORK_H
 #define SIMPLENETWORK_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Network.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class NetDest;
 class MessageBuffer;
index 3b55d156fa8ba8e8133a5fb3d8f71811526b221e..648b6ca01d447292f2416dc6ded9e430cd435cd6 100644 (file)
  */
 
 
-#include "Switch.hh"
-#include "PerfectSwitch.hh"
-#include "MessageBuffer.hh"
-#include "Throttle.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Switch.hh"
+#include "mem/ruby/network/simple/PerfectSwitch.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/Protocol.hh"
 
 Switch::Switch(SwitchID sid, SimpleNetwork* network_ptr)
 {
index a408155c054d22f30a182c9b0f3b150a3e10ee3b..58bde05eac3bdb19deed5e11bd0d7fd801cbd9cd 100644 (file)
@@ -44,8 +44,8 @@
 #ifndef Switch_H
 #define Switch_H
 
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
 
 class MessageBuffer;
 class PerfectSwitch;
index 2f6e68afdbd96dacd0ef41e45e949791d9c0c124..1d9ec0dc6279b3e2e6f2e7fc8644b7963aef54ed 100644 (file)
  *
  */
 
-#include "Throttle.hh"
-#include "MessageBuffer.hh"
-#include "Network.hh"
-#include "System.hh"
-#include "NetworkMessage.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Throttle.hh"
+#include "mem/ruby/buffers/MessageBuffer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/protocol/Protocol.hh"
 
 const int HIGH_RANGE = 256;
 const int ADJUST_INTERVAL = 50000;
index 67cfabcdc4aa8e69b1d29bded7ae6f1ec775d0f2..067c7af5fb2ebdb65c1ab1cee434edb24188097e 100644 (file)
 #ifndef THROTTLE_H
 #define THROTTLE_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
 
 class MessageBuffer;
 
index a7454a5afc445743f556b18a7d8cfc8001ac9a5f..7c52af1ce72cfaf8036800eeba4c4b63518160e2 100644 (file)
  *
  * */
 
-#include "Topology.hh"
-#include "NetDest.hh"
-#include "Network.hh"
-#include "TopologyType.hh"
-#include "RubyConfig.hh"
-#include "util.hh"
-#include "MachineType.hh"
-#include "Protocol.hh"
+#include "mem/ruby/network/simple/Topology.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/TopologyType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Protocol.hh"
 #include <string>
 
 static const int INFINITE_LATENCY = 10000; // Yes, this is a big hack
index bfc503087f066477d5b977960add31218cee6243..ee6be1ebf6329b41469c0f73ea04c1435c516680 100644 (file)
@@ -47,9 +47,9 @@
 #ifndef TOPOLOGY_H
 #define TOPOLOGY_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Network;
 class NetDest;
index 13aa3bc590e49a73a1f78245452f61e7c86baa82..48b28b7351418ee5b90563f0abc7026267df3b76 100644 (file)
@@ -32,8 +32,8 @@
  *
  */
 
-#include "AccessTraceForAddress.hh"
-#include "Histogram.hh"
+#include "mem/ruby/profiler/AccessTraceForAddress.hh"
+#include "mem/ruby/common/Histogram.hh"
 
 AccessTraceForAddress::AccessTraceForAddress()
 {
index 8ed47c2eef290f77c1608bc33329b4ea5e5de2d9..5bb0cc5455e6ebcbb2e5389d71a85a311436e208 100644 (file)
 #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 {
index 2d14b458fbfb178183959138a4835577a813dbb1..b0cc3cfd5557c57c03f9e1eea552edc5e96924b2 100644 (file)
  *
  */
 
-#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);
index 4895a7857ae83145d6226c5645916c4488dc2370..b000fb5d5879494fa84c0486a3f8c32b5ab0d6c8 100644 (file)
 #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;
index 666a99632588df2e6ac107780501ce354bdbde42..edc4bbd6d8c81765f58eb921d4267b8efe307666 100644 (file)
  *
  */
 
-#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)
index 2d538d0e3c4740b40dcc176a6255e3d74b3eb6e2..4dcff42431abb9bd0ce27066dd490fc9426d507d 100644 (file)
 #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;
 
index 456123a68f462de3831358f01f25a0adba44e0d8..558402bf575ce3da6cfc1991f4ada6113c72b782 100644 (file)
  *
  */
 
-#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>
index aa018029cf19625126988747ee3b8628276330f3..cb038a051beba0fc1fd9d0ebac998d2e76743538 100644 (file)
 #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;
index 7a1347a891bdeb86ef64f84f4016a4fb6df29f16..4d4e4798d102e004640e1787be44b2faec19db2e 100644 (file)
@@ -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
index 821345aba78e5da9593fe98c488006a7ebd91e65..a716363640117cbcc3cba23a6f75c69e0003898b 100644 (file)
 #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:
index 55fb86472bcfde56be99edd20e0bec822af1a768..8a3a7cd79b0bb8f5e92cc1adc77bfbb59d8f2cd0 100644 (file)
  * 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;
index 46584de65515fa96d1232b77c6e1be06d3c6a100..b90e95c01ec3c2b9a120988667076a610205b16f 100644 (file)
 #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;
 
index ba7ca89662d69cd766659f6a5a507dbe3d58e2cf..21193ba68e3f52c9acb7c117180400589236d3de 100644 (file)
  *
  */
 
-#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()
 {
index b8b56ff096639da522e11478f3b6a0f32390e0a9..0f69f8478bdcd9057120b9f38ce6282131819b01 100644 (file)
@@ -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;
index fd5f25ab9c78db856fb123c8975adaa187135507..ab1069582cee9c8ad0b49d73bc3bf622839c3f47 100644 (file)
  *
  */
 
-#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)
 {
index df526156b6d0e8fbff3618f7e5011fa4f061ca69..cfe2ff9e315e47859fb093e6bc534af41d10b55c 100644 (file)
 #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 {
index 0a4a290b378306dbc71a94da378aacb276f68660..896bfd31e30363f01cf2470d9c6517883866aa5e 100644 (file)
  *
  */
 
-#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()
 {
index eb05ae12df3e4de4ed8ac092a71e907e67e58002..0f78f54b2272c4222b6f97e6458a929b9261d49b 100644 (file)
@@ -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;
index 3d0e70408f23eca21a875fe18a80c32e756094b9..6bb936248a12ebf9bd70ab3749812773cf9f2441 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include "AbstractCacheEntry.hh"
+#include "mem/ruby/slicc_interface/AbstractCacheEntry.hh"
 
 AbstractCacheEntry::AbstractCacheEntry() {
 }
index ff678d342757b4cdbf4c7c642360af7114db33d1..18dc16ca8ab25447045c10a276f3a844be155201 100644 (file)
@@ -37,9 +37,9 @@
 #ifndef AbstractCacheEntry_H
 #define AbstractCacheEntry_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "AccessPermission.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessPermission.hh"
 
 class AbstractCacheEntry {
 public:
index 1f2eda74137f38831c643d6ce5657129e121aba2..5ef39b238a471bac86950bdf1e7cb2a8b4f2a15b 100644 (file)
@@ -34,7 +34,7 @@
  *
  */
 
-#include "AbstractChip.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 AbstractChip::AbstractChip(NodeID id, Network* net_ptr) {
   m_id = id;
index 05039d09d346ab482f69b8f5063a72732d57eb31..d47dd6306ee37f196d2d792acd7a4466f9f56ec0 100644 (file)
 #ifndef ABSTRACT_CHIP_H
 #define ABSTRACT_CHIP_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "RubyConfig.hh"
-#include "L1Cache_Entry.hh"
-#include "Address.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/L1Cache_Entry.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/gems_common/Vector.hh"
 
 class Network;
 class Sequencer;
index 596e1c12f1e791b75a7cc6e578bd23c1971338ea..c8917795b9f69d5b5b597aa74437012058ba0bca 100644 (file)
 #ifndef MESSAGE_H
 #define MESSAGE_H
 
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 class Message;
 typedef RefCnt<Message> MsgPtr;
index 357b89402d54365405599e771f89927980196e89..81c7dc2b09196e67367197790b4ec1c0297322ee 100644 (file)
 #ifndef NetworkMessage_H
 #define NetworkMessage_H
 
-#include "Global.hh"
-#include "RefCnt.hh"
-#include "RefCountable.hh"
-#include "Message.hh"
-#include "MessageSizeType.hh"
-#include "NetDest.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/RefCnt.hh"
+#include "mem/gems_common/RefCountable.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/common/NetDest.hh"
 
 class Address;
 
index 90f7a702bdc19ecb1452dd67f64756013f3b3862..bf5778479aeef123fdfe51491780c9adc5fd9465 100644 (file)
 #ifndef COMPONENTMAPPINGFNS_H
 #define COMPONENTMAPPINGFNS_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "Address.hh"
-#include "Set.hh"
-#include "NetDest.hh"
-#include "GenericMachineType.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"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/protocol/GenericMachineType.hh"
 
 #ifdef MACHINETYPE_L1Cache
 #define MACHINETYPE_L1CACHE_ENUM MachineType_L1Cache
index 19018c2186058d3ab1bf5c1116cbb747bc5624fe..0d5b48c34acfc3345112a5accccfacebf4ef6565 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "AddressProfiler.hh"
-#include "Protocol.hh"
-#include "RubySlicc_Profiler_interface.hh"
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 // #include "TransactionInterfaceManager.hh"
 
 void profile_request(int cache_state, Directory_State directory_state, GenericRequestType request_type)
index fa83c84c1a902c3a8ff31ad36ac4dd25e085738e..6cc3c6cd208e73a58e9bff30f53ec5be046f5fa6 100644 (file)
 #ifndef RUBYSLICC_PROFILER_INTERFACE_H
 #define RUBYSLICC_PROFILER_INTERFACE_H
 
-#include "Global.hh"
-#include "Profiler.hh"
-#include "Address.hh"
-#include "L1Cache_State.hh"
-#include "AccessType.hh"
-#include "GenericRequestType.hh"
-#include "Directory_State.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Set;
 
index a3233af5d147fc7ce670c23efe0cef0c1537b7d1..d4db1bb2875a4f46088643d0bb0678b7c9fb2c8d 100644 (file)
 #ifndef SLICC_UTIL_H
 #define SLICC_UTIL_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "MachineID.hh"
-#include "RubyConfig.hh"
-#include "CacheMsg.hh"
-#include "GenericRequestType.hh"
-#include "CacheRequestType.hh"
-#include "AccessType.hh"
-#include "MachineType.hh"
-#include "Directory_State.hh"
-#include "L1Cache_State.hh"
-#include "MessageSizeType.hh"
-#include "Network.hh"
-#include "PrefetchBit.hh"
-
-#include "RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/CacheMsg.hh"
+#include "mem/protocol/GenericRequestType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/protocol/Directory_State.hh"
+#include "mem/protocol/L1Cache_State.hh"
+#include "mem/protocol/MessageSizeType.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/protocol/PrefetchBit.hh"
+
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
 
 class Set;
 class NetDest;
index 8f552db297cea8c48000bab50ebdf1b1cb63bb79..0ac5496c4a92e2d2e462bc03f1cf20f3ff9cb234 100644 (file)
@@ -1,9 +1,9 @@
 #ifndef RUBYSLICC_INCLUDES_H
 #define RUBYSLICC_INCLUDES_H
 
-#include "RubySlicc_ComponentMapping.hh"
-#include "RubySlicc_Util.hh"
-#include "RubySlicc_Profiler_interface.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh"
 
 #endif
 
index 3b0c703aeb05412675d92f6da1bb4dacb2801882..f5fe209c019bea9aa35f5fc59490d94849cb5db3 100644 (file)
 #ifndef ABSTRACT_BLOOM_FILTER_H
 #define ABSTRACT_BLOOM_FILTER_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 class AbstractBloomFilter {
 public:
index a96a1328f73af47019c32628097193d438c737c4..8e214c74b8542e55bd557b0acff3819f31c14ff7 100644 (file)
 #ifndef ABSTRACT_MEM_OR_CACHE_H
 #define ABSTRACT_MEM_OR_CACHE_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 class AbstractMemOrCache {
 public:
index 497226fad6114ac4f7b6d7267bce1eef05a47fc0..e8b504b8ab09bea3f7f8c8b59486619f59741b70 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef ABSTRACTREPLACEMENTPOLICY_H
 #define ABSTRACTREPLACEMENTPOLICY_H
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 class AbstractReplacementPolicy {
 
index dbb0b5458d1a0f365f8851370a6f606c3921c694..d81f34ab1f1915ac314ece4dddb500c2c3a51fa7 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "BlockBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 BlockBloomFilter::BlockBloomFilter(string str)
 {
index 82f457157de1ad920a0d4a36d9d73d5c10c52630..ea7c0807aac174ffa9537c757796aad4bfcfd61f 100644 (file)
 #ifndef BLOCK_BLOOM_FILTER_H
 #define BLOCK_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class BlockBloomFilter : public AbstractBloomFilter {
 public:
index 3408dfadac44222151474a30adac563e150fedba..6d5c3f240c2f5198b9a4bd153aa86a6ef9c54704 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "BulkBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 BulkBloomFilter::BulkBloomFilter(string str)
 {
index f05b83a872cfb5aac78197f7045a181a120cf744..8c527651741f10ff0a5ee2f87e6f6e524b449b14 100644 (file)
 #ifndef BULK_BLOOM_FILTER_H
 #define BULK_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class BulkBloomFilter : public AbstractBloomFilter {
 public:
index 9344f1463feeb65f29ebf5e3936003ee28ccc3e3..4217a86853e1d454070db34d6e14645434eaf7f8 100644 (file)
 #ifndef CACHEMEMORY_H
 #define CACHEMEMORY_H
 
-#include "AbstractChip.hh"
-#include "Global.hh"
-#include "AccessPermission.hh"
-#include "Address.hh"
-#include "CacheRecorder.hh"
-#include "CacheRequestType.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "MachineType.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "PseudoLRUPolicy.hh"
-#include "LRUPolicy.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/system/PseudoLRUPolicy.hh"
+#include "mem/ruby/system/LRUPolicy.hh"
 #include <vector>
 
 template<class ENTRY>
index 3a37884dbb9ccbe97e0928bd05f041c100e3be98..d4c85cbea6a32edbdc396370c5a87fa04b980b5b 100644 (file)
  *
  */
 
-#include "System.hh"
-#include "Driver.hh"
-#include "DirectoryMemory.hh"
-#include "RubySlicc_Util.hh"
-#include "RubyConfig.hh"
-#include "Chip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/system/DirectoryMemory.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_Util.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/Chip.hh"
 
 DirectoryMemory::DirectoryMemory(Chip* chip_ptr, int version)
 {
index 7c0831af6291910953af4ab80a3a024c34b97829..94b7de9aadd3905bd363fddb1ba2c719c8e1d91f 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef DIRECTORYMEMORY_H
 #define DIRECTORYMEMORY_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "Directory_Entry.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/Directory_Entry.hh"
 
 class Chip;
 
index 38dd7f437db0443382ed86e0ac13c76505686ede..da8ec42628045d226d16c06a1d156466ae705851 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-
-#include "GenericBloomFilter.hh"
-#include "LSB_CountingBloomFilter.hh"
-#include "NonCountingBloomFilter.hh"
-#include "BulkBloomFilter.hh"
-#include "BlockBloomFilter.hh"
-#include "MultiGrainBloomFilter.hh"
-#include "MultiBitSelBloomFilter.hh"
-#include "H3BloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+
+#include "mem/ruby/system/GenericBloomFilter.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/ruby/system/BulkBloomFilter.hh"
+#include "mem/ruby/system/BlockBloomFilter.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
 
 GenericBloomFilter::GenericBloomFilter(AbstractChip* chip_ptr, string config)
 {
index 91cfdfd6e369b3221b6f553dbe40e283bc060140..11603b06f7593f5fd30285c04179b5c85a99bbb9 100644 (file)
 #ifndef GENERIC_BLOOM_FILTER_H
 #define GENERIC_BLOOM_FILTER_H
 
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class GenericBloomFilter {
 public:
index 43a47e873cbede653321063d91a3875dbcb086f8..8fed32814d618a929418469f479c6ddbef579e19 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "H3BloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/H3BloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 H3BloomFilter::H3BloomFilter(string str)
 {
index 9da6cdef50a2520709b72f651eeb347caa8ef1f4..0797b0c0875c541fbf20c0bb498f778cc3bb380a 100644 (file)
 #ifndef H3_BLOOM_FILTER_H
 #define H3_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 static int H3[64][16] = {
 {
index ea621bf4b2a84c0afe6a8090531163751815887c..184eb876d4a878d416a2d5f7f36458fa63f85133 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef LRUPOLICY_H
 #define LRUPOLICY_H
 
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
 
 /* Simple true LRU replacement policy */
 
index ddfa97f5f4bfdd9b020c6f750f231815c4811e86..f3b533b9086a7ebe42af754687a46621aa8dd96d 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "LSB_CountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/LSB_CountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 LSB_CountingBloomFilter::LSB_CountingBloomFilter(string str)
 {
index 5b0cdc87c8a2af1a6690dafef98bd41e1e53ce0f..fb039cea79b319725b3b20fe373494077c81fe89 100644 (file)
 #ifndef LSB_COUNTING_BLOOM_FILTER_H
 #define LSB_COUNTING_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class LSB_CountingBloomFilter : public AbstractBloomFilter {
 public:
index 2f294dc5443e1fe09afdc5db8e4771c09a9ff9f4..4515fe7fa8d7b32bcb8adbfe182890f06a98bf48 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef MACHINEID_H
 #define MACHINEID_H
 
-#include "Global.hh"
-#include "util.hh"
-#include "MachineType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/protocol/MachineType.hh"
 
 struct MachineID {
   MachineType type;
index e9f8a5ca8912d63f5d78f1f6fbebcdb15ffb26dc..eeb2f2fefc773d6d27b8b042e8dbc7770a38bec7 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "RubySlicc_ComponentMapping.hh"
-#include "NetworkMessage.hh"
-#include "Network.hh"
-
-#include "Consumer.hh"
-
-#include "MemoryControl.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh"
+#include "mem/ruby/slicc_interface/NetworkMessage.hh"
+#include "mem/ruby/network/Network.hh"
+
+#include "mem/ruby/common/Consumer.hh"
+
+#include "mem/ruby/system/MemoryControl.hh"
 
 #include <list>
 
index ee71b8f512d0b137f093c26777bb376c006f324c..a98181b0b8acfef6aaecd15c8cf03b5ba4ac93e9 100644 (file)
 #ifndef MEMORY_CONTROL_H
 #define MEMORY_CONTROL_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Message.hh"
-#include "util.hh"
-#include "MemoryNode.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/ruby/system/MemoryNode.hh"
 // Note that "MemoryMsg" is in the "generated" directory:
-#include "MemoryMsg.hh"
-#include "Consumer.hh"
-#include "AbstractMemOrCache.hh"
+#include "mem/protocol/MemoryMsg.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/AbstractMemOrCache.hh"
 
 #include <list>
 
index 5cba14eff4e33909cb87fbf3f747aa6521250f11..be93fae85543c4b5fd5784611cebeb09b781e0f6 100644 (file)
@@ -25,7 +25,7 @@
  *
  */
 
-#include "MemoryNode.hh"
+#include "mem/ruby/system/MemoryNode.hh"
 
 void MemoryNode::print(ostream& out) const
 {
index e6cce6c45a7bef078965efc3bf3992b82e12b5b0..95d4227f9667702e0d71e82b3406f9981facc076 100644 (file)
@@ -28,9 +28,9 @@
 #ifndef MEMORYNODE_H
 #define MEMORYNODE_H
 
-#include "Global.hh"
-#include "Message.hh"
-#include "MemoryRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/Message.hh"
+#include "mem/protocol/MemoryRequestType.hh"
 
 class MemoryNode {
 
index a42463d1e34e5515800a369d92ce814d774ecb14..8083506dbfd99fe192b5dcb8dfce85e76977fe90 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "MultiBitSelBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiBitSelBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 MultiBitSelBloomFilter::MultiBitSelBloomFilter(string str)
 {
index eaf4ff943306348df0c4b2312d0d246a68072fdf..1fa7e7e63956a9e855b5f93a65379a486a2b6a6f 100644 (file)
 #ifndef MULTIBITSEL_BLOOM_FILTER_H
 #define MULTIBITSEL_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Profiler.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class MultiBitSelBloomFilter : public AbstractBloomFilter {
 public:
index f1e110b1249275e38bc6cfdf440929a408349fc3..2af95514f610974ee040caa40a6c980a23192f7c 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "MultiGrainBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/MultiGrainBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 MultiGrainBloomFilter::MultiGrainBloomFilter(string str)
 {
index 692960853a727bdbb24de77eab2a3eae6c35cb30..943e5283b3cfc649ef4d2d0b8a06d2ab8057ffdf 100644 (file)
 #ifndef MULTIGRAIN_BLOOM_FILTER_H
 #define MULTIGRAIN_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class MultiGrainBloomFilter : public AbstractBloomFilter {
 public:
index 23df8bb4602924d8efe77f6ae493ed5378420f71..04c339accad33f421a0f760a3a4a0a931fcfc1bc 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef NODEID_H
 #define NODEID_H
 
-#include "Global.hh"
-#include "util.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/util.hh"
 
 typedef int NodeID;
 
index df2076c1e7f71a64e9eefd7b957a12b78ae7b193..0edd66c6b7689de8dc0cdbfe9c5d3bad3919d087 100644 (file)
  *
  */
 
-#include "NodePersistentTable.hh"
-#include "Set.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/NodePersistentTable.hh"
+#include "mem/ruby/common/Set.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 // randomize so that handoffs are not locality-aware
 // int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
index ac25552b8e58dc8eac479e1ac9483be3d9b6c28a..32de2613e939d0fb3e9d65c0522cd19c718699d6 100644 (file)
@@ -37,9 +37,9 @@
 #ifndef NodePersistentTable_H
 #define NodePersistentTable_H
 
-#include "Global.hh"
-#include "NodeID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/AccessType.hh"
 
 class AbstractChip;
 
index 81e4adbcd2caf338da4aef33be6806899823432e..b8f35322dcf83a0ccd6288ec9bfb6ce65ccf9ea8 100644 (file)
@@ -35,9 +35,9 @@
  *
  */
 
-#include "NonCountingBloomFilter.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/system/NonCountingBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 
 NonCountingBloomFilter::NonCountingBloomFilter(string str)
 {
index f2912c08cced7bb9186cedf2c24fc110ea1a1a6d..46ae3e84acada941246d693b01a9fea7b1cbde03 100644 (file)
 #ifndef NONCOUNTING_BLOOM_FILTER_H
 #define NONCOUNTING_BLOOM_FILTER_H
 
-#include "Map.hh"
-#include "Global.hh"
-#include "AbstractChip.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractBloomFilter.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/AbstractBloomFilter.hh"
 
 class NonCountingBloomFilter : public AbstractBloomFilter {
 public:
index 39ad7a7b3acf79569a9593c153ce61df0e8a7ed7..4578d0a44b90dd5ed044fce7f756dd3847b84700 100644 (file)
 #ifndef PERFECTCACHEMEMORY_H
 #define PERFECTCACHEMEMORY_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "AccessPermission.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 template<class ENTRY>
 class PerfectCacheLineState {
index a0bbf6979f5ae115b11231e310214bc9bce707ae..b44393301d58d6acffc807dcde3a4317cc9e49c8 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "PersistentArbiter.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentArbiter.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 PersistentArbiter::PersistentArbiter(AbstractChip* chip_ptr)
 {
index cf78a5920a1647845372000a48518b689792e012..705d833f423efa5761aaa4192b88b92614d29fed 100644 (file)
 #ifndef PERSISTENTARBITER_H
 #define PERSISTENTARBITER_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "AbstractChip.hh"
-#include "AccessPermission.hh"
-#include "AccessType.hh"
-#include "RubyConfig.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/AccessPermission.hh"
+#include "mem/protocol/AccessType.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Address.hh"
 
 struct ArbiterEntry {
   bool valid;
index 18c8b57363e065317fd27eeb7f4a3362dcea40f0..146b91fedfce567a39d9a887711097a2ae99bb9b 100644 (file)
  *
  */
 
-#include "PersistentTable.hh"
-#include "NetDest.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "AbstractChip.hh"
-#include "util.hh"
+#include "mem/ruby/system/PersistentTable.hh"
+#include "mem/ruby/common/NetDest.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/gems_common/util.hh"
 
 // randomize so that handoffs are not locality-aware
 // int persistent_randomize[] = {0, 4, 8, 12, 1, 5, 9, 13, 2, 6, 10, 14, 3, 7, 11, 15};
index 306f66e1dca3c9622d5adf3771fe71c75d6c775b..9f2e38fd734cbc4440d9a3284ff7e43d29d3d389 100644 (file)
@@ -37,9 +37,9 @@
 #ifndef PersistentTable_H
 #define PersistentTable_H
 
-#include "Global.hh"
-#include "MachineID.hh"
-#include "AccessType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/MachineID.hh"
+#include "mem/protocol/AccessType.hh"
 
 class AbstractChip;
 
index 9d4d13a955f69bee91c0609109b9a6f4dcee4f1a..57a0b40e9f0bdb7518241fe88f5467fcf25860d9 100644 (file)
@@ -2,7 +2,7 @@
 #ifndef PSEUDOLRUPOLICY_H
 #define PSEUDOLRUPOLICY_H
 
-#include "AbstractReplacementPolicy.hh"
+#include "mem/ruby/system/AbstractReplacementPolicy.hh"
 
 /**
  * Implementation of tree-based pseudo-LRU replacement
index 23efb9a0cf45800e037b91651ca187a43b050400..980152589e47eebbbff836ea1024f1eab8ef483c 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "Protocol.hh"
-#include "Profiler.hh"
-#include "CacheMemory.hh"
-#include "RubyConfig.hh"
-//#include "Tracer.hh"
-#include "AbstractChip.hh"
-#include "Chip.hh"
-#include "Tester.hh"
-#include "SubBlock.hh"
-#include "Protocol.hh"
-#include "Map.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/system/CacheMemory.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Protocol.hh"
+#include "mem/gems_common/Map.hh"
 
 Sequencer::Sequencer(AbstractChip* chip_ptr, int version) {
   m_chip_ptr = chip_ptr;
index a3924b9496d8e0f4f041d2fcfd099bdfea45213b..f4cc03131cf9f28f59cfc3263453d85db368a802 100644 (file)
 #ifndef SEQUENCER_H
 #define SEQUENCER_H
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "Consumer.hh"
-#include "CacheRequestType.hh"
-#include "AccessModeType.hh"
-#include "GenericMachineType.hh"
-#include "PrefetchBit.hh"
-#include "Map.hh"
-#include "packet.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/GenericMachineType.hh"
+#include "mem/protocol/PrefetchBit.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/packet.hh"
 
 class DataBlock;
 class AbstractChip;
index 7e5682fde2a828e0231d8e5294716bade8aa9fb5..4d67e55a541e14fa2220a7cc54d6b69fa52b1c37 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "RubyConfig.hh"
-#include "StoreBuffer.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "RubyEventQueue.hh"
-#include "AddressProfiler.hh"
-#include "Sequencer.hh"
-#include "SubBlock.hh"
-#include "Profiler.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/system/StoreBuffer.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/profiler/AddressProfiler.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/profiler/Profiler.hh"
 
 // *** Begin Helper class ***
 struct StoreBufferEntry {
index 832e4f0bb8118422ee497d5a71c056809682a64c..2fae5264329b7ca5ff5fff5fcfb1e43a34b89deb 100644 (file)
 #ifndef StoreBuffer_H
 #define StoreBuffer_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "Address.hh"
-#include "AccessModeType.hh"
-#include "CacheRequestType.hh"
-#include "StoreCache.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/protocol/AccessModeType.hh"
+#include "mem/protocol/CacheRequestType.hh"
+#include "mem/ruby/system/StoreCache.hh"
 
 class CacheMsg;
 class DataBlock;
index bc25c50d6b94f8fee4d180771a13369cb09ed76f..a11b2ac50099c5ff52909fbf3e5f0eceb902674d 100644 (file)
  *
  */
 
-#include "StoreCache.hh"
-#include "System.hh"
-#include "Driver.hh"
-#include "Vector.hh"
-#include "DataBlock.hh"
-#include "SubBlock.hh"
-#include "Map.hh"
+#include "mem/ruby/system/StoreCache.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/DataBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/gems_common/Map.hh"
 
 // Helper class
 struct StoreCacheEntry {
index d92d39888496d8b3a8264e74755b2a6febe05b2a..81eecde38f3969882cbc2b3390f685a39ef0b939 100644 (file)
@@ -37,8 +37,8 @@
 #ifndef StoreCache_H
 #define StoreCache_H
 
-#include "Global.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
 
 
 class DataBlock;
index a38809e94b5524a767b5dd3b6e111c36da529aa5..ae77d2a853a3a3306cab969575697e1399c7058a 100644 (file)
  */
 
 
-#include "System.hh"
-#include "Profiler.hh"
-#include "Network.hh"
-#include "Tester.hh"
-#include "SyntheticDriver.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
-//#include "Tracer.hh"
-#include "Protocol.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
+//#include "mem/ruby/recorder/Tracer.hh"
+#include "mem/protocol/Protocol.hh"
 //#include "XactIsolationChecker.hh"  // gem5:Arka for decomissioning of log_tm
 //#include "XactCommitArbiter.hh"
 //#include "XactVisualizer.hh"
-#include "M5Driver.hh"
+#include "mem/ruby/interfaces/M5Driver.hh"
 
 RubySystem::RubySystem()
 {
index f5b1072405cba03fed5e2ad1feee57be3d3775d5..12063eeedbc4ea0d8c1d2c79ee25795636241a8e 100644 (file)
 #ifndef SYSTEM_H
 #define SYSTEM_H
 
-#include "Global.hh"
-#include "Vector.hh"
-#include "Address.hh"
-#include "RubyConfig.hh"
-#include "MachineType.hh"
-#include "AbstractChip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/protocol/MachineType.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
 
 class Profiler;
 class Network;
index ad1674dca194185292260da47ff4ab1dbf10a545..aa7e0df6e50e5d623e11b64eb31e418fe8d64f3c 100644 (file)
 #ifndef TBETABLE_H
 #define TBETABLE_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
-#include "Profiler.hh"
-#include "AbstractChip.hh"
-#include "System.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/profiler/Profiler.hh"
+#include "mem/ruby/slicc_interface/AbstractChip.hh"
+#include "mem/ruby/system/System.hh"
 
 template<class ENTRY>
 class TBETable {
index 48e548b5c2af5a8b9d94d355f32cbc56d4518f37..edc2de23032d1d470064eec60ce458110761e5c6 100644 (file)
@@ -31,9 +31,9 @@
  * $Id$
  */
 
-#include "Global.hh"
-#include "TimerTable.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/TimerTable.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 
 TimerTable::TimerTable(Chip* chip_ptr)
 {
index c7f77efb17de79d9e24beb79ba65b9e0382e3e1d..36ac83fc60a90712078de605356f23f4fa24929b 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef TIMERTABLE_H
 #define TIMERTABLE_H
 
-#include "Global.hh"
-#include "Map.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/ruby/common/Address.hh"
 class Consumer;
 class Chip;
 
index 79b9c6d2bf46f58462aaa7741b6036040eac3172..9dbcf39fd82fca75226658d09772cf870147d556 100644 (file)
  *
  */
 
-#include "BarrierGenerator.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/BarrierGenerator.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
 
 BarrierGenerator::BarrierGenerator(NodeID node, SyntheticDriver& driver) :
   m_driver(driver)
index 1b16755a5b1a0c23f9df6efc9264a7b749ba3f7f..e0fa497dab6441a2b42849b8bdbe238caeff4171 100644 (file)
 #ifndef BARRIERGENERATOR_H
 #define BARRIERGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
 
 class Sequencer;
 class SubBlock;
index 0b278d110d28b5e364715b17a6e4b05e7dec98cf..ea26489a3cf52af84cc13e73171f37ba25227330 100644 (file)
  *
  */
 
-#include "Check.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
 
 Check::Check(const Address& address, const Address& pc)
 {
index 31959262d6e9512fbc0f053660fc72e007e17900..8f08b3f40fd753e56f566a6d0d772dc621fc35c4 100644 (file)
 #ifndef CHECK_H
 #define CHECK_H
 
-#include "Global.hh"
-#include "Address.hh"
-#include "NodeID.hh"
-#include "TesterStatus.hh"
-#include "AccessModeType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/protocol/TesterStatus.hh"
+#include "mem/protocol/AccessModeType.hh"
 class Sequencer;
 class SubBlock;
 
index 488b5814444a83795483f0178a5f83a02d1b88eb..b8e57a646772217ae543f2e0e9ac51565272d38b 100644 (file)
@@ -32,9 +32,9 @@
  *
  */
 
-#include "CheckTable.hh"
-#include "Check.hh"
-#include "Map.hh"
+#include "mem/ruby/tester/CheckTable.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/gems_common/Map.hh"
 
 CheckTable::CheckTable()
 {
index 4a162f5bcbc32ca48ca8b26b11d9e92ce7773256..a7f486315845b63968813c7ea5a30a001dd896e7 100644 (file)
@@ -37,8 +37,8 @@
 #ifndef CHECKTABLE_H
 #define CHECKTABLE_H
 
-#include "Global.hh"
-#include "Vector.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/gems_common/Vector.hh"
 
 class Address;
 class Check;
index 7e9c500c937efe94fb57817af78d8486fb50d6d3..d496cbe3a1381306351d828dd9439c596f3e0776 100644 (file)
 // This Deterministic Generator generates GETX requests for all nodes in the system
 // The GETX requests are generated one at a time in round-robin fashion 0...1...2...etc.
 
-#include "DetermGETXGenerator.hh"
-#include "DetermGETXGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermGETXGenerator.hh"
+#include "mem/protocol/DetermGETXGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
 
 DetermGETXGenerator::DetermGETXGenerator(NodeID node, DeterministicDriver& driver) :
   m_driver(driver)
index eff1eb6b369483ebd7b0fb87a3b88ca3006c12c3..1f5b67653c8bd5afc7a201d6ceac9d75119edd6a 100644 (file)
 #ifndef DETERMGETXGENERATOR_H
 #define DETERMGETXGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermGETXGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermGETXGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
 
 class Sequencer;
 class SubBlock;
index 07c1a4b01d1c28f10fb9623997fd3e3dd0f4cb5b..50d7162ab853d788f035ae92e72fe733e941c430 100644 (file)
 // then Invalidates them with a GETX.  The GETS and GETX request are generated one
 // at a time in round-robin fashion 0...1...2...etc.
 
-#include "DetermInvGenerator.hh"
-#include "DetermInvGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermInvGenerator.hh"
+#include "mem/protocol/DetermInvGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
 
 DetermInvGenerator::DetermInvGenerator(NodeID node, DeterministicDriver& driver) :
   m_driver(driver)
index a72895f3f085453052c123e989dc8197b725bfb9..4f0712fbe5802fdaea912e1038e09bf5eb8b09ed 100644 (file)
 #ifndef DETERMINVGENERATOR_H
 #define DETERMINVGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermInvGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermInvGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
 
 class Sequencer;
 class SubBlock;
index 479b8b6173601df54d3447b513e28b542e4f4f26..67fca6fe0c7c593e3817f6aae1fec4744d254d12 100644 (file)
  *
  */
 
-#include "DetermSeriesGETSGenerator.hh"
-#include "DetermSeriesGETSGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "DeterministicDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"
+#include "mem/protocol/DetermSeriesGETSGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/protocol/Chip.hh"
 
 DetermSeriesGETSGenerator::DetermSeriesGETSGenerator(NodeID node, DeterministicDriver& driver) :
   m_driver(driver)
index 25d4886a02eda28d70f7f209fae85df577eb5513..1e44dc3bc0031ef7f538d415ac2880b372d1b022 100644 (file)
 #ifndef DETERMSERIESGETSGENERATOR_H
 #define DETERMSERIESGETSGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "DetermSeriesGETSGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
-#include "SpecifiedGenerator.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/DetermSeriesGETSGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
 
 class Sequencer;
 class SubBlock;
index ff9d3da14d8b473f283cd28b2b1af15b5daede1a..2ea82c77c60afb471796a37c505bd088f8e79dc5 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "DeterministicDriver.hh"
-#include "RubyEventQueue.hh"
-#include "SpecifiedGenerator.hh"
-#include "DetermGETXGenerator.hh"
-#include "DetermInvGenerator.hh"
-#include "DetermSeriesGETSGenerator.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/DeterministicDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
+#include "mem/ruby/tester/DetermGETXGenerator.hh"
+#include "mem/ruby/tester/DetermInvGenerator.hh"
+#include "mem/ruby/tester/DetermSeriesGETSGenerator.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
 
 DeterministicDriver::DeterministicDriver(RubySystem* sys_ptr)
 {
index d501a2fce67b307d01856f4a15db7f1aae647226..d253b7e51254744de1c2f8c93c791634af6bd1cb 100644 (file)
 #ifndef DETERMINISTICDRIVER_H
 #define DETERMINISTICDRIVER_H
 
-#include "Global.hh"
-#include "Driver.hh"
-#include "Histogram.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/CacheRequestType.hh"
 
 class RubySystem;
 class SpecifiedGenerator;
index 8528a409471d485ae40217a7e2148acf6c86e0e2..1f4d56fc227d11f20bed27401db435170c7561f2 100644 (file)
@@ -23,7 +23,7 @@
  *
  */
 
-#include "Instruction.hh"
+#include "mem/ruby/tester/Instruction.hh"
 
 Instruction::Instruction(){
   m_opcode = Opcode_NUM_OPCODES;
index 674447056a185a021b8d7ae4014bc3394ffd115e..fe5540b004d678691de02e36ba273d8b5e940802 100644 (file)
@@ -26,7 +26,7 @@
 #ifndef INSTRUCTION_H
 #define INSTRUCTION_H
 
-#include "Address.hh"
+#include "mem/ruby/common/Address.hh"
 
 
 enum Opcode {
index c5cdcaa4b64bcb11ed2c0af0e5a5a9484a717803..6ea9ec795fe5b75c1ac36d3b113e64d2ef1c78c9 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "RaceyDriver.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/RaceyDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "RaceyPseudoThread.hh"
-#include "SubBlock.hh"
+#include "mem/ruby/common/SubBlock.hh"
 
 RaceyDriver::RaceyDriver()
 {
index a1a821b96244933bc07aa11b108ff8806ba3d348..a3e35b47cbb8eb572705b3955ba9fa940b083183 100644 (file)
@@ -38,8 +38,8 @@
 #ifndef RACEYDRIVER_H
 #define RACEYDRIVER_H
 
-#include "Global.hh"
-#include "Driver.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
 
 class RaceyPseudoThread;
 
index b216e06fe3cab72626a1014b4e9c64a73c6ef9d1..c1772f90505f856535bc46220bf50932549a2ba0 100644 (file)
  *
  */
 
-#include "RequestGenerator.hh"
-#include "RequestGeneratorStatus.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
+#include "mem/protocol/RequestGeneratorStatus.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
 
 RequestGenerator::RequestGenerator(NodeID node, SyntheticDriver& driver) :
   m_driver(driver)
index 3296f7951ed381481a316221e3698f501e078809..2859eb4369b99ad621e11af92c81d1bc204fe5c1 100644 (file)
 #ifndef REQUESTGENERATOR_H
 #define REQUESTGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "RequestGeneratorStatus.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/protocol/RequestGeneratorStatus.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
 
 class Sequencer;
 class SubBlock;
index e6ee802d4ad1161e9e4c46f2434f93f885b3a79a..17f827ee81b10802d0d0fa5869de146b7e383ae0 100644 (file)
  *
  */
 
-#include "SpecifiedGenerator.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
+#include "mem/ruby/tester/SpecifiedGenerator.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
 
 SpecifiedGenerator::SpecifiedGenerator()
 {
index d22c56f499041ade3741cf6df5fb6eb5475fb26b..9b4c7162393d287bf4e5f998ed63beea7fb5d246 100644 (file)
@@ -37,9 +37,9 @@
 #ifndef SPECIFIEDGENERATOR_H
 #define SPECIFIEDGENERATOR_H
 
-#include "Global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
 
 class Sequencer;
 class SubBlock;
index f5986de15c87c4feba1d31a278c69afda071aaa4..f74b69d0ba5da8166e9ea5260a86af17d5a00dd3 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "SyntheticDriver.hh"
-#include "RubyEventQueue.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 //#ifndef XACT_MEM
-#include "RequestGenerator.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
 //#endif
-//#include "XactAbortRequestGenerator.hh"
-//#include "XactRequestGenerator.hh"
-#include "SubBlock.hh"
-#include "Chip.hh"
+//#include "mem/ruby/tester/XactAbortRequestGenerator.hh"
+//#include "mem/ruby/tester/XactRequestGenerator.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/protocol/Chip.hh"
 
 SyntheticDriver::SyntheticDriver(RubySystem* sys_ptr)
 {
index fa40326e22bd7c9e17f73a7c3b3c3958cee6828f..dc0f1be1d8acd1f6e1ed3e86a885b7a19d3b6b5e 100644 (file)
 #ifndef SYNTHETICDRIVER_H
 #define SYNTHETICDRIVER_H
 
-#include "Global.hh"
-#include "Driver.hh"
-#include "Histogram.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/common/Histogram.hh"
+#include "mem/protocol/CacheRequestType.hh"
 
 class RubySystem;
 class RequestGenerator;
index 60b625120931927121a6ce5a2536965de3fdedbd..53d6bc67087135a10afc04bda612b5f2cd35ce3e 100644 (file)
  *
  */
 
-#include "Global.hh"
-#include "System.hh"
-#include "Tester.hh"
-#include "RubyEventQueue.hh"
-#include "SubBlock.hh"
-#include "Check.hh"
-#include "Chip.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/Check.hh"
+#include "mem/protocol/Chip.hh"
 
 Tester::Tester(RubySystem* sys_ptr)
 {
index 76fe0684acbc3edf0113eff7580ebefe00eddc2a..7b721e038ae241d070682ce84188f4aa02d50832 100644 (file)
 #ifndef TESTER_H
 #define TESTER_H
 
-#include "Global.hh"
-#include "Driver.hh"
-#include "CheckTable.hh"
-#include "CacheRequestType.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/common/Driver.hh"
+#include "mem/ruby/tester/CheckTable.hh"
+#include "mem/protocol/CacheRequestType.hh"
 
 class RubySystem;
 
index e562aa760f5bcb9cf148b03b63e9cc86655fe210..0b00a6342f508464483eaf991ab5c722fcc6296d 100644 (file)
 
 #ifdef XACT_MEM
 
-#include "XactAbortRequestGenerator.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
-#include "Instruction.hh"
+#include "mem/ruby/tester/XactAbortRequestGenerator.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Instruction.hh"
 #include "TransactionManager.hh"
 
 //uint8 XactAbortRequestGenerator::testArray[MAX_ADDRESS];
index 90ec1bf1b254c854f9ca33e001972564c468beb4..14c7c3fecb8fabf98fdf48487065bc66642a2ecf 100644 (file)
 
 #ifdef XACT_MEM
 
-#include "RequestGenerator.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
 #include "global.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
 
 class Sequencer;
 class SubBlock;
index c7870bb25afedbc025b2492b96682c0c44068b0b..383eb280a776596a612f64f769afc5a029013140 100644 (file)
  *
  */
 
-#include "XactRequestGenerator.hh"
-#include "LockStatus.hh"
-#include "Sequencer.hh"
-#include "System.hh"
-#include "RubyConfig.hh"
-#include "SubBlock.hh"
-#include "SyntheticDriver.hh"
-#include "Chip.hh"
-#include "Instruction.hh"
+#include "mem/ruby/tester/XactRequestGenerator.hh"
+#include "mem/protocol/LockStatus.hh"
+#include "mem/ruby/system/Sequencer.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/common/SubBlock.hh"
+#include "mem/ruby/tester/SyntheticDriver.hh"
+#include "mem/protocol/Chip.hh"
+#include "mem/ruby/tester/Instruction.hh"
 
 XactRequestGenerator::XactRequestGenerator(NodeID node, SyntheticDriver& driver) :
   m_driver(driver), RequestGenerator(node, driver)
index 826a257ce7b9b9b91ec966cbac9ed07cb8247ae4..09d75b7e927cfd9b3080773689971772a0fdb2f6 100644 (file)
 #define XACTREQUESTGENERATOR_H
 
 #include "global.hh"
-#include "RequestGenerator.hh"
-#include "Consumer.hh"
-#include "NodeID.hh"
-#include "Address.hh"
+#include "mem/ruby/tester/RequestGenerator.hh"
+#include "mem/ruby/common/Consumer.hh"
+#include "mem/ruby/system/NodeID.hh"
+#include "mem/ruby/common/Address.hh"
 #include "TransactionManager.hh"
 
 class Sequencer;
index 10cc526be47873819b7997dfc79b3c8de632c0c7..f36168c8ef39b1d978177f14b50f085f863ea724 100644 (file)
  *
  */
 
-#include "main.hh"
-#include "RubyEventQueue.hh"
-#include "RubyConfig.hh"
-#include "test_framework.hh"
+#include "mem/ruby/tester/main.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
+#include "mem/ruby/config/RubyConfig.hh"
+#include "mem/ruby/tester/test_framework.hh"
 
 // *******************
 // *** tester main ***
index 05e3a0e8d94e44922fe0de990eca97d47bcf120c..3708d770ddb8f4784683e606e7c80e55cb74d235 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-/*
- * $Id$
- *
- * Description:
- *
- */
-
 #ifndef MAIN_H
 #define MAIN_H
 
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
 
 #endif //MAIN_H
index e3a16920bd109d745d0ce5111551dbab7b907678..9886adc8d8312f58c82ceb853ec8e71ae78269fc 100644 (file)
  *
  */
 
-#include "protocol_name.hh"
-#include "test_framework.hh"
-#include "System.hh"
-#include "init.hh"
-#include "Tester.hh"
-#include "RubyEventQueue.hh"
+#include "mem/protocol/protocol_name.hh"
+#include "mem/ruby/tester/test_framework.hh"
+#include "mem/ruby/system/System.hh"
+#include "mem/ruby/init.hh"
+#include "mem/ruby/tester/Tester.hh"
+#include "mem/ruby/eventqueue/RubyEventQueue.hh"
 #include "getopt.hh"
-#include "Network.hh"
-#include "CacheRecorder.hh"
-#include "Tracer.hh"
+#include "mem/ruby/network/Network.hh"
+#include "mem/ruby/recorder/CacheRecorder.hh"
+#include "mem/ruby/recorder/Tracer.hh"
 
 using namespace std;
 #include <string>
@@ -52,14 +52,14 @@ using namespace std;
 // #include "simics/api.hh"
 // };
 
-#include "confio.hh"
-#include "initvar.hh"
+#include "mem/gems_common/ioutil/confio.hh"
+#include "mem/gems_common/ioutil/initvar.hh"
 
 // A generated file containing the default tester parameters in string form
 // The defaults are stored in the variables
 // global_default_param and global_default_tester_param
-#include "default_param.hh"
-#include "tester_param.hh"
+#include "mem/ruby/default_param.hh"
+#include "mem/ruby/tester_param.hh"
 
 static void parseOptions(int argc, char **argv);
 static void usageInstructions();
index 7464cc274501aedd1b59b4357a76239e77c1df92..5e9e9363b6b046d81756d10c68bfd715e65034e2 100644 (file)
@@ -37,8 +37,8 @@
 #ifndef TESTFRAMEWORK_H
 #define TESTFRAMEWORK_H
 
-#include "Global.hh"
-#include "mf_api.hh"
+#include "mem/ruby/common/Global.hh"
+#include "mem/ruby/interfaces/mf_api.hh"
 
 void tester_main(int argc, char **argv);
 void tester_install_opal( mf_opal_api_t  *opal_api, mf_ruby_api_t *ruby_api );
index 9342cd2e89460aca4c5c12cb38d9a6202265d00e..cf59a4360e5551088e9ecbed12f0ed16d09ccad2 100644 (file)
@@ -36,4 +36,4 @@
  *
  */
 
-#include "AST.hh"
+#include "mem/slicc/ast/AST.hh"
index b20bbebe22eee0eecfaff20b307f9b0ee3168847..93c45b3f09657528c918461450191b8dba7256bb 100644 (file)
 #ifndef AST_H
 #define AST_H
 
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Map.hh"
-#include "Location.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/ast/Location.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 class AST {
 public:
index 77b055a80d00496b12522ec075777b2c931f752c..d0ed5698f27618cbecd79b769b3adde65950a41c 100644 (file)
 #ifndef ASTs_H
 #define ASTs_H
 
-#include "slicc_global.hh"
-#include "main.hh"
-#include "StateMachine.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/AST.hh"
 
-#include "MachineAST.hh"
+#include "mem/slicc/ast/MachineAST.hh"
 
-#include "TypeAST.hh"
-#include "FormalParamAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 
-#include "DeclListAST.hh"
-#include "DeclAST.hh"
-#include "ActionDeclAST.hh"
-#include "InPortDeclAST.hh"
-#include "OutPortDeclAST.hh"
-#include "TransitionDeclAST.hh"
-#include "EnumDeclAST.hh"
-#include "TypeDeclAST.hh"
-#include "ObjDeclAST.hh"
-#include "FuncDeclAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/ActionDeclAST.hh"
+#include "mem/slicc/ast/InPortDeclAST.hh"
+#include "mem/slicc/ast/OutPortDeclAST.hh"
+#include "mem/slicc/ast/TransitionDeclAST.hh"
+#include "mem/slicc/ast/EnumDeclAST.hh"
+#include "mem/slicc/ast/TypeDeclAST.hh"
+#include "mem/slicc/ast/ObjDeclAST.hh"
+#include "mem/slicc/ast/FuncDeclAST.hh"
 
-#include "TypeFieldAST.hh"
-#include "TypeFieldMethodAST.hh"
-#include "TypeFieldMemberAST.hh"
-#include "TypeFieldEnumAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeFieldMethodAST.hh"
+#include "mem/slicc/ast/TypeFieldMemberAST.hh"
+#include "mem/slicc/ast/TypeFieldEnumAST.hh"
 
-#include "PairAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/ast/PairAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
 
-#include "ExprAST.hh"
-#include "VarExprAST.hh"
-#include "EnumExprAST.hh"
-#include "LiteralExprAST.hh"
-#include "MemberExprAST.hh"
-#include "InfixOperatorExprAST.hh"
-#include "FuncCallExprAST.hh"
-#include "MethodCallExprAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/EnumExprAST.hh"
+#include "mem/slicc/ast/LiteralExprAST.hh"
+#include "mem/slicc/ast/MemberExprAST.hh"
+#include "mem/slicc/ast/InfixOperatorExprAST.hh"
+#include "mem/slicc/ast/FuncCallExprAST.hh"
+#include "mem/slicc/ast/MethodCallExprAST.hh"
 
-#include "ChipComponentAccessAST.hh"
+#include "mem/slicc/ast/ChipComponentAccessAST.hh"
 
-#include "StatementListAST.hh"
-#include "StatementAST.hh"
-#include "ExprStatementAST.hh"
-#include "AssignStatementAST.hh"
-#include "EnqueueStatementAST.hh"
-#include "IfStatementAST.hh"
-#include "PeekStatementAST.hh"
-#include "CopyHeadStatementAST.hh"
-#include "CheckAllocateStatementAST.hh"
-#include "CheckStopSlotsStatementAST.hh"
-#include "ReturnStatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprStatementAST.hh"
+#include "mem/slicc/ast/AssignStatementAST.hh"
+#include "mem/slicc/ast/EnqueueStatementAST.hh"
+#include "mem/slicc/ast/IfStatementAST.hh"
+#include "mem/slicc/ast/PeekStatementAST.hh"
+#include "mem/slicc/ast/CopyHeadStatementAST.hh"
+#include "mem/slicc/ast/CheckAllocateStatementAST.hh"
+#include "mem/slicc/ast/CheckStopSlotsStatementAST.hh"
+#include "mem/slicc/ast/ReturnStatementAST.hh"
 
 #endif //ASTs_H
index 6514b9afd22a902064e0da521096b05db2753774..372920a1b41c81ffe2100e03d7e217104d2a8079 100644 (file)
@@ -36,8 +36,8 @@
  *
  */
 
-#include "ActionDeclAST.hh"
-#include "Action.hh"
+#include "mem/slicc/ast/ActionDeclAST.hh"
+#include "mem/slicc/symbols/Action.hh"
 
 ActionDeclAST::ActionDeclAST(string* ident_ptr,
                              PairListAST* pairs_ptr,
index cc020a95f8123d13d13ee728926f0aef6574e06c..bf6d4d403eb8e0d7e532c101a3257f6c9ccd7846 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef ActionDeclAST_H
 #define ActionDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
 
 class ActionDeclAST : public DeclAST {
 public:
index 2d72e583e262ccb8bdadd117ce41a84467107573..290ef101d119e2b766a6a07d07e228f8b9035b0a 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "AssignStatementAST.hh"
+#include "mem/slicc/ast/AssignStatementAST.hh"
 
 AssignStatementAST::AssignStatementAST(ExprAST* lvalue_ptr, ExprAST* rvalue_ptr)
   : StatementAST()
index c249c8a75ab6af080d8d93b67e47243823cf1a3e..0b442b5c67b456cd80b5cbb6f2a86370f67c5c68 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef ASSIGNSTATEMENTAST_H
 #define ASSIGNSTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 
 
index 25fd4d2e7c72de1d88be6ab929302aa79c5df078..1f498efe211852ae5766625cc2fc034e87a3c2e3 100644 (file)
  *
  */
 
-#include "CheckAllocateStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/CheckAllocateStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/gems_common/util.hh"
 
 CheckAllocateStatementAST::CheckAllocateStatementAST(VarExprAST* variable)
   : StatementAST()
index 8df08a0864c5e6d7e10efae72297f542ab11ba1c..1df853514880ab03a9a87d64d425fcbcc3e60a59 100644 (file)
@@ -35,9 +35,9 @@
 #ifndef CHECKALLOCATESTATEMENTAST_H
 #define CHECKALLOCATESTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class VarExprAST;
 class Var;
index f102e8894660131949ee2f090ae091667eb47e35..38dc449d6b1875c1baf9e01b9e21b01b8cc689e2 100644 (file)
  *
  */
 
-#include "CheckStopSlotsStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/ast/CheckStopSlotsStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
 
 CheckStopSlotsStatementAST::CheckStopSlotsStatementAST(VarExprAST* variable, string* condStr, string* bankStr)
   : StatementAST()
index 131b8cf4d0b7a7bba97d1823c245dd231bcb7e64..6de068caa9c3dd8fb6ca35bc16b73c217833b365 100644 (file)
 #ifndef CHECKSTOPSLOTSSTATEMENTAST_H
 #define CHECKSTOPSLOTSSTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "StatementAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class VarExprAST;
 class Var;
index 1ba1b98f25afdd69781ef9f4bc9e954be275f1d9..952bd6ad9864a6dd6e6123664b9505fae49e88da 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "ChipComponentAccessAST.hh"
+#include "mem/slicc/ast/ChipComponentAccessAST.hh"
 
 ChipComponentAccessAST::ChipComponentAccessAST(VarExprAST* machine, ExprAST* mach_version, VarExprAST* component, string* proc_name, Vector<ExprAST*>* expr_vec_ptr)
 
index 039fece2b40f1f4e201eb61072ed47ac5c2db808..4702066a5b37b300790a676b1086ff312b4a039a 100644 (file)
 #ifndef ChipComponentAccessAST_H
 #define ChipComponentAccessAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
-#include "VarExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class ChipComponentAccessAST : public ExprAST {
 public:
index 40e61dc076ee10d4da1d07e70e919c67661b219d..8d455eb9dffc1a6bf0e1b994a494e982383b4175 100644 (file)
  *
  */
 
-#include "CopyHeadStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/CopyHeadStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/gems_common/util.hh"
 
 CopyHeadStatementAST::CopyHeadStatementAST(VarExprAST* in_queue_ptr,
                                            VarExprAST* out_queue_ptr,
index 1631395fc93b8759afc55e504ff995c180cb6d89..53d479136a370234968642798758a096f7c9cecd 100644 (file)
 #ifndef COPYHEADSTATEMENTAST_H
 #define COPYHEADTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
 
 class VarExprAST;
 class Var;
index 4269ed9f4be81721e443fb3f757ddf0f93c43102..ebbdaeeaa204b34c436cd5ca281e5b2e5129ca85 100644 (file)
@@ -36,4 +36,4 @@
  *
  */
 
-#include "DeclAST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
index e7c8467d67c584917ff114d5f7581b33d3535e98..bcada71808ee1a9fa16c416327656332c98008aa 100644 (file)
 #ifndef DECLAST_H
 #define DECLAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "PairListAST.hh"
-#include "StateMachine.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class DeclAST : public AST {
 public:
index 6dacd5435117f9075bac412d392005172d348bd9..f2e35acd0aca365351e4650c3577248bde98b156 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "DeclListAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
 
 DeclListAST::DeclListAST(Vector<DeclAST*>* vec_ptr)
   : AST()
index 80c7fffccca91870437f96949fd827351cade009..f776a08122738db9723f153f7681900385763e8f 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef DeclListAST_H
 #define DeclListAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "DeclAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/DeclAST.hh"
 
 class DeclListAST : public AST {
 public:
index 49f2a92339f34e5a7eb545e4de201ca4f2891d70..e323e67ac5bd4ef36ed323ca9ba38cf67b35713d 100644 (file)
  *
  */
 
-#include "EnqueueStatementAST.hh"
-#include "SymbolTable.hh"
-#include "VarExprAST.hh"
-#include "PairListAST.hh"
-#include "util.hh"
+#include "mem/slicc/ast/EnqueueStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/gems_common/util.hh"
 
 EnqueueStatementAST::EnqueueStatementAST(VarExprAST* queue_name_ptr,
                                          TypeAST* type_name_ptr,
index eb7dad9af8cac757c76c8ad2d92af9676ad5eed6..939b9734c58c7276d369b750844aac7d1c4313e0 100644 (file)
 #ifndef ENQUEUESTATEMENTAST_H
 #define ENQUEUESTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class VarExprAST;
 class Var;
index c8e0330950f7932eb6aced28710d21bc4d574be3..0edfa57f7e84f0606cd7706979a641760f4d6e88 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "EnumDeclAST.hh"
-#include "main.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/EnumDeclAST.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 EnumDeclAST::EnumDeclAST(TypeAST* type_ast_ptr,
                          PairListAST* pairs_ptr,
index 4474b69ccbe198aa5754bc44b62db23b77b40166..24384dedbb5386623260319de9c55c70c52829a9 100644 (file)
 #ifndef EnumDeclAST_H
 #define EnumDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeAST.hh"
-#include "TypeFieldAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
 
 class EnumDeclAST : public DeclAST {
 public:
index 90dc4bebf38ee66619b52eca00e03ffbd7828197..f04c3efff6a992d2004511e9c9d0d24ab3ed824e 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "EnumExprAST.hh"
+#include "mem/slicc/ast/EnumExprAST.hh"
 
 EnumExprAST::EnumExprAST(TypeAST* type_ast_ptr,
                          string* value_ptr)
index 492f9ac3311044ad84e4eb3416fe6ca87689cc24..08feea450ed978d77c386f59b7658519c1ece967 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef EnumExprAST_H
 #define EnumExprAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 
 class EnumExprAST : public ExprAST {
index e910d688a38cb9ca4c878478a9633d6c1e158d01..c933d0ed65769f8c40e6b3162af5998a17713a67 100644 (file)
@@ -36,4 +36,4 @@
  *
  */
 
-#include "ExprAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
index 0015cebaae101a72b872f2cf248913478cbc7457..a2ec9cb815b0e45445af07e7140e58ce698e2b72 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef EXPRAST_H
 #define EXPRAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
 
 
 class ExprAST : public AST {
index 5eb1ce7b4ea522be0212654fd7d8b2486628ccb9..fa9465d81e02228296a7228d3521659b1eb8340b 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "ExprStatementAST.hh"
+#include "mem/slicc/ast/ExprStatementAST.hh"
 
 ExprStatementAST::ExprStatementAST(ExprAST* expr_ptr)
   : StatementAST()
index 925ded72ad3959560bad68ad1e931ce1162178ec..046de6599f1d60466d6ea7b1635f143fa00f08cc 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef ExprStatementAST_H
 #define ExprStatementAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 class ExprStatementAST : public StatementAST {
 public:
index b7dacf8a11dc7ab56d4030da7da82ead30b098bc..171c4c9335824b580b325761b9cb493d8a88253e 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "FormalParamAST.hh"
-#include "StatementAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 FormalParamAST::~FormalParamAST()
 {
index 0dc08fabeb0b710c1f8043f42902b0ec6ffa56df..be213fb010cac1f937e77ccbf164e37964961be5 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef FORMALPARAMAST_H
 #define FORMALPARAMAST_H
 
-#include "slicc_global.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 
 class FormalParamAST : public AST {
index 845d0c8e36d0347ada64acc6d84fac0826be4540..becead5459c70459ec40ba1f93345b29b1853b0b 100644 (file)
@@ -36,8 +36,8 @@
  *
  */
 
-#include "FuncCallExprAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/FuncCallExprAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 FuncCallExprAST::FuncCallExprAST(string* proc_name_ptr,
                                  Vector<ExprAST*>* expr_vec_ptr)
index edac97a045ed344b623ef1734a1bf5e8fa0a8fc0..fecca348693a7dc77d8f430f1f03d4af4ac316fd 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef FUNCCALLEXPRAST_H
 #define FUNCCALLEXPRAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 
 // ProcGen decl
index 9f9dd1f8e983929f4ff2a47e37dfb6964434a26a..69c09121ad93bb579f55eb2b281fbf65fae382ab 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "FuncDeclAST.hh"
-#include "SymbolTable.hh"
-#include "main.hh"
+#include "mem/slicc/ast/FuncDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/main.hh"
 
 FuncDeclAST::FuncDeclAST(TypeAST* return_type_ast_ptr,
                          string* ident_ptr,
index 4096a8b66d49e94756c41720ee998c989e9fddd5..a06eb7eb17d97432f1e5db3e3a6c37188593d0e4 100644 (file)
 #ifndef FuncDeclAST_H
 #define FuncDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
-#include "FormalParamAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/FormalParamAST.hh"
 
 class FuncDeclAST : public DeclAST {
 public:
index 372b213d898c00d7216e253dc0c7cf4a050fafe4..e3c076ff1762b70eca874ba628e21f8dd6d8879d 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "IfStatementAST.hh"
+#include "mem/slicc/ast/IfStatementAST.hh"
 
 IfStatementAST::IfStatementAST(ExprAST* cond_ptr,
                                StatementListAST* then_ptr,
index bad7a286df916b9b660fd238a8ce83e0756ceaa3..6ac4a573b1a13a1fbaf1ae80a790a5c3af0ae628 100644 (file)
 #ifndef IFSTATEMENTAST_H
 #define IFSTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
-#include "StatementAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
 
 
 class IfStatementAST : public StatementAST {
index 6b13fec51245df99e2eb9eff0894464d0cf20904..7711f2b6c49ad93dfe761dfcbe54aa5ebb3edc57 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "InPortDeclAST.hh"
-#include "SymbolTable.hh"
-#include "Var.hh"
+#include "mem/slicc/ast/InPortDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/symbols/Var.hh"
 
 InPortDeclAST::InPortDeclAST(string* ident_ptr,
                              TypeAST* msg_type_ptr,
index 4f3c25f93617e196adf3d7b5714a759cec808518..24d8b1cfbf04635d19344393430212d29006ebe2 100644 (file)
 #ifndef InPortDeclAST_H
 #define InPortDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
 
 class InPortDeclAST : public DeclAST {
 public:
index ba3aa12457712c4b4d0b502b1290908a06b40f92..916974bc76b264bffce5651dc839b06b9fe42a12 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "InfixOperatorExprAST.hh"
+#include "mem/slicc/ast/InfixOperatorExprAST.hh"
 
 InfixOperatorExprAST::InfixOperatorExprAST(ExprAST* left_ptr,
                                            string* op_ptr,
index 451156f6d91ff45d54b202ef37e8080e6346c461..a573acbb70e59d81fb76bcf91d7d39df2eda4efe 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef INFIXOPERATOREXPRAST_H
 #define INFIXOPERATOREXPRAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 
 class InfixOperatorExprAST : public ExprAST {
index b3b415bc9114ca53ea787f39c5f572f93c7fc881..04083db262dc280dbc844281dc1da99b7c13cad5 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "LiteralExprAST.hh"
+#include "mem/slicc/ast/LiteralExprAST.hh"
 
 Type* LiteralExprAST::generate(string& code) const
 {
index be433a1e3747761e13627a1aefd878f252b33fe2..b0152489b0537f57594a15a8db9b2af11271ba52 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef LITERALEXPRAST_H
 #define LITERALEXPRAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 
 class LiteralExprAST : public ExprAST {
index 91b8dbd284018321beb58db093dd4c9d924ea2c8..6209ccdb736d0c89194ae6042e230fb94681bbf4 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "Location.hh"
+#include "mem/slicc/ast/Location.hh"
 
 int g_line_number = 0;
 string g_file_name("");
index 6cf2df5a4c3cbcfba785fefc7b9efbbd13d795a5..f070efc4662e2439acf67ad290c59774d2b3b272 100644 (file)
@@ -39,7 +39,7 @@
 #ifndef LOCATION_H
 #define LOCATION_H
 
-#include "slicc_global.hh"
+#include "mem/slicc/slicc_global.hh"
 
 extern int g_line_number;
 extern string g_file_name;
index 3ee97bc383168667437ebae5d0f76ed944ebf39c..68acb0070ef8642eff8feb62f771c3769c5a015f 100644 (file)
@@ -36,8 +36,8 @@
  *
  */
 
-#include "MachineAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/MachineAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 MachineAST::MachineAST(string* ident_ptr,
                        PairListAST* pairs_ptr,
index c05bcc5f2755f8a3691183f054e33ddb912b1374..cf8361d824aa82ece6cf1294659e9f014a420191 100644 (file)
 #ifndef MachineAST_H
 #define MachineAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "DeclListAST.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 class MachineAST : public DeclAST {
 public:
index c4e9ce24be2a6ec6f4d60055f54af01177a6ed2c..9547251b631b936311182e028af63f6ecc7bb0ca 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "MemberExprAST.hh"
+#include "mem/slicc/ast/MemberExprAST.hh"
 
 MemberExprAST::MemberExprAST(ExprAST* expr_ast_ptr, string* field_ptr)
   : ExprAST()
index c5fd3d0ddd5d7b3d5e97a1cc788646f759d1e2c4..2be5c69d6972da1976c8fbf11e99d5a39dfb1965 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef MemberExprAST_H
 #define MemberExprAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 
 class MemberExprAST : public ExprAST {
index fe6505a1a43bda10dc48d668cda89c5819a8c58c..da4be31e84861193bee992f183e2e4c493fe8cd0 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "MethodCallExprAST.hh"
+#include "mem/slicc/ast/MethodCallExprAST.hh"
 
 MethodCallExprAST::MethodCallExprAST(ExprAST* obj_expr_ptr,
                                      string* proc_name_ptr,
index 22766e922147c9b8fdf2be23648ba15edc4aa340..537d5993a9578a45a23820ebd22dbe8843b993ec 100644 (file)
 #ifndef MethodCallExprAST_H
 #define MethodCallExprAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class MethodCallExprAST : public ExprAST {
 public:
index 106c18cac73f109380c3d4cdf8594d167ae76e3e..6e338cc3db8a07cf45f481641442edbf02b3fe6f 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "ObjDeclAST.hh"
-#include "SymbolTable.hh"
-#include "main.hh"
+#include "mem/slicc/ast/ObjDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/main.hh"
 
 ObjDeclAST::ObjDeclAST(TypeAST* type_ptr,
                        string* ident_ptr,
index 2d4ac97141f5c570510785325401c28691b17302..0415f53225389f7f3d0e7718c0b6f264fb776104 100644 (file)
 #ifndef ObjDeclAST_H
 #define ObjDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class ObjDeclAST : public DeclAST {
 public:
index 1aa0363aa96af60306eaaf0729c210eecacb9339..b53484715467b1d81522d64ac1fa3b7d02337b98 100644 (file)
@@ -36,8 +36,8 @@
  *
  */
 
-#include "OutPortDeclAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/OutPortDeclAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 OutPortDeclAST::OutPortDeclAST(string* ident_ptr,
                                TypeAST* msg_type_ptr,
index 3fcd755ef56c8ac88e44cd4848c658466c210e1b..28fc5903eae63bb9431d74409bee720d1c7bc6d4 100644 (file)
 #ifndef OutPortDeclAST_H
 #define OutPortDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
 
 class OutPortDeclAST : public DeclAST {
 public:
index da71bdd01eb191f6cc7c3b020bcc52436c920175..312aa69467285176961b8aa171f9355dee19fb81 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "PairAST.hh"
+#include "mem/slicc/ast/PairAST.hh"
 
 PairAST::PairAST(string* key_ptr, string* value_ptr)
   : AST()
index 4cc297dc1cc1ddf8ee8b151506eb07c684e1709c..7f2969b0c86d8527d04fc4af1ad401e93d079de5 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef PAIRAST_H
 #define PAIRAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
 
 class PairAST : public AST {
 public:
index 9af8b3898b93e46083280ab10f695cac71ec3baa..925b8065f41f97eb55ac3891a6e418375efbaf52 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "PairListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
 
 void PairListAST::addPair(PairAST* pair_ptr)
 {
index 9d270027793d8ac82bdfe48289e6775d9d1d5fae..bc695eaa4cb24ed509020f97bf0a777b8d10f426 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef PairListAST_H
 #define PairListAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "PairAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/PairAST.hh"
 
 
 class PairListAST : public AST {
index 627e85ae85e18f27cf24a5e31f20188bec8568a9..96e97f18ba99ecc0eacd525bc33f80aeebaea9f8 100644 (file)
  *
  */
 
-#include "PeekStatementAST.hh"
-#include "SymbolTable.hh"
-#include "StatementListAST.hh"
-#include "TypeAST.hh"
-#include "VarExprAST.hh"
+#include "mem/slicc/ast/PeekStatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
 
 PeekStatementAST::PeekStatementAST(VarExprAST* queue_name_ptr,
                                    TypeAST* type_ptr,
index e51a0a6a49aabaa838872ba7a6b4de7c274119e0..da663a4aeac54cce68324bee71eab90b23f78374 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef PEEKSTATEMENTAST_H
 #define PEEKSTATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
 
 class StatementListAST;
 class TypeAST;
index 68e81b83415c9e9e8a9da634c8fd089c991c098e..acc6fcd885b69be7cad24c1c47f0a078458b7ce5 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "ReturnStatementAST.hh"
+#include "mem/slicc/ast/ReturnStatementAST.hh"
 
 ReturnStatementAST::ReturnStatementAST(ExprAST* expr_ptr)
   : StatementAST()
index f8c4812cfd45093ed958adc871787a9478440f71..86717bf31cc911d6b3c9613d39bc7ad75009e5b3 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef ReturnStatementAST_H
 #define ReturnStatementAST_H
 
-#include "slicc_global.hh"
-#include "StatementAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 class ReturnStatementAST : public StatementAST {
 public:
index 1f3c02474a5f9f09f2279df2672cddb8e2e27e42..f15c5f0119a057cad612fc888ad95d7bee44b4ad 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "StatementAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
 
 static int indentation_depth = 1;
 
index 16a1ecafe66f326a9ada3b5f89a063877eb8fc24..d4ff541930ac82175fc7e57ae8a4f65ce9e3d458 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef STATEMENTAST_H
 #define STATEMENTAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
 
 void inc_indent();
 void dec_indent();
index f70d5b1fa42caad76c542eb503c5e49cb184114a..dfdcc2d26419a87ceb081d5d3127fad732625e6f 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "StatementListAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
 
 StatementListAST::StatementListAST(Vector<StatementAST*>* vec_ptr)
   : AST()
index 3b3968211ddf3d6c30d38c30f7c7a8e9d7af0237..c77cb8c653e544f6cf67cda9d274c3afb737440f 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef STATEMENTLISTAST_H
 #define STATEMENTLISTAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
-#include "StatementAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
 class Var;
 
 class StatementListAST : public AST {
index 83361e233660026843983d00fa395ff2bd0087f6..a1826041aed81294c70ff4bb093d0ed0b838de68 100644 (file)
@@ -36,8 +36,8 @@
  *
  */
 
-#include "TransitionDeclAST.hh"
-#include "Transition.hh"
+#include "mem/slicc/ast/TransitionDeclAST.hh"
+#include "mem/slicc/symbols/Transition.hh"
 
 TransitionDeclAST::TransitionDeclAST(Vector<string>* state_list_ptr,
                                      Vector<string>* event_list_ptr,
index 10ca067d3f0351a2ae47806da3d787128b225c5f..95bf0b48c1e2e96acab9e7615318d6ae042d2d64 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef TransitionDeclAST_H
 #define TransitionDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "StatementListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
 
 class TransitionDeclAST : public DeclAST {
 public:
index 82364732b2b5dfd0b72c421400e476a7e0d0ba3a..284e917dfdb3bb0f76f1f850276f44af78258482 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "TypeAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 TypeAST::TypeAST(string* ident_ptr)
   : AST()
index a0fea56c3a51fa091dc724d156a55874a476ff0a..a1aa13ad4cc8ee5e37851fea6ed65395dd79476e 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef TYPEAST_H
 #define TYPEAST_H
 
-#include "slicc_global.hh"
-#include "AST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/AST.hh"
 
 class TypeAST : public AST {
 public:
index 5d2b19bace5c7a0358516a8f93a224f43f823f1e..1af2beb1ceeb4246a58364da4d37604a13aec94c 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "TypeDeclAST.hh"
-#include "main.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/TypeDeclAST.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 TypeDeclAST::TypeDeclAST(TypeAST* type_ast_ptr,
                          PairListAST* pairs_ptr,
index 1928c1bdee82aa815744d2807a22e31dba4f423a..bb0ea2935c388e14235f1cb256707c31271aec96 100644 (file)
 #ifndef TypeDeclAST_H
 #define TypeDeclAST_H
 
-#include "slicc_global.hh"
-#include "DeclAST.hh"
-#include "TypeAST.hh"
-#include "TypeFieldAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
 
 class TypeDeclAST : public DeclAST {
 public:
index 9dfe4539784a65890c3c18f25b94ac9296ad6619..9b3c77ef37db26f9350342467ce0ded0d830725a 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
 
 TypeFieldAST::TypeFieldAST(PairListAST* pairs_ptr)
   : AST(pairs_ptr->getPairs()) {
index 69d6d8b87fc651b111e91482854e448a69ef8f54..9979121f5f3fda4147759aff475e360d99c53bd8 100644 (file)
 #ifndef TypeFieldAST_H
 #define TypeFieldAST_H
 
-#include "slicc_global.hh"
-#include "StateMachine.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 
 class TypeFieldAST : public AST {
 public:
index dbb27c3aede870fa5af004bc883fd22bb4617345..47a42d8eba32410b5cc136e259684548525f6daf 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "TypeFieldEnumAST.hh"
-#include "State.hh"
-#include "Event.hh"
+#include "mem/slicc/ast/TypeFieldEnumAST.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
 
 TypeFieldEnumAST::TypeFieldEnumAST(string* field_id_ptr,
                                    PairListAST* pairs_ptr)
index f9c1117620c5cf95812142b5b783c6b4f310b22e..c17f3cfab4b7e950b067b7a29deef46f26af5966 100644 (file)
 #ifndef TypeFieldEnumAST_H
 #define TypeFieldEnumAST_H
 
-#include "slicc_global.hh"
-#include "StateMachine.hh"
-#include "TypeFieldAST.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
 
 class TypeFieldEnumAST : public TypeFieldAST {
 public:
index 40109851bb336d103dbdd2f2805b2d8a667fcd7a..67b90b44eb8fd30ad5e48039d885ad41960f5350 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "TypeFieldMemberAST.hh"
+#include "mem/slicc/ast/TypeFieldMemberAST.hh"
 
 TypeFieldMemberAST::TypeFieldMemberAST(TypeAST* type_ast_ptr,
                                        string* field_id_ptr,
index 5e275bb96336e3b457f996b04da51dc11f9e9bd9..9f8df0520b88834c14249e4e7a6584f189ecfcbd 100644 (file)
 #ifndef TypeFieldMemberAST_H
 #define TypeFieldMemberAST_H
 
-#include "slicc_global.hh"
-#include "TypeFieldAST.hh"
-#include "StateMachine.hh"
-#include "StatementListAST.hh"
-#include "PairListAST.hh"
-#include "ExprAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/ast/StatementListAST.hh"
+#include "mem/slicc/ast/PairListAST.hh"
+#include "mem/slicc/ast/ExprAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class TypeFieldMemberAST : public TypeFieldAST {
 public:
index 5229d4a08f7442851a36423736a2cd119e13c828..71c7a8fd1439ce149cba2fee3f0a0e4d45aa9aa3 100644 (file)
@@ -36,7 +36,7 @@
  *
  */
 
-#include "TypeFieldMethodAST.hh"
+#include "mem/slicc/ast/TypeFieldMethodAST.hh"
 
 TypeFieldMethodAST::TypeFieldMethodAST(TypeAST* return_type_ast_ptr,
                                        string* ident_ptr,
index a276cc5f87d2a598484de69df240008b76a87a6e..c429b7ef65baa49fdef047ad854360b63c49733c 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef TYPEFIELDMETHODAST_H
 #define TYPEFIELDMETHODAST_H
 
-#include "slicc_global.hh"
-#include "TypeFieldAST.hh"
-#include "TypeAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/TypeFieldAST.hh"
+#include "mem/slicc/ast/TypeAST.hh"
 
 class TypeFieldMethodAST : public TypeFieldAST {
 public:
index 865cc71b0af44c853eaa7bd7ebb96cecc1857b57..878d0d6419827d0b3425f80d25fc30a8232facbf 100644 (file)
@@ -36,9 +36,9 @@
  *
  */
 
-#include "VarExprAST.hh"
-#include "StatementAST.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/ast/VarExprAST.hh"
+#include "mem/slicc/ast/StatementAST.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 VarExprAST::~VarExprAST()
 {
index ce2f68875d99cc917cd52fd341ea4e4fd3a55d6c..65829de8f7b014e535b7cc7dd5545621facde923 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef VAREXPRAST_H
 #define VAREXPRAST_H
 
-#include "slicc_global.hh"
-#include "ExprAST.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/ExprAST.hh"
 class Var;
 
 class VarExprAST : public ExprAST {
index 1707e5b7a96ee8a05cae54c6c1c1f6bfc22f3291..273c76bfd760e2369c5166d06c8f4508c3f78d55 100644 (file)
@@ -36,7 +36,7 @@
  *
  * */
 
-#include "fileio.hh"
+#include "mem/slicc/generator/fileio.hh"
 
 void conditionally_write_file(string filename, ostringstream& sstr)
 {
index 3cca7ccaa509679af2a4d5281ec4d935cc43e738..fa1cc34932cec09b39919bba26c888b17707d81d 100644 (file)
@@ -39,7 +39,7 @@
 #ifndef FILEIO_H
 #define FILEIO_H
 
-#include "slicc_global.hh"
+#include "mem/slicc/slicc_global.hh"
 
 void conditionally_write_file(string filename, ostringstream& sstr);
 
index 3d17018e169bd53b80d0809a926d2a78b6e1213f..ebe02db925aa8b0b4070c541f8a1f00c031ecfe1 100644 (file)
@@ -36,9 +36,9 @@
  *
  * */
 
-#include "html_gen.hh"
-#include "fileio.hh"
-#include "SymbolTable.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
 
 string formatHTMLShorthand(const string shorthand);
 
index 3f0de8df9bbf828b6734580f34d32888e58d455b..e90836b332be35b2e91da8546b7428b8b4fd6b9b 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef HTML_GEN_H
 #define HTML_GEN_H
 
-#include "slicc_global.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 string formatHTMLShorthand(const string shorthand);
 void createHTMLindex(string title, ostream& out);
index 0e6253654a05102c4102437fcfeb230c39fcce6c..2dca149b42b066b3d747ba2c2ac881121dd79a52 100644 (file)
  *
  */
 
-#include "mif_gen.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "Transition.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Transition.hh"
 
 // -- Helper functions
 string formatShorthand(const string shorthand);
index ba1dc0b0b2e542d977427453f3acb0c305a2c760..9cc5e1ea3145550581b18c80bf3dd568af4a7707 100644 (file)
@@ -35,7 +35,7 @@
 #ifndef MIF_GEN_H
 #define MIF_GEN_H
 
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 void printStateTableMIF(const StateMachine& sm, ostream& out);
 void printEventTableMIF(const StateMachine& sm, ostream& out);
index acd9e73f972e0a82ce7490bdbf5bdc00c61a4724..294925ee15dc29b8c65b28a0042dd41eb1a02ab2 100644 (file)
  *
  * */
 
-#include "main.hh"
-#include "StateMachine.hh"
-#include "mif_gen.hh"
-#include "html_gen.hh"
-#include "fileio.hh"
-#include "DeclListAST.hh"
-#include "Type.hh"
-#include "SymbolTable.hh"
-#include "Event.hh"
-#include "State.hh"
-#include "Action.hh"
-#include "Transition.hh"
+#include "mem/slicc/main.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Transition.hh"
 
 // -- Main conversion functions
 
index e9fdee034a9bc3c2fe098d6f61ec169f62d34bf9..3e09c58f9ccb4c38d25299c1e63ce6b8517373ab 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef MAIN_H
 #define MAIN_H
 
-#include "slicc_global.hh"
-#include "DeclListAST.hh"
-#include "Map.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/ast/DeclListAST.hh"
+#include "mem/gems_common/Map.hh"
 
 extern DeclListAST* g_decl_list_ptr;
 
index 7903b0ee740691c89bc19b5571959e016081e7ad..a4af2ac51e257687199d34ab9ae0c3e133362365 100644 (file)
@@ -29,8 +29,8 @@
 %{
 
 #include <assert.h>
-#include "ASTs.hh"
-#include "parser.h"
+#include "mem/slicc/ast/ASTs.hh"
+#include "mem/slicc/parser/parser.hh"
 #include <string>
 
 extern "C" int yylex();
index f4d9a1a624a121af5d856468e61ffbaad7fdc5d5..8090b88f79f4dd87df8e15a11c95ede6e7021b9a 100644 (file)
@@ -30,7 +30,7 @@
 #include <string>
 #include <stdio.h>
 #include <assert.h>
-#include "ASTs.hh"
+#include "mem/slicc/ast/ASTs.hh"
 
 #define YYMAXDEPTH 100000
 #define YYERROR_VERBOSE
index 72af5be5820157ab8ee353f050605ffaa0d2d3d3..caa5509f8861258bda75d561fcf69cb4da087410 100644 (file)
@@ -34,8 +34,8 @@
                      * ../common directory.
                      */
 
-#include "std-includes.hh"
-#include "Map.hh"
+#include "mem/gems_common/std-includes.hh"
+#include "mem/gems_common/Map.hh"
 
 typedef unsigned char uint8;
 typedef unsigned int uint32;
index 0f6e4929017d65edddd64053ca6d26e09f50d4c4..dbb0c836a2bcc5c0e48e2788c9611f2656b90d51 100644 (file)
@@ -34,7 +34,7 @@
 #ifndef ACTION_H
 #define ACTION_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Action : public Symbol {
 public:
index f272e8eb1a1f6e08afd512bde1b34b7a9b1a33c5..40cefc982609d426d3ea4538bf2af28b39635d24 100644 (file)
@@ -34,7 +34,7 @@
 #ifndef EVENT_H
 #define EVENT_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Event : public Symbol {
 public:
index 1af1e299cb3a6ecdaa44dadf1fc960ffb40caee9..0ccca75984d24d8078494e82baf2b040ff7f8c43 100644 (file)
  *
  */
 
-#include "Func.hh"
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Func::Func(string id, const Location& location,
            Type* type_ptr, const Vector<Type*>& param_type_vec,
@@ -98,8 +98,8 @@ void Func::writeCFiles(string path) const
     // Header
     out << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
     out << endl;
-    out << "#include \"Types.hh\"" << endl;
-    out << "#include \"Chip.hh\"" << endl;
+    out << "#include \"mem/protocol/Types.hh\"" << endl;
+    out << "#include \"mem/protocol/Chip.hh\"" << endl;
     if (m_isInternalMachineFunc) {
       out << "#include \"" << m_machineStr << "_Controller.hh\"" << endl;
     }
index 763827701998877797272695d9bb150c943f0888..c7e78838e8967f9aa25d64c2e67fc8e7c8f7e8e6 100644 (file)
@@ -39,8 +39,8 @@
 #ifndef FUNC_H
 #define FUNC_H
 
-#include "slicc_global.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Type.hh"
 class StateMachine;
 
 class Func : public Symbol {
index cac743e578e8dad7bc4eed4c8012d999b4768b95..39900d5064a76a4b17b2723ab11de5cf1ebeddc5 100644 (file)
@@ -34,7 +34,7 @@
 #ifndef STATE_H
 #define STATE_H
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class State : public Symbol {
 public:
index d4436870eb3e5277c4024426588ad346c26ac4a8..6aaa0ebcad8eaad6206bb4fcd75da73bead064e2 100644 (file)
  *
  * */
 
-#include "StateMachine.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "Action.hh"
-#include "Event.hh"
-#include "State.hh"
-#include "Transition.hh"
-#include "Var.hh"
-#include "SymbolTable.hh"
-#include "util.hh"
-#include "Vector.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/gems_common/Vector.hh"
 
 StateMachine::StateMachine(string ident, const Location& location, const Map<string, string>& pairs)
   : Symbol(ident, location, pairs)
@@ -230,11 +230,11 @@ void StateMachine::printControllerH(ostream& out, string component) const
   out << "#ifndef " << component << "_CONTROLLER_H" << endl;
   out << "#define " << component << "_CONTROLLER_H" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"Consumer.hh\"" << endl;
-  out << "#include \"TransitionResult.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"" << component << "_Profiler.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Consumer.hh\"" << endl;
+  out << "#include \"mem/protocol/TransitionResult.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
   out << endl;
 
   // for adding information to the protocol debug trace
@@ -302,14 +302,14 @@ void StateMachine::printControllerC(ostream& out, string component) const
   out << "  * Created by slicc definition of Module \"" << getShorthand() << "\"" << endl;
   out << "  */" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"RubySlicc_includes.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
 
   // for adding information to the protocol debug trace
@@ -399,14 +399,14 @@ void StateMachine::printCWakeup(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"RubySlicc_includes.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
   out << "void " << component << "_Controller::wakeup()" << endl;
   out << "{" << endl;
@@ -447,13 +447,13 @@ void StateMachine::printCSwitch(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"" << component << "_Controller.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
-  out << "#include \"Types.hh\"" << endl;
-  out << "#include \"System.hh\"" << endl;
-  out << "#include \"Chip.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Controller.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/protocol/Types.hh\"" << endl;
+  out << "#include \"mem/ruby/system/System.hh\"" << endl;
+  out << "#include \"mem/protocol/Chip.hh\"" << endl;
   out << endl;
   out << "#define HASH_FUN(state, event)  ((int(state)*" << component
       << "_Event_NUM)+int(event))" << endl;
@@ -650,9 +650,9 @@ void StateMachine::printProfilerH(ostream& out, string component) const
   out << "#ifndef " << component << "_PROFILER_H" << endl;
   out << "#define " << component << "_PROFILER_H" << endl;
   out << endl;
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"" << component << "_State.hh\"" << endl;
-  out << "#include \"" << component << "_Event.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_State.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Event.hh\"" << endl;
   out << endl;
   out << "class " << component << "_Profiler {" << endl;
   out << "public:" << endl;
@@ -674,7 +674,7 @@ void StateMachine::printProfilerC(ostream& out, string component) const
   out << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "// " << getIdent() << ": " << getShorthand() << endl;
   out << endl;
-  out << "#include \"" << component << "_Profiler.hh\"" << endl;
+  out << "#include \"mem/protocol/" << component << "_Profiler.hh\"" << endl;
   out << endl;
 
   // Constructor
index 9f3663ed46023917954e45329e8eb9366e590487..02ab12881a89629103d40b8f8ca8ea8d8dad1309 100644 (file)
 #ifndef STATEMACHINE_H
 #define STATEMACHINE_H
 
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class Transition;
 class Event;
index 3365c94eba0b0c9f2952eabcb9d5fae04343e5f9..25af5ad474b3112e5ddba00465fd80d96aafc71a 100644 (file)
@@ -32,7 +32,7 @@
  *
  */
 
-#include "Symbol.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 Symbol::Symbol(string id, const Location& location, const Map<string, string>& pairs)
 {
index bca7d32db162e2127ab6e205a5a23915ac16c7f9..1b4bd517a52cbee203aa93941d05e8419a28fa3c 100644 (file)
@@ -34,9 +34,9 @@
 #ifndef SYMBOL_H
 #define SYMBOL_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Location.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/ast/Location.hh"
 
 class Symbol {
 public:
index 37e233e8849af12735ed0ee5d309c7163810a19e..70391f8386227d699e1ccf5db86d6adefc38d088 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "SymbolTable.hh"
-#include "fileio.hh"
-#include "html_gen.hh"
-#include "mif_gen.hh"
-#include "Action.hh"
+#include "mem/slicc/symbols/SymbolTable.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/slicc/generator/html_gen.hh"
+#include "mem/slicc/generator/mif_gen.hh"
+#include "mem/slicc/symbols/Action.hh"
 
 SymbolTable g_sym_table;
 
@@ -163,15 +163,15 @@ void SymbolTable::writeCFiles(string path) const
 {
   int size = m_sym_vec.size();
   {
-    // Write the Types.hh include file for the types
+    // Write the mem/protocol/Types.hh include file for the types
     ostringstream sstr;
     sstr << "/** Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< " */" << endl;
     sstr << endl;
-    sstr << "#include \"RubySlicc_includes.hh\"" << endl;
+    sstr << "#include \"mem/ruby/slicc_interface/RubySlicc_includes.hh\"" << endl;
     for(int i=0; i<size; i++) {
       Type* type = dynamic_cast<Type*>(m_sym_vec[i]);
       if (type != NULL && !type->isPrimitive()) {
-        sstr << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+        sstr << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
       }
     }
     conditionally_write_file(path + "/Types.hh", sstr);
@@ -187,7 +187,7 @@ void SymbolTable::writeCFiles(string path) const
 
 void SymbolTable::writeChipFiles(string path) const
 {
-  // Create Chip.cc and Chip.hh
+  // Create Chip.cc and mem/protocol/Chip.hh
 
   // FIXME - Note: this method is _really_ ugly.  Most of this
   // functionality should be pushed into each type of symbol and use
@@ -208,9 +208,9 @@ void SymbolTable::writeChipFiles(string path) const
     sstr << endl;
 
     // Includes
-    sstr << "#include \"Global.hh\"" << endl;
-    sstr << "#include \"Types.hh\"" << endl;
-    sstr << "#include \"AbstractChip.hh\"" << endl;
+    sstr << "#include \"mem/ruby/common/Global.hh\"" << endl;
+    sstr << "#include \"mem/protocol/Types.hh\"" << endl;
+    sstr << "#include \"mem/ruby/slicc_interface/AbstractChip.hh\"" << endl;
     sstr << "class Network;" << endl;
     sstr << endl;
 
@@ -331,16 +331,16 @@ void SymbolTable::writeChipFiles(string path) const
   {
     ostringstream sstr;
     sstr << "// Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<<endl<<endl;
-    sstr << "#include \"Chip.hh\"" << endl;
-    sstr << "#include \"Network.hh\"" << endl;
-    sstr << "#include \"CacheRecorder.hh\"" << endl;
+    sstr << "#include \"mem/protocol/Chip.hh\"" << endl;
+    sstr << "#include \"mem/ruby/network/Network.hh\"" << endl;
+    sstr << "#include \"mem/ruby/recorder/CacheRecorder.hh\"" << endl;
     sstr << "" << endl;
 
     sstr << "// Includes for controllers" << endl;
     for(int i=0; i<size; i++) {
       StateMachine* machine = dynamic_cast<StateMachine*>(m_sym_vec[i]);
       if (machine != NULL) {
-        sstr << "#include \"" << machine->getIdent() << "_Controller.hh\"" << endl;
+        sstr << "#include \"mem/protocol/" << machine->getIdent() << "_Controller.hh\"" << endl;
       }
     }
 
index 8f40fe8c5308aa14c916d660610fa51532d57b2c..5e032e65d9c35484daeed7d6b1a50f126510499b 100644 (file)
 #ifndef SYMBOLTABLE_H
 #define SYMBOLTABLE_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Vector.hh"
-
-#include "Symbol.hh"
-#include "Type.hh"
-#include "Var.hh"
-#include "Func.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/gems_common/Vector.hh"
+
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/Func.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 class SymbolTable;
 
index 7c144c101de1e4100c72e8581b96cef73adbf0fa..d6d348166378e7eb70e6e3e2bb374ea6b341e86b 100644 (file)
  *
  * */
 
-#include "Transition.hh"
-#include "State.hh"
-#include "Event.hh"
-#include "Action.hh"
-#include "util.hh"
-#include "Var.hh"
+#include "mem/slicc/symbols/Transition.hh"
+#include "mem/slicc/symbols/State.hh"
+#include "mem/slicc/symbols/Event.hh"
+#include "mem/slicc/symbols/Action.hh"
+#include "mem/gems_common/util.hh"
+#include "mem/slicc/symbols/Var.hh"
 
 Transition::Transition(string state, string event, string nextState,
                        const Vector<string>& actionList,
index af8eb3a057b080df2088a5849fa1c1433d74b20b..7d39447b0e219a648c1f9916640b2d7e28d0254f 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef TRANSITION_H
 #define TRANSITION_H
 
-#include "slicc_global.hh"
-#include "Vector.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Vector.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class State;
 class Event;
index a49e9d7ba1bbaa9e059a45ddb1ed6c43205007d6..a1de381ec017efba212b181afef9795f1905d1e7 100644 (file)
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "Type.hh"
-#include "fileio.hh"
-#include "Map.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Type.hh"
+#include "mem/slicc/generator/fileio.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Type::Type(string id, const Location& location,
            const Map<string, string>& pairs,
@@ -198,18 +198,18 @@ void Type::printTypeH(string path) const
   out << endl;
 
   // Include all of the #includes needed
-  out << "#include \"Global.hh\"" << endl;
-  out << "#include \"Allocator.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
+  out << "#include \"mem/gems_common/Allocator.hh\"" << endl;
   for (int i=0; i < size; i++) {
     Type* type = m_data_member_type_vec[i];
     if (!type->isPrimitive()) {
-      out << "#include \"" << type->cIdent() << ".hh" << "\"" << endl;
+      out << "#include \"mem/protocol/" << type->cIdent() << ".hh" << "\"" << endl;
     }
   }
   string interface = "";
   if(existPair("interface")) {
     interface = lookupPair("interface");
-    out << "#include \"" << interface << ".hh\"" << endl;
+    out << "#include \"mem/protocol/" << interface << ".hh\"" << endl;
   }
 
   // Class definition
@@ -445,7 +445,7 @@ void Type::printTypeC(string path) const
   out << "  * Auto generated C++ code started by "<<__FILE__<<":"<<__LINE__<< endl;
   out << "  */" << endl;
   out << endl;
-  out << "#include \"" << type_name << ".hh\"" << endl;
+  out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
   out << endl;
   if (isMessage()) {
     out << "Allocator<" << type_name << ">* " << type_name << "::s_allocator_ptr = NULL;" << endl;
@@ -490,9 +490,9 @@ void Type::printEnumH(string path) const
   out << "#define " << type_name << "_H" << endl;
   out << endl;
   // Include all of the #includes needed
-  out << "#include \"Global.hh\"" << endl;
+  out << "#include \"mem/ruby/common/Global.hh\"" << endl;
   if (m_isMachineType) {
-    out << "#include \"RubyConfig.hh\"" << endl << endl;
+    out << "#include \"mem/ruby/config/RubyConfig.hh\"" << endl << endl;
   }
   out << endl;
 
@@ -568,7 +568,7 @@ void Type::printEnumC(string path) const
   out << "  */" << endl;
 
   out << endl;
-  out << "#include \"" << type_name << ".hh\"" << endl;
+  out << "#include \"mem/protocol/" << type_name << ".hh\"" << endl;
   out << endl;
 
   // Code for output operator
@@ -629,7 +629,7 @@ void Type::printEnumC(string path) const
     out << "/** \\brief returns the base vector index for each machine type to be used by NetDest " << endl;
     out << "  * " << endl;
     out << "  * \\return the base vector index for each machine type to be used by NetDest" << endl;
-    out << "  * \\see NetDest.hh" << endl;
+    out << "  * \\see mem/ruby/common/NetDest.hh" << endl;
     out << "  */" << endl;
     out << "int " << type_name << "_base_level(const " << type_name << "& obj)" << endl;
     out << "{" << endl;
index c6f8913269d2a8a2a145c2956212a0b7806179b6..4187d8ad5be618b7c0a410c3e035fdbbc14e7a7b 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef TYPE_H
 #define TYPE_H
 
-#include "slicc_global.hh"
-#include "Map.hh"
-#include "Symbol.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/gems_common/Map.hh"
+#include "mem/slicc/symbols/Symbol.hh"
 
 class StateMachine;
 
index a16c869678ccd468067b61c9aa6a9088a9f90b1f..a6e8dfd55c52b5a7cbea3ebfed8a827ce3d8b2d4 100644 (file)
@@ -32,8 +32,8 @@
  *
  * */
 
-#include "Var.hh"
-#include "StateMachine.hh"
+#include "mem/slicc/symbols/Var.hh"
+#include "mem/slicc/symbols/StateMachine.hh"
 
 Var::Var(string id, const Location& location,
          Type* type_ptr, string code,
index 277be0f74ceefb212c3c0288b1f2fb8734f744d1..7b1a2c77d09347a548b6f9d41da1231edb1afef8 100644 (file)
@@ -39,9 +39,9 @@
 #ifndef VAR_H
 #define VAR_H
 
-#include "slicc_global.hh"
-#include "Symbol.hh"
-#include "Type.hh"
+#include "mem/slicc/slicc_global.hh"
+#include "mem/slicc/symbols/Symbol.hh"
+#include "mem/slicc/symbols/Type.hh"
 
 class StateMachine;