|
From: <sv...@va...> - 2010-08-29 09:51:15
|
Author: bart
Date: 2010-08-29 10:51:06 +0100 (Sun, 29 Aug 2010)
New Revision: 11302
Log:
Source code cleanup.
Modified:
trunk/drd/drd_load_store.c
trunk/drd/drd_load_store.h
trunk/drd/drd_main.c
Modified: trunk/drd/drd_load_store.c
===================================================================
--- trunk/drd/drd_load_store.c 2010-08-29 09:19:07 UTC (rev 11301)
+++ trunk/drd/drd_load_store.c 2010-08-29 09:51:06 UTC (rev 11302)
@@ -114,12 +114,12 @@
}
}
-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 @@
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 @@
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)))));
}
Modified: trunk/drd/drd_load_store.h
===================================================================
--- trunk/drd/drd_load_store.h 2010-08-29 09:19:07 UTC (rev 11301)
+++ trunk/drd/drd_load_store.h 2010-08-29 09:51:06 UTC (rev 11302)
@@ -40,8 +40,6 @@
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,
Modified: trunk/drd/drd_main.c
===================================================================
--- trunk/drd/drd_main.c 2010-08-29 09:19:07 UTC (rev 11301)
+++ trunk/drd/drd_main.c 2010-08-29 09:51:06 UTC (rev 11302)
@@ -329,24 +329,20 @@
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__
|