From 3555b2aecca85457d4ce5899ebafd2a7cde08e53 Mon Sep 17 00:00:00 2001
From: Nathan Binkert <nate@binkert.org>
Date: Tue, 21 Aug 2007 16:15:14 -0700
Subject: [PATCH 1/2] style: fix style hook when run from a repo subdir. Before
 this fix, the style hook would blow up when you did a qrefresh to add a new
 file, but executed the qrefresh from a repository sub directory.

--HG--
extra : convert_revision : 851b0421dfa5c5b23d0f49441c4ba2e0ac579c5d
---
 util/style.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/util/style.py b/util/style.py
index 866bef9b8f..18b224f276 100644
--- a/util/style.py
+++ b/util/style.py
@@ -286,7 +286,7 @@ def check_whitespace(ui, repo, hooktype, node, parent1, parent2):
 
     for fname in added:
         ok = True
-        for line,num in checkwhite(fname):
+        for line,num in checkwhite(repo.wjoin(fname)):
             ui.write("invalid whitespace in %s:%d\n" % (fname, num))
             if verbose:
                 ui.write(">>%s<<\n" % line[-1])

From e1054170b54c37043d768d454f7b0eafcf1c119e Mon Sep 17 00:00:00 2001
From: Kevin Lim <ktlim@umich.edu>
Date: Tue, 21 Aug 2007 16:16:56 -0700
Subject: [PATCH 2/2] o3: Fix for retry ID bug. It should be cleared prior to
 the call to recvRetry. Add extra DPRINTF statement for clearer debugging
 output.

--HG--
extra : convert_revision : e2332754743f42d60e159ac89f6fb0fd8b7f57f8
---
 src/cpu/o3/lsq_impl.hh      | 3 ++-
 src/cpu/o3/lsq_unit_impl.hh | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/cpu/o3/lsq_impl.hh b/src/cpu/o3/lsq_impl.hh
index 10c0afd381..c71a0ad9d2 100644
--- a/src/cpu/o3/lsq_impl.hh
+++ b/src/cpu/o3/lsq_impl.hh
@@ -101,10 +101,11 @@ LSQ<Impl>::DcachePort::recvRetry()
         //Squashed, so drop it
         return;
     }
-    lsq->thread[lsq->retryTid].recvRetry();
+    int curr_retry_tid = lsq->retryTid;
     // Speculatively clear the retry Tid.  This will get set again if
     // the LSQUnit was unable to complete its access.
     lsq->retryTid = -1;
+    lsq->thread[curr_retry_tid].recvRetry();
 }
 
 template <class Impl>
diff --git a/src/cpu/o3/lsq_unit_impl.hh b/src/cpu/o3/lsq_unit_impl.hh
index 8b2e82d8ea..4ab149cee6 100644
--- a/src/cpu/o3/lsq_unit_impl.hh
+++ b/src/cpu/o3/lsq_unit_impl.hh
@@ -928,6 +928,7 @@ void
 LSQUnit<Impl>::recvRetry()
 {
     if (isStoreBlocked) {
+        DPRINTF(LSQUnit, "Receiving retry: store blocked\n");
         assert(retryPkt != NULL);
 
         if (dcachePort->sendTiming(retryPkt)) {