Factor out a little more common code.

--HG--
extra : convert_revision : 626255a91679d534030c91bcdb4fc1bed36ceb9b

1 files changed, 32 insertions, 46 deletions

diff --git a/src/mem/cache/cache_impl.hh b/src/mem/cache/cache_impl.hh
index 568e7ff63..b4c3c6359 100644
--- a/src/mem/cache/cache_impl.hh
+++ b/src/mem/cache/cache_impl.hh
@@ -143,6 +143,37 @@ Cache<TagStore>::cmpAndSwap(BlkType *blk, PacketPtr pkt)
 }
 
 
+template<class TagStore>
+void
+Cache<TagStore>::satisfyCpuSideRequest(PacketPtr pkt, BlkType *blk)
+{
+    assert(blk);
+    assert(pkt->needsExclusive() ? blk->isWritable() : blk->isValid());
+    assert(pkt->getOffset(blkSize) + pkt->getSize() <= blkSize);
+
+    // Check RMW operations first since both isRead() and
+    // isWrite() will be true for them
+    if (pkt->cmd == MemCmd::SwapReq) {
+        cmpAndSwap(blk, pkt);
+    } else if (pkt->isWrite()) {
+        if (blk->checkWrite(pkt)) {
+            blk->status |= BlkDirty;
+            pkt->writeDataToBlock(blk->data, blkSize);
+        }
+    } else if (pkt->isRead()) {
+        if (pkt->isLocked()) {
+            blk->trackLoadLocked(pkt);
+        }
+        pkt->setDataFromBlock(blk->data, blkSize);
+    } else {
+        // Not a read or write... must be an upgrade.  it's OK
+        // to just ack those as long as we have an exclusive
+        // copy at this level.
+        assert(pkt->cmd == MemCmd::UpgradeReq);
+    }
+}
+
+
 /////////////////////////////////////////////////////
 //
 // MSHR helper functions
@@ -237,27 +268,7 @@ Cache<TagStore>::access(PacketPtr pkt, BlkType *&blk, int &lat)
             // OK to satisfy access
             hits[pkt->cmdToIndex()][0/*pkt->req->getThreadNum()*/]++;
             satisfied = true;
-
-            // Check RMW operations first since both isRead() and
-            // isWrite() will be true for them
-            if (pkt->cmd == MemCmd::SwapReq) {
-                cmpAndSwap(blk, pkt);
-            } else if (pkt->isWrite()) {
-                if (blk->checkWrite(pkt)) {
-                    blk->status |= BlkDirty;
-                    pkt->writeDataToBlock(blk->data, blkSize);
-                }
-            } else if (pkt->isRead()) {
-                if (pkt->isLocked()) {
-                    blk->trackLoadLocked(pkt);
-                }
-                pkt->setDataFromBlock(blk->data, blkSize);
-            } else {
-                // Not a read or write... must be an upgrade.  it's OK
-                // to just ack those as long as we have an exclusive
-                // copy at this level.
-                assert(pkt->cmd == MemCmd::UpgradeReq);
-            }
+            satisfyCpuSideRequest(pkt, blk);
         } else {
             // permission violation... nothing to do here, leave unsatisfied
             // for statistics purposes this counts like a complete miss
@@ -559,31 +570,6 @@ Cache<TagStore>::functionalAccess(PacketPtr pkt,
 
 
 template<class TagStore>
-void
-Cache<TagStore>::satisfyCpuSideRequest(PacketPtr pkt, BlkType *blk)
-{
-    assert(blk);
-    assert(pkt->needsExclusive() ? blk->isWritable() : blk->isValid());
-    assert(pkt->isWrite() || pkt->isReadWrite() || pkt->isRead());
-    assert(pkt->getOffset(blkSize) + pkt->getSize() <= blkSize);
-
-    if (pkt->isWrite()) {
-        if (blk->checkWrite(pkt)) {
-            blk->status |= BlkDirty;
-            pkt->writeDataToBlock(blk->data, blkSize);
-        }
-    } else if (pkt->isReadWrite()) {
-        cmpAndSwap(blk, pkt);
-    } else {
-        if (pkt->isLocked()) {
-            blk->trackLoadLocked(pkt);
-        }
-        pkt->setDataFromBlock(blk->data, blkSize);
-    }
-}
-
-
-template<class TagStore>
 bool
 Cache<TagStore>::satisfyMSHR(MSHR *mshr, PacketPtr pkt,
                              BlkType *blk)