From nobody Wed Oct 11 15:44:28 2023 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 4S5HBh6SpXz4wKGq; Wed, 11 Oct 2023 15:44: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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4S5HBh5fFqz3dSF; Wed, 11 Oct 2023 15:44:28 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1697039068; 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=QRFkMWZbS+hKOP2l6sup/o5tWXF4R0RMasCffuWrKnU=; b=asw85JuQBfR5zx+pIhhP07hQoqjQ2m2560xtlWxb4eUzsrltAftbNPOjDVpFyK1XgZNYvY SvvsUg7b6tFN6/JsjvxKVhO2zNnIeXJJNZN9pqOwAfB3IEnIMUJ0fs+tvb7vDxeworx++8 0ubySZdu2oV9DZ2h0CHk1nSUPvG3S7zY5I14BjjQy7CnpG6l4QMrOBK2HCvVGuQ9qWQoLf dYWIccF+HqRpQ2wqYdXsMKL0U6+0Jeqj/rpj4obdB3HJR9OUeZ2UrBVoz5TOYAPLI0X99w w4y0IbI61e6jt4JTDa82ZDn9YGo7QeZhSMFCuqEjOm49WBgcT1eJAhv06gQIMg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1697039068; a=rsa-sha256; cv=none; b=lakGeQ/gxG98nrLKon2C/5/wiKGi7/hNXm2dL1ONVEDuCWE+SVnXrJOBI3QBd4eVseav6S pRdqKYFxhQnZZSRfFFDCElbIUMRjRrVh92OReUIjmiPNkqfshdWC+MSmpGqzveLvRiJKSr 1m/DaQ3kxd00Ziejyed+tK70sq/HvOK1jXbP51xr7vBpzuGF2dQuW5j2upTaV4fqp7icGW RGA4JLbOXGALk9dXfyAJD6P6WxXfCWUa55c2LnuEQdrjQijgrfN230698vL2Qb7KR/ZR5y gfCz8gK8bPLoIPE0nZ5uhfptn+73wMAT+lAHgkgr0nE4N2q4wfxrAxUgpBoDvw== 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=1697039068; 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=QRFkMWZbS+hKOP2l6sup/o5tWXF4R0RMasCffuWrKnU=; b=jpWNwMOffCGHzgl+O5pdEoKfukT/W10Vn9hemgDCrgecuMNpulGsY3OsntRQU4sCJ2Ifx2 Xg8BsnUDUTeMIgvZujO4stHCRLEcN/k4txMbb7Qb/KQ0I4QsFH87rHxcaD1NQHxpEE7c2M uMcZKHMmqKpDPnvNeuP5wi7tY3uOrwwvo51VgFh4CITMeW56NAd6kwaDqtI80JoBFHPIHy /cdAP6POJ9XaT3TZM4pEnzHr15drcQJhIRLFSstUQpyeLcMpOESh6l5Lq2hkCj8y4beTTu HCdPe2aEq2qti0B4kto/U1sENWc3unP/FggjDNMAeBVTpVzRfRE2osot7ViQug== 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 4S5HBh4Z61zBMK; Wed, 11 Oct 2023 15:44:28 +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 39BFiSRL024031; Wed, 11 Oct 2023 15:44:28 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39BFiSn6024028; Wed, 11 Oct 2023 15:44:28 GMT (envelope-from git) Date: Wed, 11 Oct 2023 15:44:28 GMT Message-Id: <202310111544.39BFiSn6024028@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: 4ad3f9dbe8cf - stable/14 - riscv: Don't print zero offsets for register addresses 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: jhb X-Git-Repository: src X-Git-Refname: refs/heads/stable/14 X-Git-Reftype: branch X-Git-Commit: 4ad3f9dbe8cf6c6c9bb3dafad8d076814c3a440c Auto-Submitted: auto-generated The branch stable/14 has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=4ad3f9dbe8cf6c6c9bb3dafad8d076814c3a440c commit 4ad3f9dbe8cf6c6c9bb3dafad8d076814c3a440c Author: John Baldwin AuthorDate: 2023-09-05 16:12:27 +0000 Commit: John Baldwin CommitDate: 2023-10-11 15:10:32 +0000 riscv: Don't print zero offsets for register addresses This matches the behavior of db_printsym. Reviewed by: mhorne, markj Sponsored by: DARPA Differential Revision: https://reviews.freebsd.org/D41702 (cherry picked from commit ba675bb94870fcb1a07018920433e9468003364c) --- sys/riscv/riscv/trap.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/sys/riscv/riscv/trap.c b/sys/riscv/riscv/trap.c index e681058800f6..123163ecfc10 100644 --- a/sys/riscv/riscv/trap.c +++ b/sys/riscv/riscv/trap.c @@ -149,7 +149,10 @@ print_with_symbol(const char *name, uint64_t value) sym = db_search_symbol(value, DB_STGY_ANY, &offset); if (sym != C_DB_SYM_NULL) { db_symbol_values(sym, &sym_name, &sym_value); - printf(" (%s + 0x%lx)", sym_name, offset); + if (offset != 0) + printf(" (%s + 0x%lx)", sym_name, offset); + else + printf(" (%s)", sym_name); } } #endif