History

avutil/x86inc: fix warnings when assembling with Nasm 2.15

Some new warnings regarding use of empty macro parameters has been added, so adjust some x86inc code to silence those. Fixes part of ticket #8771

Henrik Gramner committed 6 years ago

Commit 0b2b0351 parent 3205ed31 file · +30 −16Browse files

Unified · Split

libavutil/x86/x86inc.asm+30−16
@@ -411,16 +411,6 @@ DECLARE_REG_TMP_SIZE 0,1,2,3,4,5,6,7,8,9,10,11,12,13,14 · 410 unmodified lines
411411 %endif
412412 %endmacro
413413
414−%macro DEFINE_ARGS_INTERNAL 3+
415− %ifnum %2
416− DEFINE_ARGS %3
417− %elif %1 == 4
418− DEFINE_ARGS %2
419− %elif %1 > 4
420− DEFINE_ARGS %2, %3
421− %endif
422−%endmacro
423−
424414 %if WIN64 ; Windows x64 ;=================================================
425415
426416 DECLARE_REG 0, rcx
@@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104 · 12 unmodified lines
439429 DECLARE_REG 13, R12, 112
440430 DECLARE_REG 14, R13, 120
441431
442−%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
432+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
443433 %assign num_args %1
444434 %assign regs_used %2
445435 ASSERT regs_used >= num_args
@@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120 · 5 unmodified lines
451441 WIN64_SPILL_XMM %3
452442 %endif
453443 LOAD_IF_USED 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14
454− DEFINE_ARGS_INTERNAL %0, %4, %5
444+ %if %0 > 4
445+ %ifnum %4
446+ DEFINE_ARGS %5
447+ %else
448+ DEFINE_ARGS %4, %5
449+ %endif
450+ %elifnnum %4
451+ DEFINE_ARGS %4
452+ %endif
455453 %endmacro
456454
457455 %macro WIN64_PUSH_XMM 0
@@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56 · 89 unmodified lines
547545 DECLARE_REG 13, R12, 64
548546 DECLARE_REG 14, R13, 72
549547
550−%macro PROLOGUE 2-5+ 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
548+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
551549 %assign num_args %1
552550 %assign regs_used %2
553551 %assign xmm_regs_used %3
@@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72 · 3 unmodified lines
557555 PUSH_IF_USED 9, 10, 11, 12, 13, 14
558556 ALLOC_STACK %4
559557 LOAD_IF_USED 6, 7, 8, 9, 10, 11, 12, 13, 14
560− DEFINE_ARGS_INTERNAL %0, %4, %5
558+ %if %0 > 4
559+ %ifnum %4
560+ DEFINE_ARGS %5
561+ %else
562+ DEFINE_ARGS %4, %5
563+ %endif
564+ %elifnnum %4
565+ DEFINE_ARGS %4
566+ %endif
561567 %endmacro
562568
563569 %define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required
@@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28 · 34 unmodified lines
598604
599605 DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14
600606
601−%macro PROLOGUE 2-5+ ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
607+%macro PROLOGUE 2-5+ 0, 0 ; #args, #regs, #xmm_regs, [stack_size,] arg_names...
602608 %assign num_args %1
603609 %assign regs_used %2
604610 ASSERT regs_used >= num_args
@@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 · 8 unmodified lines
613619 PUSH_IF_USED 3, 4, 5, 6
614620 ALLOC_STACK %4
615621 LOAD_IF_USED 0, 1, 2, 3, 4, 5, 6
616− DEFINE_ARGS_INTERNAL %0, %4, %5
622+ %if %0 > 4
623+ %ifnum %4
624+ DEFINE_ARGS %5
625+ %else
626+ DEFINE_ARGS %4, %5
627+ %endif
628+ %elifnnum %4
629+ DEFINE_ARGS %4
630+ %endif
617631 %endmacro
618632
619633 %define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t