Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 16 Apr 2021 13:52:47 GMT
From:      Mitchell Horne <mhorne@FreeBSD.org>
To:        src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org
Subject:   git: dbc54475c142 - stable/13 - arm64: adjust comments in dbg_monitor_exit()
Message-ID:  <202104161352.13GDqlHl022030@gitrepo.freebsd.org>

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

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

commit dbc54475c142215a8b85667b7ec2791cc06eb377
Author:     Mitchell Horne <mhorne@FreeBSD.org>
AuthorDate: 2021-04-13 17:34:58 +0000
Commit:     Mitchell Horne <mhorne@FreeBSD.org>
CommitDate: 2021-04-16 13:49:05 +0000

    arm64: adjust comments in dbg_monitor_exit()
    
    These comments were copied from dbg_monitor_enter(), but the intended
    modifications weren't made. Update them to reflect what this code
    actually does.
    
    Sponsored by:   The FreeBSD Foundation
    
    (cherry picked from commit 5742f2d89c03311e8b2d92422c0e2e4063cb2e1d)
---
 sys/arm64/arm64/debug_monitor.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/sys/arm64/arm64/debug_monitor.c b/sys/arm64/arm64/debug_monitor.c
index d302c8c95b4f..a2b4b7e8b40b 100644
--- a/sys/arm64/arm64/debug_monitor.c
+++ b/sys/arm64/arm64/debug_monitor.c
@@ -549,11 +549,11 @@ dbg_monitor_exit(struct thread *thread, struct trapframe *frame)
 	if (!(SV_PROC_FLAG(thread->td_proc, SV_ILP32)))
 		frame->tf_spsr |= PSR_D;
 	if ((thread->td_pcb->pcb_dbg_regs.dbg_flags & DBGMON_ENABLED) != 0) {
-		/* Install the kernel version of the registers */
+		/* Install the thread's version of the registers */
 		dbg_register_sync(&thread->td_pcb->pcb_dbg_regs);
 		frame->tf_spsr &= ~PSR_D;
 	} else if ((kernel_monitor.dbg_flags & DBGMON_ENABLED) != 0) {
-		/* Disable the user breakpoints until we return to userspace */
+		/* Disable the kernel breakpoints until we re-enter */
 		for (i = 0; i < dbg_watchpoint_num; i++) {
 			dbg_wb_write_reg(DBG_REG_BASE_WCR, i, 0);
 			dbg_wb_write_reg(DBG_REG_BASE_WVR, i, 0);



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