From nobody Mon Jul 15 12:38:10 2024 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 4WN1vQ6TZfz5QrMP; Mon, 15 Jul 2024 12:38:10 +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 4WN1vQ4NLXz4HDm; Mon, 15 Jul 2024 12:38:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1721047090; 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=kMjUobLczdtTP/wqjEO+oiuIXuGLaTGRcCAuI/Izusw=; b=UVV4lwGLfsw0r2IWiZ2kECYHdD0b9UGNLn9V1kDWFaYg68LmdWotNWTsELKcVMtKFwMr2g YpM6i27AeoitJjuyUdc+Zgad8j0nKVj/sBLcnUrs0Q2pTfSWK3ZoyYeQWup3k0sDK5xtmN MzTKyAzMcd36Rol2FfiP0wjuR3vydk1ws5NvMSLOvuXFdAszxh1iDIzDdboa6af3Oek/n2 q/NX6weEJy/zKphQAugesJCJNYGKdinx0E3rsuPKPLjsqAjGn6TIKVO8Pn6t7mpbZN4JdK Bdy1P7T2VJ1Yw0frhnFu+u2x6kTSiqezn9badbyjmkS+nYyjAcTG5qMWB6dg0g== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1721047090; a=rsa-sha256; cv=none; b=eKA/5ebTyWXhZJQhjETigFViIFFcbVMQthhxmAabqDe5JevQFv+w4t6POy3u4tfMvJi9N6 5UpYMNlRWf2+c7FVSSTi0BVPCuQtgcbcoKfNiVzn3PoPI1y0k/DfjyHbbBc1e+uz8NFRet hO0yBDya1v9roVTHNwYJ5ufY/ko5mTAVk0CHd+4hk38THryx/1b7qP9IlQohqOfoZe4xXi Zb74Zs0rCe4ic12WLMGQ0uilBtDZC4z47WFNu1AAeDLMcNeLIxUBsqOM1zr9HhjspWfMUw xTqq92oyB9Wyo58K1RavIaQTm9M91a3ubMGU4NYJuEZglF/JqB3pRfT4NW9rCQ== 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=1721047090; 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=kMjUobLczdtTP/wqjEO+oiuIXuGLaTGRcCAuI/Izusw=; b=lCGtVFwX36oevim5AW9Nfc3pFSFNVzL6ucbWkAGpeAk0YxA0ptZsL8Ouvst2CiEV0wRetX nqUidgqAa4FbjQoAJ8pUhcxmWWabKlz3xiGBrow/V2I4Yjl/ssgu2EkgvsJY6zl5WVNBx2 0fY4r+IDjsYvmG9t9CcgSAtErm7AR20v19KDZyqWchLHdlz7Fx98HGyvDvtxUAh19aTb/+ dMRg6m7zvfs8Cd2q5ytXRr6J5SX+SbbTxn9CzZM8iVRIQ/RZMDOjZIMgWnQDdidJXS1CNf p+kd+wFMy7BtR4NDgBBJCVZ0jHigOHoHnaRpQzNEncNZZlXl6WHjBtaozuHPKA== 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 4WN1vQ40NmzsZD; Mon, 15 Jul 2024 12:38:10 +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 46FCcAgn060036; Mon, 15 Jul 2024 12:38:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 46FCcAbc060033; Mon, 15 Jul 2024 12:38:10 GMT (envelope-from git) Date: Mon, 15 Jul 2024 12:38:10 GMT Message-Id: <202407151238.46FCcAbc060033@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Andrew Turner Subject: git: 3ab140921420 - stable/13 - arm64: Use a switch to decide when to enable debug 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: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@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/stable/13 X-Git-Reftype: branch X-Git-Commit: 3ab140921420046c3112769d7f00563f4d9b7f97 Auto-Submitted: auto-generated The branch stable/13 has been updated by andrew: URL: https://cgit.FreeBSD.org/src/commit/?id=3ab140921420046c3112769d7f00563f4d9b7f97 commit 3ab140921420046c3112769d7f00563f4d9b7f97 Author: Andrew Turner AuthorDate: 2024-03-12 16:47:38 +0000 Commit: Andrew Turner CommitDate: 2024-07-15 12:34:28 +0000 arm64: Use a switch to decide when to enable debug Use a switch statement to decide which exceptions we need to call dbg_enable for. This simplifies adding more esceptions to the list in the future. Reviewed by: jhb Sponsored by: Arm Ltd Differential Revision: https://reviews.freebsd.org/D44352 (cherry picked from commit d93b3a65f7697630ca1dd2635fc976f3ef36b602) --- sys/arm64/arm64/trap.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arm64/arm64/trap.c b/sys/arm64/arm64/trap.c index 74122cd508ab..4a659e9d5538 100644 --- a/sys/arm64/arm64/trap.c +++ b/sys/arm64/arm64/trap.c @@ -467,9 +467,15 @@ do_el1h_sync(struct thread *td, struct trapframe *frame) * Enable debug exceptions if we aren't already handling one. They will * be masked again in the exception handler's epilogue. */ - if (exception != EXCP_BRK && exception != EXCP_WATCHPT_EL1 && - exception != EXCP_SOFTSTP_EL1) + switch (exception) { + case EXCP_BRK: + case EXCP_WATCHPT_EL1: + case EXCP_SOFTSTP_EL1: + break; + default: dbg_enable(); + break; + } switch (exception) { case EXCP_FP_SIMD: