From nobody Tue Jan 9 01:00:21 2024 X-Original-To: dev-commits-src-all@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 4T8CK14ylfz55RNZ; Tue, 9 Jan 2024 01:00:21 +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 4T8CK129VXz4JgV; Tue, 9 Jan 2024 01:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762021; 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=Ha65tsMzhQ3jnc+EFV0fDCKpOwNxvI3f3taLGMRI5Xo=; b=PGI/AYSDp/YSzJQ5QhvCK8GICrg4vV3hz7HF5XCQCF8BeNVJ9iP2sS9+b6cr0XeymEigW9 bsTuzz17/oyTbpUCAh6zIY9qjInW284GA4rdDDFeZHDi9USVPtDgbcw0PDSL+C0wrlu90h 5y8+fq/O+BwV/J/2RH6CKs6AHIF/d+A8sWi7CrIeZagSVppV6Ok4b9Ttq+JB6yE88mlZS3 F8fGu73eI5X4hTqhxD75REPTNAA7ffjcGBT82UH7cK7P4ExutGntWzODTszQc9CpPnZbPf 2qrS9hIvY9OtAwN6UzBbwItJ9YZypzWeAiZxmnqrwi72OkS7gwsWGSyig+fLkQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762021; 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=Ha65tsMzhQ3jnc+EFV0fDCKpOwNxvI3f3taLGMRI5Xo=; b=Q17jNAosFiA8NfLr+NZldsankqsL/smROkhLD+/UePRpCca5ffL7kWXd/A6Wf+y4RF3R+K 0pFcbJFMhh7NJWLB/8PgcYB0pgDgX+GY5NlGIELvzQ5mbnFrbnyIFUodpYzkOUWd9+DUHh tL5LFyG82ZJiFygAoHyP1kkfPrU9zd/YnCiLsBflSh3i3BJKC/jwjZKiod/caQs0pmRCUr gQbL81LXXhh1yUEJ0EJfYEF6iC7nP3HYebo5S7ocBToRmipuQktm4ZfBCgpEZStIl1yMEQ 2KU/Vt5Xzd3KTzcM21Qw/CAbCGlUamYEjAUB8gbFPgav+qL0pUnL0kS18Fk+Pg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704762021; a=rsa-sha256; cv=none; b=e3cyC+Negspyo3/uaWFoTx12lR1Xk2l1mIkb22J1ALX0PpjYj5uguEpDld3WK0uwcNPGVS bKuOVaEDaKZRYpRG3V3XRdjXD6PQ1EBgTiTn9HcutdK+uP5TgyVmSKzpSjvqSqgzMN55XI pQUZfH8y9KiFopKuhXkGttYzu//1rhRSmbZusTHpF97GLjD0B9I41/zrCp4pNBth/O2/Zu Y+vioF9nlzwjzhnwszWeh2lEf1R8A9LzfFc7/GNEqZdAz0v1Jj6gf4MzHtNUVi2gzNMrTZ kSvaUWiB6QYzZ0Nb0NE942VOhx8qQwrnNtVauA74SazvRT0hEI2eftg49v3rAw== 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 4T8CK11Gn3zVn0; Tue, 9 Jan 2024 01:00:21 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 40910Lno072262; Tue, 9 Jan 2024 01:00:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40910L45072259; Tue, 9 Jan 2024 01:00:21 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:00:21 GMT Message-Id: <202401090100.40910L45072259@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Mark Johnston Subject: git: 009c8a3d2d76 - stable/14 - ctfconvert: Handle DW_AT_data_bit_offset List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: markj X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 009c8a3d2d76ed8bedc5ea0316979f18f9ae2791 Auto-Submitted: auto-generated The branch stable/14 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=009c8a3d2d76ed8bedc5ea0316979f18f9ae2791 commit 009c8a3d2d76ed8bedc5ea0316979f18f9ae2791 Author: Mark Johnston AuthorDate: 2024-01-02 04:12:29 +0000 Commit: Mark Johnston CommitDate: 2024-01-09 00:59:54 +0000 ctfconvert: Handle DW_AT_data_bit_offset This attribute is new in DWARF 4 and supersedes DW_AT_bit_offset. PR: 276059 Reported by: rscheff Tested by: rscheff MFC after: 1 week (cherry picked from commit 78cd75393ec79565c63927bf200f06f839a1dc05) --- cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c index ec5a3c58856d..42faaad65db5 100644 --- a/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c +++ b/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c @@ -1004,7 +1004,9 @@ die_sou_create(dwarf_t *dw, Dwarf_Die str, Dwarf_Off off, tdesc_t *tdp, else ml->ml_size = tdesc_bitsize(ml->ml_type); - if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) { + if (die_unsigned(dw, mem, DW_AT_data_bit_offset, &bitoff, 0)) { + ml->ml_offset += bitoff; + } else if (die_unsigned(dw, mem, DW_AT_bit_offset, &bitoff, 0)) { #if BYTE_ORDER == _BIG_ENDIAN ml->ml_offset += bitoff; #else