Remove unnecessary PIC support macros

[x264] / common / x86 / predict-a.asm

diff --git a/common/x86/predict-a.asm b/common/x86/predict-a.asm
index 899c24c84b9d6d46a22ae8e3a3f2d0d13fbfd443..b0cd3d0192728ae9fe769da57911c3b9956477a2 100644 (file)
--- a/common/x86/predict-a.asm
+++ b/common/x86/predict-a.asm
@@ -99,7 +99,7 @@ SECTION .text
     pavgb       %2, %3
     pxor        %3, %5
     mov%6       %1, %4
-    pand        %3, [pb_1 GLOBAL]
+    pand        %3, [pb_1]
     psubusb     %2, %3
     pavgb       %1, %2
 %endmacro
@@ -466,7 +466,7 @@ cglobal predict_8x8_dc_mmxext, 2,2
     pxor        mm1, mm1
     psadbw      mm0, [r1+7]
     psadbw      mm1, [r1+16]
-    paddw       mm0, [pw_8 GLOBAL]
+    paddw       mm0, [pw_8]
     paddw       mm0, mm1
     psrlw       mm0, 4
     pshufw      mm0, mm0, 0
@@ -481,7 +481,7 @@ cglobal predict_8x8_dc_mmxext, 2,2
 cglobal %1, 2,2
     pxor        mm0, mm0
     psadbw      mm0, [r1+%2]
-    paddw       mm0, [pw_4 GLOBAL]
+    paddw       mm0, [pw_4]
     psrlw       mm0, 3
     pshufw      mm0, mm0, 0
     packuswb    mm0, mm0
@@ -559,6 +559,7 @@ cglobal predict_8x8_ddr_mmxext, 2,2
 ;-----------------------------------------------------------------------------
 ; void predict_8x8_hu_mmxext( uint8_t *src, uint8_t *edge )
 ;-----------------------------------------------------------------------------
+%define PALIGNR PALIGNR_MMX
 cglobal predict_8x8_hu_mmxext, 2,2
     movq    mm1, [r1+7]         ; l0 l1 l2 l3 l4 l5 l6 l7
     add      r0, 4*FDEC_STRIDE
@@ -588,7 +589,7 @@ cglobal predict_8x8_hu_mmxext, 2,2
     pshufw  mm1, mm6, 11111001b
     PALIGNR mm6, mm4, 4, mm2
     pshufw  mm2, mm7, 11111110b
-    PALIGNR mm7, mm4, 6, mm4
+    PALIGNR mm7, mm4, 6, mm3
     pshufw  mm3, mm0, 11111111b
     movq   [r0-4*FDEC_STRIDE], mm4
     movq   [r0-3*FDEC_STRIDE], mm5
@@ -642,7 +643,7 @@ cglobal predict_8x8_vr_core_mmxext, 2,2
 cglobal predict_8x8c_p_core_mmxext, 1,2
     LOAD_PLANE_ARGS
     movq        mm1, mm2
-    pmullw      mm2, [pw_3210 GLOBAL]
+    pmullw      mm2, [pw_3210]
     psllw       mm1, 2
     paddsw      mm0, mm2        ; mm0 = {i+0*b, i+1*b, i+2*b, i+3*b}
     paddsw      mm1, mm0        ; mm1 = {i+4*b, i+5*b, i+6*b, i+7*b}
@@ -671,7 +672,7 @@ cglobal predict_16x16_p_core_mmxext, 1,2
     LOAD_PLANE_ARGS
     movq        mm5, mm2
     movq        mm1, mm2
-    pmullw      mm5, [pw_3210 GLOBAL]
+    pmullw      mm5, [pw_3210]
     psllw       mm2, 3
     psllw       mm1, 2
     movq        mm3, mm2
@@ -783,9 +784,9 @@ cglobal predict_8x8_vl_sse2, 2,2
 ;-----------------------------------------------------------------------------
 ; void predict_8x8_vr_sse2( uint8_t *src, uint8_t *edge )
 ;-----------------------------------------------------------------------------
-cglobal predict_8x8_vr_sse2, 2,2
+cglobal predict_8x8_vr_sse2, 2,2,7
     movdqu      xmm0, [r1+8]
-    movdqa      xmm6, [pw_ff00 GLOBAL]
+    movdqa      xmm6, [pw_ff00]
     add         r0, 4*FDEC_STRIDE
     movdqa      xmm1, xmm0
     movdqa      xmm2, xmm0
@@ -909,7 +910,7 @@ cglobal predict_8x8_hu_%1, 2,2
     add        r0, 4*FDEC_STRIDE
 %ifidn %1, ssse3
     movq      mm5, [r1+7]
-    movq      mm6, [pb_reverse GLOBAL]
+    movq      mm6, [pb_reverse]
     movq      mm1, mm5
     movq      mm2, mm5
     movq      mm3, mm5
@@ -978,7 +979,7 @@ cglobal predict_8x8c_v_mmx, 1,1
 %macro PRED_8x8C_H 1
 cglobal predict_8x8c_h_%1, 1,1
 %ifidn %1, ssse3
-    mova   m1, [pb_3 GLOBAL]
+    mova   m1, [pb_3]
 %endif
 %assign n 0
 %rep 8
@@ -986,7 +987,7 @@ cglobal predict_8x8c_h_%1, 1,1
     mova [r0+FDEC_STRIDE*n], m0
 %assign n n+1
 %endrep
-    REP_RET
+    RET
 %endmacro
 
 INIT_MMX
@@ -1017,7 +1018,7 @@ cglobal predict_8x8c_dc_core_mmxext, 1,1
     pshufw      mm2, r2m, 0
 %endif
     psrlw       mm0, 3
-    paddw       mm1, [pw_2 GLOBAL]
+    paddw       mm1, [pw_2]
     movq        mm3, mm2
     pshufw      mm1, mm1, 0
     pshufw      mm0, mm0, 0     ; dc0 (w)
@@ -1064,7 +1065,7 @@ cglobal predict_8x8c_p_core_sse2, 1,1
     punpcklqdq  xmm0, xmm0
     punpcklqdq  xmm2, xmm2
     punpcklqdq  xmm4, xmm4
-    pmullw      xmm2, [pw_76543210 GLOBAL]
+    pmullw      xmm2, [pw_76543210]
     paddsw      xmm0, xmm2        ; xmm0 = {i+0*b, i+1*b, i+2*b, i+3*b, i+4*b, i+5*b, i+6*b, i+7*b}
     movdqa      xmm3, xmm0
     paddsw      xmm3, xmm4
@@ -1095,7 +1096,7 @@ call .loop
 ;-----------------------------------------------------------------------------
 ; void predict_16x16_p_core_sse2( uint8_t *src, int i00, int b, int c )
 ;-----------------------------------------------------------------------------
-cglobal predict_16x16_p_core_sse2, 1,2
+cglobal predict_16x16_p_core_sse2, 1,2,8
     movd        xmm0, r1m
     movd        xmm1, r2m
     movd        xmm2, r3m
@@ -1106,7 +1107,7 @@ cglobal predict_16x16_p_core_sse2, 1,2
     punpcklqdq  xmm1, xmm1
     punpcklqdq  xmm2, xmm2
     movdqa      xmm3, xmm1
-    pmullw      xmm3, [pw_76543210 GLOBAL]
+    pmullw      xmm3, [pw_76543210]
     psllw       xmm1, 3
     paddsw      xmm0, xmm3  ; xmm0 = {i+ 0*b, i+ 1*b, i+ 2*b, i+ 3*b, i+ 4*b, i+ 5*b, i+ 6*b, i+ 7*b}
     paddsw      xmm1, xmm0  ; xmm1 = {i+ 8*b, i+ 9*b, i+10*b, i+11*b, i+12*b, i+13*b, i+14*b, i+15*b}
@@ -1161,7 +1162,7 @@ cglobal predict_16x16_v_sse2, 1,1
 cglobal predict_16x16_h_%1, 1,2
     mov r1, FDEC_STRIDE*12
 %ifidn %1, ssse3
-    mova   m1, [pb_3 GLOBAL]
+    mova   m1, [pb_3]
 %endif
 .vloop:
 %assign n 0
@@ -1213,7 +1214,7 @@ cglobal predict_16x16_dc_core_mmxext, 1,2
     REP_RET
 
 cglobal predict_16x16_dc_top_mmxext, 1,2
-    PRED16x16_DC [pw_8 GLOBAL], 4
+    PRED16x16_DC [pw_8], 4
     REP_RET
 
 cglobal predict_16x16_dc_left_core_mmxext, 1,1
@@ -1246,7 +1247,7 @@ cglobal predict_16x16_dc_core_sse2, 1,1
     RET
 
 cglobal predict_16x16_dc_top_sse2, 1,1
-    PRED16x16_DC_SSE2 [pw_8 GLOBAL], 4
+    PRED16x16_DC_SSE2 [pw_8], 4
     RET
 
 cglobal predict_16x16_dc_left_core_sse2, 1,1
@@ -1255,4 +1256,4 @@ cglobal predict_16x16_dc_left_core_sse2, 1,1
     punpcklqdq xmm0, xmm0
     packuswb   xmm0, xmm0
     STORE16x16_SSE2 xmm0
-    REP_RET
+    RET