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
Unified · Split
| @@ -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 | ||
| 411 | 411 | %endif |
| 412 | 412 | %endmacro |
| 413 | 413 | |
| 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 | − | |
| 424 | 414 | %if WIN64 ; Windows x64 ;================================================= |
| 425 | 415 | |
| 426 | 416 | DECLARE_REG 0, rcx |
| @@ -439,7 +429,7 @@ DECLARE_REG 12, R15, 104 · 12 unmodified lines | ||
| 439 | 429 | DECLARE_REG 13, R12, 112 |
| 440 | 430 | DECLARE_REG 14, R13, 120 |
| 441 | 431 | |
| 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... | |
| 443 | 433 | %assign num_args %1 |
| 444 | 434 | %assign regs_used %2 |
| 445 | 435 | ASSERT regs_used >= num_args |
| @@ -451,7 +441,15 @@ DECLARE_REG 14, R13, 120 · 5 unmodified lines | ||
| 451 | 441 | WIN64_SPILL_XMM %3 |
| 452 | 442 | %endif |
| 453 | 443 | 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 | |
| 455 | 453 | %endmacro |
| 456 | 454 | |
| 457 | 455 | %macro WIN64_PUSH_XMM 0 |
| @@ -547,7 +545,7 @@ DECLARE_REG 12, R15, 56 · 89 unmodified lines | ||
| 547 | 545 | DECLARE_REG 13, R12, 64 |
| 548 | 546 | DECLARE_REG 14, R13, 72 |
| 549 | 547 | |
| 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... | |
| 551 | 549 | %assign num_args %1 |
| 552 | 550 | %assign regs_used %2 |
| 553 | 551 | %assign xmm_regs_used %3 |
| @@ -557,7 +555,15 @@ DECLARE_REG 14, R13, 72 · 3 unmodified lines | ||
| 557 | 555 | PUSH_IF_USED 9, 10, 11, 12, 13, 14 |
| 558 | 556 | ALLOC_STACK %4 |
| 559 | 557 | 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 | |
| 561 | 567 | %endmacro |
| 562 | 568 | |
| 563 | 569 | %define has_epilogue regs_used > 9 || stack_size > 0 || vzeroupper_required |
| @@ -598,7 +604,7 @@ DECLARE_REG 6, ebp, 28 · 34 unmodified lines | ||
| 598 | 604 | |
| 599 | 605 | DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 |
| 600 | 606 | |
| 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... | |
| 602 | 608 | %assign num_args %1 |
| 603 | 609 | %assign regs_used %2 |
| 604 | 610 | ASSERT regs_used >= num_args |
| @@ -613,7 +619,15 @@ DECLARE_ARG 7, 8, 9, 10, 11, 12, 13, 14 · 8 unmodified lines | ||
| 613 | 619 | PUSH_IF_USED 3, 4, 5, 6 |
| 614 | 620 | ALLOC_STACK %4 |
| 615 | 621 | 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 | |
| 617 | 631 | %endmacro |
| 618 | 632 | |
| 619 | 633 | %define has_epilogue regs_used > 3 || stack_size > 0 || vzeroupper_required |