From nobody Wed Aug 31 01:32:18 2022 X-Original-To: dev-commits-src-branches@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 4MHRVq28M0z4bqJB; Wed, 31 Aug 2022 01:32:19 +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 4MHRVq1Fj5z3Cs2; Wed, 31 Aug 2022 01:32:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909539; 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=psqXHVN6/NAEKLoKqZejzYpVQdBMtnpjYSiTpKDDQkc=; b=UG1zInx7jv6MTuY8tX+z6MSP14REFZD4u78tzzig4xip6E1S5IXIyaRGtNmGK4Sb+6UsUP EYt+dZjJXZ9BrnJ/vzzHw9FuY63yuyaaA5+MPpIVvdE3jsppJ7cFc2EbUSQDUMWZHUQf3Y FjbNvQov4yUdmh89noa8g5CBlzozp4eKRqo3SP6UVW0Ws04zroL5ANZJUrZVxaxaTEgvZM HjTjrr9Drf0YFIMu+ZSF7kDw/9yS43i4sfKXculn04oP4FBVTPMZvOTPSCJHzUygcQXLTp QEBSZjPAknH/i8NIZZkRAFpBkFLcfrYiWzSF4vKFGaVDuQwgDm9xx9YAOyf3bQ== 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 4MHRVp6jHTzy4C; Wed, 31 Aug 2022 01:32:18 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 27V1WIkZ033286; Wed, 31 Aug 2022 01:32:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 27V1WIhG033285; Wed, 31 Aug 2022 01:32:18 GMT (envelope-from git) Date: Wed, 31 Aug 2022 01:32:18 GMT Message-Id: <202208310132.27V1WIhG033285@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Konstantin Belousov Subject: git: 6a959c68c97f - stable/13 - x86: improve machdep.uprintf_signal List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-src-branches@freebsd.org X-BeenThere: dev-commits-src-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: kib X-Git-Repository: src X-Git-Refname: refs/heads/stable/13 X-Git-Reftype: branch X-Git-Commit: 6a959c68c97f05c019bf2c0675b687c027c5248a Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1661909539; 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=psqXHVN6/NAEKLoKqZejzYpVQdBMtnpjYSiTpKDDQkc=; b=P7sseQJtpoXeA2kisfJc5IBl6KYfDZ0qqD4rS8/tkux7T1ORVEw5vstpNhjoriOWRWE8nh C2tN+pqKLS0FC4qGjmCfBlOVli6ASD7bM2ntxR5euqigap7vJ1Xi2SozCzzb+benMJyf/H ypSAjz48tA/2WZTjM0zQSSgtrJw6mU5mOpr5tNnXGYFAP0i8axRJIbVnJKy05F5oXzu77I RqIWXAWLOe6vwKaLUGKyMtnAXRcsOgzHikPVBt16nvFyn+sPTca04IJKqFM8hU2CndZ/GK Vf41vhn41AmbuHNQ9HaDPwXEaDd67mue3yCtNpA58pqv6Ua5yOdCZtnwr+zJdA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1661909539; a=rsa-sha256; cv=none; b=Nf2iPX0bChlt6CkJhvC4Sn+kFQDd8ahI+uUCadFd15ccGIVeiN9Geb2qCn5UwNebTEtkKL 7Z6Dl7ZdAofJ8txLYoZEZUL2wb/sZiwv7HpP5T+c4gW7XuxdleP0BepFhDvVz2g7w3Eyd9 4zltWY4CAD/SWc1qBFQnaMUG+DSn0ZkHZFh8NJyAp/wfgsFFRANRK0yQfEnsRYreQ3w057 /D4DqT2P6DU1hpSRe+c7syIymhHyJliT/cERl3zClKvM36VplhIWKvYNN8fCb3WfGfNsCW Moy8D4gLYMITnwlO8GGhC8czGpWB3tY0KJBE500chEbZyiwsKnTjcOj4TlUIAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch stable/13 has been updated by kib: URL: https://cgit.FreeBSD.org/src/commit/?id=6a959c68c97f05c019bf2c0675b687c027c5248a commit 6a959c68c97f05c019bf2c0675b687c027c5248a Author: Konstantin Belousov AuthorDate: 2022-08-21 01:47:11 +0000 Commit: Konstantin Belousov CommitDate: 2022-08-31 01:20:28 +0000 x86: improve machdep.uprintf_signal (cherry picked from commit ff32a055542f0bbe835205a261350d9c0b6c553a) --- sys/amd64/amd64/trap.c | 6 +++--- sys/i386/i386/trap.c | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/sys/amd64/amd64/trap.c b/sys/amd64/amd64/trap.c index 6b4f7df9d174..888ecf5d0255 100644 --- a/sys/amd64/amd64/trap.c +++ b/sys/amd64/amd64/trap.c @@ -626,11 +626,11 @@ trap(struct trapframe *frame) ksi.ksi_trapno = type; ksi.ksi_addr = (void *)addr; if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %lx code %d type %d " - "addr 0x%lx rsp 0x%lx rip 0x%lx " + uprintf("pid %d comm %s: signal %d err %#lx code %d type %d " + "addr %#lx rsp %#lx rip %#lx rax %#lx" "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, - addr, frame->tf_rsp, frame->tf_rip, + addr, frame->tf_rsp, frame->tf_rip, frame->tf_rax, fubyte((void *)(frame->tf_rip + 0)), fubyte((void *)(frame->tf_rip + 1)), fubyte((void *)(frame->tf_rip + 2)), diff --git a/sys/i386/i386/trap.c b/sys/i386/i386/trap.c index 271ef2c3118f..5a09de409d26 100644 --- a/sys/i386/i386/trap.c +++ b/sys/i386/i386/trap.c @@ -693,12 +693,12 @@ kernel_trctrap: ksi.ksi_addr = (void *)addr; ksi.ksi_trapno = type; if (uprintf_signal) { - uprintf("pid %d comm %s: signal %d err %x code %d type %d " - "addr 0x%x ss 0x%04x esp 0x%08x cs 0x%04x eip 0x%08x " + uprintf("pid %d comm %s: signal %d err %#x code %d type %d " + "addr %#x ss %#04x esp %#08x cs %#04x eip %#08x eax %#08x" "<%02x %02x %02x %02x %02x %02x %02x %02x>\n", p->p_pid, p->p_comm, signo, frame->tf_err, ucode, type, addr, frame->tf_ss, frame->tf_esp, frame->tf_cs, - frame->tf_eip, + frame->tf_eip, frame->tf_eax, fubyte((void *)(frame->tf_eip + 0)), fubyte((void *)(frame->tf_eip + 1)), fubyte((void *)(frame->tf_eip + 2)),