Errors: Use the correct panic/warn/fatal/info message in some places.

diff --git a/src/arch/sparc/tlb.cc b/src/arch/sparc/tlb.cc
index 875ae1411e654ad8dff01a18604a21ecd425ef16..9e5230674af2c3d6aa342633feb8b604cf305065 100644 (file)
--- 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 a1f4c7d1d77e87243499cd974eab93bf631cebfd..b335d0cf2000d39012cd50edb70b433ef51951c5 100644 (file)
--- 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 9af873f902c7c1c0b10368b9c346e5629f1135b5..1ac2c80df54537ae4737ce812a2332d4f819ef22 100644 (file)
--- 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 864b0fdc7de95d3d68aae1c7a00d1f380f5b3c3c..d16524c415b2c2b4981fbdc48eebcc9dcec94853 100644 (file)
--- 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++;