From 5cdc3a4c29c5da43a4c346d57932c1c46068abec Mon Sep 17 00:00:00 2001 From: Jan Kratochvil Date: Mon, 4 Oct 2010 23:18:58 +0200 Subject: nasm: address labels 'rel label' vice 'wrt rip' nasm does not support `label wrt rip', it requires `rel label'. It is still fully compatible with yasm. Provide nasm compatibility. No binary change by this patch with yasm on {x86_64,i686}-fedora13-linux-gnu. Few longer opcodes with nasm on {x86_64,i686}-fedora13-linux-gnu have been checked as safe. Change-Id: I488773a4e930a56e43b0cc72d867ee5291215f50 --- vp8/common/x86/subpixel_mmx.asm | 42 ++++++++++++++++++++--------------------- 1 file changed, 21 insertions(+), 21 deletions(-) (limited to 'vp8/common/x86/subpixel_mmx.asm') diff --git a/vp8/common/x86/subpixel_mmx.asm b/vp8/common/x86/subpixel_mmx.asm index 06db0c6a0..23ed4e208 100644 --- a/vp8/common/x86/subpixel_mmx.asm +++ b/vp8/common/x86/subpixel_mmx.asm @@ -84,7 +84,7 @@ nextrow: pmullw mm5, [rdx] ; mm5 *= kernel 5 modifiers paddsw mm3, mm5 ; mm3 += mm5 - paddsw mm3, [rd GLOBAL] ; mm3 += round value + paddsw mm3, [GLOBAL(rd)] ; mm3 += round value psraw mm3, VP8_FILTER_SHIFT ; mm3 /= 128 packuswb mm3, mm0 ; pack and unpack to saturate punpcklbw mm3, mm0 ; @@ -136,7 +136,7 @@ sym(vp8_filter_block1d_v6_mmx): push rdi ; end prolog - movq mm5, [rd GLOBAL] + movq mm5, [GLOBAL(rd)] push rbx mov rbx, arg(6) ;vp8_filter movq mm1, [rbx + 16] ; do both the negative taps first!!! @@ -225,7 +225,7 @@ sym(vp8_filter_block1dc_v6_mmx): push rdi ; end prolog - movq mm5, [rd GLOBAL] + movq mm5, [GLOBAL(rd)] push rbx mov rbx, arg(7) ;vp8_filter movq mm1, [rbx + 16] ; do both the negative taps first!!! @@ -320,7 +320,7 @@ sym(vp8_bilinear_predict8x8_mmx): mov rdi, arg(4) ;dst_ptr ; shl rax, 5 ; offset * 32 - lea rcx, [sym(vp8_bilinear_filters_mmx) GLOBAL] + lea rcx, [GLOBAL(sym(vp8_bilinear_filters_mmx))] add rax, rcx ; HFilter mov rsi, arg(0) ;src_ptr ; @@ -363,10 +363,10 @@ sym(vp8_bilinear_predict8x8_mmx): paddw mm3, mm5 ; paddw mm4, mm6 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; movq mm7, mm3 ; @@ -404,10 +404,10 @@ next_row_8x8: pmullw mm5, [rax] ; pmullw mm6, [rax] ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; movq mm7, mm3 ; @@ -421,10 +421,10 @@ next_row_8x8: paddw mm4, mm6 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; packuswb mm3, mm4 @@ -476,7 +476,7 @@ sym(vp8_bilinear_predict8x4_mmx): movsxd rax, dword ptr arg(2) ;xoffset mov rdi, arg(4) ;dst_ptr ; - lea rcx, [sym(vp8_bilinear_filters_mmx) GLOBAL] + lea rcx, [GLOBAL(sym(vp8_bilinear_filters_mmx))] shl rax, 5 mov rsi, arg(0) ;src_ptr ; @@ -518,10 +518,10 @@ sym(vp8_bilinear_predict8x4_mmx): paddw mm3, mm5 ; paddw mm4, mm6 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; movq mm7, mm3 ; @@ -559,10 +559,10 @@ next_row_8x4: pmullw mm5, [rax] ; pmullw mm6, [rax] ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; movq mm7, mm3 ; @@ -576,10 +576,10 @@ next_row_8x4: paddw mm4, mm6 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 - paddw mm4, [rd GLOBAL] ; + paddw mm4, [GLOBAL(rd)] ; psraw mm4, VP8_FILTER_SHIFT ; packuswb mm3, mm4 @@ -631,7 +631,7 @@ sym(vp8_bilinear_predict4x4_mmx): movsxd rax, dword ptr arg(2) ;xoffset mov rdi, arg(4) ;dst_ptr ; - lea rcx, [sym(vp8_bilinear_filters_mmx) GLOBAL] + lea rcx, [GLOBAL(sym(vp8_bilinear_filters_mmx))] shl rax, 5 add rax, rcx ; HFilter @@ -662,7 +662,7 @@ sym(vp8_bilinear_predict4x4_mmx): pmullw mm5, mm2 ; paddw mm3, mm5 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 @@ -686,7 +686,7 @@ next_row_4x4: punpcklbw mm5, mm0 ; pmullw mm5, [rax] ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 movq mm7, mm3 ; @@ -697,7 +697,7 @@ next_row_4x4: paddw mm3, mm5 ; - paddw mm3, [rd GLOBAL] ; xmm3 += round value + paddw mm3, [GLOBAL(rd)] ; xmm3 += round value psraw mm3, VP8_FILTER_SHIFT ; xmm3 /= 128 packuswb mm3, mm0 -- cgit v1.2.3