From: Timothy M. Jones <tjones1@inf.ed.ac.uk>
Date: Thu, 22 Jul 2010 17:54:37 +0000 (+0100)
Subject: LSQ Unit: After deleting part of a split request, set it to NULL so that it
X-Git-Tag: stable_2012_02_02~982
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=607f5198004934c115af7975812a2d69bd005f7e;p=gem5.git

LSQ Unit: After deleting part of a split request, set it to NULL so that it
isn't accidentally deleted again later (causing a segmentation fault).
---

diff --git a/src/cpu/o3/lsq_unit.hh b/src/cpu/o3/lsq_unit.hh
index 7b8b1e2e3..c19a368d1 100644
--- a/src/cpu/o3/lsq_unit.hh
+++ b/src/cpu/o3/lsq_unit.hh
@@ -744,6 +744,8 @@ LSQUnit<Impl>::read(Request *req, Request *sreqLow, Request *sreqHigh,
                 delete fst_data_pkt;
                 delete snd_data_pkt->req;
                 delete snd_data_pkt;
+                sreqLow = NULL;
+                sreqHigh = NULL;
             }
 
             req = NULL;
@@ -769,6 +771,7 @@ LSQUnit<Impl>::read(Request *req, Request *sreqLow, Request *sreqHigh,
                 state->complete();
 
                 req = NULL;
+                sreqHigh = NULL;
 
                 lsq->setRetryTid(lsqID);
             }