From 24da30e317cdbf4b628141d69b2d17dac5ae3822 Mon Sep 17 00:00:00 2001 From: Nathan Binkert Date: Mon, 11 May 2009 10:38:45 -0700 Subject: 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. --- 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 +- 14 files changed, 28 insertions(+), 28 deletions(-) (limited to 'src/mem/gems_common') diff --git a/src/mem/gems_common/Allocator.hh b/src/mem/gems_common/Allocator.hh index 109696601..76333fd5f 100644 --- a/src/mem/gems_common/Allocator.hh +++ b/src/mem/gems_common/Allocator.hh @@ -23,7 +23,7 @@ #ifndef ALLOCATOR_H #define ALLOCATOR_H -#include "Vector.hh" +#include "mem/gems_common/Vector.hh" template class Allocator { diff --git a/src/mem/gems_common/Map.hh b/src/mem/gems_common/Map.hh index 1ecd13d64..6b145a90a 100644 --- a/src/mem/gems_common/Map.hh +++ b/src/mem/gems_common/Map.hh @@ -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 diff --git a/src/mem/gems_common/PrioHeap.hh b/src/mem/gems_common/PrioHeap.hh index d549f0944..acdcc0eba 100644 --- a/src/mem/gems_common/PrioHeap.hh +++ b/src/mem/gems_common/PrioHeap.hh @@ -29,7 +29,7 @@ #ifndef PRIOHEAP_H #define PRIOHEAP_H -#include "Vector.hh" +#include "mem/gems_common/Vector.hh" typedef unsigned int HeapIndex; diff --git a/src/mem/gems_common/RefCnt_tester.cc b/src/mem/gems_common/RefCnt_tester.cc index 574f8fe3c..58828604a 100644 --- a/src/mem/gems_common/RefCnt_tester.cc +++ b/src/mem/gems_common/RefCnt_tester.cc @@ -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 --git a/src/mem/gems_common/RefCountable.hh b/src/mem/gems_common/RefCountable.hh index 88aba07e6..32fb924cf 100644 --- a/src/mem/gems_common/RefCountable.hh +++ b/src/mem/gems_common/RefCountable.hh @@ -33,7 +33,7 @@ #ifndef REFCOUNTABLE_H #define REFCOUNTABLE_H -#include "RefCnt.hh" +#include "mem/gems_common/RefCnt.hh" class RefCountable { public: diff --git a/src/mem/gems_common/Vector.hh b/src/mem/gems_common/Vector.hh index 744dc698c..7e648e7c9 100644 --- a/src/mem/gems_common/Vector.hh +++ b/src/mem/gems_common/Vector.hh @@ -38,7 +38,7 @@ #ifndef VECTOR_H #define VECTOR_H -#include "std-includes.hh" +#include "mem/gems_common/std-includes.hh" template class Vector diff --git a/src/mem/gems_common/ioutil/attrlex.ll b/src/mem/gems_common/ioutil/attrlex.ll index 068591b07..3d142eef1 100644 --- a/src/mem/gems_common/ioutil/attrlex.ll +++ b/src/mem/gems_common/ioutil/attrlex.ll @@ -68,7 +68,7 @@ WHITESPACE [ \t] %{ -#include "Global.hh" +#include "mem/ruby/common/Global.hh" using namespace std; #include @@ -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 diff --git a/src/mem/gems_common/ioutil/attrparse.yy b/src/mem/gems_common/ioutil/attrparse.yy index 987e0cb3b..b6d0a9b72 100644 --- a/src/mem/gems_common/ioutil/attrparse.yy +++ b/src/mem/gems_common/ioutil/attrparse.yy @@ -65,7 +65,7 @@ /* Includes */ /*------------------------------------------------------------------------*/ -#include "Global.hh" +#include "mem/ruby/common/Global.hh" using namespace std; #include @@ -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 diff --git a/src/mem/gems_common/ioutil/confio.cc b/src/mem/gems_common/ioutil/confio.cc index 54a96527e..db2bf0a35 100644 --- a/src/mem/gems_common/ioutil/confio.cc +++ b/src/mem/gems_common/ioutil/confio.cc @@ -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 */ diff --git a/src/mem/gems_common/ioutil/confio.hh b/src/mem/gems_common/ioutil/confio.hh index 143c4da8b..1e9718c16 100644 --- a/src/mem/gems_common/ioutil/confio.hh +++ b/src/mem/gems_common/ioutil/confio.hh @@ -33,7 +33,7 @@ /* Includes */ /*------------------------------------------------------------------------*/ -#include "FakeSimicsDataTypes.hh" +#include "mem/gems_common/ioutil/FakeSimicsDataTypes.hh" /*------------------------------------------------------------------------*/ /* Macro declarations */ diff --git a/src/mem/gems_common/ioutil/initvar.cc b/src/mem/gems_common/ioutil/initvar.cc index b6b7ff9e0..62fe3b6af 100644 --- a/src/mem/gems_common/ioutil/initvar.cc +++ b/src/mem/gems_common/ioutil/initvar.cc @@ -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 diff --git a/src/mem/gems_common/ioutil/vardecl.hh b/src/mem/gems_common/ioutil/vardecl.hh index 150868e18..607bc54f6 100644 --- a/src/mem/gems_common/ioutil/vardecl.hh +++ b/src/mem/gems_common/ioutil/vardecl.hh @@ -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 --git a/src/mem/gems_common/util.cc b/src/mem/gems_common/util.cc index c5b8f22b5..f1535bdcf 100644 --- a/src/mem/gems_common/util.cc +++ b/src/mem/gems_common/util.cc @@ -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 --git a/src/mem/gems_common/util.hh b/src/mem/gems_common/util.hh index d9e9fec3e..7b32f24e8 100644 --- a/src/mem/gems_common/util.hh +++ b/src/mem/gems_common/util.hh @@ -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); -- cgit v1.2.3