resolving conficts after merging

This commit is contained in:
apostolos
2021-11-13 18:58:22 +02:00
31 changed files with 1283 additions and 322 deletions

View File

@@ -57,7 +57,7 @@ template <uint16_t S>
static really_inline
const u8 *fwdBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> chars, const u8 *buf) {
SuperVector<S> res = blockSingleMask(shuf_mask_lo_highclear, shuf_mask_lo_highset, chars);
return firstMatch<S>(buf, res);
return first_zero_match_inverted<S>(buf, res);
}
template <uint16_t S>
@@ -121,7 +121,7 @@ static really_inline
const u8 *revBlock(SuperVector<S> shuf_mask_lo_highclear, SuperVector<S> shuf_mask_lo_highset, SuperVector<S> v,
const u8 *buf) {
SuperVector<S> res = blockSingleMask(shuf_mask_lo_highclear, shuf_mask_lo_highset, v);
return lastMatch<S>(buf, res);
return last_zero_match_inverted<S>(buf, res);
}
template <uint16_t S>