From nobody Tue Jan 02 04:13:14 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 4T3zwq1w5Sz568v2; Tue, 2 Jan 2024 04:13:15 +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 4T3zwp6m91z4cKt; Tue, 2 Jan 2024 04:13:14 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704168794; 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=hbkozz9wNoDwqYdXqXS2IYxae1MJX+deA+V4Ik+5eac=; b=VFLnPe3UevUaxM+VYGGXuAF1ss7/hFbRFL/bjxGg2FU9eE/PuaYUqLOvkDUer7cjpSOBUW immwhD769EhRWRsmYI7b4gZEqESWXx+9mDl2FJZds2aBR/sL6K7VHLFebmOhv5P6ytJp44 tXBWHtMvpSK39mLYAaOKXZSSy74QEq2svp6y87CztKcYL9WaK8FtgB6B1JW2wMd63OGrPA LwPDx/ZHAaZurKXenIVw0QPayF/AX6GCRMRNgtp0vOugCEEqwUjk7sfjbLD3ZqUtoWGo3i NrLDiTmGOyi8tiPyxwxcquw17YGKRHCqpvsfO6BOZrrw6cUqa8zDIzOACzPRqw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704168794; a=rsa-sha256; cv=none; b=KAQEeBQmeuBxQQ1VRd13MPVcMMCbaqDBA0oxzsdmiOD9ALn7eyWU6EocElatJcsk2hrlpB //E0KCp8F3WJGvpLoEmMPIatx3GomhKKQmbew6OIJ9s0GoahOrdXKGE80CNclra8E5nBM9 FhXMP/4Sqj431OTRqtXdfW1qcr2TYwjeGXKLflWkR/h5wbB4RD+HYmQpVE2D7UGbQcCq4J C12IrbNFuuZLMhRrrggubYrzPVLniX/LoVdNG69WZSEvdM4XkUUkt6HzgtF8W4UifBpZZl okJ1EL7hyQkQ1Bmjc/scDXUOr0u2mxxyXOdVJg7qXZ8hjyAG3e33+Z+TI49c0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704168794; 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=hbkozz9wNoDwqYdXqXS2IYxae1MJX+deA+V4Ik+5eac=; b=T44qMwrmsjMHdMWyX4ReOwGajddv1ef8MJ7uxcbnD/YGx7D46NpQqk0LNfv7kKRSOfxZOI 8Rnd4Sn9e6QDnKG61FkXCa9MuilC7GVZkHQN7L1VkxjOShiqBMt2sa3x7DRYawZpmHdwui +sVte1ikqiPQ75qMFgiOT2btVJwWgw6mO/fQvRcPNMqo5sq1krPUIA36pC7Go6em4dPk6i rLgb6bb/EqZtNBJrAjBcVCekiczRNCsfh5erHSy6ArfyQ0iforcqCjAFrrV4dSJne4raH8 iHqQnmDBhXL9LLEm8Q+HH6wkLib7QCZbm8+DP2Mx7DXOLwRapQLTeZic2TpeVw== 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 4T3zwp5q91zlvs; Tue, 2 Jan 2024 04:13:14 +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 4024DERi059225; Tue, 2 Jan 2024 04:13:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 4024DEaT059222; Tue, 2 Jan 2024 04:13:14 GMT (envelope-from git) Date: Tue, 2 Jan 2024 04:13:14 GMT Message-Id: <202401020413.4024DEaT059222@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Mark Johnston Subject: git: 78cd75393ec7 - main - 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/main X-Git-Reftype: branch X-Git-Commit: 78cd75393ec79565c63927bf200f06f839a1dc05 Auto-Submitted: auto-generated The branch main has been updated by markj: URL: https://cgit.FreeBSD.org/src/commit/?id=78cd75393ec79565c63927bf200f06f839a1dc05 commit 78cd75393ec79565c63927bf200f06f839a1dc05 Author: Mark Johnston AuthorDate: 2024-01-02 04:12:29 +0000 Commit: Mark Johnston CommitDate: 2024-01-02 04:12:29 +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 --- 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