d/numam-dpdk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

eal/x86: fix strict aliasing rules

Browse Source 
Fixed strict-aliasing rules breaking errors for some GCC version.

Signed-off-by: Zhihong Wang <zhihong.wang@intel.com>
Acked-by: Cunming Liang <cunming.liang@intel.com>
Acked-by: Michael Qiu <michael.qiu@intel.com>
This commit is contained in:
Zhihong Wang 2015-03-02 17:03:50 +08:00 committed by Thomas Monjalon
parent 0cd854eef5
commit 76746eb13f
1 changed files with 24 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
lib/librte_eal/common/include/arch/x86/rte_memcpy.h
View File

@ -195,6 +195,8 @@ rte_mov256blocks(uint8_t *dst, const uint8_t *src, size_t n)
static inline void * static inline void *
rte_memcpy(void *dst, const void *src, size_t n) rte_memcpy(void *dst, const void *src, size_t n)
{ {
uintptr_t dstu = (uintptr_t)dst;
uintptr_t srcu = (uintptr_t)src;
void *ret = dst; void *ret = dst;
int dstofss; int dstofss;
int bits; int bits;
@ -204,22 +206,22 @@ rte_memcpy(void *dst, const void *src, size_t n)
*/ */
if (n < 16) { if (n < 16) {
if (n & 0x01) { if (n & 0x01) {
*(uint8_t *)dst = *(const uint8_t *)src; *(uint8_t *)dstu = *(const uint8_t *)srcu;
src = (const uint8_t *)src + 1; srcu = (uintptr_t)((const uint8_t *)srcu + 1);
dst = (uint8_t *)dst + 1; dstu = (uintptr_t)((uint8_t *)dstu + 1);
} }
if (n & 0x02) { if (n & 0x02) {
*(uint16_t *)dst = *(const uint16_t *)src; *(uint16_t *)dstu = *(const uint16_t *)srcu;
src = (const uint16_t *)src + 1; srcu = (uintptr_t)((const uint16_t *)srcu + 1);
dst = (uint16_t *)dst + 1; dstu = (uintptr_t)((uint16_t *)dstu + 1);
} }
if (n & 0x04) { if (n & 0x04) {
*(uint32_t *)dst = *(const uint32_t *)src; *(uint32_t *)dstu = *(const uint32_t *)srcu;
src = (const uint32_t *)src + 1; srcu = (uintptr_t)((const uint32_t *)srcu + 1);
dst = (uint32_t *)dst + 1; dstu = (uintptr_t)((uint32_t *)dstu + 1);
} }
if (n & 0x08) { if (n & 0x08) {
*(uint64_t *)dst = *(const uint64_t *)src; *(uint64_t *)dstu = *(const uint64_t *)srcu;
} }
return ret; return ret;
} }
@ -492,6 +494,8 @@ static inline void *
rte_memcpy(void *dst, const void *src, size_t n) rte_memcpy(void *dst, const void *src, size_t n)
{ {
__m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8; __m128i xmm0, xmm1, xmm2, xmm3, xmm4, xmm5, xmm6, xmm7, xmm8;
uintptr_t dstu = (uintptr_t)dst;
uintptr_t srcu = (uintptr_t)src;
void *ret = dst; void *ret = dst;
int dstofss; int dstofss;
int srcofs; int srcofs;
@ -501,22 +505,22 @@ rte_memcpy(void *dst, const void *src, size_t n)
*/ */
if (n < 16) { if (n < 16) {
if (n & 0x01) { if (n & 0x01) {
*(uint8_t *)dst = *(const uint8_t *)src; *(uint8_t *)dstu = *(const uint8_t *)srcu;
src = (const uint8_t *)src + 1; srcu = (uintptr_t)((const uint8_t *)srcu + 1);
dst = (uint8_t *)dst + 1; dstu = (uintptr_t)((uint8_t *)dstu + 1);
} }
if (n & 0x02) { if (n & 0x02) {
*(uint16_t *)dst = *(const uint16_t *)src; *(uint16_t *)dstu = *(const uint16_t *)srcu;
src = (const uint16_t *)src + 1; srcu = (uintptr_t)((const uint16_t *)srcu + 1);
dst = (uint16_t *)dst + 1; dstu = (uintptr_t)((uint16_t *)dstu + 1);
} }
if (n & 0x04) { if (n & 0x04) {
*(uint32_t *)dst = *(const uint32_t *)src; *(uint32_t *)dstu = *(const uint32_t *)srcu;
src = (const uint32_t *)src + 1; srcu = (uintptr_t)((const uint32_t *)srcu + 1);
dst = (uint32_t *)dst + 1; dstu = (uintptr_t)((uint32_t *)dstu + 1);
} }
if (n & 0x08) { if (n & 0x08) {
*(uint64_t *)dst = *(const uint64_t *)src; *(uint64_t *)dstu = *(const uint64_t *)srcu;
} }
return ret; return ret;
} }