[PATCH v3 08/24] ewah: implement bitmap_or()
- From
Taylor Blau <me@ttaylorr.com>
- Date
- Dec 8, 2020, 00:04 UTC
- Message-ID
- <34137a7f35835c923fe9db39049a124a41ca0839.1607385833.git.me@ttaylorr.com>
- In-Reply-To
- <cover.1607385833.git.me@ttaylorr.com>
From: Jeff King <peff@peff.net>
We have a function to bitwise-OR an ewah into an uncompressed bitmap, but not to OR two uncompressed bitmaps. Let's add it.
Interestingly, we have a public header declaration going back to e1273106f6 (ewah: compressed bitmap implementation, 2013-11-14), but the function was never implemented. That was all OK since there were no users of 'bitmap_or()', but a first caller will be added in a couple of patches.
Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Taylor Blau <me@ttaylorr.com> --- ewah/bitmap.c | 9 +++++++++ 1 file changed, 9 insertions(+)
diff --git a/ewah/bitmap.c b/ewah/bitmap.c index 6f9e5c529b..0a3502603f 100644 --- a/ewah/bitmap.c +++ b/ewah/bitmap.c @@ -122,6 +122,15 @@ void bitmap_and_not(struct bitmap *self, struct bitmap *other) self->words[i] &= ~other->words[i]; } +void bitmap_or(struct bitmap *self, const struct bitmap *other) +{ + size_t i; + + bitmap_grow(self, other->word_alloc); + for (i = 0; i < other->word_alloc; i++) + self->words[i] |= other->words[i]; +} + void bitmap_or_ewah(struct bitmap *self, struct ewah_bitmap *other) { size_t original_size = self->word_alloc;
-- 2.29.2.533.g07db1f5344