<div dir="ltr">Thanks for the patch, Nomis101. I'll check this out.</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Thu, Sep 3, 2020 at 9:28 PM Nomis101 <<a href="mailto:Nomis101@web.de" target="_blank">Nomis101@web.de</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Am 15.07.20 um 20:37 schrieb Nomis101:<br>
> From e955f07a0596d5e3911dc02e845a2363da44bde4 Mon Sep 17 00:00:00 2001<br>
> From: Nomis101 <<a href="mailto:Nomis101@web.de" target="_blank">Nomis101@web.de</a>><br>
> Date: Wed, 15 Jul 2020 20:22:41 +0200<br>
> Subject: [PATCH] fix warnings when assembling with NASM 2.15<br>
> <br>
> Adjust code to silence some new warnings added in NASM 2.15.<br>
> Fixes Issue #559.<br>
> <br>
> Signed-off-by: Nomis101 <<a href="mailto:Nomis101@web.de" target="_blank">Nomis101@web.de</a>><br>
> ---<br>
> source/common/x86/const-a.asm | 2 +-<br>
> source/common/x86/x86inc.asm | 46 +++++++++++++++++++++++------------<br>
> source/common/x86/x86util.asm | 4 ++-<br>
> 3 files changed, 34 insertions(+), 18 deletions(-)<br>
> <br>
> diff --git a/source/common/x86/const-a.asm b/source/common/x86/const-a.asm<br>
> index acba18ccc..c8142bbb5 100644<br>
> --- a/source/common/x86/const-a.asm<br>
> +++ b/source/common/x86/const-a.asm<br>
> @@ -100,7 +100,7 @@ const pw_ff00, times 8 dw 0xff00<br>
> const pw_2000, times 16 dw 0x2000<br>
> const pw_8000, times 8 dw 0x8000<br>
> const pw_3fff, times 16 dw 0x3fff<br>
> -const pw_32_0, times 4 dw 32,<br>
> +const pw_32_0, times 4 dw 32<br>
> times 4 dw 0<br>
> const pw_pixel_max, times 16 dw ((1 << BIT_DEPTH)-1)<br>
> <br>
> diff --git a/source/common/x86/x86inc.asm b/source/common/x86/x86inc.asm<br>
> index 670699ec6..805aa1180 100644<br>
> --- a/source/common/x86/x86inc.asm<br>
> +++ b/source/common/x86/x86inc.asm<br>
> @@ -401,16 +401,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14<br>
> %endif<br>
> %endmacro<br>
> <br>
> -%macro DEFINE_ARGS_INTERNAL 3+<br>
> - %ifnum %2<br>
> - DEFINE_ARGS %3<br>
> - %elif %1 == 4<br>
> - DEFINE_ARGS %2<br>
> - %elif %1 > 4<br>
> - DEFINE_ARGS %2, %3<br>
> - %endif<br>
> -%endmacro<br>
> -<br>
> %if WIN64 ; Windows x64 ;=================================================<br>
> <br>
> DECLARE_REG 0, rcx<br>
> @@ -429,7 +419,7 @@ DECLARE_REG 12, R15, 104<br>
> DECLARE_REG 13, R12, 112<br>
> DECLARE_REG 14, R13, 120<br>
> <br>
> -%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> %assign num_args %1<br>
> %assign regs_used %2<br>
> ASSERT regs_used >= num_args<br>
> @@ -441,7 +431,15 @@ DECLARE_REG 14, R13, 120<br>
> WIN64_SPILL_XMM %3<br>
> %endif<br>
> LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14<br>
> - DEFINE_ARGS_INTERNAL %0, %4, %5<br>
> + %if %0 > 4<br>
> + %ifnum %4<br>
> + DEFINE_ARGS %5<br>
> + %else<br>
> + DEFINE_ARGS %4, %5<br>
> + %endif<br>
> + %elifnnum %4<br>
> + DEFINE_ARGS %4<br>
> + %endif<br>
> %endmacro<br>
> <br>
> %macro WIN64_PUSH_XMM 0<br>
> @@ -537,7 +535,7 @@ DECLARE_REG 12, R15, 56<br>
> DECLARE_REG 13, R12, 64<br>
> DECLARE_REG 14, R13, 72<br>
> <br>
> -%macro PROLOGUE 2-5+ 0; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> %assign num_args %1<br>
> %assign regs_used %2<br>
> %assign xmm_regs_used %3<br>
> @@ -547,7 +545,15 @@ DECLARE_REG 14, R13, 72<br>
> PUSH_IF_USED 9, 10, 11, 12, 13, 14<br>
> ALLOC_STACK %4<br>
> LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14<br>
> - DEFINE_ARGS_INTERNAL %0, %4, %5<br>
> + %if %0 > 4<br>
> + %ifnum %4<br>
> + DEFINE_ARGS %5<br>
> + %else<br>
> + DEFINE_ARGS %4, %5<br>
> + %endif<br>
> + %elifnnum %4<br>
> + DEFINE_ARGS %4<br>
> + %endif<br>
> %endmacro<br>
> <br>
> %define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required<br>
> @@ -588,7 +594,7 @@ DECLARE_REG 6, ebp, 28<br>
> <br>
> DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14<br>
> <br>
> -%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> +%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...<br>
> %assign num_args %1<br>
> %assign regs_used %2<br>
> ASSERT regs_used >= num_args<br>
> @@ -603,7 +609,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14<br>
> PUSH_IF_USED 3, 4, 5, 6<br>
> ALLOC_STACK %4<br>
> LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6<br>
> - DEFINE_ARGS_INTERNAL %0, %4, %5<br>
> + %if %0 > 4<br>
> + %ifnum %4<br>
> + DEFINE_ARGS %5<br>
> + %else<br>
> + DEFINE_ARGS %4, %5<br>
> + %endif<br>
> + %elifnnum %4<br>
> + DEFINE_ARGS %4<br>
> + %endif<br>
> %endmacro<br>
> <br>
> %define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required<br>
> diff --git a/source/common/x86/x86util.asm b/source/common/x86/x86util.asm<br>
> index fa8712257..fe8939332 100644<br>
> --- a/source/common/x86/x86util.asm<br>
> +++ b/source/common/x86/x86util.asm<br>
> @@ -578,8 +578,10 @@<br>
> %elif %1==2<br>
> %if mmsize==8<br>
> SBUTTERFLY dq, %3, %4, %5<br>
> - %else<br>
> + %elif %0==6<br>
> TRANS q, ORDER, %3, %4, %5, %6<br>
> + %else<br>
> + TRANS q, ORDER, %3, %4, %5<br>
> %endif<br>
> %elif %1==4<br>
> SBUTTERFLY qdq, %3, %4, %5<br>
> -- <br>
> 2.24.3 (Apple Git-128)<br>
> <br>
> _______________________________________________<br>
> x265-devel mailing list<br>
> <a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
> <a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
> <br>
<br>
<br>
Would be nice, if somebody could look into this patch, because all this noise since NASM 2.15 is <br>
really anyoing.<br>
<br>
_______________________________________________<br>
x265-devel mailing list<br>
<a href="mailto:x265-devel@videolan.org" target="_blank">x265-devel@videolan.org</a><br>
<a href="https://mailman.videolan.org/listinfo/x265-devel" rel="noreferrer" target="_blank">https://mailman.videolan.org/listinfo/x265-devel</a><br>
</blockquote></div><br clear="all"><div><br></div>-- <br><div dir="ltr"><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><div><div dir="ltr"><font face="georgia, serif">Regards,</font><div><b><font face="georgia, serif">Aruna Matheswaran,</font></b></div><div><font face="georgia, serif">Video Codec Engineer,</font></div><div><font face="georgia, serif">Media & AI analytics BU,</font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" width="96" height="36" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><span><span style="font-size:11pt;font-family:Arial;color:rgb(0,0,0);background-color:transparent;vertical-align:baseline;white-space:pre-wrap"><span style="border:none;display:inline-block;overflow:hidden;width:153px;height:58px"><img src="https://lh5.googleusercontent.com/gjX5cPNIZgwUrhfqkTwQUZWztIKmmo0qs3kbwvkS5H-bDVE2ftte9pMTVnFLSjOcjYWLtfc6_OGpxW4vraLg2r5QAIf1Q3MpldFDgWtzK_gXi8ptw5B3joIbsGL6mxj-JRdjHzT5" style="margin-left: 0px; margin-top: 0px;"></span></span></span><font face="georgia, serif"><br></font></div><div><font face="georgia, serif"><br></font></div></div></div></div></div></div></div></div></div>