diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/mem/gems_common/ioutil/initvar.cc | 18 | ||||
| -rw-r--r-- | src/mem/gems_common/ioutil/initvar.hh | 3 | ||||
| -rw-r--r-- | src/mem/gems_common/ioutil/vardecl.hh | 2 | ||||
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.cc | 2 | ||||
| -rw-r--r-- | src/mem/ruby/config/RubyConfig.hh | 1 | ||||
| -rw-r--r-- | src/mem/ruby/config/config.hh (renamed from src/mem/ruby/config/config.include) | 0 |
6 files changed, 8 insertions, 18 deletions
diff --git a/src/mem/gems_common/ioutil/initvar.cc b/src/mem/gems_common/ioutil/initvar.cc index 57caad2b0..8a560176a 100644 --- a/src/mem/gems_common/ioutil/initvar.cc +++ b/src/mem/gems_common/ioutil/initvar.cc @@ -78,12 +78,6 @@ using namespace std; #include "initvar.hh" /*------------------------------------------------------------------------*/ -/* Macro declarations */ -/*------------------------------------------------------------------------*/ - -#define CONFIG_VAR_FILENAME "config.include" - -/*------------------------------------------------------------------------*/ /* Variable declarations */ /*------------------------------------------------------------------------*/ @@ -102,7 +96,7 @@ using namespace std; char *NAME; #define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) \ PTYPE NAME[ARRAY_SIZE]; -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -162,7 +156,7 @@ initvar_t::~initvar_t( ) NAME = NULL; \ } #define PARAM_ARRAY( PTYPE, NAME, ARRAY_SIZE ) -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -215,7 +209,7 @@ void initvar_t::init_config_reader( const char *initString ) initvar_get_attr, (void *) name, \ initvar_set_attr, (void *) name ); -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -391,7 +385,7 @@ static attr_value_t initvar_get_attr( void *ptr, void *obj ) return (ret); \ } -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -475,7 +469,7 @@ static set_error_t initvar_set_attr( void *ptr, void *obj, return Sim_Set_Ok; \ } -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG @@ -575,7 +569,7 @@ void initvar_t::list_param( FILE *fp ) } \ fprintf( fp, ")\n" ); -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG diff --git a/src/mem/gems_common/ioutil/initvar.hh b/src/mem/gems_common/ioutil/initvar.hh index 8dea8dfc1..d88f80c32 100644 --- a/src/mem/gems_common/ioutil/initvar.hh +++ b/src/mem/gems_common/ioutil/initvar.hh @@ -46,9 +46,6 @@ * setting the varibles (from the command line), printing the configuration, * and saving it to a file. * -* Before including this file, you must define the variable CONFIG_VAR_FILENAME -* to define which variables are to be used. -* * @see confio_t * @author cmauer * @version $Id$ diff --git a/src/mem/gems_common/ioutil/vardecl.hh b/src/mem/gems_common/ioutil/vardecl.hh index 21bc62d02..150868e18 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_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG diff --git a/src/mem/ruby/config/RubyConfig.cc b/src/mem/ruby/config/RubyConfig.cc index fe4e3be8f..3d615ac02 100644 --- a/src/mem/ruby/config/RubyConfig.cc +++ b/src/mem/ruby/config/RubyConfig.cc @@ -164,7 +164,7 @@ static void print_parameters(ostream& out) } \ -#include CONFIG_VAR_FILENAME +#include "config.hh" #undef PARAM #undef PARAM_UINT #undef PARAM_ULONG diff --git a/src/mem/ruby/config/RubyConfig.hh b/src/mem/ruby/config/RubyConfig.hh index b2cc745bc..bb12d6426 100644 --- a/src/mem/ruby/config/RubyConfig.hh +++ b/src/mem/ruby/config/RubyConfig.hh @@ -41,7 +41,6 @@ #define RUBYCONFIG_H #include "Global.hh" -#define CONFIG_VAR_FILENAME "config.include" #include "vardecl.hh" #include "NodeID.hh" diff --git a/src/mem/ruby/config/config.include b/src/mem/ruby/config/config.hh index f853fb72b..f853fb72b 100644 --- a/src/mem/ruby/config/config.include +++ b/src/mem/ruby/config/config.hh |