CVS commit: src/sys/arch/aarch64/aarch64

[Ryo Shimizu]

Module Name:    src
Committed By:   ryo
Date:           Mon Sep 19 17:24:23 UTC 2022

Modified Files:
        src/sys/arch/aarch64/aarch64: db_trace.c

Log Message:
Fixed stack analyzing backtrace (bt/s) correctly for nested trapframes.


To generate a diff of this commit:
cvs rdiff -u -r1.19 -r1.20 src/sys/arch/aarch64/aarch64/db_trace.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/arch/aarch64/aarch64/db_trace.c
diff -u src/sys/arch/aarch64/aarch64/db_trace.c:1.19 src/sys/arch/aarch64/aarch64/db_trace.c:1.20
--- src/sys/arch/aarch64/aarch64/db_trace.c:1.19	Tue Jun  7 23:55:25 2022
+++ src/sys/arch/aarch64/aarch64/db_trace.c	Mon Sep 19 17:24:23 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: db_trace.c,v 1.19 2022/06/07 23:55:25 ryo Exp $ */
+/* $NetBSD: db_trace.c,v 1.20 2022/09/19 17:24:23 ryo Exp $ */
 
 /*
  * Copyright (c) 2017 Ryo Shimizu <r...@nerv.org>
@@ -28,7 +28,7 @@
 
 #include <sys/cdefs.h>
 
-__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.19 2022/06/07 23:55:25 ryo Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.20 2022/09/19 17:24:23 ryo Exp $");
 
 #include <sys/param.h>
 #include <sys/bitops.h>
@@ -544,8 +544,8 @@ db_sp_trace(struct trapframe *tf, db_add
 				pc = aarch64_strip_pac(tf_buf.tf_lr);
 			if (pc == 0)
 				break;
-
-			pr_traceaddr("sp", sp, pc, flags, pr);
+			lr0 = aarch64_strip_pac(tf_buf.tf_lr);
+			allow_leaf_function = true;
 
 		} else {
 			db_sym_t sym;