ruby: rename config.include to config.hh and clean up the macro stuff.

I did the macro cleanup because I was worried that the SCons scanner
would get confused.  This code will hopefully go away soon anyway.

--HG--
rename : src/mem/ruby/config/config.include => src/mem/ruby/config/config.hh
This commit is contained in:
Nathan Binkert 2009-05-11 10:38:44 -07:00
parent b05da09cd6
commit 84a18e7fdc
6 changed files with 8 additions and 18 deletions

View file

@ -77,12 +77,6 @@ using namespace std;
#include "confio.hh"
#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

View file

@ -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$

View file

@ -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

View file

@ -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

View file

@ -41,7 +41,6 @@
#define RUBYCONFIG_H
#include "Global.hh"
#define CONFIG_VAR_FILENAME "config.include"
#include "vardecl.hh"
#include "NodeID.hh"