From nobody Wed May 24 16:20:18 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 4QRGcg4D1tz4TF1k; Wed, 24 May 2023 16:20: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 4QRGcg1nm6z446M; Wed, 24 May 2023 16:20:19 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945219; 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=RwWObW9rWgrAwP9ol9fkr5dhEZ6kE3QBibAcL6t6Ep0=; b=E7tJFyOndPgVbqaagjeeN+wr40kLG+eDiD+W/UP4Bep9D7UMTtUx0Lmkdakcqy3jLYuK3G G/SQrLGGcm14l4bbF7FXNJsHiqN/ySFyNH9Rlqb199hmbbh6lfXFKpafmmPhIhPOcOEKSI luD6IJ8q8AbnmXaG0beqOj4fzsCse+khvuGYQOSRJvx8IZnT5M7vVx/oLharcaznRS9AGW VBefqeFy+s2SqLMNtfwhnPCo9C8DG91WHovwwDBxaE5ABX5ZdC5sDuhWLkQChK2v6Q8gZH lPaCs1XV5UMSSCchdq6XDFrIvq8Tc60gRTyTLS3fTLCT08dUW1C3FjzufW0TLA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1684945219; 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=RwWObW9rWgrAwP9ol9fkr5dhEZ6kE3QBibAcL6t6Ep0=; b=vcqBY2hQHmn1hBjQPBGZPr258byQkVZEsN19I/UkGF/K/ou24EiGX1ER1oFP+okkEOqlez PC5/AjvpGuAIMrOyZaKNzWS/aXiNepjHzNG9q/lfBrZYawxzf5AgvCJ52jqKF7YT5FFQ+G Wx03mV6w7KO8WTV90vFIPLMux76RxkKGDyQ5U8RqGdydZJ0Vj7Tb0GSAyRhbvhGa9ft2kR m5A7omTVsTtUCJubBXeiGdO8knN/bwOykW1vl1J+l6ukkaKFg1dtqTyHd4P2WfHV6bb72z a+uGN1PayokRgYc3o9kHfU7nnP3qvhYqrSN6yfqJ3oEFikobX3KOmGNNwhz9lg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1684945219; a=rsa-sha256; cv=none; b=JOBK/BT6DMwmjRP93k9T6dVADh3DVkCW0crG5yxluLzk1UfoI3hMGn0tedMIpuTIh+8dWx odA3+fDm1xnUI31PIu0ylio1VzQrKRzRBP/1lZK2NqwJf+UdbRotvQXJgwtkBfBH1yVDTJ Ulkq+76qcPDE1sKi3u8ZjaUMFUrQhPGJu+/W/CIM8AvaJW/BZEG2qk56mMMyZ0ZGMiFOPx tV5oHjUow2i3vy8kT+W1/vlQ4zvKkZSBvItddxo/tDi5suN8hFRiwH35T+F717E+mvOXIi jQLgO2ziWG+32NK7fi3V8KTIXZxZgD1JnJ7fLXanpSH2tlJzpP1pzEuNMdUzBw== 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 4QRGcg0Js6zpPG; Wed, 24 May 2023 16:20:19 +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 34OGKI35078812; Wed, 24 May 2023 16:20:18 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34OGKImo078811; Wed, 24 May 2023 16:20:18 GMT (envelope-from git) Date: Wed, 24 May 2023 16:20:18 GMT Message-Id: <202305241620.34OGKImo078811@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Andrew Turner Subject: git: b81e1c6b72f1 - main - Don't print leading 0's in the arm64 esr 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: andrew X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: b81e1c6b72f1b0ee57311c2bf51c3549d5c44d3a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=b81e1c6b72f1b0ee57311c2bf51c3549d5c44d3a commit b81e1c6b72f1b0ee57311c2bf51c3549d5c44d3a Author: Andrew Turner AuthorDate: 2023-05-16 09:42:45 +0000 Commit: Andrew Turner CommitDate: 2023-05-24 16:20:06 +0000 Don't print leading 0's in the arm64 esr We don't print leading zeros for other registers, so do the same with ESR_EL1. Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D40129 --- sys/arm64/arm64/trap.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 0ee1bed0c35a..95f2bf46e18e 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -213,7 +213,7 @@ align_abort(struct thread *td, struct trapframe *frame, uint64_t esr, if (!lower) { print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("Misaligned access from kernel space!"); } @@ -330,7 +330,7 @@ data_abort(struct thread *td, struct trapframe *frame, uint64_t esr, WARN_GIANTOK, NULL, "Kernel page fault") != 0) { print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("data abort in critical section or under mutex"); } @@ -371,7 +371,7 @@ bad_far: printf("Fatal data abort:\n"); print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); #ifdef KDB if (debugger_on_trap) { @@ -499,7 +499,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) #endif { print_registers(frame); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("VFP exception in the kernel"); } break; @@ -512,7 +512,7 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) } else { print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("Unhandled EL1 %s abort: %x", exception == EXCP_INSN_ABORT ? "instruction" : "data", dfsc); @@ -630,7 +630,7 @@ do_el0_sync(struct thread *td, struct trapframe *frame) else { print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("Unhandled EL0 %s abort: %x", exception == EXCP_INSN_ABORT_L ? "instruction" : "data", dfsc); @@ -723,7 +723,7 @@ do_serror(struct trapframe *frame) print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("Unhandled System Error"); } @@ -738,6 +738,6 @@ unhandled_exception(struct trapframe *frame) print_registers(frame); print_gp_register("far", far); - printf(" esr: %.16lx\n", esr); + printf(" esr: %16lx\n", esr); panic("Unhandled exception"); }