From b5f1a822586056246ed52c9a0dc3443c0daa31d1 Mon Sep 17 00:00:00 2001 From: Konstantinos Margaritis Date: Fri, 17 Nov 2023 03:50:30 +0800 Subject: [PATCH] Move VERM16 enums to the end of the list This was causing a hard-to-track segfault with Fat Runtime on SVE2 hw, because of the macro-based hard-coded way to calculate offsets for each implementation. This needs a rewrite. --- src/nfa/nfa_internal.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/nfa/nfa_internal.h b/src/nfa/nfa_internal.h index 2d4c40b5..8cc701b6 100644 --- a/src/nfa/nfa_internal.h +++ b/src/nfa/nfa_internal.h @@ -66,10 +66,6 @@ enum NFAEngineType { LBR_NFA_DOT, /**< magic pseudo nfa */ LBR_NFA_VERM, /**< magic pseudo nfa */ LBR_NFA_NVERM, /**< magic pseudo nfa */ -#ifdef HAVE_SVE2 - LBR_NFA_VERM16, /**< magic pseudo nfa */ - LBR_NFA_NVERM16, /**< magic pseudo nfa */ -#endif // HAVE_SVE2 LBR_NFA_SHUF, /**< magic pseudo nfa */ LBR_NFA_TRUF, /**< magic pseudo nfa */ CASTLE_NFA, /**< magic pseudo nfa */ @@ -81,6 +77,10 @@ enum NFAEngineType { SHENG_NFA_64, /**< magic pseudo nfa */ MCSHENG_64_NFA_8, /**< magic pseudo nfa */ MCSHENG_64_NFA_16, /**< magic pseudo nfa */ +#ifdef HAVE_SVE2 + LBR_NFA_VERM16, /**< magic pseudo nfa */ + LBR_NFA_NVERM16, /**< magic pseudo nfa */ +#endif // HAVE_SVE2 /** \brief bogus NFA - not used */ INVALID_NFA };