From nobody Tue Sep 5 16:12:51 2023 X-Original-To: dev-commits-src-main@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 4Rg9X36hCrz4sM6v; Tue, 5 Sep 2023 16:12:51 +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 4Rg9X36Cp7z4jBs; Tue, 5 Sep 2023 16:12:51 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1693930371; 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=De+ymqUmLz7OanCA98pqgFLgMKd2e4H1KfRCmtEyC7g=; b=burb3IaqRBC4w4SSElxUPaDni4E9AnJsgAObFdFxoVZfGrSVBH7j4VZAARjSTFYfNAKw5p otJEg87OF+c27CTLta86OocvlqUUCPB4rkDhlicr7k6+U+o4wFBJ/TYzOpZ6DGfNDMmwBq f6Pojb1QsYuexpca6dOuefcTNdFaUDoLYhf8cDtjwN+lQrWknODKI0pndoGPNlDFbk15/1 1iKzfXlh5gIQfaVL6PWiyeXFaBxBsdkkCn/OnhpXsKDdTZcIq7mer0dgn035Vs64LFeWug g/5ne9py++ISK8YuPjsmVxL6PmexZEtSnTxQLihfBlEW6f4FcEAVCR2ZdQ6rtg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1693930371; a=rsa-sha256; cv=none; b=ucbN33LInBEnOEIck82P5uVMZTsGfgFrYOUqN3XCCgrmQIlZre/rD7xgGz1O9ZdrSGjaj9 8ZyQiv0FcDYq8e1YPRMiGVduuuuuvP3YmuqGzYeVPd0wnCWDLIhYV3DdbCEm+QhTvuN+it CZEaabVyDrUWbQdizcZjcDwEc/2QTc5cKTQl1FdpAU4tu86ai6svapizMS4R7Vb90OaH7J nVuvRu0x4UsqLY0gU/U7Wtoh+UhfOAqmRkiwhdhM5P82ClSJ9rYfaAERV6qnVX+4BKqpxk rKBrX+9AjlvW2hj8oeJPEiq4zKEA2h/9wuScGLWia+NDxaNuHqzulfnM/jrvqg== 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=1693930371; 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=De+ymqUmLz7OanCA98pqgFLgMKd2e4H1KfRCmtEyC7g=; b=NPzHP4L8TNvLl2+rTSTNeZxtUnu91rA7pUXBMsa1lQHopDn4fH62p8Xac95OGERuV5YABn m2q7lfaxwQ4/GfMtIlyRRM87iuqOtu/L0m3YGSWNxcaOObDwyVbtmyZR+PNKhGhFVMWQ56 tNUkK1o54v5RQ0fJmvlLyu2qP6D8wGaHtoKsfmYlpcKieRJ0tdoDwCC7UjFLBl/Sp7Qmyq KwDSSGx342UkeU4x44xY1ghrQlCMxiCtVng4CyYloxQg2jWgPivhNe6KCu0+b63pSIbX9K XlF2U9pf9HO9TRUT2kvr4KWJ/Qm0PHUobkYTE9UpRXuWXgZkbtHEEdONsomdRg== 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 4Rg9X35JG0zgBN; Tue, 5 Sep 2023 16:12:51 +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 385GCpdE059043; Tue, 5 Sep 2023 16:12:51 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 385GCpLv059040; Tue, 5 Sep 2023 16:12:51 GMT (envelope-from git) Date: Tue, 5 Sep 2023 16:12:51 GMT Message-Id: <202309051612.385GCpLv059040@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: John Baldwin Subject: git: ba675bb94870 - main - riscv: Don't print zero offsets for register addresses List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-main@freebsd.org X-BeenThere: dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: ba675bb94870fcb1a07018920433e9468003364c Auto-Submitted: auto-generated The branch main has been updated by jhb: URL: https://cgit.FreeBSD.org/src/commit/?id=ba675bb94870fcb1a07018920433e9468003364c commit ba675bb94870fcb1a07018920433e9468003364c Author: John Baldwin AuthorDate: 2023-09-05 16:12:27 +0000 Commit: John Baldwin CommitDate: 2023-09-05 16:12:27 +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 --- 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 e454beeb5245..bde402c1cc16 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