summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Saidi <saidi@eecs.umich.edu>2009-01-30 20:04:17 -0500
committerAli Saidi <saidi@eecs.umich.edu>2009-01-30 20:04:17 -0500
commite7293dd24eb15ce568ffbb2f6aa8ae60f88472b1 (patch)
tree422a136fb93c2b2e31ef2b5a44981578da2f290a
parentf4291aac256622546a5a51dce109599007f5b3cb (diff)
downloadgem5-e7293dd24eb15ce568ffbb2f6aa8ae60f88472b1.tar.xz
Errors: Use the correct panic/warn/fatal/info message in some places.
-rw-r--r--src/arch/sparc/tlb.cc2
-rw-r--r--src/sim/process.cc2
-rw-r--r--src/sim/simulate.cc2
-rw-r--r--src/sim/system.cc14
4 files changed, 10 insertions, 10 deletions
diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 875ae1411..9e5230674 100644
--- a/src/arch/sparc/tlb.cc
+++ b/src/arch/sparc/tlb.cc
@@ -1129,7 +1129,7 @@ DTB::doMmuRegWrite(ThreadContext *tc, Packet *pkt)
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 --git a/src/sim/process.cc b/src/sim/process.cc
index a1f4c7d1d..b335d0cf2 100644
--- a/src/sim/process.cc
+++ b/src/sim/process.cc
@@ -343,7 +343,7 @@ Process::checkAndAllocNextPage(Addr vaddr)
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 --git a/src/sim/simulate.cc b/src/sim/simulate.cc
index 9af873f90..1ac2c80df 100644
--- a/src/sim/simulate.cc
+++ b/src/sim/simulate.cc
@@ -84,7 +84,7 @@ simulate(Tick num_cycles)
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 --git a/src/sim/system.cc b/src/sim/system.cc
index 864b0fdc7..d16524c41 100644
--- a/src/sim/system.cc
+++ b/src/sim/system.cc
@@ -95,12 +95,12 @@ System::System(Params *p)
* 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 @@ System::System(Params *p)
// 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 @@ System::registerThreadContext(ThreadContext *tc, int assigned)
}
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++;