Changeset 02055415 in mainline

Timestamp:

2005-12-10T19:15:05Z (19 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

a276c56

Parents:

f5acb62

Message:

ptlb command (currently usable on mips32 only).

Files:

• Makefile (modified) (1 diff)
• arch/mips32/include/mm/tlb.h (modified) (1 diff)
• arch/mips32/src/mm/tlb.c (modified) (3 diffs)
• generic/include/mm/tlb_cmd.h (added)
• generic/src/console/kconsole.c (modified) (2 diffs)
• generic/src/mm/tlb.c (modified) (1 diff)
• generic/src/mm/tlb_cmd.c (added)

Makefile

@@ -115 +115 @@
         generic/src/mm/page.c \
         generic/src/mm/tlb.c \
+        generic/src/mm/tlb_cmd.c \
         generic/src/mm/vm.c \
         generic/src/lib/func.c \

arch/mips32/include/mm/tlb.h

@@ -33 +33 @@
 #include <typedefs.h>
 
-#define TLB_SIZE        48
+#define TLB_ENTRY_COUNT         48
 
 #define TLB_WIRED               1

arch/mips32/src/mm/tlb.c

@@ -66 +66 @@
          * Invalidate all entries.
          */
-        for (i = 0; i < TLB_SIZE; i++) {
+        for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbwi();
@@ -323 +323 @@
         ipl = interrupts_disable();
         
-        for (i = 0; i < TLB_SIZE; i++) {
+        for (i = 0; i < TLB_ENTRY_COUNT; i++) {
                 cp0_index_write(i);
                 tlbr();
@@ -400 +400 @@
 }
 
+/** Print contents of TLB. */
 void tlb_print(void)
 {
-}
+        entry_lo_t lo0, lo1;
+        entry_hi_t hi;
+        int i;
+
+        printf("TLB:\n");
+        for (i = 0; i < TLB_ENTRY_COUNT; i++) {
+                cp0_index_write(i);
+
+                tlbr();
+                
+                hi.value = cp0_entry_hi_read();
+                lo0.value = cp0_entry_lo0_read();
+                lo1.value = cp0_entry_lo1_read();
+                
+                printf("%d: asid=%d, vpn2=%d\tg[0]=%d, v[0]=%d, d[0]=%d, c[0]=%B, pfn[0]=%d\n"
+                       "\t\t\tg[1]=%d, v[1]=%d, d[1]=%d, c[1]=%B, pfn[1]=%d\n",
+                       i, hi.asid, hi.vpn2, lo0.g, lo0.v, lo0.d, lo0.c, lo0.pfn,
+                       lo1.g, lo1.v, lo1.d, lo1.c, lo1.pfn);
+        }
+}

generic/src/console/kconsole.c

@@ -40 +40 @@
 #include <debug.h>
 #include <symtab.h>
+
+#include <mm/tlb_cmd.h>
 
 #define MAX_CMDLINE     256
@@ -270 +272 @@
         if (!cmd_register(&halt_info))
                 panic("could not register command %s\n", halt_info.name);
+
+        spinlock_initialize(&desc_ptlb.lock, "kconsole_ptlb");
+        link_initialize(&desc_ptlb.link);
+        if (!cmd_register(&desc_ptlb))
+                panic("could not register command %s\n", desc_ptlb.name);
 }
 

generic/src/mm/tlb.c

@@ -36 +36 @@
 #include <config.h>
 #include <arch.h>
+#include <panic.h>
 
 #ifdef CONFIG_SMP