|
From: <sv...@va...> - 2009-05-10 06:14:49
|
Author: bart
Date: 2009-05-10 07:14:42 +0100 (Sun, 10 May 2009)
New Revision: 9812
Log:
Inserted DRD_(...) where it was missing.
Modified:
branches/DRDDEV/drd/drd_bitmap.c
branches/DRDDEV/drd/drd_bitmap.h
branches/DRDDEV/drd/pub_drd_bitmap.h
Modified: branches/DRDDEV/drd/drd_bitmap.c
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.c 2009-05-10 06:10:47 UTC (rev 9811)
+++ branches/DRDDEV/drd/drd_bitmap.c 2009-05-10 06:14:42 UTC (rev 9812)
@@ -1058,11 +1058,11 @@
(bm2 = VG_(OSetGen_Next)(bm->oset)) != 0;
)
{
- bm2_print(bm2);
+ DRD_(bm2_print)(bm2);
}
}
-void bm2_print(const struct bitmap2* const bm2)
+void DRD_(bm2_print)(const struct bitmap2* const bm2)
{
const struct bitmap1* bm1;
Addr a;
@@ -1107,13 +1107,14 @@
}
/** Clear the bitmap contents. */
-void bm2_clear(struct bitmap2* const bm2)
+void DRD_(bm2_clear)(struct bitmap2* const bm2)
{
tl_assert(bm2);
VG_(memset)(&bm2->bm1, 0, sizeof(bm2->bm1));
}
/** Compute *bm2l |= *bm2r. */
+static
void bm2_merge(struct bitmap2* const bm2l, const struct bitmap2* const bm2r)
{
unsigned k;
Modified: branches/DRDDEV/drd/drd_bitmap.h
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.h 2009-05-10 06:10:47 UTC (rev 9811)
+++ branches/DRDDEV/drd/drd_bitmap.h 2009-05-10 06:14:42 UTC (rev 9812)
@@ -596,7 +596,7 @@
if (bm2 == 0)
{
bm2 = bm2_insert(bm, a1);
- bm2_clear(bm2);
+ DRD_(bm2_clear)(bm2);
}
}
else
@@ -605,7 +605,7 @@
if (! bm2)
{
bm2 = bm2_insert(bm, a1);
- bm2_clear(bm2);
+ DRD_(bm2_clear)(bm2);
}
bm_update_cache(bm, a1, bm2);
}
Modified: branches/DRDDEV/drd/pub_drd_bitmap.h
===================================================================
--- branches/DRDDEV/drd/pub_drd_bitmap.h 2009-05-10 06:10:47 UTC (rev 9811)
+++ branches/DRDDEV/drd/pub_drd_bitmap.h 2009-05-10 06:14:42 UTC (rev 9812)
@@ -128,9 +128,9 @@
ULong DRD_(bm_get_bitmap2_merge_count)(void);
/* Second-level bitmaps. */
-void bm2_clear(struct bitmap2* const bm2);
-void bm2_print(const struct bitmap2* const bm2);
-ULong bm_get_bitmap2_creation_count(void);
+void DRD_(bm2_clear)(struct bitmap2* const bm2);
+void DRD_(bm2_print)(const struct bitmap2* const bm2);
+ULong DRD_(bm_get_bitmap2_creation_count)(void);
void DRD_(bm_test)(void);
|