From: Nilay Vaish <nilay@cs.wisc.edu>
Date: Tue, 10 Jan 2012 16:15:02 +0000 (-0600)
Subject: DPRINTF: Improve some dprintf messages.
X-Git-Tag: stable_2012_06_28~275^2~23
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9957035a42653a0666e30c744ab02fb0074db3a3;p=gem5.git

DPRINTF: Improve some dprintf messages.
---

diff --git a/src/cpu/o3/iew_impl.hh b/src/cpu/o3/iew_impl.hh
index 9c4b1068d..92c8875e4 100644
--- a/src/cpu/o3/iew_impl.hh
+++ b/src/cpu/o3/iew_impl.hh
@@ -1340,10 +1340,10 @@ DefaultIEW<Impl>::executeInsts()
                 fetchRedirect[tid] = true;
 
                 DPRINTF(IEW, "Execute: Branch mispredict detected.\n");
-                DPRINTF(IEW, "Predicted target was PC:%#x, NPC:%#x.\n",
-                        inst->predInstAddr(), inst->predNextInstAddr());
+                DPRINTF(IEW, "Predicted target was PC: %s.\n",
+                        inst->readPredTarg());
                 DPRINTF(IEW, "Execute: Redirecting fetch to PC: %s.\n",
-                        inst->pcState(), inst->nextInstAddr());
+                        inst->pcState());
                 // If incorrect, then signal the ROB that it must be squashed.
                 squashDueToBranch(inst, tid);
 
diff --git a/src/dev/io_device.cc b/src/dev/io_device.cc
index dab1f766e..00e463de1 100644
--- a/src/dev/io_device.cc
+++ b/src/dev/io_device.cc
@@ -71,7 +71,7 @@ void
 PioDevice::init()
 {
     if (!pioPort)
-        panic("Pio port not connected to anything!");
+        panic("Pio port of %s not connected to anything!", name());
     pioPort->sendStatusChange(Port::RangeChange);
 }