[FFmpeg-devel] [GAS-PP PATCH] Handle the aarch64 tbnz intruction in the same way as tbz, for armasm64

[Martin Storsjö]

---
I'll apply in a couple days if there's no comments.
---
 gas-preprocessor.pl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/gas-preprocessor.pl b/gas-preprocessor.pl
index 67b130e..59c93c1 100755
--- a/gas-preprocessor.pl
+++ b/gas-preprocessor.pl
@@ -943,7 +943,7 @@ sub handle_serialized_line {
                      ($arch eq "aarch64" and !is_aarch64_register($target))) {
                 $call_targets{$target}++;
             }
-        } elsif ($line =~ /(?:^|\n)\s*(\w+\s*:\s*)?(cbn?z|adr|tbz)\s+(\w+)\s*,(\s*#\d+\s*,)?\s*(\w+)/) {
+        } elsif ($line =~ /(?:^|\n)\s*(\w+\s*:\s*)?(cbn?z|adr|tbn?z)\s+(\w+)\s*,(\s*#\d+\s*,)?\s*(\w+)/) {
             my $instr = $2;
             my $reg = $3;
             my $bit = $4;
@@ -956,7 +956,7 @@ sub handle_serialized_line {
             }
             # Convert tbz with a wX register into an xX register,
             # due to armasm64 bugs/limitations.
-            if ($instr eq "tbz" and $reg =~ /w\d+/) {
+            if (($instr eq "tbz" or $instr eq "tbnz") and $reg =~ /w\d+/) {
                 my $xreg = $reg;
                 $xreg =~ s/w/x/;
                 $line =~ s/\b$reg\b/$xreg/;
-- 
2.25.1