diff --git a/src/hwlm/noodle_engine_simd.hpp b/src/hwlm/noodle_engine_simd.hpp index 9e16c2f3..9af76768 100644 --- a/src/hwlm/noodle_engine_simd.hpp +++ b/src/hwlm/noodle_engine_simd.hpp @@ -37,7 +37,7 @@ static really_really_inline hwlm_error_t single_zscan(const struct noodTable *n,const u8 *d, const u8 *buf, typename SuperVector::comparemask_type z, size_t len, const struct cb_info *cbi) { while (unlikely(z)) { - typename SuperVector::comparemask_type pos = SuperVector::findLSB(z) >> Z_POSSHIFT; + typename SuperVector::comparemask_type pos = SuperVector::findLSB(z); size_t matchPos = d - buf + pos; DEBUG_PRINTF("match pos %zu\n", matchPos); hwlmcb_rv_t rv = final(n, buf, len, n->msk_len != 1, cbi, matchPos); @@ -51,7 +51,7 @@ static really_really_inline hwlm_error_t double_zscan(const struct noodTable *n,const u8 *d, const u8 *buf, typename SuperVector::comparemask_type z, size_t len, const struct cb_info *cbi) { while (unlikely(z)) { - typename SuperVector::comparemask_type pos = SuperVector::findLSB(z) >> Z_POSSHIFT; + typename SuperVector::comparemask_type pos = SuperVector::findLSB(z); size_t matchPos = d - buf + pos - 1; DEBUG_PRINTF("match pos %zu\n", matchPos); hwlmcb_rv_t rv = final(n, buf, len, true, cbi, matchPos); diff --git a/src/util/supervector/supervector.hpp b/src/util/supervector/supervector.hpp index 1d72ee81..3c4b1eea 100644 --- a/src/util/supervector/supervector.hpp +++ b/src/util/supervector/supervector.hpp @@ -48,18 +48,6 @@ #include -#if defined(HAVE_SIMD_512_BITS) -#define Z_POSSHIFT 0 -#elif defined(HAVE_SIMD_256_BITS) -#define Z_POSSHIFT 0 -#elif defined(HAVE_SIMD_128_BITS) -#if !defined(VS_SIMDE_BACKEND) && (defined(ARCH_ARM32) || defined(ARCH_AARCH64)) -#define Z_POSSHIFT 2 -#else -#define Z_POSSHIFT 0 -#endif -#endif - // Define a common assume_aligned using an appropriate compiler built-in, if // it's available. Note that we need to handle C or C++ compilation. #ifdef __cplusplus