|
From: <sv...@va...> - 2008-03-13 20:11:38
|
Author: bart
Date: 2008-03-13 20:11:33 +0000 (Thu, 13 Mar 2008)
New Revision: 7676
Log:
Small additional optimization.
Modified:
trunk/exp-drd/drd_bitmap.c
trunk/exp-drd/drd_main.c
Modified: trunk/exp-drd/drd_bitmap.c
===================================================================
--- trunk/exp-drd/drd_bitmap.c 2008-03-13 19:24:30 UTC (rev 7675)
+++ trunk/exp-drd/drd_bitmap.c 2008-03-13 20:11:33 UTC (rev 7676)
@@ -218,14 +218,6 @@
b_end = (bm2->addr << ADDR0_BITS) + ADDR0_COUNT;
else
b_end = a2;
-#if 0
- VG_(message)(Vg_DebugMsg,
- "in 0x%lx 0x%lx / cur 0x%lx 0x%lx / out 0x%lx 0x%lx",
- a1, a2,
- (bm2->addr << ADDR0_BITS),
- (bm2->addr << ADDR0_BITS) + ADDR0_COUNT,
- b_start, b_end);
-#endif
tl_assert(a1 <= b_end && b_end <= a2);
tl_assert(b_start < b_end);
tl_assert((b_start & ADDR0_MASK) <= ((b_end - 1) & ADDR0_MASK));
Modified: trunk/exp-drd/drd_main.c
===================================================================
--- trunk/exp-drd/drd_main.c 2008-03-13 19:24:30 UTC (rev 7675)
+++ trunk/exp-drd/drd_main.c 2008-03-13 20:11:33 UTC (rev 7676)
@@ -181,7 +181,7 @@
#endif
sg = thread_get_segment(thread_get_running_tid());
bm_access_range_load(sg->bm, addr, addr + size);
- if (bm_has_conflict_with(thread_get_danger_set(), addr, addr + size, eLoad)
+ if (bm_load_has_conflict_with(thread_get_danger_set(), addr, addr + size)
&& ! drd_is_suppressed(addr, addr + size))
{
DataRaceErrInfo drei;
@@ -231,7 +231,7 @@
#endif
sg = thread_get_segment(thread_get_running_tid());
bm_access_range_store(sg->bm, addr, addr + size);
- if (bm_has_conflict_with(thread_get_danger_set(), addr, addr + size, eStore)
+ if (bm_store_has_conflict_with(thread_get_danger_set(), addr, addr + size)
&& ! drd_is_suppressed(addr, addr + size))
{
DataRaceErrInfo drei;
|