From patchwork Mon Mar 21 11:10:10 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Martin_Storsj=C3=B6?= X-Patchwork-Id: 34878 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6838:ed11:0:0:0:0 with SMTP id hi17csp1545686nkc; Mon, 21 Mar 2022 04:10:23 -0700 (PDT) X-Google-Smtp-Source: ABdhPJwLMpZN8aWC/Hzwh+IGbGDYmrjjoAAdUwxLS+8fn4+OeS8V0NtzQw/K46ib1RZuF9hJ4r/4 X-Received: by 2002:a17:906:4fc1:b0:6e0:244c:ad9 with SMTP id i1-20020a1709064fc100b006e0244c0ad9mr1817059ejw.131.1647861023247; Mon, 21 Mar 2022 04:10:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1647861023; cv=none; d=google.com; s=arc-20160816; b=adTshFri69lof4q15cnrPyOYfhSg0A2N1P6Nr1Rwx1bZ5Tpvko9TCHTfBxUzptbvFF w1qAUEGhS2OQFD9GAfn7CpKJI0bh9cmMYgDMLdv5Mtmy80F9Bbo5YLNHIteW2TClqmNL gwV5EbU9MNi+FWRZTdCTWm8wmwZ5mN0U8T6fIusNjdHrJMMw8iv2b+lwQOWEoLuvmIM+ PNo60OG+4P4JGX2+gD+aiWgIJuyvbmxxRnKX6Ypgb/WYNzl86PLnBt5PQsV+J6pN6jqk GoEO+oreXHYOabS3Una0J+r46LSRqTPPS7x1uz//6whMohv2cjLhauq/Ri6mGN2T7F+r MU/w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=ByeuQJz6BYynm4pTJzpk/UPjjy9hv5tKNyA1ykMBS4c=; b=xPi9uYLTT3bIbxI1zSdAnHyewk4AXnD2enni16IRK2mtKIAvoBCfLlkj4cp9jBpWTr wuVIoTcD6UC9uU48z9RbkBJS57liJfPKAuehWIzH+ylLS5Ybe4c0FtOsiF/lSJH0eyeE GcYyWySJ+ZZW2r+OPxkOY5yRGodJ6vhE7SsA3qpri0FipBD4uS/Aesn5B29lNJd89nXR izn2jxQJB+zzCGDg4ke6GBQ+e/I5OR57psdm3ZFMGb9VO4xYzruTBIMB/v1gxfnpYb/y YUr2Thui2k95NRdmQeQNVuJ48zVX3JisAPsdVO5bZn28g938raFaPznZOCI620HLHtF1 LPiw== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="XJpmF/2y"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id ky19-20020a170907779300b006df76385c28si6640224ejc.200.2022.03.21.04.10.22; Mon, 21 Mar 2022 04:10:23 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@martin-st.20210112.gappssmtp.com header.s=20210112 header.b="XJpmF/2y"; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 4837268B120; Mon, 21 Mar 2022 13:10:18 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 26687689D48 for ; Mon, 21 Mar 2022 13:10:12 +0200 (EET) Received: by mail-lj1-f178.google.com with SMTP id r22so19304720ljd.4 for ; Mon, 21 Mar 2022 04:10:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=martin-st.20210112.gappssmtp.com; s=20210112; h=from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=IZ4Sx+SYkJ5LX7/P22sv/lvO+Xz2uw+ktdly6rr7hMQ=; b=XJpmF/2y7WIb+r/l3FCCogzO/7JKC5ijAj7N9BKhpWqA5Hk7sDvdwHs0h9XLtL422g cPl1D8CpoJTZM9g+6vf4Fl9/IVTNsFrrkjUfi0c83vcGUBHJmXfkh3vBDwb7OkFvigzd HHfCVA/4T667UbZZcYYhBa3bUjaHn9vK2yOTvtxJTcEhclg+meoAPfU5+nYkNykCw8aD 3cO3W+ceh6IkGSpE0WzjheDotJC2ho0d4zRJqXebqMmd4PDvNmGH1plJbuCOxDROjdVi 4ck+PZddq9toM1iPPGLuUWZG1npkSADfFAWg9UnOAIZhcxx4Ms+NATuazLdtKhvjMIoN FR7Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:mime-version :content-transfer-encoding; bh=IZ4Sx+SYkJ5LX7/P22sv/lvO+Xz2uw+ktdly6rr7hMQ=; b=zBRVwmqQGrZmPSXZF/QOdx2dQavINSM8CbsQi4FamOLOMGW1P0nFiCsHYa+fAkVre2 ginSYRpirK9UJVRNq9qm/6vth/NSED3Py4LocIXPi+Mtk9KLEUuJHtZuujBxm7pPn9VQ Bphx9qsWiTYwkC7Snl6+cwAwydhDntKZDTc4ogjfJMPpIcEYurVzpoMk8wgSTzDEZ7JZ gZb+JHLdQ/2awUZo20MzuBcuxCpqUTokgUvSNTZBd+UHmzFxcRtcriQv33R15GW6692A l0GZ3hc3zQrAUIvbL4cKUTBuAW6Py35Jf7PHRM9rXUCHRM7pwSkvfe9S12AQrCL4nu4H LJ1A== X-Gm-Message-State: AOAM5327GdBHQ8xiraHr9UMzo3BUY7sYYvx9cIPLwL+8z2Zx5zOwi4WA caHbNM+rPBCHydplaCg3FxIxp913QxtZUfZm X-Received: by 2002:a2e:a594:0:b0:249:1ef2:e4d8 with SMTP id m20-20020a2ea594000000b002491ef2e4d8mr15330428ljp.138.1647861011220; Mon, 21 Mar 2022 04:10:11 -0700 (PDT) Received: from localhost.localdomain (dsl-tkubng21-58c01c-243.dhcp.inet.fi. [88.192.28.243]) by smtp.gmail.com with ESMTPSA id v21-20020a2e2f15000000b002456e6cdab2sm2031690ljv.93.2022.03.21.04.10.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 21 Mar 2022 04:10:10 -0700 (PDT) From: =?utf-8?q?Martin_Storsj=C3=B6?= To: ffmpeg-devel@ffmpeg.org Date: Mon, 21 Mar 2022 13:10:10 +0200 Message-Id: <20220321111010.1014514-1-martin@martin.st> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [GAS-PP PATCH] Handle the aarch64 tbnz intruction in the same way as tbz, for armasm64 X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: n2xNxfzR4NOI --- 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/;