From nobody Tue Jan 9 01:01:10 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 4T8CKz3GJ4z55RhB; Tue, 9 Jan 2024 01:01:11 +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 4T8CKz0ZFRz4Kjl; Tue, 9 Jan 2024 01:01:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762071; 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=QtCh//DrZEJJH7vzpFUp5NNhW5LIf4MFVfJ1r6Rb72Q=; b=ie1yQQd8CJQpF9Gf06+O161ZGOjXT22RoJpLIHFwTw41Qnuq5eDxodgva0d0GcFGJj4T12 AI3icjIPY+LZx47sWdfn6Nob/K7V7hyMJL9zyN7tegGID9OvrsHGxa1e/UGd9K5AaxMggI UsXNmoXB+KNmPg28zqghsdtcdKw54ZtHcJNJok4g7abOkbf9cECEIPRPmghktbbp+zFZjG U3rVqtHmUN/sk6e+HGWcBLwylziY8neR5HRS1XWy+fASUhVB72ua5foc6qIGk8+3pZtiN+ hG5NLf0nlKYCI3M/+cR9F1Xki/EGe6z8dtn4KW0XGcm6R3q9o8u1uSZBH5ASxQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704762071; 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=QtCh//DrZEJJH7vzpFUp5NNhW5LIf4MFVfJ1r6Rb72Q=; b=nZ8Hrs/P/rsgbZbmc8OK2Wynjd++zKA8anU2pGBw0kuLxEaPRPqjhfJaNR6YsA8NbrN6XP 2w1KaZlgDEyTAZoei38c/Znjn/7h1ZCkxsNFDYA/KPBFNkIUKECsV7W2pOVG1e4NUrlotS LkckUU8Z+TKcuPY6F/P1ghz7U8nqUxcn/XRr3rE4evt4GnWFNfETmZLH0wUElYhIGXqzU8 GaL93jEJXSNUG//bTJVlpu3fYn3vkfMGc+BsRviWPovDDLO2tYEEsAnC53KRBge+bCWTuN /o5A+DB/BE8M5Ju1fD/PMZVps/tUg6QiPVQCijzumQR9cEpKqBQpX54kK5Sxag== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704762071; a=rsa-sha256; cv=none; b=YL9CJC+jID0+Ey0tt9q+/39xgsVIkEDTCIxMLefubyfODfoXmUr2+36/t2l8CW7lxaipLu Xlp3q64aSg4CTy7Y1ETiq3kXn9ehUNOuBQrImtb5IILTR6z7fWWHWRjNIWwX+bM4nSb3lH GruZzus1aD8DiOBS4nF3I7nwt036eb35tpVD4Xt3Lnd9H5T+pc5Sx10t1zP0o1AeUEEuB5 /LX89LXWl/f26y6JpHae8hUQRDf0ZiZPLKj7Z+/pG6iULbuOiKb8dm3d+P5wJWS7uiDYEM Xs6p0HifMe58Nyh4/3nnM3/Dc5VLXQpcwNWK2o2oUxxd4yATdk4UgFKTK/9jYw== 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 4T8CKy6lvKzVkj; Tue, 9 Jan 2024 01:01:10 +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 40911A32075135; Tue, 9 Jan 2024 01:01:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 40911AOS075132; Tue, 9 Jan 2024 01:01:10 GMT (envelope-from git) Date: Tue, 9 Jan 2024 01:01:10 GMT Message-Id: <202401090101.40911AOS075132@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: 693dbc0070f9 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 693dbc0070f97cc6744796d40eeab63e3305492e Auto-Submitted: auto-generated The branch stable/13 has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=693dbc0070f97cc6744796d40eeab63e3305492e commit 693dbc0070f97cc6744796d40eeab63e3305492e Author: Mark Johnston AuthorDate: 2024-01-02 04:12:29 +0000 Commit: Mark Johnston CommitDate: 2024-01-09 01:00:31 +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 861fda0931af..1de5741ae207 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