summaryrefslogtreecommitdiff
path: root/vp8/encoder
diff options
context:
space:
mode:
Diffstat (limited to 'vp8/encoder')
-rw-r--r--vp8/encoder/x86/dct_mmx.asm4
-rw-r--r--vp8/encoder/x86/dct_sse2.asm30
-rw-r--r--vp8/encoder/x86/variance_impl_mmx.asm18
-rw-r--r--vp8/encoder/x86/variance_impl_sse2.asm6
4 files changed, 29 insertions, 29 deletions
diff --git a/vp8/encoder/x86/dct_mmx.asm b/vp8/encoder/x86/dct_mmx.asm
index b6cfc5ce0..5acaca875 100644
--- a/vp8/encoder/x86/dct_mmx.asm
+++ b/vp8/encoder/x86/dct_mmx.asm
@@ -35,7 +35,7 @@ sym(vp8_short_fdct4x4_mmx):
mov rsi, arg(0) ;input
mov rdi, arg(1) ;output
- lea rdx, [dct_const_mmx GLOBAL]
+ lea rdx, [GLOBAL(dct_const_mmx)]
movsxd rax, dword ptr arg(2) ;pitch
lea rcx, [rsi + rax*2]
@@ -243,7 +243,7 @@ sym(vp8_short_fdct8x4_wmt):
mov rsi, arg(0) ;input
mov rdi, arg(1) ;output
- lea rdx, [dct_const_xmm GLOBAL]
+ lea rdx, [GLOBAL(dct_const_xmm)]
movsxd rax, dword ptr arg(2) ;pitch
lea rcx, [rsi + rax*2]
diff --git a/vp8/encoder/x86/dct_sse2.asm b/vp8/encoder/x86/dct_sse2.asm
index f7a18432d..723a78d76 100644
--- a/vp8/encoder/x86/dct_sse2.asm
+++ b/vp8/encoder/x86/dct_sse2.asm
@@ -52,14 +52,14 @@ sym(vp8_short_fdct4x4_sse2):
psllw xmm0, 3 ;b1 <<= 3 a1 <<= 3
psllw xmm3, 3 ;c1 <<= 3 d1 <<= 3
movdqa xmm1, xmm0
- pmaddwd xmm0, XMMWORD PTR[_mult_add GLOBAL] ;a1 + b1
- pmaddwd xmm1, XMMWORD PTR[_mult_sub GLOBAL] ;a1 - b1
+ pmaddwd xmm0, XMMWORD PTR[GLOBAL(_mult_add)] ;a1 + b1
+ pmaddwd xmm1, XMMWORD PTR[GLOBAL(_mult_sub)] ;a1 - b1
movdqa xmm4, xmm3
- pmaddwd xmm3, XMMWORD PTR[_5352_2217 GLOBAL] ;c1*2217 + d1*5352
- pmaddwd xmm4, XMMWORD PTR[_2217_neg5352 GLOBAL] ;d1*2217 - c1*5352
+ pmaddwd xmm3, XMMWORD PTR[GLOBAL(_5352_2217)] ;c1*2217 + d1*5352
+ pmaddwd xmm4, XMMWORD PTR[GLOBAL(_2217_neg5352)];d1*2217 - c1*5352
- paddd xmm3, XMMWORD PTR[_14500 GLOBAL]
- paddd xmm4, XMMWORD PTR[_7500 GLOBAL]
+ paddd xmm3, XMMWORD PTR[GLOBAL(_14500)]
+ paddd xmm4, XMMWORD PTR[GLOBAL(_7500)]
psrad xmm3, 12 ;(c1 * 2217 + d1 * 5352 + 14500)>>12
psrad xmm4, 12 ;(d1 * 2217 - c1 * 5352 + 7500)>>12
@@ -80,7 +80,7 @@ sym(vp8_short_fdct4x4_sse2):
punpcklwd xmm0, xmm3 ;13 12 11 10 03 02 01 00
punpckhwd xmm2, xmm3 ;33 32 31 30 23 22 21 20
- movdqa xmm5, XMMWORD PTR[_7 GLOBAL]
+ movdqa xmm5, XMMWORD PTR[GLOBAL(_7)]
pshufd xmm2, xmm2, 04eh
movdqa xmm3, xmm0
paddw xmm0, xmm2 ;b1 b1 b1 b1 a1 a1 a1 a1
@@ -94,8 +94,8 @@ sym(vp8_short_fdct4x4_sse2):
pshufhw xmm0, xmm0, 0d8h ;b1 a1 b1 a1 b1 a1 b1 a1
pshufhw xmm3, xmm3, 0d8h ;c1 d1 c1 d1 c1 d1 c1 d1
movdqa xmm1, xmm0
- pmaddwd xmm0, XMMWORD PTR[_mult_add GLOBAL] ;a1 + b1
- pmaddwd xmm1, XMMWORD PTR[_mult_sub GLOBAL] ;a1 - b1
+ pmaddwd xmm0, XMMWORD PTR[GLOBAL(_mult_add)] ;a1 + b1
+ pmaddwd xmm1, XMMWORD PTR[GLOBAL(_mult_sub)] ;a1 - b1
pxor xmm4, xmm4 ;zero out for compare
paddd xmm0, xmm5
@@ -103,14 +103,14 @@ sym(vp8_short_fdct4x4_sse2):
pcmpeqw xmm2, xmm4
psrad xmm0, 4 ;(a1 + b1 + 7)>>4
psrad xmm1, 4 ;(a1 - b1 + 7)>>4
- pandn xmm2, XMMWORD PTR[_cmp_mask GLOBAL] ;clear upper,
- ;and keep bit 0 of lower
+ pandn xmm2, XMMWORD PTR[GLOBAL(_cmp_mask)] ;clear upper,
+ ;and keep bit 0 of lower
movdqa xmm4, xmm3
- pmaddwd xmm3, XMMWORD PTR[_5352_2217 GLOBAL] ;c1*2217 + d1*5352
- pmaddwd xmm4, XMMWORD PTR[_2217_neg5352 GLOBAL] ;d1*2217 - c1*5352
- paddd xmm3, XMMWORD PTR[_12000 GLOBAL]
- paddd xmm4, XMMWORD PTR[_51000 GLOBAL]
+ pmaddwd xmm3, XMMWORD PTR[GLOBAL(_5352_2217)] ;c1*2217 + d1*5352
+ pmaddwd xmm4, XMMWORD PTR[GLOBAL(_2217_neg5352)] ;d1*2217 - c1*5352
+ paddd xmm3, XMMWORD PTR[GLOBAL(_12000)]
+ paddd xmm4, XMMWORD PTR[GLOBAL(_51000)]
packssdw xmm0, xmm1 ;op[8] op[0]
psrad xmm3, 16 ;(c1 * 2217 + d1 * 5352 + 12000)>>16
psrad xmm4, 16 ;(d1 * 2217 - c1 * 5352 + 51000)>>16
diff --git a/vp8/encoder/x86/variance_impl_mmx.asm b/vp8/encoder/x86/variance_impl_mmx.asm
index d4ec63bd6..67a9b4d3e 100644
--- a/vp8/encoder/x86/variance_impl_mmx.asm
+++ b/vp8/encoder/x86/variance_impl_mmx.asm
@@ -556,7 +556,7 @@ sym(vp8_filter_block2d_bil4x4_var_mmx):
pmullw mm3, [rax+8] ;
paddw mm1, mm3 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
movq mm5, mm1
@@ -580,7 +580,7 @@ filter_block2d_bil4x4_var_mmx_loop:
pmullw mm3, [rax+8] ;
paddw mm1, mm3 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
movq mm3, mm5 ;
@@ -592,7 +592,7 @@ filter_block2d_bil4x4_var_mmx_loop:
paddw mm1, mm3 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
movd mm3, [rdi] ;
@@ -710,10 +710,10 @@ sym(vp8_filter_block2d_bil_var_mmx):
paddw mm1, mm3 ;
paddw mm2, mm4 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
- paddw mm2, [mmx_bi_rd GLOBAL] ;
+ paddw mm2, [GLOBAL(mmx_bi_rd)] ;
psraw mm2, mmx_filter_shift ;
movq mm5, mm1
@@ -749,10 +749,10 @@ filter_block2d_bil_var_mmx_loop:
paddw mm1, mm3 ;
paddw mm2, mm4 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
- paddw mm2, [mmx_bi_rd GLOBAL] ;
+ paddw mm2, [GLOBAL(mmx_bi_rd)] ;
psraw mm2, mmx_filter_shift ;
movq mm3, mm5 ;
@@ -773,8 +773,8 @@ filter_block2d_bil_var_mmx_loop:
paddw mm1, mm3 ;
paddw mm2, mm4 ;
- paddw mm1, [mmx_bi_rd GLOBAL] ;
- paddw mm2, [mmx_bi_rd GLOBAL] ;
+ paddw mm1, [GLOBAL(mmx_bi_rd)] ;
+ paddw mm2, [GLOBAL(mmx_bi_rd)] ;
psraw mm1, mmx_filter_shift ;
psraw mm2, mmx_filter_shift ;
diff --git a/vp8/encoder/x86/variance_impl_sse2.asm b/vp8/encoder/x86/variance_impl_sse2.asm
index 38b3f33ee..cefa0a956 100644
--- a/vp8/encoder/x86/variance_impl_sse2.asm
+++ b/vp8/encoder/x86/variance_impl_sse2.asm
@@ -532,7 +532,7 @@ sym(vp8_filter_block2d_bil_var_sse2):
pmullw xmm3, [rax+16] ;
paddw xmm1, xmm3 ;
- paddw xmm1, [xmm_bi_rd GLOBAL] ;
+ paddw xmm1, [GLOBAL(xmm_bi_rd)] ;
psraw xmm1, xmm_filter_shift ;
movdqa xmm5, xmm1
@@ -554,7 +554,7 @@ filter_block2d_bil_var_sse2_loop:
pmullw xmm3, [rax+16] ;
paddw xmm1, xmm3 ;
- paddw xmm1, [xmm_bi_rd GLOBAL] ;
+ paddw xmm1, [GLOBAL(xmm_bi_rd)] ;
psraw xmm1, xmm_filter_shift ;
movdqa xmm3, xmm5 ;
@@ -565,7 +565,7 @@ filter_block2d_bil_var_sse2_loop:
pmullw xmm1, [rdx+16] ;
paddw xmm1, xmm3 ;
- paddw xmm1, [xmm_bi_rd GLOBAL] ;
+ paddw xmm1, [GLOBAL(xmm_bi_rd)] ;
psraw xmm1, xmm_filter_shift ;
movq xmm3, QWORD PTR [rdi] ;
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-11 13:36:00 +0000