[src/trunk]: src/sys/arch/mips/mips Add /v to show only valid TLBs.

[simonb <simonb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/46b73cc6c65b
branches:  trunk
changeset: 1013219:46b73cc6c65b
user:      simonb <simonb%NetBSD.org@localhost>
date:      Sun Aug 23 03:21:57 2020 +0000

description:
Add /v to show only valid TLBs.
Align tlb display nicely if > 100 TLBs.
Sort commands in the command dispatch function.

diffstat:

 sys/arch/mips/mips/db_interface.c |  44 ++++++++++++++++++++++++--------------
 1 files changed, 28 insertions(+), 16 deletions(-)

diffs (100 lines):

diff -r f930463bd9dc -r 46b73cc6c65b sys/arch/mips/mips/db_interface.c
--- a/sys/arch/mips/mips/db_interface.c Sun Aug 23 03:17:00 2020 +0000
+++ b/sys/arch/mips/mips/db_interface.c Sun Aug 23 03:21:57 2020 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: db_interface.c,v 1.90 2020/08/17 03:19:35 mrg Exp $    */
+/*     $NetBSD: db_interface.c,v 1.91 2020/08/23 03:21:57 simonb Exp $ */
 
 /*
  * Mach Operating System
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.90 2020/08/17 03:19:35 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.91 2020/08/23 03:21:57 simonb Exp $");
 
 #ifdef _KERNEL_OPT
 #include "opt_multiprocessor.h"
@@ -229,6 +229,10 @@
               const char *modif)
 {
        struct tlbmask tlb;
+       bool valid_only = false;
+
+       if (modif[0] == 'v')
+               valid_only = true;
 
 #ifdef MIPS1
        if (!MIPS_HAS_R4K_MMU) {
@@ -236,6 +240,8 @@
 
                for (i = 0; i < mips_options.mips_num_tlb_entries; i++) {
                        tlb_read_entry(i, &tlb);
+                       if (valid_only && !(tlb.tlb_lo1 & MIPS1_PG_V))
+                               continue;       /* skip invalid TLBs */
                        db_printf("TLB%c%2d Hi 0x%08x Lo 0x%08x",
                                (tlb.tlb_lo1 & MIPS1_PG_V) ? ' ' : '*',
                                i, tlb.tlb_hi,
@@ -250,12 +256,18 @@
 #ifdef MIPS3_PLUS
        if (MIPS_HAS_R4K_MMU) {
                int i;
+               const int tlb_count_width =
+                   mips_options.mips_num_tlb_entries > 100 ? 3 : 2;
 
                for (i = 0; i < mips_options.mips_num_tlb_entries; i++) {
                        tlb_read_entry(i, &tlb);
-                       db_printf("TLB%c%2d Hi 0x%08"PRIxVADDR" ",
-                       (tlb.tlb_lo0 | tlb.tlb_lo1) & MIPS3_PG_V ? ' ' : '*',
-                               i, tlb.tlb_hi);
+                       if (valid_only &&
+                           !((tlb.tlb_lo0 | tlb.tlb_lo1) & MIPS3_PG_V))
+                               continue;       /* skip invalid TLBs */
+
+                       db_printf("TLB%c%*d Hi 0x%08"PRIxVADDR" ",
+                           (tlb.tlb_lo0 | tlb.tlb_lo1) & MIPS3_PG_V ? ' ' : '*',
+                           tlb_count_width, i, tlb.tlb_hi);
                        db_printf("Lo0=0x%09" PRIx64 " %c%c attr %x ",
                                (uint64_t)mips_tlbpfn_to_paddr(tlb.tlb_lo0),
                                (tlb.tlb_lo0 & MIPS3_PG_D) ? 'D' : ' ',
@@ -784,21 +796,10 @@
        { DDB_ADD_CMD("cp0",    db_cp0dump_cmd, 0,
                "Dump CP0 registers.",
                NULL, NULL) },
-#if (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0
-       { DDB_ADD_CMD("watch",  db_watch_cmd,           CS_MORE,
-               "set cp0 watchpoint",
-               "address <mask> <asid> </rwxma>", NULL) },
-       { DDB_ADD_CMD("unwatch",db_unwatch_cmd,         0,
-               "delete cp0 watchpoint",
-               "address", NULL) },
-#endif /* (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0 */
        { DDB_ADD_CMD("kvtop",  db_kvtophys_cmd,        0,
                "Print the physical address for a given kernel virtual address",
                "address",
                "   address:\tvirtual address to look up") },
-       { DDB_ADD_CMD("tlb",    db_tlbdump_cmd,         0,
-               "Print out TLB entries. (only works with options DEBUG)",
-               NULL, NULL) },
 #ifdef MIPS64_XLS
        { DDB_ADD_CMD("mfcr",   db_mfcr_cmd,            CS_NOREPEAT,
                "Dump processor control register",
@@ -815,6 +816,17 @@
        { DDB_ADD_CMD("reset",  db_mach_reset_cmd,      CS_NOREPEAT,
                "Initiate hardware reset",
                NULL, NULL) },
+       { DDB_ADD_CMD("tlb",    db_tlbdump_cmd,         0,
+               "Print out TLB entries. (only works with options DEBUG)",
+               NULL, NULL) },
+#if (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0
+       { DDB_ADD_CMD("watch",  db_watch_cmd,           CS_MORE,
+               "set cp0 watchpoint",
+               "address <mask> <asid> </rwxma>", NULL) },
+       { DDB_ADD_CMD("unwatch",db_unwatch_cmd,         0,
+               "delete cp0 watchpoint",
+               "address", NULL) },
+#endif /* (MIPS32 + MIPS32R2 + MIPS64 + MIPS64R2) > 0 */
        { DDB_ADD_CMD(NULL,     NULL,               0,  NULL,NULL,NULL) }
 };
 #endif /* !KGDB */