From: Justin Viiret <justin.viiret@intel.com>
Date: Tue, 15 Mar 2016 05:36:39 +0000 (+1100)
Subject: shufticompile: Remove unused mergeShuftiMask
X-Git-Tag: v4.2.0^2~100
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ae908fd119467320899f264f6fdc2fdc5f642b7;p=thirdparty%2Fvectorscan.git

shufticompile: Remove unused mergeShuftiMask
---

diff --git a/src/nfa/shufticompile.cpp b/src/nfa/shufticompile.cpp
index 13ec9d0c..05072a44 100644
--- a/src/nfa/shufticompile.cpp
+++ b/src/nfa/shufticompile.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2016, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -163,15 +163,6 @@ void shuftiBuildDoubleMasks(const CharReach &onechar,
     memcpy(hi2, hi2_a.data(), sizeof(m128));
 }
 
-void mergeShuftiMask(m128 *lo, const m128 lo_in, u32 lo_bits) {
-    assert(lo_bits <= 8);
-    const u8 *lo_in_p = (const u8 *)&lo_in;
-    u8 *lo_p = (u8 *)lo;
-    for (u32 i = 0; i < 16; i++) {
-        lo_p[i] |= lo_in_p[i] << lo_bits;
-    }
-}
-
 #ifdef DUMP_SUPPORT
 
 CharReach shufti2cr(const m128 lo_in, const m128 hi_in) {
diff --git a/src/nfa/shufticompile.h b/src/nfa/shufticompile.h
index b0cc1b1b..2795b73a 100644
--- a/src/nfa/shufticompile.h
+++ b/src/nfa/shufticompile.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015, Intel Corporation
+ * Copyright (c) 2015-2016, Intel Corporation
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions are met:
@@ -54,8 +54,6 @@ void shuftiBuildDoubleMasks(const CharReach &onechar,
                             const flat_set<std::pair<u8, u8>> &twochar,
                             m128 *lo1, m128 *hi1, m128 *lo2, m128 *hi2);
 
-void mergeShuftiMask(m128 *lo, const m128 lo_in, u32 lo_bits);
-
 #ifdef DUMP_SUPPORT
 
 /**