a bunch of warning fixes

arch/alpha/isa_desc:
    don't say warn: Warning:
base/misc.cc:
    avoid printing two newlines in a row
sim/main.cc:
    print out a message just before we enter the event queue

--HG--
extra : convert_revision : 2a824d4b67661903fc739a0fb0759aa91d72382c
This commit is contained in:
Nathan Binkert 2004-01-27 17:56:23 -05:00
parent ee6b889ad5
commit 801c46d250
3 changed files with 37 additions and 8 deletions

View file

@ -538,7 +538,7 @@ declare {{
trappingMode((enum TrappingMode)FP_TRAPMODE)
{
if (trappingMode != Imprecise) {
warn("Warning: precise FP traps unimplemented\n");
warn("precise FP traps unimplemented\n");
}
}
@ -1609,7 +1609,7 @@ declare {{
Trace::InstRecord *traceData)
{
if (!warned) {
warn("Warning: instruction '%s' unimplemented\n", mnemonic);
warn("instruction '%s' unimplemented\n", mnemonic);
warned = true;
}
@ -1620,7 +1620,7 @@ declare {{
Trace::InstRecord *traceData)
{
if (!xc->spec_mode && !warned) {
warn("Warning: instruction '%s' unimplemented\n", mnemonic);
warn("instruction '%s' unimplemented\n", mnemonic);
warned = true;
}

View file

@ -42,7 +42,17 @@ void
__panic(const string &format, cp::ArgList &args, const char *func,
const char *file, int line)
{
string fmt = "panic: " + format + " @ cycle %d\n[%s:%s, line %d]\n";
string fmt = "panic: " + format;
switch (fmt[fmt.size() - 1]) {
case '\n':
case '\r':
break;
default:
fmt += "\n";
}
fmt += " @ cycle %d\n[%s:%s, line %d]\n";
args.append(curTick);
args.append(func);
args.append(file);
@ -63,8 +73,18 @@ void
__fatal(const string &format, cp::ArgList &args, const char *func,
const char *file, int line)
{
string fmt = "fatal: " + format + " @ cycle %d\n[%s:%s, line %d]\n"
"Memory Usage: %ld KBytes\n";
string fmt = "fatal: " + format;
switch (fmt[fmt.size() - 1]) {
case '\n':
case '\r':
break;
default:
fmt += "\n";
}
fmt += " @ cycle %d\n[%s:%s, line %d]\n";
fmt += "Memory Usage: %ld KBytes\n";
args.append(curTick);
args.append(func);
@ -83,15 +103,23 @@ __warn(const string &format, cp::ArgList &args, const char *func,
const char *file, int line)
{
string fmt = "warn: " + format;
switch (fmt[fmt.size() - 1]) {
case '\n':
case '\r':
break;
default:
fmt += "\n";
}
#ifdef VERBOSE_WARN
fmt += " @ cycle %d\n[%s:%s, line %d]\n";
args.append(curTick);
args.append(func);
args.append(file);
args.append(line);
#else
fmt += "\n";
#endif
args.dump(cerr, fmt);
delete &args;

View file

@ -400,6 +400,7 @@ main(int argc, char **argv)
}
SimInit();
warn("Entering event queue. Starting simulation...\n");
while (!mainEventQueue.empty()) {
assert(curTick <= mainEventQueue.nextTick() &&