From: Bart Van Assche <bvanassche@acm.org>
Date: Sun, 29 Aug 2010 09:51:06 +0000 (+0000)
Subject: Source code cleanup.
X-Git-Tag: svn/VALGRIND_3_6_0~155
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d8a4b467a2ee78f2501a6471ca5c90cafff55cde;p=thirdparty%2Fvalgrind.git

Source code cleanup.

git-svn-id: svn://svn.valgrind.org/valgrind/trunk@11302
---

diff --git a/drd/drd_load_store.c b/drd/drd_load_store.c
index be6667175a..2b6d6f5026 100644
--- a/drd/drd_load_store.c
+++ b/drd/drd_load_store.c
@@ -114,12 +114,12 @@ void DRD_(trace_mem_access)(const Addr addr, const SizeT size,
    }
 }
 
-VG_REGPARM(2) void DRD_(trace_mem_load)(const Addr addr, const SizeT size)
+static VG_REGPARM(2) void drd_trace_mem_load(const Addr addr, const SizeT size)
 {
    return DRD_(trace_mem_access)(addr, size, eLoad);
 }
 
-VG_REGPARM(2) void DRD_(trace_mem_store)(const Addr addr,const SizeT size)
+static VG_REGPARM(2) void drd_trace_mem_store(const Addr addr,const SizeT size)
 {
    return DRD_(trace_mem_access)(addr, size, eStore);
 }
@@ -324,7 +324,7 @@ static void instrument_load(IRSB* const bb,
             unsafeIRDirty_0_N(/*regparms*/2,
                               "drd_trace_load",
                               VG_(fnptr_to_fnentry)
-                              (DRD_(trace_mem_load)),
+                              (drd_trace_mem_load),
                               mkIRExprVec_2(addr_expr,
                                             mkIRExpr_HWord(size)))));
    }
@@ -389,7 +389,7 @@ static void instrument_store(IRSB* const bb,
                                  unsafeIRDirty_0_N(/*regparms*/2,
                                                    "drd_trace_store",
                                                    VG_(fnptr_to_fnentry)
-                                                   (DRD_(trace_mem_store)),
+                                                   (drd_trace_mem_store),
                                                    mkIRExprVec_2(addr_expr,
                                                                  mkIRExpr_HWord(size)))));
    }
diff --git a/drd/drd_load_store.h b/drd/drd_load_store.h
index f80e31b8cb..be6df7b935 100644
--- a/drd/drd_load_store.h
+++ b/drd/drd_load_store.h
@@ -40,8 +40,6 @@ Bool DRD_(get_check_stack_accesses)(void);
 void DRD_(set_check_stack_accesses)(const Bool c);
 Bool DRD_(get_first_race_only)(void);
 void DRD_(set_first_race_only)(const Bool fro);
-VG_REGPARM(2) void DRD_(trace_mem_load)(const Addr addr, const SizeT size);
-VG_REGPARM(2) void DRD_(trace_mem_store)(const Addr addr,const SizeT size);
 IRSB* DRD_(instrument)(VgCallbackClosure* const closure,
                        IRSB* const bb_in,
                        VexGuestLayout* const layout,
diff --git a/drd/drd_main.c b/drd/drd_main.c
index 8b2024e4d2..3b92a9ab81 100644
--- a/drd/drd_main.c
+++ b/drd/drd_main.c
@@ -329,24 +329,20 @@ void drd_stop_using_mem(const Addr a1, const SizeT len,
    tl_assert(a1 < a2);
 
    if (UNLIKELY(DRD_(any_address_is_traced)()))
-   {
       DRD_(trace_mem_access)(a1, len, eEnd);
-   }
 
    if (!is_stack_mem && s_trace_alloc)
       VG_(message)(Vg_UserMsg, "Stopped using memory range 0x%lx + %ld\n",
                    a1, len);
 
-   if (! is_stack_mem || DRD_(get_check_stack_accesses)())
+   if (!is_stack_mem || DRD_(get_check_stack_accesses)())
    {
       DRD_(thread_stop_using_mem)(a1, a2, !is_stack_mem && s_free_is_write);
       DRD_(clientobj_stop_using_mem)(a1, a2);
       DRD_(suppression_stop_using_mem)(a1, a2);
    }
-   if (! is_stack_mem && s_free_is_write)
-   {
-      DRD_(trace_mem_store)(a1, len);
-   }
+   if (!is_stack_mem && s_free_is_write)
+      DRD_(trace_store)(a1, len);
 }
 
 static __inline__