github_mirrors/vectorscan
3
0
Fork 1
mirror of https://github.com/VectorCamp/vectorscan.git synced 2025-11-15 17:02:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

resolving conficts after merging

Browse Source
This commit is contained in:
apostolos
2021-11-13 18:58:22 +02:00
parent 6440d18b48 092e217e85
commit 2136580d50
31 changed files with 1283 additions and 322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/nfa/shufti_simd.hpp
View File

@@ -65,7 +65,7 @@ static really_inline
const u8 *fwdBlock(SuperVector<S> mask_lo, SuperVector<S> mask_hi, SuperVector<S> chars, const u8 *buf) {
SuperVector<S> v = blockSingleMask(mask_lo, mask_hi, chars);
return firstMatch<S>(buf, v);
return first_zero_match_inverted<S>(buf, v);
}
template <uint16_t S>
@@ -73,7 +73,7 @@ static really_inline
const u8 *revBlock(SuperVector<S> mask_lo, SuperVector<S> mask_hi, SuperVector<S> chars, const u8 *buf) {
SuperVector<S> v = blockSingleMask(mask_lo, mask_hi, chars);
return lastMatch<S>(buf, v);
return last_zero_match_inverted<S>(buf, v);
}
template <uint16_t S>
@@ -82,7 +82,7 @@ const u8 *fwdBlockDouble(SuperVector<S> mask1_lo, SuperVector<S> mask1_hi, Super
SuperVector<S> mask = blockDoubleMask(mask1_lo, mask1_hi, mask2_lo, mask2_hi, chars);
return firstMatch<S>(buf, mask);
return first_zero_match_inverted<S>(buf, mask);
}
template <uint16_t S>