Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 15 Jul 2024 12:38:04 GMT
From:      Andrew Turner <andrew@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: cf5be947352b - stable/14 - arm64: Use a switch to decide when to enable debug
Message-ID:  <202407151238.46FCc4lS059492@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch stable/14 has been updated by andrew:

URL: https://cgit.FreeBSD.org/src/commit/?id=cf5be947352bf5956ee98d4ef81050411bd05b08

commit cf5be947352bf5956ee98d4ef81050411bd05b08
Author:     Andrew Turner <andrew@FreeBSD.org>
AuthorDate: 2024-03-12 16:47:38 +0000
Commit:     Andrew Turner <andrew@FreeBSD.org>
CommitDate: 2024-07-15 12:23:49 +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 6534fd2283a1..50f930b66664 100644
--- a/sys/arm64/arm64/trap.c
+++ b/sys/arm64/arm64/trap.c
@@ -496,9 +496,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:



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202407151238.46FCc4lS059492>