From 60ce2b34fedcb999e249c7b9d277605303b741cf Mon Sep 17 00:00:00 2001
From: Ali Saidi <Ali.Saidi@ARM.com>
Date: Thu, 17 Oct 2013 10:20:45 -0500
Subject: mem: Make MemoryAccess flag more verbose

This patch extends the MemoryAccess debug flag to report who sent the
requests and the cacheability.
---
 src/mem/abstract_mem.cc | 20 ++++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/src/mem/abstract_mem.cc b/src/mem/abstract_mem.cc
index b25b32616..a169243e9 100644
--- a/src/mem/abstract_mem.cc
+++ b/src/mem/abstract_mem.cc
@@ -273,10 +273,12 @@ AbstractMemory::checkLockedAddrList(PacketPtr pkt)
 
 #if TRACING_ON
 
-#define CASE(A, T)                                                      \
-  case sizeof(T):                                                       \
-    DPRINTF(MemoryAccess,"%s of size %i on address 0x%x data 0x%x\n",   \
-            A, pkt->getSize(), pkt->getAddr(), pkt->get<T>());          \
+#define CASE(A, T)                                                        \
+  case sizeof(T):                                                         \
+    DPRINTF(MemoryAccess,"%s from %s of size %i on address 0x%x data " \
+            "0x%x %c\n", A, system()->getMasterName(pkt->req->masterId()),\
+            pkt->getSize(), pkt->getAddr(), pkt->get<T>(),                \
+            pkt->req->isUncacheable() ? 'U' : 'C');                       \
   break
 
 
@@ -288,10 +290,12 @@ AbstractMemory::checkLockedAddrList(PacketPtr pkt)
           CASE(A, uint16_t);                                            \
           CASE(A, uint8_t);                                             \
           default:                                                      \
-            DPRINTF(MemoryAccess, "%s of size %i on address 0x%x\n",    \
-                    A, pkt->getSize(), pkt->getAddr());                 \
-            DDUMP(MemoryAccess, pkt->getPtr<uint8_t>(), pkt->getSize());\
-        }                                                               \
+            DPRINTF(MemoryAccess, "%s from %s of size %i on address 0x%x %c\n",\
+                    A, system()->getMasterName(pkt->req->masterId()),          \
+                    pkt->getSize(), pkt->getAddr(),                            \
+                    pkt->req->isUncacheable() ? 'U' : 'C');                    \
+            DDUMP(MemoryAccess, pkt->getPtr<uint8_t>(), pkt->getSize());       \
+        }                                                                      \
     } while (0)
 
 #else
-- 
cgit v1.2.3