Skip to content

Commit

Permalink
ewah_bitmap: delete unused 'ewah_and_not()'
Browse files Browse the repository at this point in the history
Reported-by: Ramsay Jones <ramsay@ramsayjones.plus.com>
Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
  • Loading branch information
derrickstolee authored and gitster committed Jun 18, 2018
1 parent 01b4a63 commit 19436fe
Showing 2 changed files with 0 additions and 78 deletions.
73 changes: 0 additions & 73 deletions ewah/ewah_bitmap.c
Original file line number Diff line number Diff line change
@@ -459,79 +459,6 @@ void ewah_xor(
out->bit_size = max_size(ewah_i->bit_size, ewah_j->bit_size);
}

void ewah_and_not(
struct ewah_bitmap *ewah_i,
struct ewah_bitmap *ewah_j,
struct ewah_bitmap *out)
{
struct rlw_iterator rlw_i;
struct rlw_iterator rlw_j;
size_t literals;

rlwit_init(&rlw_i, ewah_i);
rlwit_init(&rlw_j, ewah_j);

while (rlwit_word_size(&rlw_i) > 0 && rlwit_word_size(&rlw_j) > 0) {
while (rlw_i.rlw.running_len > 0 || rlw_j.rlw.running_len > 0) {
struct rlw_iterator *prey, *predator;

if (rlw_i.rlw.running_len < rlw_j.rlw.running_len) {
prey = &rlw_i;
predator = &rlw_j;
} else {
prey = &rlw_j;
predator = &rlw_i;
}

if ((predator->rlw.running_bit && prey == &rlw_i) ||
(!predator->rlw.running_bit && prey != &rlw_i)) {
ewah_add_empty_words(out, 0,
predator->rlw.running_len);
rlwit_discard_first_words(prey,
predator->rlw.running_len);
rlwit_discard_first_words(predator,
predator->rlw.running_len);
} else {
size_t index;
int negate_words;

negate_words = (&rlw_i != prey);
index = rlwit_discharge(prey, out,
predator->rlw.running_len, negate_words);
ewah_add_empty_words(out, negate_words,
predator->rlw.running_len - index);
rlwit_discard_first_words(predator,
predator->rlw.running_len);
}
}

literals = min_size(
rlw_i.rlw.literal_words,
rlw_j.rlw.literal_words);

if (literals) {
size_t k;

for (k = 0; k < literals; ++k) {
ewah_add(out,
rlw_i.buffer[rlw_i.literal_word_start + k] &
~(rlw_j.buffer[rlw_j.literal_word_start + k])
);
}

rlwit_discard_first_words(&rlw_i, literals);
rlwit_discard_first_words(&rlw_j, literals);
}
}

if (rlwit_word_size(&rlw_i) > 0)
rlwit_discharge(&rlw_i, out, ~0, 0);
else
rlwit_discharge_empty(&rlw_j, out);

out->bit_size = max_size(ewah_i->bit_size, ewah_j->bit_size);
}

void ewah_or(
struct ewah_bitmap *ewah_i,
struct ewah_bitmap *ewah_j,
5 changes: 0 additions & 5 deletions ewah/ewok.h
Original file line number Diff line number Diff line change
@@ -169,11 +169,6 @@ void ewah_or(
struct ewah_bitmap *ewah_j,
struct ewah_bitmap *out);

void ewah_and_not(
struct ewah_bitmap *ewah_i,
struct ewah_bitmap *ewah_j,
struct ewah_bitmap *out);

void ewah_xor(
struct ewah_bitmap *ewah_i,
struct ewah_bitmap *ewah_j,

0 comments on commit 19436fe

Please sign in to comment.