|
From: <sv...@va...> - 2009-05-10 06:02:14
|
Author: bart
Date: 2009-05-10 07:02:09 +0100 (Sun, 10 May 2009)
New Revision: 9810
Log:
Converted several assignment statements in assert statements.
Modified:
branches/DRDDEV/drd/drd_bitmap.c
Modified: branches/DRDDEV/drd/drd_bitmap.c
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.c 2009-05-09 22:57:57 UTC (rev 9809)
+++ branches/DRDDEV/drd/drd_bitmap.c 2009-05-10 06:02:09 UTC (rev 9810)
@@ -121,10 +121,9 @@
tl_assert(bm);
tl_assert(a1 < a2);
tl_assert(a2 < first_address_with_higher_msb(a2));
+ tl_assert(a1 == first_address_with_same_lsb(a1));
+ tl_assert(a2 == first_address_with_same_lsb(a2));
- a1 = first_address_with_same_lsb(a1);
- a2 = first_address_with_same_lsb(a2);
-
for (b = a1; b < a2; b = b_next)
{
Addr b_start;
@@ -218,10 +217,9 @@
tl_assert(bm);
tl_assert(a1 < a2);
tl_assert(a2 < first_address_with_higher_msb(a2));
+ tl_assert(a1 == first_address_with_same_lsb(a1));
+ tl_assert(a2 == first_address_with_same_lsb(a2));
- a1 = first_address_with_same_lsb(a1);
- a2 = first_address_with_same_lsb(a2);
-
for (b = a1; b < a2; b = b_next)
{
Addr b_start;
@@ -511,16 +509,9 @@
tl_assert(bm);
tl_assert(a1);
tl_assert(a1 <= a2);
+ tl_assert(a1 == first_address_with_same_lsb(a1));
+ tl_assert(a2 == first_address_with_same_lsb(a2));
-#if 0
- if (address_msb(a1) != address_msb(a2))
- VG_(message)(Vg_DebugMsg, "bm_clear(bm = %p, a1 = 0x%lx, a2 = 0x%lx,"
- " delta = 0x%lx)", bm, a1, a2, a2 - a1);
-#endif
-
- a1 = first_address_with_same_lsb(a1);
- a2 = first_address_with_same_lsb(a2);
-
for (b = a1; b < a2; b = b_next)
{
struct bitmap2* p2;
@@ -595,16 +586,9 @@
tl_assert(bm);
tl_assert(a1);
tl_assert(a1 <= a2);
+ tl_assert(a1 == first_address_with_same_lsb(a1));
+ tl_assert(a2 == first_address_with_same_lsb(a2));
-#if 0
- if (address_msb(a1) != address_msb(a2))
- VG_(message)(Vg_DebugMsg, "bm_clear_load(bm = %p, a1 = 0x%lx, a2 = 0x%lx,"
- " delta = 0x%lx)", bm, a1, a2, a2 - a1);
-#endif
-
- a1 = first_address_with_same_lsb(a1);
- a2 = first_address_with_same_lsb(a2);
-
for (b = a1; b < a2; b = b_next)
{
struct bitmap2* p2;
@@ -683,16 +667,9 @@
tl_assert(bm);
tl_assert(a1);
tl_assert(a1 <= a2);
+ tl_assert(a1 == first_address_with_same_lsb(a1));
+ tl_assert(a2 == first_address_with_same_lsb(a2));
-#if 0
- if (address_msb(a1) != address_msb(a2))
- VG_(message)(Vg_DebugMsg, "bm_clear_store(bm = %p, a1 = 0x%lx, a2 = 0x%lx,"
- " delta = 0x%lx)", bm, a1, a2, a2 - a1);
-#endif
-
- a1 = first_address_with_same_lsb(a1);
- a2 = first_address_with_same_lsb(a2);
-
for (b = a1; b < a2; b = b_next)
{
struct bitmap2* p2;
@@ -939,10 +916,6 @@
if (bm2l == 0)
break;
tl_assert(bm2l);
-#if 0
- VG_(message)(Vg_DebugMsg, "bm_equal: at 0x%lx",
- make_address(bm2l->addr, 0));
-#endif
do
{
@@ -963,10 +936,6 @@
&& (bm2l->addr != bm2r->addr
|| VG_(memcmp)(&bm2l->bm1, &bm2r->bm1, sizeof(bm2l->bm1)) != 0))
{
-#if 0
- VG_(message)(Vg_DebugMsg, "bm_equal: rhs 0x%lx -- returning false",
- make_address(bm2r->addr, 0));
-#endif
return False;
}
}
@@ -982,11 +951,6 @@
tl_assert(DRD_(bm_has_any_access)(rhs,
make_address(bm2r->addr, 0),
make_address(bm2r->addr + 1, 0)));
-#if 0
- VG_(message)(Vg_DebugMsg,
- "bm_equal: remaining rhs 0x%lx -- returning false",
- make_address(bm2r->addr, 0));
-#endif
return False;
}
return True;
|