From 813bf9f97d44f1891b114beb47b57e7dd3c53af0 Mon Sep 17 00:00:00 2001 From: "fbarchard@google.com" Date: Wed, 19 Nov 2014 23:02:04 +0000 Subject: [PATCH] Change lea macros from memaccess to memlea to fix nacl 64 bit build errors. BUG=381 TESTED=local nacl build and validate R=harryjin@google.com Review URL: https://webrtc-codereview.appspot.com/32129004 git-svn-id: http://libyuv.googlecode.com/svn/trunk@1174 16f28f9a-4ce2-e073-06de-1de4eb20be90 --- README.chromium | 2 +- include/libyuv/version.h | 2 +- source/row_posix.cc | 19 +++++++++---------- 3 files changed, 11 insertions(+), 12 deletions(-) diff --git a/README.chromium b/README.chromium index 353524298..1b82686cc 100644 --- a/README.chromium +++ b/README.chromium @@ -1,6 +1,6 @@ Name: libyuv URL: http://code.google.com/p/libyuv/ -Version: 1172 +Version: 1174 License: BSD License File: LICENSE diff --git a/include/libyuv/version.h b/include/libyuv/version.h index fff315202..2dbb5e0ce 100644 --- a/include/libyuv/version.h +++ b/include/libyuv/version.h @@ -11,6 +11,6 @@ #ifndef INCLUDE_LIBYUV_VERSION_H_ // NOLINT #define INCLUDE_LIBYUV_VERSION_H_ -#define LIBYUV_VERSION 1172 +#define LIBYUV_VERSION 1174 #endif // INCLUDE_LIBYUV_VERSION_H_ NOLINT diff --git a/source/row_posix.cc b/source/row_posix.cc index 924566936..f459f3233 100644 --- a/source/row_posix.cc +++ b/source/row_posix.cc @@ -656,7 +656,7 @@ void ARGBToARGB1555Row_SSE2(const uint8* src, uint8* dst, int pix) { "packssdw %%xmm0,%%xmm0 \n" "lea " MEMLEA(0x10,0) ",%0 \n" "movq %%xmm0," MEMACCESS(1) " \n" - "lea " MEMACCESS2(0x8,1) ",%1 \n" + "lea " MEMLEA(0x8,1) ",%1 \n" "sub $0x4,%2 \n" "jg 1b \n" : "+r"(src), // %0 @@ -1419,7 +1419,6 @@ struct { { VR, UR, VR, UR, VR, UR, VR, UR, VR, UR, VR, UR, VR, UR, VR, UR } }; - // Read 8 UV from 411 #define READYUV444 \ "movq " MEMACCESS([u_buf]) ",%%xmm0 \n" \ @@ -2279,12 +2278,12 @@ void MirrorUVRow_SSSE3(const uint8* src, uint8* dst_u, uint8* dst_v, intptr_t temp_width = (intptr_t)(width); asm volatile ( "movdqa %4,%%xmm1 \n" - "lea " MEMLEA4(-0x10,0,3,2) ",%0 \n" + "lea " MEMLEA4(-0x10,0,3,2) ",%0 \n" "sub %1,%2 \n" LABELALIGN "1: \n" "movdqu " MEMACCESS(0) ",%%xmm0 \n" - "lea " MEMLEA(-0x10,0) ",%0 \n" + "lea " MEMLEA(-0x10,0) ",%0 \n" "pshufb %%xmm1,%%xmm0 \n" "sub $8,%3 \n" "movlpd %%xmm0," MEMACCESS(1) " \n" @@ -3035,7 +3034,7 @@ void YUY2ToUVRow_AVX2(const uint8* src_yuy2, int stride_yuy2, "vmovdqu " MEMACCESS2(0x20,0) ",%%ymm1 \n" VMEMOPREG(vpavgb,0x00,0,4,1,ymm0,ymm0) // vpavgb (%0,%4,1),%%ymm0,%%ymm0 VMEMOPREG(vpavgb,0x20,0,4,1,ymm1,ymm1) - "lea " MEMACCESS2(0x40,0) ",%0 \n" + "lea " MEMLEA(0x40,0) ",%0 \n" "vpsrlw $0x8,%%ymm0,%%ymm0 \n" "vpsrlw $0x8,%%ymm1,%%ymm1 \n" "vpackuswb %%ymm1,%%ymm0,%%ymm0 \n" @@ -3048,7 +3047,7 @@ void YUY2ToUVRow_AVX2(const uint8* src_yuy2, int stride_yuy2, "vpermq $0xd8,%%ymm0,%%ymm0 \n" "vextractf128 $0x0,%%ymm1," MEMACCESS(1) " \n" VEXTOPMEM(vextractf128,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) - "lea 0x10" MEMACCESS(1) ",%1 \n" + "lea " MEMLEA(0x10,1) ",%1 \n" "sub $0x20,%3 \n" "jg 1b \n" "vzeroupper \n" @@ -3090,7 +3089,7 @@ void YUY2ToUV422Row_AVX2(const uint8* src_yuy2, "vpermq $0xd8,%%ymm0,%%ymm0 \n" "vextractf128 $0x0,%%ymm1," MEMACCESS(1) " \n" VEXTOPMEM(vextractf128,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) - "lea 0x10" MEMACCESS(1) ",%1 \n" + "lea " MEMLEA(0x10,1) ",%1 \n" "sub $0x20,%3 \n" "jg 1b \n" "vzeroupper \n" @@ -3148,7 +3147,7 @@ void UYVYToUVRow_AVX2(const uint8* src_uyvy, int stride_uyvy, "vmovdqu " MEMACCESS2(0x20,0) ",%%ymm1 \n" VMEMOPREG(vpavgb,0x00,0,4,1,ymm0,ymm0) // vpavgb (%0,%4,1),%%ymm0,%%ymm0 VMEMOPREG(vpavgb,0x20,0,4,1,ymm1,ymm1) - "lea " MEMACCESS2(0x40,0) ",%0 \n" + "lea " MEMLEA(0x40,0) ",%0 \n" "vpand %%ymm5,%%ymm0,%%ymm0 \n" "vpand %%ymm5,%%ymm1,%%ymm1 \n" "vpackuswb %%ymm1,%%ymm0,%%ymm0 \n" @@ -3161,7 +3160,7 @@ void UYVYToUVRow_AVX2(const uint8* src_uyvy, int stride_uyvy, "vpermq $0xd8,%%ymm0,%%ymm0 \n" "vextractf128 $0x0,%%ymm1," MEMACCESS(1) " \n" VEXTOPMEM(vextractf128,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) - "lea 0x10" MEMACCESS(1) ",%1 \n" + "lea " MEMLEA(0x10,1) ",%1 \n" "sub $0x20,%3 \n" "jg 1b \n" "vzeroupper \n" @@ -3203,7 +3202,7 @@ void UYVYToUV422Row_AVX2(const uint8* src_uyvy, "vpermq $0xd8,%%ymm0,%%ymm0 \n" "vextractf128 $0x0,%%ymm1," MEMACCESS(1) " \n" VEXTOPMEM(vextractf128,ymm0,0x00,1,2,1) // vextractf128 $0x0,%%ymm0,(%1,%2,1) - "lea 0x10" MEMACCESS(1) ",%1 \n" + "lea " MEMLEA(0x10,1) ",%1 \n" "sub $0x20,%3 \n" "jg 1b \n" "vzeroupper \n"