|
From: <sv...@va...> - 2011-12-11 17:58:57
|
Author: bart
Date: 2011-12-11 17:54:17 +0000 (Sun, 11 Dec 2011)
New Revision: 12288
Log:
DRD: Two non-functional changes: adjust source code indentation and fix
second argument of unsafeIRDirty_0_N() in the memory access tracing code.
Modified:
trunk/drd/drd_load_store.c
Modified: trunk/drd/drd_load_store.c
===================================================================
--- trunk/drd/drd_load_store.c 2011-12-11 16:29:43 UTC (rev 12287)
+++ trunk/drd/drd_load_store.c 2011-12-11 17:54:17 UTC (rev 12288)
@@ -247,9 +247,9 @@
{
if (DRD_(running_thread_is_recording_stores)()
&& (s_check_stack_accesses
- || ! DRD_(thread_address_on_stack)(addr))
+ || !DRD_(thread_address_on_stack)(addr))
&& bm_access_store_4_triggers_conflict(addr)
- && ! DRD_(is_suppressed)(addr, addr + 4))
+ && !DRD_(is_suppressed)(addr, addr + 4))
{
drd_report_race(addr, 4, eStore);
}
@@ -312,11 +312,10 @@
addStmtToIRSB(bb,
IRStmt_Dirty(
unsafeIRDirty_0_N(/*regparms*/2,
- "drd_trace_load",
+ "drd_trace_mem_load",
VG_(fnptr_to_fnentry)
(drd_trace_mem_load),
- mkIRExprVec_2(addr_expr,
- mkIRExpr_HWord(size)))));
+ mkIRExprVec_2(addr_expr, mkIRExpr_HWord(size)))));
}
if (! s_check_stack_accesses && is_stack_access(bb, addr_expr))
@@ -375,16 +374,15 @@
if (UNLIKELY(DRD_(any_address_is_traced)()))
{
addStmtToIRSB(bb,
- IRStmt_Dirty(
- unsafeIRDirty_0_N(/*regparms*/2,
- "drd_trace_store",
- VG_(fnptr_to_fnentry)
- (drd_trace_mem_store),
- mkIRExprVec_2(addr_expr,
- mkIRExpr_HWord(size)))));
+ IRStmt_Dirty(
+ unsafeIRDirty_0_N(/*regparms*/2,
+ "drd_trace_mem_store",
+ VG_(fnptr_to_fnentry)
+ (drd_trace_mem_store),
+ mkIRExprVec_2(addr_expr, mkIRExpr_HWord(size)))));
}
- if (! s_check_stack_accesses && is_stack_access(bb, addr_expr))
+ if (!s_check_stack_accesses && is_stack_access(bb, addr_expr))
return;
switch (size)
|