changeset 6bb54dcb940e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=6bb54dcb940e
description:
ruby: Make ruby #includes use full paths to the files they're including.
This basically means changing all #include statements and changing
autogenerated code so that it generates the correct paths. Because
slicc generates #includes, I had to hard code the include paths to
mem/protocol.
diffstat:
344 files changed, 1464 insertions(+), 1471 deletions(-)
src/mem/gems_common/Allocator.hh | 2
src/mem/gems_common/Map.hh | 2
src/mem/gems_common/PrioHeap.hh | 2
src/mem/gems_common/RefCnt_tester.cc | 4
src/mem/gems_common/RefCountable.hh | 2
src/mem/gems_common/Vector.hh | 2
src/mem/gems_common/ioutil/attrlex.ll | 6
src/mem/gems_common/ioutil/attrparse.yy | 6
src/mem/gems_common/ioutil/confio.cc | 4
src/mem/gems_common/ioutil/confio.hh | 2
src/mem/gems_common/ioutil/initvar.cc | 18 +-
src/mem/gems_common/ioutil/vardecl.hh | 2
src/mem/gems_common/util.cc | 2
src/mem/gems_common/util.hh | 2
src/mem/ruby/buffers/MessageBuffer.cc | 4
src/mem/ruby/buffers/MessageBuffer.hh | 14 -
src/mem/ruby/buffers/MessageBufferNode.cc | 2
src/mem/ruby/buffers/MessageBufferNode.hh | 4
src/mem/ruby/common/Address.cc | 2
src/mem/ruby/common/Address.hh | 8
src/mem/ruby/common/BigSet.cc | 4
src/mem/ruby/common/BigSet.hh | 8
src/mem/ruby/common/Consumer.hh | 4
src/mem/ruby/common/DataBlock.cc | 2
src/mem/ruby/common/DataBlock.hh | 6
src/mem/ruby/common/Debug.cc | 6
src/mem/ruby/common/Driver.cc | 2
src/mem/ruby/common/Driver.hh | 14 -
src/mem/ruby/common/Global.cc | 2
src/mem/ruby/common/Global.hh | 4
src/mem/ruby/common/Histogram.cc | 2
src/mem/ruby/common/Histogram.hh | 4
src/mem/ruby/common/Message.cc | 2
src/mem/ruby/common/NetDest.cc | 6
src/mem/ruby/common/NetDest.hh | 14 -
src/mem/ruby/common/OptBigSet.cc | 4
src/mem/ruby/common/OptBigSet.hh | 8
src/mem/ruby/common/Set.cc | 4
src/mem/ruby/common/Set.hh | 12 -
src/mem/ruby/common/SubBlock.cc | 2
src/mem/ruby/common/SubBlock.hh | 10 -
src/mem/ruby/config/RubyConfig.cc | 10 -
src/mem/ruby/config/RubyConfig.hh | 6
src/mem/ruby/eventqueue/RubyEventQueue.cc | 14 -
src/mem/ruby/eventqueue/RubyEventQueue.hh | 4
src/mem/ruby/eventqueue/RubyEventQueueNode.cc | 2
src/mem/ruby/eventqueue/RubyEventQueueNode.hh | 2
src/mem/ruby/init.cc | 20 +-
src/mem/ruby/network/Network.hh | 6
src/mem/ruby/network/garnet-fixed-pipeline/CreditLink_d.hh | 2
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.cc | 18 +-
src/mem/ruby/network/garnet-fixed-pipeline/GarnetNetwork_d.hh | 8
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.cc | 4
src/mem/ruby/network/garnet-fixed-pipeline/InputUnit_d.hh | 14 -
src/mem/ruby/network/garnet-fixed-pipeline/NetworkHeader.hh | 4
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.cc | 8
src/mem/ruby/network/garnet-fixed-pipeline/NetworkInterface_d.hh | 16 -
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.cc | 6
src/mem/ruby/network/garnet-fixed-pipeline/NetworkLink_d.hh | 10 -
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.cc | 6
src/mem/ruby/network/garnet-fixed-pipeline/OutVcState_d.hh | 2
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.cc | 6
src/mem/ruby/network/garnet-fixed-pipeline/OutputUnit_d.hh | 12 -
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.cc | 20 +-
src/mem/ruby/network/garnet-fixed-pipeline/Router_d.hh | 10 -
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.cc | 8
src/mem/ruby/network/garnet-fixed-pipeline/RoutingUnit_d.hh | 8
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.cc | 10 -
src/mem/ruby/network/garnet-fixed-pipeline/SWallocator_d.hh | 4
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.cc | 6
src/mem/ruby/network/garnet-fixed-pipeline/Switch_d.hh | 6
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.cc | 12 -
src/mem/ruby/network/garnet-fixed-pipeline/VCallocator_d.hh | 4
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.cc | 2
src/mem/ruby/network/garnet-fixed-pipeline/VirtualChannel_d.hh | 4
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.cc | 2
src/mem/ruby/network/garnet-fixed-pipeline/flitBuffer_d.hh | 6
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.cc | 2
src/mem/ruby/network/garnet-fixed-pipeline/flit_d.hh | 4
src/mem/ruby/network/garnet-flexible-pipeline/FlexibleConsumer.hh | 6
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.cc | 20 +-
src/mem/ruby/network/garnet-flexible-pipeline/GarnetNetwork.hh | 8
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.cc | 2
src/mem/ruby/network/garnet-flexible-pipeline/InVcState.hh | 2
src/mem/ruby/network/garnet-flexible-pipeline/NetworkConfig.hh | 6
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.cc | 8
src/mem/ruby/network/garnet-flexible-pipeline/NetworkInterface.hh | 14 -
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.cc | 6
src/mem/ruby/network/garnet-flexible-pipeline/NetworkLink.hh | 10 -
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.cc | 2
src/mem/ruby/network/garnet-flexible-pipeline/OutVcState.hh | 2
src/mem/ruby/network/garnet-flexible-pipeline/Router.cc | 10 -
src/mem/ruby/network/garnet-flexible-pipeline/Router.hh | 18 +-
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.cc | 4
src/mem/ruby/network/garnet-flexible-pipeline/VCarbiter.hh | 4
src/mem/ruby/network/garnet-flexible-pipeline/flit.cc | 2
src/mem/ruby/network/garnet-flexible-pipeline/flit.hh | 4
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.cc | 2
src/mem/ruby/network/garnet-flexible-pipeline/flitBuffer.hh | 6
src/mem/ruby/network/orion/NetworkPower.cc | 22 +-
src/mem/ruby/network/orion/SIM_power.hh | 2
src/mem/ruby/network/orion/power_arbiter.cc | 14 -
src/mem/ruby/network/orion/power_arbiter.hh | 2
src/mem/ruby/network/orion/power_array.cc | 12 -
src/mem/ruby/network/orion/power_bus.cc | 12 -
src/mem/ruby/network/orion/power_crossbar.cc | 12 -
src/mem/ruby/network/orion/power_ll.cc | 8
src/mem/ruby/network/orion/power_router_init.cc | 18 +-
src/mem/ruby/network/orion/power_router_init.hh | 6
src/mem/ruby/network/orion/power_static.cc | 2
src/mem/ruby/network/orion/power_static.hh | 2
src/mem/ruby/network/orion/power_utils.cc | 4
src/mem/ruby/network/simple/PerfectSwitch.cc | 16 -
src/mem/ruby/network/simple/PerfectSwitch.hh | 8
src/mem/ruby/network/simple/SimpleNetwork.cc | 22 +-
src/mem/ruby/network/simple/SimpleNetwork.hh | 8
src/mem/ruby/network/simple/Switch.cc | 14 -
src/mem/ruby/network/simple/Switch.hh | 4
src/mem/ruby/network/simple/Throttle.cc | 12 -
src/mem/ruby/network/simple/Throttle.hh | 10 -
src/mem/ruby/network/simple/Topology.cc | 16 -
src/mem/ruby/network/simple/Topology.hh | 6
src/mem/ruby/profiler/AccessTraceForAddress.cc | 4
src/mem/ruby/profiler/AccessTraceForAddress.hh | 14 -
src/mem/ruby/profiler/AddressProfiler.cc | 14 -
src/mem/ruby/profiler/AddressProfiler.hh | 12 -
src/mem/ruby/profiler/CacheProfiler.cc | 12 -
src/mem/ruby/profiler/CacheProfiler.hh | 12 -
src/mem/ruby/profiler/Profiler.cc | 26 +--
src/mem/ruby/profiler/Profiler.hh | 28 +--
src/mem/ruby/profiler/StoreTrace.cc | 4
src/mem/ruby/profiler/StoreTrace.hh | 8
src/mem/ruby/profiler/XactProfiler.cc | 12 -
src/mem/ruby/profiler/XactProfiler.hh | 28 +--
src/mem/ruby/recorder/CacheRecorder.cc | 8
src/mem/ruby/recorder/CacheRecorder.hh | 6
src/mem/ruby/recorder/TraceRecord.cc | 10 -
src/mem/ruby/recorder/TraceRecord.hh | 8
src/mem/ruby/recorder/Tracer.cc | 10 -
src/mem/ruby/recorder/Tracer.hh | 6
src/mem/ruby/slicc_interface/AbstractCacheEntry.cc | 2
src/mem/ruby/slicc_interface/AbstractCacheEntry.hh | 6
src/mem/ruby/slicc_interface/AbstractChip.cc | 2
src/mem/ruby/slicc_interface/AbstractChip.hh | 12 -
src/mem/ruby/slicc_interface/Message.hh | 8
src/mem/ruby/slicc_interface/NetworkMessage.hh | 12 -
src/mem/ruby/slicc_interface/RubySlicc_ComponentMapping.hh | 16 -
src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.cc | 14 -
src/mem/ruby/slicc_interface/RubySlicc_Profiler_interface.hh | 16 -
src/mem/ruby/slicc_interface/RubySlicc_Util.hh | 32 +--
src/mem/ruby/slicc_interface/RubySlicc_includes.hh | 6
src/mem/ruby/system/AbstractBloomFilter.hh | 8
src/mem/ruby/system/AbstractMemOrCache.hh | 8
src/mem/ruby/system/AbstractReplacementPolicy.hh | 2
src/mem/ruby/system/BlockBloomFilter.cc | 6
src/mem/ruby/system/BlockBloomFilter.hh | 12 -
src/mem/ruby/system/BulkBloomFilter.cc | 6
src/mem/ruby/system/BulkBloomFilter.hh | 12 -
src/mem/ruby/system/CacheMemory.hh | 24 +-
src/mem/ruby/system/DirectoryMemory.cc | 12 -
src/mem/ruby/system/DirectoryMemory.hh | 6
src/mem/ruby/system/GenericBloomFilter.cc | 24 +-
src/mem/ruby/system/GenericBloomFilter.hh | 10 -
src/mem/ruby/system/H3BloomFilter.cc | 6
src/mem/ruby/system/H3BloomFilter.hh | 16 -
src/mem/ruby/system/LRUPolicy.hh | 2
src/mem/ruby/system/LSB_CountingBloomFilter.cc | 6
src/mem/ruby/system/LSB_CountingBloomFilter.hh | 12 -
src/mem/ruby/system/MachineID.hh | 6
src/mem/ruby/system/MemoryControl.cc | 22 +-
src/mem/ruby/system/MemoryControl.hh | 24 +-
src/mem/ruby/system/MemoryNode.cc | 2
src/mem/ruby/system/MemoryNode.hh | 6
src/mem/ruby/system/MultiBitSelBloomFilter.cc | 6
src/mem/ruby/system/MultiBitSelBloomFilter.hh | 16 -
src/mem/ruby/system/MultiGrainBloomFilter.cc | 6
src/mem/ruby/system/MultiGrainBloomFilter.hh | 12 -
src/mem/ruby/system/NodeID.hh | 4
src/mem/ruby/system/NodePersistentTable.cc | 12 -
src/mem/ruby/system/NodePersistentTable.hh | 6
src/mem/ruby/system/NonCountingBloomFilter.cc | 6
src/mem/ruby/system/NonCountingBloomFilter.hh | 12 -
src/mem/ruby/system/PerfectCacheMemory.hh | 12 -
src/mem/ruby/system/PersistentArbiter.cc | 8
src/mem/ruby/system/PersistentArbiter.hh | 14 -
src/mem/ruby/system/PersistentTable.cc | 12 -
src/mem/ruby/system/PersistentTable.hh | 6
src/mem/ruby/system/PseudoLRUPolicy.hh | 2
src/mem/ruby/system/Sequencer.cc | 28 +--
src/mem/ruby/system/Sequencer.hh | 18 +-
src/mem/ruby/system/StoreBuffer.cc | 24 +-
src/mem/ruby/system/StoreBuffer.hh | 12 -
src/mem/ruby/system/StoreCache.cc | 14 -
src/mem/ruby/system/StoreCache.hh | 4
src/mem/ruby/system/System.cc | 20 +-
src/mem/ruby/system/System.hh | 12 -
src/mem/ruby/system/TBETable.hh | 12 -
src/mem/ruby/system/TimerTable.cc | 6
src/mem/ruby/system/TimerTable.hh | 6
src/mem/ruby/tester/BarrierGenerator.cc | 14 -
src/mem/ruby/tester/BarrierGenerator.hh | 8
src/mem/ruby/tester/Check.cc | 10 -
src/mem/ruby/tester/Check.hh | 10 -
src/mem/ruby/tester/CheckTable.cc | 6
src/mem/ruby/tester/CheckTable.hh | 4
src/mem/ruby/tester/DetermGETXGenerator.cc | 18 +-
src/mem/ruby/tester/DetermGETXGenerator.hh | 12 -
src/mem/ruby/tester/DetermInvGenerator.cc | 18 +-
src/mem/ruby/tester/DetermInvGenerator.hh | 12 -
src/mem/ruby/tester/DetermSeriesGETSGenerator.cc | 18 +-
src/mem/ruby/tester/DetermSeriesGETSGenerator.hh | 12 -
src/mem/ruby/tester/DeterministicDriver.cc | 20 +-
src/mem/ruby/tester/DeterministicDriver.hh | 8
src/mem/ruby/tester/Instruction.cc | 2
src/mem/ruby/tester/Instruction.hh | 2
src/mem/ruby/tester/RaceyDriver.cc | 10 -
src/mem/ruby/tester/RaceyDriver.hh | 4
src/mem/ruby/tester/RequestGenerator.cc | 18 +-
src/mem/ruby/tester/RequestGenerator.hh | 10 -
src/mem/ruby/tester/SpecifiedGenerator.cc | 10 -
src/mem/ruby/tester/SpecifiedGenerator.hh | 6
src/mem/ruby/tester/SyntheticDriver.cc | 18 +-
src/mem/ruby/tester/SyntheticDriver.hh | 8
src/mem/ruby/tester/Tester.cc | 14 -
src/mem/ruby/tester/Tester.hh | 8
src/mem/ruby/tester/XactAbortRequestGenerator.cc | 18 +-
src/mem/ruby/tester/XactAbortRequestGenerator.hh | 8
src/mem/ruby/tester/XactRequestGenerator.cc | 18 +-
src/mem/ruby/tester/XactRequestGenerator.hh | 8
src/mem/ruby/tester/main.cc | 8
src/mem/ruby/tester/main.hh | 9 -
src/mem/ruby/tester/test_framework.cc | 26 +--
src/mem/ruby/tester/test_framework.hh | 4
src/mem/slicc/ast/AST.cc | 2
src/mem/slicc/ast/AST.hh | 10 -
src/mem/slicc/ast/ASTs.hh | 86
+++++-----
src/mem/slicc/ast/ActionDeclAST.cc | 4
src/mem/slicc/ast/ActionDeclAST.hh | 6
src/mem/slicc/ast/AssignStatementAST.cc | 2
src/mem/slicc/ast/AssignStatementAST.hh | 6
src/mem/slicc/ast/CheckAllocateStatementAST.cc | 8
src/mem/slicc/ast/CheckAllocateStatementAST.hh | 6
src/mem/slicc/ast/CheckStopSlotsStatementAST.cc | 8
src/mem/slicc/ast/CheckStopSlotsStatementAST.hh | 8
src/mem/slicc/ast/ChipComponentAccessAST.cc | 2
src/mem/slicc/ast/ChipComponentAccessAST.hh | 10 -
src/mem/slicc/ast/CopyHeadStatementAST.cc | 8
src/mem/slicc/ast/CopyHeadStatementAST.hh | 10 -
src/mem/slicc/ast/DeclAST.cc | 2
src/mem/slicc/ast/DeclAST.hh | 10 -
src/mem/slicc/ast/DeclListAST.cc | 2
src/mem/slicc/ast/DeclListAST.hh | 6
src/mem/slicc/ast/EnqueueStatementAST.cc | 10 -
src/mem/slicc/ast/EnqueueStatementAST.hh | 8
src/mem/slicc/ast/EnumDeclAST.cc | 6
src/mem/slicc/ast/EnumDeclAST.hh | 8
src/mem/slicc/ast/EnumExprAST.cc | 2
src/mem/slicc/ast/EnumExprAST.hh | 6
src/mem/slicc/ast/ExprAST.cc | 2
src/mem/slicc/ast/ExprAST.hh | 4
src/mem/slicc/ast/ExprStatementAST.cc | 2
src/mem/slicc/ast/ExprStatementAST.hh | 6
src/mem/slicc/ast/FormalParamAST.cc | 6
src/mem/slicc/ast/FormalParamAST.hh | 4
src/mem/slicc/ast/FuncCallExprAST.cc | 4
src/mem/slicc/ast/FuncCallExprAST.hh | 6
src/mem/slicc/ast/FuncDeclAST.cc | 6
src/mem/slicc/ast/FuncDeclAST.hh | 10 -
src/mem/slicc/ast/IfStatementAST.cc | 2
src/mem/slicc/ast/IfStatementAST.hh | 8
src/mem/slicc/ast/InPortDeclAST.cc | 6
src/mem/slicc/ast/InPortDeclAST.hh | 8
src/mem/slicc/ast/InfixOperatorExprAST.cc | 2
src/mem/slicc/ast/InfixOperatorExprAST.hh | 4
src/mem/slicc/ast/LiteralExprAST.cc | 2
src/mem/slicc/ast/LiteralExprAST.hh | 4
src/mem/slicc/ast/Location.cc | 2
src/mem/slicc/ast/Location.hh | 2
src/mem/slicc/ast/MachineAST.cc | 4
src/mem/slicc/ast/MachineAST.hh | 8
src/mem/slicc/ast/MemberExprAST.cc | 2
src/mem/slicc/ast/MemberExprAST.hh | 4
src/mem/slicc/ast/MethodCallExprAST.cc | 2
src/mem/slicc/ast/MethodCallExprAST.hh | 8
src/mem/slicc/ast/ObjDeclAST.cc | 6
src/mem/slicc/ast/ObjDeclAST.hh | 8
src/mem/slicc/ast/OutPortDeclAST.cc | 4
src/mem/slicc/ast/OutPortDeclAST.hh | 8
src/mem/slicc/ast/PairAST.cc | 2
src/mem/slicc/ast/PairAST.hh | 4
src/mem/slicc/ast/PairListAST.cc | 2
src/mem/slicc/ast/PairListAST.hh | 6
src/mem/slicc/ast/PeekStatementAST.cc | 10 -
src/mem/slicc/ast/PeekStatementAST.hh | 4
src/mem/slicc/ast/ReturnStatementAST.cc | 2
src/mem/slicc/ast/ReturnStatementAST.hh | 6
src/mem/slicc/ast/StatementAST.cc | 2
src/mem/slicc/ast/StatementAST.hh | 4
src/mem/slicc/ast/StatementListAST.cc | 2
src/mem/slicc/ast/StatementListAST.hh | 6
src/mem/slicc/ast/TransitionDeclAST.cc | 4
src/mem/slicc/ast/TransitionDeclAST.hh | 6
src/mem/slicc/ast/TypeAST.cc | 2
src/mem/slicc/ast/TypeAST.hh | 4
src/mem/slicc/ast/TypeDeclAST.cc | 6
src/mem/slicc/ast/TypeDeclAST.hh | 8
src/mem/slicc/ast/TypeFieldAST.cc | 2
src/mem/slicc/ast/TypeFieldAST.hh | 10 -
src/mem/slicc/ast/TypeFieldEnumAST.cc | 6
src/mem/slicc/ast/TypeFieldEnumAST.hh | 10 -
src/mem/slicc/ast/TypeFieldMemberAST.cc | 2
src/mem/slicc/ast/TypeFieldMemberAST.hh | 14 -
src/mem/slicc/ast/TypeFieldMethodAST.cc | 2
src/mem/slicc/ast/TypeFieldMethodAST.hh | 6
src/mem/slicc/ast/VarExprAST.cc | 6
src/mem/slicc/ast/VarExprAST.hh | 4
src/mem/slicc/generator/fileio.cc | 2
src/mem/slicc/generator/fileio.hh | 2
src/mem/slicc/generator/html_gen.cc | 6
src/mem/slicc/generator/html_gen.hh | 4
src/mem/slicc/generator/mif_gen.cc | 10 -
src/mem/slicc/generator/mif_gen.hh | 2
src/mem/slicc/main.cc | 24 +-
src/mem/slicc/main.hh | 6
src/mem/slicc/parser/lexer.ll | 4
src/mem/slicc/parser/parser.yy | 2
src/mem/slicc/slicc_global.hh | 4
src/mem/slicc/symbols/Action.hh | 2
src/mem/slicc/symbols/Event.hh | 2
src/mem/slicc/symbols/Func.cc | 12 -
src/mem/slicc/symbols/Func.hh | 4
src/mem/slicc/symbols/State.hh | 2
src/mem/slicc/symbols/StateMachine.cc | 86
+++++-----
src/mem/slicc/symbols/StateMachine.hh | 8
src/mem/slicc/symbols/Symbol.cc | 2
src/mem/slicc/symbols/Symbol.hh | 6
src/mem/slicc/symbols/SymbolTable.cc | 32 +--
src/mem/slicc/symbols/SymbolTable.hh | 16 -
src/mem/slicc/symbols/Transition.cc | 12 -
src/mem/slicc/symbols/Transition.hh | 6
src/mem/slicc/symbols/Type.cc | 26 +--
src/mem/slicc/symbols/Type.hh | 6
src/mem/slicc/symbols/Var.cc | 4
src/mem/slicc/symbols/Var.hh | 6
diffs (truncated from 6637 to 300 lines):
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/Allocator.hh
--- a/src/mem/gems_common/Allocator.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/Allocator.hh Mon May 11 10:38:45 2009 -0700
@@ -23,7 +23,7 @@
#ifndef ALLOCATOR_H
#define ALLOCATOR_H
-#include "Vector.hh"
+#include "mem/gems_common/Vector.hh"
template <class TYPE>
class Allocator {
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/Map.hh
--- a/src/mem/gems_common/Map.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/Map.hh Mon May 11 10:38:45 2009 -0700
@@ -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>
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/PrioHeap.hh
--- a/src/mem/gems_common/PrioHeap.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/PrioHeap.hh Mon May 11 10:38:45 2009 -0700
@@ -29,7 +29,7 @@
#ifndef PRIOHEAP_H
#define PRIOHEAP_H
-#include "Vector.hh"
+#include "mem/gems_common/Vector.hh"
typedef unsigned int HeapIndex;
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/RefCnt_tester.cc
--- a/src/mem/gems_common/RefCnt_tester.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/RefCnt_tester.cc Mon May 11 10:38:45 2009 -0700
@@ -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:
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/RefCountable.hh
--- a/src/mem/gems_common/RefCountable.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/RefCountable.hh Mon May 11 10:38:45 2009 -0700
@@ -33,7 +33,7 @@
#ifndef REFCOUNTABLE_H
#define REFCOUNTABLE_H
-#include "RefCnt.hh"
+#include "mem/gems_common/RefCnt.hh"
class RefCountable {
public:
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/Vector.hh
--- a/src/mem/gems_common/Vector.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/Vector.hh Mon May 11 10:38:45 2009 -0700
@@ -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
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/attrlex.ll
--- a/src/mem/gems_common/ioutil/attrlex.ll Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/attrlex.ll Mon May 11 10:38:45 2009 -0700
@@ -68,7 +68,7 @@
%{
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
using namespace std;
#include <string>
@@ -80,12 +80,12 @@
// #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
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/attrparse.yy
--- a/src/mem/gems_common/ioutil/attrparse.yy Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/attrparse.yy Mon May 11 10:38:45 2009 -0700
@@ -65,7 +65,7 @@
/* Includes */
/*------------------------------------------------------------------------*/
-#include "Global.hh"
+#include "mem/ruby/common/Global.hh"
using namespace std;
#include <string>
@@ -77,9 +77,9 @@
// #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
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/confio.cc
--- a/src/mem/gems_common/ioutil/confio.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/confio.cc Mon May 11 10:38:45 2009 -0700
@@ -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 @@
// #endif
// };
-#include "confio.hh"
+#include "mem/gems_common/ioutil/confio.hh"
/*------------------------------------------------------------------------*/
/* Macro declarations */
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/confio.hh
--- a/src/mem/gems_common/ioutil/confio.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/confio.hh Mon May 11 10:38:45 2009 -0700
@@ -33,7 +33,7 @@
/* Includes */
/*------------------------------------------------------------------------*/
-#include "FakeSimicsDataTypes.hh"
+#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh"
/*------------------------------------------------------------------------*/
/* Macro declarations */
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/initvar.cc
--- a/src/mem/gems_common/ioutil/initvar.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/initvar.cc Mon May 11 10:38:45 2009 -0700
@@ -70,10 +70,10 @@
// #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 @@
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 @@
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 @@
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 @@
return (ret); \
}
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
@@ -464,7 +464,7 @@
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 @@
} \
fprintf( fp, ")\n" );
-#include "config.hh"
+#include "mem/ruby/config/config.hh"
#undef PARAM
#undef PARAM_UINT
#undef PARAM_ULONG
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/ioutil/vardecl.hh
--- a/src/mem/gems_common/ioutil/vardecl.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/ioutil/vardecl.hh Mon May 11 10:38:45 2009 -0700
@@ -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
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/util.cc
--- a/src/mem/gems_common/util.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/util.cc Mon May 11 10:38:45 2009 -0700
@@ -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
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/gems_common/util.hh
--- a/src/mem/gems_common/util.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/gems_common/util.hh Mon May 11 10:38:45 2009 -0700
@@ -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);
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/ruby/buffers/MessageBuffer.cc
--- a/src/mem/ruby/buffers/MessageBuffer.cc Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/ruby/buffers/MessageBuffer.cc Mon May 11 10:38:45 2009 -0700
@@ -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()
{
diff -r 0011560d49b0 -r 6bb54dcb940e src/mem/ruby/buffers/MessageBuffer.hh
--- a/src/mem/ruby/buffers/MessageBuffer.hh Mon May 11 10:38:45 2009 -0700
+++ b/src/mem/ruby/buffers/MessageBuffer.hh Mon May 11 10:38:45 2009 -0700
@@ -38,13 +38,13 @@
#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"
_______________________________________________
m5-dev mailing list
[email protected]
http://m5sim.org/mailman/listinfo/m5-dev
