From: apostolos <apostolos.tapsas@vectorcamp.gr>
Date: Sat, 13 Nov 2021 16:58:22 +0000 (+0200)
Subject: resolving conficts after merging
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2136580d50a7c54dfb8d7753ff7d39f28d5175b2;p=thirdparty%2Fvectorscan.git

resolving conficts after merging
---

2136580d50a7c54dfb8d7753ff7d39f28d5175b2
diff --cc src/nfa/truffle_simd.hpp
index 51b9ee68,13a5e787..8d9911fd
--- a/src/nfa/truffle_simd.hpp
+++ b/src/nfa/truffle_simd.hpp
@@@ -57,7 -55,8 +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>
diff --cc unit/internal/simd_utils.cpp
index b1b9bfb1,9b206e1b..23640034
--- a/unit/internal/simd_utils.cpp
+++ b/unit/internal/simd_utils.cpp
@@@ -667,10 -667,7 +667,11 @@@ TEST(SimdUtilsTest, movq) 
      simd = _mm_set_epi64x(~0LL, 0x123456789abcdef);
  #elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
      int64x2_t a = { 0x123456789abcdefLL, ~0LL };
 +    simd = vreinterpretq_s64_s8(a);
 +#elif defined(ARCH_PPC64EL)
 +    int64x2_t a = {0x123456789abcdefLL, ~0LL };
 +    simd = (m128) a;
+     simd = vreinterpretq_s32_s64(a);
  #endif
  #endif
      r = movq(simd);