commit dbb9c8e327781376552ddbfcb151e21883217f49
author njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Feb 12 11:28:38 2007 +0000
committer njn <njn@a5019735-40e9-0310-863c-91ae7b9d1cf9> Mon Feb 12 11:28:38 2007 +0000
tree d93f7848568d27f8499145395388de8ea4934d5d
parent 5a0a7734f032b159ed6e6759c26e141a30bee4ed

This code shouldn't be run unless --trace-mem was specified.



git-svn-id: svn://svn.valgrind.org/valgrind/trunk@6587 a5019735-40e9-0310-863c-91ae7b9d1cf9

lackey/lk_main.c

diff --git a/lackey/lk_main.c b/lackey/lk_main.c
index c8d9c9c..2716d27 100644
--- a/lackey/lk_main.c
+++ b/lackey/lk_main.c
@@ -500,6 +500,7 @@
 static void addEvent_Ir ( IRSB* sb, IRAtom* iaddr, UInt isize )
 {
    Event* evt;
+   tl_assert(clo_trace_mem);
    tl_assert( (VG_MIN_INSTR_SZB <= isize && isize <= VG_MAX_INSTR_SZB)
             || VG_CLREQ_SZB == isize );
    if (events_used == N_EVENTS)
@@ -516,6 +517,7 @@
 void addEvent_Dr ( IRSB* sb, IRAtom* daddr, Int dsize )
 {
    Event* evt;
+   tl_assert(clo_trace_mem);
    tl_assert(isIRAtom(daddr));
    tl_assert(dsize >= 1 && dsize <= MAX_DSIZE);
    if (events_used == N_EVENTS)
@@ -533,6 +535,7 @@
 {
    Event* lastEvt;
    Event* evt;
+   tl_assert(clo_trace_mem);
    tl_assert(isIRAtom(daddr));
    tl_assert(dsize >= 1 && dsize <= MAX_DSIZE);
 
@@ -744,20 +747,22 @@
             break;
 
          case Ist_Dirty: {
-            Int      dsize;
-            IRDirty* d = st->Ist.Dirty.details;
-            if (d->mFx != Ifx_None) {
-               // This dirty helper accesses memory.  Collect the details.
-               tl_assert(d->mAddr != NULL);
-               tl_assert(d->mSize != 0);
-               dsize = d->mSize;
-               if (d->mFx == Ifx_Read || d->mFx == Ifx_Modify)
-                  addEvent_Dr( sbOut, d->mAddr, dsize );
-               if (d->mFx == Ifx_Write || d->mFx == Ifx_Modify)
-                  addEvent_Dw( sbOut, d->mAddr, dsize );
-            } else {
-               tl_assert(d->mAddr == NULL);
-               tl_assert(d->mSize == 0);
+            if (clo_trace_mem) {
+               Int      dsize;
+               IRDirty* d = st->Ist.Dirty.details;
+               if (d->mFx != Ifx_None) {
+                  // This dirty helper accesses memory.  Collect the details.
+                  tl_assert(d->mAddr != NULL);
+                  tl_assert(d->mSize != 0);
+                  dsize = d->mSize;
+                  if (d->mFx == Ifx_Read || d->mFx == Ifx_Modify)
+                     addEvent_Dr( sbOut, d->mAddr, dsize );
+                  if (d->mFx == Ifx_Write || d->mFx == Ifx_Modify)
+                     addEvent_Dw( sbOut, d->mAddr, dsize );
+               } else {
+                  tl_assert(d->mAddr == NULL);
+                  tl_assert(d->mSize == 0);
+               }
             }
             addStmtToIRSB( sbOut, st );
             break;