fix getvaddr nullptr stuff, add a non-spec load printingis-rebase11-LSQUnit

1 files changed, 12 insertions, 6 deletions

diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 7f5406885..7462d4c84 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -1134,12 +1134,18 @@ LSQUnit<Impl>::exposeLoads()
         // we should not have both req and sreqLow not NULL
         assert( !(req && sreqLow));
 
-        DPRINTF(LSQUnit, "Validate/Expose request for inst [sn:%lli]"
-            " PC= %s. req=%#x, reqLow=%#x, reqHigh=%#x\n",
-            load_inst->seqNum, load_inst->pcState(),
-            load_inst->postReq->getVaddr(),
-            load_inst->postSreqLow->getVaddr(),
-            load_inst->postSreqHigh->getVaddr());
+        if (req) {
+          DPRINTF(LSQUnit, "Validate/Expose request for inst [sn:%lli]"
+                  " PC= %s. req=%#x\n",
+                  load_inst->seqNum, load_inst->pcState(),
+                  req->getVaddr());
+        } else {
+          DPRINTF(LSQUnit, "Validate/Expose request for inst [sn:%lli]"
+                  " PC= %s. reqLow=%#x, reqHigh=%#x\n",
+                  load_inst->seqNum, load_inst->pcState(),
+                  load_inst->postSreqLow->getVaddr(),
+                  load_inst->postSreqHigh->getVaddr());
+        }
 
         PacketPtr data_pkt = NULL;
         PacketPtr snd_data_pkt = NULL;