sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

ruby: Ruby debug print fixes.

Browse source
This commit is contained in:
Brad Beckmann 2009-11-18 13:55:57 -08:00
parent c3204421d8
commit 5492f71755
2 changed files with 22 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
src/mem/ruby/common/Debug.cc
View file

@ -39,6 +39,7 @@
#include "mem/ruby/common/Debug.hh" #include "mem/ruby/common/Debug.hh"
#include "mem/ruby/eventqueue/RubyEventQueue.hh" #include "mem/ruby/eventqueue/RubyEventQueue.hh"
#include "mem/gems_common/util.hh" #include "mem/gems_common/util.hh"
#include "base/misc.hh"
class Debug; class Debug;
extern Debug* g_debug_ptr; extern Debug* g_debug_ptr;
@ -70,6 +71,7 @@ DebugComponentData debugComponents[] =
{"Cache", 'c' }, {"Cache", 'c' },
{"Predictor", 'p' }, {"Predictor", 'p' },
{"Allocator", 'a' }, {"Allocator", 'a' },
{"Memory", 'M' },
}; };
extern "C" void changeDebugVerbosity(VerbosityLevel vb); extern "C" void changeDebugVerbosity(VerbosityLevel vb);
@ -95,19 +97,27 @@ Debug::Debug()
Debug::Debug( const string & name, const vector<string> & argv ) Debug::Debug( const string & name, const vector<string> & argv )
{ {
for (size_t i=0;i<argv.size();i+=2){ //
if (argv[i] == "filter_string") // must clear the filter before adding filter strings
setFilterString( argv[i+1].c_str() ); //
else if (argv[i] == "verbosity_string") clearFilter();
for (size_t i=0;i<argv.size();i+=2) {
if (argv[i] == "filter_string") {
if (setFilterString(argv[i+1].c_str())) {
fatal("could not set filter string to %s\n", argv[i+1].c_str());
}
} else if (argv[i] == "verbosity_string") {
setVerbosityString( argv[i+1].c_str() ); setVerbosityString( argv[i+1].c_str() );
else if (argv[i] == "start_time") } else if (argv[i] == "start_time") {
m_starting_cycle = atoi( argv[i+1].c_str() ); m_starting_cycle = atoi( argv[i+1].c_str() );
else if (argv[i] == "output_filename") } else if (argv[i] == "output_filename") {
setDebugOutputFile( argv[i+1].c_str() ); setDebugOutputFile( argv[i+1].c_str() );
else if (argv[i] == "protocol_trace") } else if (argv[i] == "protocol_trace") {
m_protocol_trace = string_to_bool(argv[i+1]); m_protocol_trace = string_to_bool(argv[i+1]);
else } else {
assert(0); fatal("invalid argument %s\n");
}
} }
} }
@ -119,7 +129,8 @@ Debug::Debug( const char *filterString, const char *verboseString,
debug_cout_ptr = &cout; debug_cout_ptr = &cout;
m_starting_cycle = filterStartTime; m_starting_cycle = filterStartTime;
setFilterString( filterString ); if (setFilterString(filterString))
fatal("could not set filter string to %s\n", filterString);
setVerbosityString( verboseString ); setVerbosityString( verboseString );
setDebugOutputFile( filename ); setDebugOutputFile( filename );
} }

1
src/mem/ruby/common/Debug.hh
View file

@ -63,6 +63,7 @@ enum DebugComponents
CACHE_COMP, CACHE_COMP,
PREDICTOR_COMP, PREDICTOR_COMP,
ALLOCATOR_COMP, ALLOCATOR_COMP,
MEMORY_COMP,
NUMBER_OF_COMPS NUMBER_OF_COMPS
}; };