Module Name: src Committed By: ryo Date: Thu Sep 22 21:00:46 UTC 2022
Modified Files: src/sys/arch/aarch64/aarch64: db_trace.c Log Message: Specifying the frame address "trace <frame-address>" was not working. To generate a diff of this commit: cvs rdiff -u -r1.21 -r1.22 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.21 src/sys/arch/aarch64/aarch64/db_trace.c:1.22 --- src/sys/arch/aarch64/aarch64/db_trace.c:1.21 Thu Sep 22 19:33:00 2022 +++ src/sys/arch/aarch64/aarch64/db_trace.c Thu Sep 22 21:00:46 2022 @@ -1,4 +1,4 @@ -/* $NetBSD: db_trace.c,v 1.21 2022/09/22 19:33:00 ryo Exp $ */ +/* $NetBSD: db_trace.c,v 1.22 2022/09/22 21:00:46 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.21 2022/09/22 19:33:00 ryo Exp $"); +__KERNEL_RCSID(0, "$NetBSD: db_trace.c,v 1.22 2022/09/22 21:00:46 ryo Exp $"); #include <sys/param.h> #include <sys/bitops.h> @@ -497,15 +497,6 @@ db_sp_trace(struct trapframe *tf, db_add db_addr_t pc, sp, lr0; bool allow_leaf_function = false; - if (tf == NULL) { - /* - * In the case of "trace/s <frame-address>", - * the specified frame pointer address is considered - * a trapframe (or a switchframe) address. - */ - tf = (struct trapframe *)fp; - } - pr_frame(tf, pr); db_read_bytes((db_addr_t)tf, sizeof(tf_buf), (char *)&tf_buf); @@ -810,6 +801,15 @@ db_stack_trace_print(db_expr_t addr, boo if (count > MAXBACKTRACE) count = MAXBACKTRACE; + if (tf == NULL) { + /* + * In the case of "trace <frame-address>", + * the specified frame pointer address is considered + * a trapframe (or a switchframe) address. + */ + tf = (struct trapframe *)fp; + } + if (trace_sp) { /* trace $lr pushed to sp */ db_sp_trace(tf, fp, count, flags, pr);