From nobody Tue May 10 23:24:04 2022 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id D88181AD7C50; Tue, 10 May 2022 23:24:05 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4KyYyY3GDLz4cC6; Tue, 10 May 2022 23:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8ygLcyl8tb2S7HC7rW8tVICzHcnCJMUfT8s/ZwAyHI=; b=y0ebZyWdYc+sa4yAyxgDiFNxonQgo73e7UwAN+D/rePcZzbIF/V2wyir7iWujw5FdkIaac K9crI52eyTQOQCxD65J3ZqP2LUn4ZEkw/vVKq3WM+i2ZS/p0A+F/OSzEFEqOpAnQVfSpHL YbmJ6/MYHEfZqVPwmfZnXLSdH9U4hub7mUWr6l5gDrMIoUNdrT52lqBYrkKxrBFWDUWJCe iFwZZFlQuaHAqUXDJ2derTy7RYo+5VtArI2LKShz+KZxAuUXfA0ZDPNl4BE8HkEyeACQwW azLWXpW4ak8LjMHtaqiltYElRBEJ2waKnLvhYuubWXR++77sesVcZAzBBIjegg== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id BD0476BDB; Tue, 10 May 2022 23:24:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 24ANO40f072342; Tue, 10 May 2022 23:24:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 24ANO4ML072341; Tue, 10 May 2022 23:24:04 GMT (envelope-from git) Date: Tue, 10 May 2022 23:24:04 GMT Message-Id: <202205102324.24ANO4ML072341@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: John Baldwin Subject: git: 37179c47d76a - stable/13 - arm64: Fix a logic bug in is_load_instr(). List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 37179c47d76ad1441ab2f1c2cff299d33d719129 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1652225045; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=d8ygLcyl8tb2S7HC7rW8tVICzHcnCJMUfT8s/ZwAyHI=; b=gZejbsIvANLYPWaw25/Hm5eyZb45hpy42GWR83xsLWtXts5rrGvaCYzSesy46qek0luhBv YbnGmM7wxwfITpicLEuUDvFT96W7JD/TGZcF2sxhqr2S3vKReOSkGqEApVTlaSSBclZdqK OCY5k6jCOcC4zW2KdtVHlTJJ3yDqt1NRu30KhH53GxlLc8dqDsbOC7aGYO0nAGfdoyO8AX Vj03vFJNzKRUiaZ2lYK59nBQedhv7sU4bG0e7KIFfBmstOAK+m15UScO4T3+b6SNp12Pcw P5qStQmJKZkzuQR8U/fc9Vw/bH2ApdxvIvVllt4Ma3+2iGQG1JnfqkkLuWhVwA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1652225045; a=rsa-sha256; cv=none; b=NqWOG5GcGZOsatIB5dexPUsxVh4NwT6BfzJ5IIUh/KU8nIpVuv/i/eXlhTF8KGkbyjDunF x9NVns2t1boNgNf/+OkOg4wZ7wTq2XGYWq9N+wzTdrCTn6XJrg3M0auhLAavMN1m50Prk0 5F4ylQYb4LJ5bFQSBI+AwcrtX+D1sJf34F1dAlJJYt3VvcpSCYajJHbzKljNAm49aO+r7+ BOcTzso+2vtCaGWxKQ9YSSnvxJJw5IX/+q6qpDc0qW3XMHITq+896lXeQhCoHu1eVVmDID lra6O9Ev0Le8KKsuN9TZTZUYr3s3DKlXIafv3uA/qjIJePuHEYzqEuhzLHxwHQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=37179c47d76ad1441ab2f1c2cff299d33d719129 commit 37179c47d76ad1441ab2f1c2cff299d33d719129 Author: John Baldwin AuthorDate: 2021-09-15 16:03:18 +0000 Commit: John Baldwin CommitDate: 2022-05-10 22:51:49 +0000 arm64: Fix a logic bug in is_load_instr(). Logical and ('&&') was used to join two conditions instead of logical or ('||') causing some store instructions to not be recognized. Reported by: GCC 9 -Wparentheses Reviewed by: andrew Differential Revision: https://reviews.freebsd.org/D31949 (cherry picked from commit 8753039a8f231ab04c7f3db9eaa5d9144d73440d) --- sys/arm64/include/db_machdep.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sys/arm64/include/db_machdep.h b/sys/arm64/include/db_machdep.h index 105e8e507ce3..9ec0b6402a91 100644 --- a/sys/arm64/include/db_machdep.h +++ b/sys/arm64/include/db_machdep.h @@ -97,7 +97,7 @@ typedef long db_expr_t; (((ins) & 0xffe00c00u) != 0x3c800000u)) || /* unscaled immediate */ \ ((((ins) & 0x3b000000u) == 0x39000000u) && \ (((ins) & 0x3bc00000u) != 0x39000000u) && \ - (((ins) & 0xffc00000u) != 0x3d800000u)) && /* unsigned immediate */ \ + (((ins) & 0xffc00000u) != 0x3d800000u)) || /* unsigned immediate */ \ (((ins) & 0x3bc00000u) == 0x28400000u) || /* pair (offset) */ \ (((ins) & 0x3bc00000u) == 0x28c00000u) || /* pair (post-indexed) */ \ (((ins) & 0x3bc00000u) == 0x29800000u)) /* pair (pre-indexed) */