[Qemu-devel] [PATCH] SH4: Added monitoring of TLBs

[Qemu-devel] [PATCH] SH4: Added monitoring of TLBs

[Lionel Landwerlin]

This patch might interest some people trying (as I try to do) to fix
some tlbs for kernel/user space data sharing.


Signed-off-by: Lionel Landwerlin <lionel.landwerlin@openwide.fr>
---
 monitor.c |   35 +++++++++++++++++++++++++++++++++--
 1 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/monitor.c b/monitor.c
index 745c335..a9d378c 100644
--- a/monitor.c
+++ b/monitor.c
@@ -1245,6 +1245,35 @@ static void mem_info(void)
 }
 #endif
 
+#if defined(TARGET_SH4)
+
+static void print_tlb(int idx, tlb_t *tlb)
+{
+    term_printf(" tlb%i:\t"
+                "asid=%hhu vpn=%x\tppn=%x\tsz=%hhu size=%u\t"
+                "v=%hhu shared=%hhu cached=%hhu prot=%hhu "
+                "dirty=%hhu writethrough=%hhu\n",
+                idx,
+                tlb->asid, tlb->vpn, tlb->ppn, tlb->sz, tlb->size,
+                tlb->v, tlb->sh, tlb->c, tlb->pr,
+                tlb->d, tlb->wt);
+}
+
+static void tlb_info(void)
+{
+    CPUState *env = mon_get_cpu();
+    int i;
+
+    term_printf ("ITLB:\n");
+    for (i = 0 ; i < ITLB_SIZE ; i++)
+        print_tlb (i, &env->itlb[i]);
+    term_printf ("UTLB:\n");
+    for (i = 0 ; i < UTLB_SIZE ; i++)
+        print_tlb (i, &env->utlb[i]);
+}
+
+#endif
+
 static void do_info_kqemu(void)
 {
 #ifdef USE_KQEMU
@@ -1542,9 +1571,11 @@ static const term_cmd_t info_cmds[] = {
       "", "show i8259 (PIC) state", },
     { "pci", "", pci_info,
       "", "show PCI info", },
-#if defined(TARGET_I386)
+#if defined(TARGET_I386) || defined(TARGET_SH4)
     { "tlb", "", tlb_info,
       "", "show virtual to physical memory mappings", },
+#endif
+#if defined(TARGET_I386)
     { "mem", "", mem_info,
       "", "show the active virtual memory mappings", },
     { "hpet", "", do_info_hpet,
-- 
1.5.6.5

Re: [Qemu-devel] [PATCH] SH4: Added monitoring of TLBs

[Aurelien Jarno]

On Mon, Feb 16, 2009 at 11:39:14PM +0100, Lionel Landwerlin wrote:
> This patch might interest some people trying (as I try to do) to fix
> some tlbs for kernel/user space data sharing.
> 
> 
> Signed-off-by: Lionel Landwerlin <lionel.landwerlin@openwide.fr>

Thanks applied.

> ---
>  monitor.c |   35 +++++++++++++++++++++++++++++++++--
>  1 files changed, 33 insertions(+), 2 deletions(-)
> 
> diff --git a/monitor.c b/monitor.c
> index 745c335..a9d378c 100644
> --- a/monitor.c
> +++ b/monitor.c
> @@ -1245,6 +1245,35 @@ static void mem_info(void)
>  }
>  #endif
>  
> +#if defined(TARGET_SH4)
> +
> +static void print_tlb(int idx, tlb_t *tlb)
> +{
> +    term_printf(" tlb%i:\t"
> +                "asid=%hhu vpn=%x\tppn=%x\tsz=%hhu size=%u\t"
> +                "v=%hhu shared=%hhu cached=%hhu prot=%hhu "
> +                "dirty=%hhu writethrough=%hhu\n",
> +                idx,
> +                tlb->asid, tlb->vpn, tlb->ppn, tlb->sz, tlb->size,
> +                tlb->v, tlb->sh, tlb->c, tlb->pr,
> +                tlb->d, tlb->wt);
> +}
> +
> +static void tlb_info(void)
> +{
> +    CPUState *env = mon_get_cpu();
> +    int i;
> +
> +    term_printf ("ITLB:\n");
> +    for (i = 0 ; i < ITLB_SIZE ; i++)
> +        print_tlb (i, &env->itlb[i]);
> +    term_printf ("UTLB:\n");
> +    for (i = 0 ; i < UTLB_SIZE ; i++)
> +        print_tlb (i, &env->utlb[i]);
> +}
> +
> +#endif
> +
>  static void do_info_kqemu(void)
>  {
>  #ifdef USE_KQEMU
> @@ -1542,9 +1571,11 @@ static const term_cmd_t info_cmds[] = {
>        "", "show i8259 (PIC) state", },
>      { "pci", "", pci_info,
>        "", "show PCI info", },
> -#if defined(TARGET_I386)
> +#if defined(TARGET_I386) || defined(TARGET_SH4)
>      { "tlb", "", tlb_info,
>        "", "show virtual to physical memory mappings", },
> +#endif
> +#if defined(TARGET_I386)
>      { "mem", "", mem_info,
>        "", "show the active virtual memory mappings", },
>      { "hpet", "", do_info_hpet,
> -- 
> 1.5.6.5
> 
> 
> 
> 
> 
> 

-- 
Aurelien Jarno	                        GPG: 1024D/F1BCDB73
aurelien@aurel32.net                 http://www.aurel32.net