|
From: <sv...@va...> - 2009-05-10 06:46:34
|
Author: bart
Date: 2009-05-10 07:46:31 +0100 (Sun, 10 May 2009)
New Revision: 9815
Log:
More diff minimizing.
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:39:37 UTC (rev 9814)
+++ branches/DRDDEV/drd/drd_bitmap.c 2009-05-10 06:46:31 UTC (rev 9815)
@@ -37,15 +37,11 @@
#include "pub_tool_mallocfree.h" /* VG_(malloc), VG_(free) */
-/* Forward declarations. */
-
-struct bitmap2;
-
-
/* Local function declarations. */
static void bm2_merge(struct bitmap2* const bm2l,
const struct bitmap2* const bm2r);
+static void bm2_print(const struct bitmap2* const bm2);
/* Local variables. */
@@ -1058,11 +1054,11 @@
(bm2 = VG_(OSetGen_Next)(bm->oset)) != 0;
)
{
- DRD_(bm2_print)(bm2);
+ bm2_print(bm2);
}
}
-void DRD_(bm2_print)(const struct bitmap2* const bm2)
+static void bm2_print(const struct bitmap2* const bm2)
{
const struct bitmap1* bm1;
Addr a;
@@ -1107,7 +1103,7 @@
}
/** Clear the bitmap contents. */
-void DRD_(bm2_clear)(struct bitmap2* const bm2)
+static void bm2_clear(struct bitmap2* const bm2)
{
tl_assert(bm2);
VG_(memset)(&bm2->bm1, 0, sizeof(bm2->bm1));
Modified: branches/DRDDEV/drd/drd_bitmap.h
===================================================================
--- branches/DRDDEV/drd/drd_bitmap.h 2009-05-10 06:39:37 UTC (rev 9814)
+++ branches/DRDDEV/drd/drd_bitmap.h 2009-05-10 06:46:31 UTC (rev 9815)
@@ -342,6 +342,7 @@
};
+static void bm2_clear(struct bitmap2* const bm2);
static __inline__
struct bitmap2* bm2_insert(struct bitmap* const bm, const UWord a1);
@@ -596,7 +597,7 @@
if (bm2 == 0)
{
bm2 = bm2_insert(bm, a1);
- DRD_(bm2_clear)(bm2);
+ bm2_clear(bm2);
}
}
else
@@ -605,7 +606,7 @@
if (! bm2)
{
bm2 = bm2_insert(bm, a1);
- DRD_(bm2_clear)(bm2);
+ 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:39:37 UTC (rev 9814)
+++ branches/DRDDEV/drd/pub_drd_bitmap.h 2009-05-10 06:46:31 UTC (rev 9815)
@@ -51,7 +51,6 @@
/* Forward declarations. */
struct bitmap;
-struct bitmap2;
/* Datatype definitions. */
@@ -127,11 +126,4 @@
ULong DRD_(bm_get_bitmap2_creation_count)(void);
ULong DRD_(bm_get_bitmap2_merge_count)(void);
-/* Second-level bitmaps. */
-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);
-
#endif /* __PUB_DRD_BITMAP_H */
|