From nobody Sun Jul 21 17:32:27 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 4WRr8D1MHJz5Rs5F; Sun, 21 Jul 2024 17:32:28 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WRr8D0dZWz4v7B; Sun, 21 Jul 2024 17:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721583148; 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=0fgGLVAlDXxTQZ2sj7Nz4C4gtn8VQ5i0zz8QWuMPWxc=; b=YeeItrUIqflYEy6ZcxDxx5tPmasLu0SG+FzALvz/py/xBY5e+140mUk5tmPxFXOL6gN2pD dadHH/F2CovvAN3ZyZIklD+WzemdoskBSxD3vtp1CDx9F9DCHgOnuXz6iEfxlyURnxYgAx VnNCLsPfsnbAyhvvRAcDD5/TbG8nTAmX9/grev8KRCuUcBTqeV0EBBsfizTT6JxwHg1KGq G7iT4NDZ0GxvYK7DBJncFbpQWlAm6WQAEAjQ5QXZ3XLQub2HXOirNhEEaDJ0SY+RJhnzOZ /YduXdg23resg9OCqzQSD1uhPu5WIsTEk9meNpBOQrF0rdEOGTFt1YVfFrdx6w== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721583148; a=rsa-sha256; cv=none; b=Gt7hTTSPTDTSwT88JmVr2r4C0a2DPSX26JIgsDpHJEIA3CVHagz00E4ksm73DpjU0KzGVh 88Y3gQB4KoKfzVW4V5wWzelmFDsF6EYqi7FmAtcILgPfPNiT89QXzJ3dcPAc5cxtOKIb0W P9sPDiDwFksHHkUAaQWmYaTZa3ied/mRt/rX0c/kqXq4hgh+TDf9jgwMnp/PRCzGtR/ucn YL6HuvM0GHd5RoVtgyZGZ7uUoBO/WmoI4VjqAa/zDPzfzPq6YMI9W0de/VAm1CnH4fMmBt j/A9uWEQ0rkiMPWrF1zvDySiKRQ4fasE1AgHkPhlGIqERqHe//O4qpr7Nw3GXQ== 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=1721583148; 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=0fgGLVAlDXxTQZ2sj7Nz4C4gtn8VQ5i0zz8QWuMPWxc=; b=sUl6Hu84xyaG7hRGEyBRWnbKqajo5B5WxK+Ts0vAkDZD+S5l+Lp5BkOgWPhMR1j9bfylhV qQhArZDqlK3KZXxSkiaN4Eo6jjkpEscLfepRWLMnnkX0fE9I2WQ8/Ecm87btBVNgBhEBXp vwKlRjWgZt0Jj3jcq7exfctaD1tc+QKIvit+OYosedZtUrHsRkXtWbUyLcctzslUJX0/po AzeQg9aFClsU4N5fpqXf9yo2nPkwVO8r5DyGciHeIOxMDaIY+BHdJUGQO3PINYnq1IB9c3 VRw52xz3G/jh2T/14435ah72BEAXZ/TPdVAgOIdAjebi5Bt1oEaMKYH1EWf49w== 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 4WRr8D0FWSz194V; Sun, 21 Jul 2024 17:32:28 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 46LHWROT062764; Sun, 21 Jul 2024 17:32:27 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46LHWRo0062761; Sun, 21 Jul 2024 17:32:27 GMT (envelope-from git) Date: Sun, 21 Jul 2024 17:32:27 GMT Message-Id: <202407211732.46LHWRo0062761@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Bojan =?utf-8?Q?Novkovi=C4=87?= Subject: git: 82f5dfc12139 - main - db_pprint: Fix offset calculation for struct members 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: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bnovkov X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 82f5dfc121391604b079ea96aa14ea71e6b618c9 Auto-Submitted: auto-generated The branch main has been updated by bnovkov: URL: https://cgit.FreeBSD.org/src/commit/?id=82f5dfc121391604b079ea96aa14ea71e6b618c9 commit 82f5dfc121391604b079ea96aa14ea71e6b618c9 Author: Bojan Novković AuthorDate: 2024-07-21 16:45:33 +0000 Commit: Bojan Novković CommitDate: 2024-07-21 17:31:48 +0000 db_pprint: Fix offset calculation for struct members The struct pretty-printing code uses the ctm_offset field in struct ctf_member_v3 to calculate the address of a struct member. However, the code treats this as a byte offset rather than the offset in bits, leading to wrong values being printed. Fix this by diving with ctm_offset by NBBY. Approved by: markj (mentor) Fixes: c21bc6f3c242 --- sys/ddb/db_pprint.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sys/ddb/db_pprint.c b/sys/ddb/db_pprint.c index 10334ce650c8..2925caedd49d 100644 --- a/sys/ddb/db_pprint.c +++ b/sys/ddb/db_pprint.c @@ -117,7 +117,7 @@ db_pprint_struct(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) return; } mtype = db_ctf_typeid_to_type(&sym_data, mp->ctm_type); - maddr = addr + mp->ctm_offset; + maddr = addr + (mp->ctm_offset / NBBY); mname = db_ctf_stroff_to_str(&sym_data, mp->ctm_name); db_indent = depth; if (mname != NULL) { @@ -140,7 +140,7 @@ db_pprint_struct(db_addr_t addr, struct ctf_type_v3 *type, u_int depth) return; } mtype = db_ctf_typeid_to_type(&sym_data, mp->ctlm_type); - maddr = addr + CTF_LMEM_OFFSET(mp); + maddr = addr + (CTF_LMEM_OFFSET(mp) / NBBY); mname = db_ctf_stroff_to_str(&sym_data, mp->ctlm_name); db_indent = depth; if (mname != NULL) {