Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
NAT: fix coverity error 190176 (VPP-1474)
[vpp.git]
/
src
/
vppinfra
/
crc32.h
diff --git
a/src/vppinfra/crc32.h
b/src/vppinfra/crc32.h
index
5a47236
..
5f4d94f
100644
(file)
--- a/
src/vppinfra/crc32.h
+++ b/
src/vppinfra/crc32.h
@@
-16,10
+16,15
@@
#ifndef __included_crc32_h__
#define __included_crc32_h__
#ifndef __included_crc32_h__
#define __included_crc32_h__
+#include <vppinfra/clib.h>
+
#if __SSE4_2__
#define clib_crc32c_uses_intrinsics
#include <x86intrin.h>
#if __SSE4_2__
#define clib_crc32c_uses_intrinsics
#include <x86intrin.h>
+#define crc32_u64 _mm_crc32_u64
+#define crc32_u32 _mm_crc32_u32
+
static_always_inline u32
clib_crc32c (u8 * s, int len)
{
static_always_inline u32
clib_crc32c (u8 * s, int len)
{
@@
-31,7
+36,9
@@
clib_crc32c (u8 * s, int len)
#else
/* workaround weird GCC bug when using _mm_crc32_u32
which happens with -O2 optimization */
#else
/* workaround weird GCC bug when using _mm_crc32_u32
which happens with -O2 optimization */
+#if !defined (__i686__)
volatile ("":::"memory");
volatile ("":::"memory");
+#endif
#endif
for (; len >= 4; len -= 4, s += 4)
#endif
for (; len >= 4; len -= 4, s += 4)
@@
-47,9
+54,13
@@
clib_crc32c (u8 * s, int len)
}
#elif __ARM_FEATURE_CRC32
}
#elif __ARM_FEATURE_CRC32
-#define clib_crc32c_
with
_intrinsics
+#define clib_crc32c_
uses
_intrinsics
#include <arm_acle.h>
#include <arm_acle.h>
+
+#define crc32_u64 __crc32cd
+#define crc32_u32 __crc32cw
+
static_always_inline u32
clib_crc32c (u8 * s, int len)
{
static_always_inline u32
clib_crc32c (u8 * s, int len)
{