changeset 9f7efe90084e in /z/repo/m5
details: http://repo.m5sim.org/m5?cmd=changeset;node=9f7efe90084e
description:
Errors: Use the correct panic/warn/fatal/info message in some places.
diffstat:
4 files changed, 10 insertions(+), 10 deletions(-)
src/arch/sparc/tlb.cc | 2 +-
src/sim/process.cc | 2 +-
src/sim/simulate.cc | 2 +-
src/sim/system.cc | 14 +++++++-------
diffs (84 lines):
diff -r 05ffa2c3c800 -r 9f7efe90084e src/arch/sparc/tlb.cc
--- a/src/arch/sparc/tlb.cc Fri Jan 30 20:04:15 2009 -0500
+++ b/src/arch/sparc/tlb.cc Fri Jan 30 20:04:17 2009 -0500
@@ -1129,7 +1129,7 @@
break;
case ASI_SPARC_ERROR_EN_REG:
case ASI_SPARC_ERROR_STATUS_REG:
- warn("Ignoring write to SPARC ERROR regsiter\n");
+ inform("Ignoring write to SPARC ERROR regsiter\n");
break;
case ASI_HYP_SCRATCHPAD:
case ASI_SCRATCHPAD:
diff -r 05ffa2c3c800 -r 9f7efe90084e src/sim/process.cc
--- a/src/sim/process.cc Fri Jan 30 20:04:15 2009 -0500
+++ b/src/sim/process.cc Fri Jan 30 20:04:17 2009 -0500
@@ -343,7 +343,7 @@
if(stack_base - stack_min > 8*1024*1024)
fatal("Over max stack size for one thread\n");
pTable->allocate(stack_min, TheISA::PageBytes);
- warn("Increasing stack size by one page.");
+ inform("Increasing stack size by one page.");
};
return true;
}
diff -r 05ffa2c3c800 -r 9f7efe90084e src/sim/simulate.cc
--- a/src/sim/simulate.cc Fri Jan 30 20:04:15 2009 -0500
+++ b/src/sim/simulate.cc Fri Jan 30 20:04:17 2009 -0500
@@ -84,7 +84,7 @@
if (se_event != limit_event) {
assert(limit_event->scheduled());
limit_event->squash();
- warn_once("be nice to actually delete the event here");
+ hack_once("be nice to actually delete the event here");
}
return se_event;
diff -r 05ffa2c3c800 -r 9f7efe90084e src/sim/system.cc
--- a/src/sim/system.cc Fri Jan 30 20:04:15 2009 -0500
+++ b/src/sim/system.cc Fri Jan 30 20:04:17 2009 -0500
@@ -95,12 +95,12 @@
* Load the kernel code into memory
*/
if (params()->kernel == "") {
- warn("No kernel set for full system simulation. Assuming you know what"
+ inform("No kernel set for full system simulation. Assuming you know
what"
" you're doing...\n");
} else {
// Load kernel code
kernel = createObjectFile(params()->kernel);
- warn("kernel located at: %s", params()->kernel);
+ inform("kernel located at: %s", params()->kernel);
if (kernel == NULL)
fatal("Could not load kernel file %s", params()->kernel);
@@ -115,16 +115,16 @@
// load symbols
if (!kernel->loadGlobalSymbols(kernelSymtab))
- panic("could not load kernel symbols\n");
+ fatal("could not load kernel symbols\n");
if (!kernel->loadLocalSymbols(kernelSymtab))
- panic("could not load kernel local symbols\n");
+ fatal("could not load kernel local symbols\n");
if (!kernel->loadGlobalSymbols(debugSymbolTable))
- panic("could not load kernel symbols\n");
+ fatal("could not load kernel symbols\n");
if (!kernel->loadLocalSymbols(debugSymbolTable))
- panic("could not load kernel local symbols\n");
+ fatal("could not load kernel local symbols\n");
DPRINTF(Loader, "Kernel start = %#x\n", kernelStart);
DPRINTF(Loader, "Kernel end = %#x\n", kernelEnd);
@@ -184,7 +184,7 @@
}
if (threadContexts[id])
- panic("Cannot have two CPUs with the same id (%d)\n", id);
+ fatal("Cannot have two CPUs with the same id (%d)\n", id);
threadContexts[id] = tc;
_numContexts++;
_______________________________________________
m5-dev mailing list
m5-dev@m5sim.org
http://m5sim.org/mailman/listinfo/m5-dev
