summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorNilay Vaish <nilay@cs.wisc.edu>2012-01-10 10:15:02 -0600
committerNilay Vaish <nilay@cs.wisc.edu>2012-01-10 10:15:02 -0600
commit9957035a42653a0666e30c744ab02fb0074db3a3 (patch)
treeffb06b65d5f1dd8bc7d49312872f49bd5142e1a6
parenta5a2b9ecbdeeefcfa8d5a5d116c385cdf59e0256 (diff)
downloadgem5-9957035a42653a0666e30c744ab02fb0074db3a3.tar.xz
DPRINTF: Improve some dprintf messages.
-rw-r--r--src/cpu/o3/iew_impl.hh6
-rw-r--r--src/dev/io_device.cc2
2 files changed, 4 insertions, 4 deletions
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);
}