minor fixes

diff --git a/src/hwlm/noodle_engine_simd.hpp b/src/hwlm/noodle_engine_simd.hpp
index c3080f089631451f06e8e1afdc3522e101fa0e73..d5f6a8d006c95213770eb2cbcb2225f5ead0103e 100644 (file)
--- a/src/hwlm/noodle_engine_simd.hpp
+++ b/src/hwlm/noodle_engine_simd.hpp
@@ -1,6 +1,6 @@
 /*
  * Copyright (c) 2017, Intel Corporation
- * Copyright (c) 2020, 2021, VectorCamp PC
+ * Copyright (c) 2020-2021, VectorCamp PC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:

diff --git a/src/nfa/shufti.cpp b/src/nfa/shufti.cpp
index 4622af92539fd8fd96cc8fba3db088cdc187d783..0a95bacb18492d759235f59ebf52b0274698c4c7 100644 (file)
--- a/src/nfa/shufti.cpp
+++ b/src/nfa/shufti.cpp
@@ -1,5 +1,6 @@
 /*
  * Copyright (c) 2015-2017, Intel Corporation
+ * Copyright (c) 2020, 2021, VectorCamp PC
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -37,44 +38,6 @@
 #include "util/arch.h"
 #include "util/bitutils.h"
 
-#ifdef DEBUG
-#include <ctype.h>
-
-#define DUMP_MSK(_t)                                \
-static UNUSED                                       \
-void dumpMsk##_t(m##_t msk) {                       \
-    u8 * mskAsU8 = (u8 *)&msk;                      \
-    for (unsigned i = 0; i < sizeof(msk); i++) {    \
-        u8 c = mskAsU8[i];                          \
-        for (int j = 0; j < 8; j++) {               \
-            if ((c >> (7-j)) & 0x1)                 \
-                printf("1");                        \
-            else                                    \
-                printf("0");                        \
-        }                                           \
-        printf(" ");                                \
-    }                                               \
-}                                                   \
-static UNUSED                                       \
-void dumpMsk##_t##AsChars(m##_t msk) {              \
-    u8 * mskAsU8 = (u8 *)&msk;                      \
-    for (unsigned i = 0; i < sizeof(msk); i++) {    \
-        u8 c = mskAsU8[i];                          \
-        if (isprint(c))                             \
-            printf("%c",c);                         \
-        else                                        \
-            printf(".");                            \
-    }                                               \
-}
-
-#endif
-
-#ifdef DEBUG
-DUMP_MSK(128)
-#endif
-
-
-
 /** \brief Naive byte-by-byte implementation. */
 static really_inline
 const u8 *shuftiFwdSlow(const u8 *lo, const u8 *hi, const u8 *buf,
@@ -124,4 +87,4 @@ const u8 *shuftiDoubleExec(m128 mask1_lo, m128 mask1_hi,
                             const u8 *buf, const u8 *buf_end) {
     return shuftiDoubleExecReal<VECTORSIZE>(mask1_lo, mask1_hi, mask2_lo, mask2_hi, buf, buf_end);
 }
-#endif
\ No newline at end of file
+#endif