From: "Daniel P. Berrangé" <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: "Peter Maydell" <peter.maydell@linaro.org>, "Chris Wulff" <crwulff@gmail.com>, "David Hildenbrand" <david@redhat.com>, "Bin Meng" <bin.meng@windriver.com>, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Yuval Shaia" <yuval.shaia.ml@gmail.com>, "Laurent Vivier" <laurent@vivier.eu>, "Max Filippov" <jcmvbkbc@gmail.com>, "Taylor Simpson" <tsimpson@quicinc.com>, "Alistair Francis" <alistair.francis@wdc.com>, "Gerd Hoffmann" <kraxel@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Eric Blake" <eblake@redhat.com>, "Marek Vasut" <marex@denx.de>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Markus Armbruster" <armbru@redhat.com>, "Halil Pasic" <pasic@linux.ibm.com>, "Christian Borntraeger" <borntraeger@de.ibm.com>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Laurent Vivier" <lvivier@redhat.com>, "Thomas Huth" <thuth@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Greg Kurz" <groug@kaod.org>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, qemu-s390x@nongnu.org, qemu-arm@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>, "Peter Xu" <peterx@redhat.com>, "Daniel P. Berrangé" <berrange@redhat.com>, "Stafford Horne" <shorne@gmail.com>, "David Gibson" <david@gibson.dropbear.id.au>, qemu-riscv@nongnu.org, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Cornelia Huck" <cohuck@redhat.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, qemu-ppc@nongnu.org, "Paolo Bonzini" <pbonzini@redhat.com>, "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>, "Aurelien Jarno" <aurelien@aurel32.net> Subject: [PATCH v2 49/53] target/xtensa: convert to use format_tlb callback Date: Tue, 14 Sep 2021 15:20:38 +0100 [thread overview] Message-ID: <20210914142042.1655100-50-berrange@redhat.com> (raw) In-Reply-To: <20210914142042.1655100-1-berrange@redhat.com> Change the "info tlb" implementation to use the format_tlb callback. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- target/xtensa/cpu.h | 2 +- target/xtensa/mmu_helper.c | 126 +++++++++++++++++++++---------------- target/xtensa/monitor.c | 10 ++- 3 files changed, 79 insertions(+), 59 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 97cd6892df..8c82994826 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -573,6 +573,7 @@ void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr); void xtensa_cpu_format_state(CPUState *cpu, GString *buf, int flags); +void xtensa_cpu_format_tlb(CPUState *cpu, GString *buf); hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); void xtensa_count_regs(const XtensaConfig *config, unsigned *n_regs, unsigned *n_core_regs); @@ -678,7 +679,6 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool update_tlb, uint32_t vaddr, int is_write, int mmu_idx, uint32_t *paddr, uint32_t *page_size, unsigned *access); void reset_mmu(CPUXtensaState *env); -void dump_mmu(CPUXtensaState *env); static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index b01ff9399a..d499255984 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1055,7 +1055,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool update_tlb, } } -static void dump_tlb(CPUXtensaState *env, bool dtlb) +static void dump_tlb(CPUXtensaState *env, bool dtlb, GString *buf) { unsigned wi, ei; const xtensa_tlb *conf = @@ -1094,34 +1094,40 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb) if (print_header) { print_header = false; - qemu_printf("Way %u (%d %s)\n", wi, sz, sz_text); - qemu_printf("\tVaddr Paddr ASID Attr RWX Cache\n" - "\t---------- ---------- ---- ---- --- -------\n"); + g_string_append_printf(buf, "Way %u (%d %s)\n", + wi, sz, sz_text); + g_string_append_printf(buf, "\tVaddr Paddr " + "ASID Attr RWX Cache\n" + "\t---------- ---------- ---- " + "---- --- -------\n"); } - qemu_printf("\t0x%08x 0x%08x 0x%02x 0x%02x %c%c%c %-7s\n", - entry->vaddr, - entry->paddr, - entry->asid, - entry->attr, - (access & PAGE_READ) ? 'R' : '-', - (access & PAGE_WRITE) ? 'W' : '-', - (access & PAGE_EXEC) ? 'X' : '-', - cache_text[cache_idx] ? - cache_text[cache_idx] : "Invalid"); + g_string_append_printf(buf, "\t0x%08x 0x%08x 0x%02x " + "0x%02x %c%c%c %-7s\n", + entry->vaddr, + entry->paddr, + entry->asid, + entry->attr, + (access & PAGE_READ) ? 'R' : '-', + (access & PAGE_WRITE) ? 'W' : '-', + (access & PAGE_EXEC) ? 'X' : '-', + cache_text[cache_idx] ? + cache_text[cache_idx] : "Invalid"); } } } } static void dump_mpu(CPUXtensaState *env, - const xtensa_mpu_entry *entry, unsigned n) + const xtensa_mpu_entry *entry, unsigned n, GString *buf) { unsigned i; - qemu_printf("\t%s Vaddr Attr Ring0 Ring1 System Type CPU cache\n" - "\t%s ---------- ---------- ----- ----- ------------- ---------\n", - env ? "En" : " ", - env ? "--" : " "); + g_string_append_printf(buf, "\t%s Vaddr Attr " + "Ring0 Ring1 System Type CPU cache\n" + "\t%s ---------- ---------- ----- ----- " + "------------- ---------\n", + env ? "En" : " ", + env ? "--" : " "); for (i = 0; i < n; ++i) { uint32_t attr = entry[i].attr; @@ -1130,63 +1136,73 @@ static void dump_mpu(CPUXtensaState *env, unsigned type = mpu_attr_to_type(attr); char cpu_cache = (type & XTENSA_MPU_TYPE_CPU_CACHE) ? '-' : ' '; - qemu_printf("\t %c 0x%08x 0x%08x %c%c%c %c%c%c ", - env ? - ((env->sregs[MPUENB] & (1u << i)) ? '+' : '-') : ' ', - entry[i].vaddr, attr, - (access0 & PAGE_READ) ? 'R' : '-', - (access0 & PAGE_WRITE) ? 'W' : '-', - (access0 & PAGE_EXEC) ? 'X' : '-', - (access1 & PAGE_READ) ? 'R' : '-', - (access1 & PAGE_WRITE) ? 'W' : '-', - (access1 & PAGE_EXEC) ? 'X' : '-'); + g_string_append_printf(buf, "\t %c 0x%08x 0x%08x " + "%c%c%c %c%c%c ", + env ? ((env->sregs[MPUENB] & (1u << i)) ? + '+' : '-') : ' ', + entry[i].vaddr, attr, + (access0 & PAGE_READ) ? 'R' : '-', + (access0 & PAGE_WRITE) ? 'W' : '-', + (access0 & PAGE_EXEC) ? 'X' : '-', + (access1 & PAGE_READ) ? 'R' : '-', + (access1 & PAGE_WRITE) ? 'W' : '-', + (access1 & PAGE_EXEC) ? 'X' : '-'); switch (type & XTENSA_MPU_SYSTEM_TYPE_MASK) { case XTENSA_MPU_SYSTEM_TYPE_DEVICE: - qemu_printf("Device %cB %3s\n", - (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', - (type & XTENSA_MPU_TYPE_INT) ? "int" : ""); + g_string_append_printf(buf, "Device %cB %3s\n", + (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', + (type & XTENSA_MPU_TYPE_INT) ? "int" : ""); break; case XTENSA_MPU_SYSTEM_TYPE_NC: - qemu_printf("Sys NC %cB %c%c%c\n", - (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', - (type & XTENSA_MPU_TYPE_CPU_R) ? 'r' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_W) ? 'w' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); + g_string_append_printf(buf, "Sys NC %cB %c%c%c\n", + (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', + (type & XTENSA_MPU_TYPE_CPU_R) ? + 'r' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_W) ? + 'w' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_C) ? + 'c' : cpu_cache); break; case XTENSA_MPU_SYSTEM_TYPE_C: - qemu_printf("Sys C %c%c%c %c%c%c\n", - (type & XTENSA_MPU_TYPE_SYS_R) ? 'R' : '-', - (type & XTENSA_MPU_TYPE_SYS_W) ? 'W' : '-', - (type & XTENSA_MPU_TYPE_SYS_C) ? 'C' : '-', - (type & XTENSA_MPU_TYPE_CPU_R) ? 'r' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_W) ? 'w' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); + g_string_append_printf(buf, "Sys C %c%c%c %c%c%c\n", + (type & XTENSA_MPU_TYPE_SYS_R) ? 'R' : '-', + (type & XTENSA_MPU_TYPE_SYS_W) ? 'W' : '-', + (type & XTENSA_MPU_TYPE_SYS_C) ? 'C' : '-', + (type & XTENSA_MPU_TYPE_CPU_R) ? + 'r' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_W) ? + 'w' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_C) ? + 'c' : cpu_cache); break; default: - qemu_printf("Unknown\n"); + g_string_append_printf(buf, "Unknown\n"); break; } } } -void dump_mmu(CPUXtensaState *env) +void xtensa_cpu_format_tlb(CPUState *cpu, GString *buf) { + CPUXtensaState *env = cpu->env_ptr; + if (xtensa_option_bits_enabled(env->config, XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_TRANSLATION) | XTENSA_OPTION_BIT(XTENSA_OPTION_MMU))) { - qemu_printf("ITLB:\n"); - dump_tlb(env, false); - qemu_printf("\nDTLB:\n"); - dump_tlb(env, true); + g_string_append_printf(buf, "ITLB:\n"); + dump_tlb(env, false, buf); + g_string_append_printf(buf, "\nDTLB:\n"); + dump_tlb(env, true, buf); } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_MPU)) { - qemu_printf("Foreground map:\n"); - dump_mpu(env, env->mpu_fg, env->config->n_mpu_fg_segments); - qemu_printf("\nBackground map:\n"); - dump_mpu(NULL, env->config->mpu_bg, env->config->n_mpu_bg_segments); + g_string_append_printf(buf, "Foreground map:\n"); + dump_mpu(env, env->mpu_fg, env->config->n_mpu_fg_segments, buf); + g_string_append_printf(buf, "\nBackground map:\n"); + dump_mpu(NULL, env->config->mpu_bg, + env->config->n_mpu_bg_segments, buf); } else { - qemu_printf("No TLB for this CPU core\n"); + g_string_append_printf(buf, "No TLB for this CPU core\n"); } } diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index fbf60d5553..99d35e8ef1 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -29,11 +29,15 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) { - CPUArchState *env1 = mon_get_cpu_env(mon); + g_autoptr(GString) buf = g_string_new(""); + CPUState *cpu = mon_get_cpu(mon); - if (!env1) { + if (!cpu) { monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(env1); + + cpu_format_tlb(cpu, buf); + + monitor_printf(mon, "%s", buf->str); } -- 2.31.1
WARNING: multiple messages have this Message-ID (diff)
From: "Daniel P. Berrangé" <berrange@redhat.com> To: qemu-devel@nongnu.org Cc: "Greg Kurz" <groug@kaod.org>, "Bin Meng" <bin.meng@windriver.com>, "Yoshinori Sato" <ysato@users.sourceforge.jp>, "Stafford Horne" <shorne@gmail.com>, "Cornelia Huck" <cohuck@redhat.com>, "David Hildenbrand" <david@redhat.com>, "Edgar E. Iglesias" <edgar.iglesias@gmail.com>, "Jiaxun Yang" <jiaxun.yang@flygoat.com>, "Peter Xu" <peterx@redhat.com>, "Christian Borntraeger" <borntraeger@de.ibm.com>, qemu-ppc@nongnu.org, "Mark Cave-Ayland" <mark.cave-ayland@ilande.co.uk>, "Paolo Bonzini" <pbonzini@redhat.com>, qemu-arm@nongnu.org, "Michael Rolnik" <mrolnik@gmail.com>, "Peter Maydell" <peter.maydell@linaro.org>, "Palmer Dabbelt" <palmer@dabbelt.com>, "Alistair Francis" <alistair.francis@wdc.com>, "Halil Pasic" <pasic@linux.ibm.com>, "Taylor Simpson" <tsimpson@quicinc.com>, "Gerd Hoffmann" <kraxel@redhat.com>, qemu-riscv@nongnu.org, "Max Filippov" <jcmvbkbc@gmail.com>, "Yuval Shaia" <yuval.shaia.ml@gmail.com>, "Bastian Koppelmann" <kbastian@mail.uni-paderborn.de>, "Artyom Tarasenko" <atar4qemu@gmail.com>, "Philippe Mathieu-Daudé" <f4bug@amsat.org>, "Thomas Huth" <thuth@redhat.com>, "Aleksandar Rikalo" <aleksandar.rikalo@syrmia.com>, "David Gibson" <david@gibson.dropbear.id.au>, "Marcel Apfelbaum" <marcel.apfelbaum@gmail.com>, "Laurent Vivier" <laurent@vivier.eu>, "Dr. David Alan Gilbert" <dgilbert@redhat.com>, "Eduardo Habkost" <ehabkost@redhat.com>, "Marek Vasut" <marex@denx.de>, "Markus Armbruster" <armbru@redhat.com>, "Aurelien Jarno" <aurelien@aurel32.net>, qemu-s390x@nongnu.org, "Laurent Vivier" <lvivier@redhat.com>, "Eric Blake" <eblake@redhat.com>, "Richard Henderson" <richard.henderson@linaro.org>, "Chris Wulff" <crwulff@gmail.com>, "Daniel P. Berrangé" <berrange@redhat.com> Subject: [PATCH v2 49/53] target/xtensa: convert to use format_tlb callback Date: Tue, 14 Sep 2021 15:20:38 +0100 [thread overview] Message-ID: <20210914142042.1655100-50-berrange@redhat.com> (raw) In-Reply-To: <20210914142042.1655100-1-berrange@redhat.com> Change the "info tlb" implementation to use the format_tlb callback. Signed-off-by: Daniel P. Berrangé <berrange@redhat.com> --- target/xtensa/cpu.h | 2 +- target/xtensa/mmu_helper.c | 126 +++++++++++++++++++++---------------- target/xtensa/monitor.c | 10 ++- 3 files changed, 79 insertions(+), 59 deletions(-) diff --git a/target/xtensa/cpu.h b/target/xtensa/cpu.h index 97cd6892df..8c82994826 100644 --- a/target/xtensa/cpu.h +++ b/target/xtensa/cpu.h @@ -573,6 +573,7 @@ void xtensa_cpu_do_transaction_failed(CPUState *cs, hwaddr physaddr, vaddr addr, int mmu_idx, MemTxAttrs attrs, MemTxResult response, uintptr_t retaddr); void xtensa_cpu_format_state(CPUState *cpu, GString *buf, int flags); +void xtensa_cpu_format_tlb(CPUState *cpu, GString *buf); hwaddr xtensa_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); void xtensa_count_regs(const XtensaConfig *config, unsigned *n_regs, unsigned *n_core_regs); @@ -678,7 +679,6 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool update_tlb, uint32_t vaddr, int is_write, int mmu_idx, uint32_t *paddr, uint32_t *page_size, unsigned *access); void reset_mmu(CPUXtensaState *env); -void dump_mmu(CPUXtensaState *env); static inline MemoryRegion *xtensa_get_er_region(CPUXtensaState *env) { diff --git a/target/xtensa/mmu_helper.c b/target/xtensa/mmu_helper.c index b01ff9399a..d499255984 100644 --- a/target/xtensa/mmu_helper.c +++ b/target/xtensa/mmu_helper.c @@ -1055,7 +1055,7 @@ int xtensa_get_physical_addr(CPUXtensaState *env, bool update_tlb, } } -static void dump_tlb(CPUXtensaState *env, bool dtlb) +static void dump_tlb(CPUXtensaState *env, bool dtlb, GString *buf) { unsigned wi, ei; const xtensa_tlb *conf = @@ -1094,34 +1094,40 @@ static void dump_tlb(CPUXtensaState *env, bool dtlb) if (print_header) { print_header = false; - qemu_printf("Way %u (%d %s)\n", wi, sz, sz_text); - qemu_printf("\tVaddr Paddr ASID Attr RWX Cache\n" - "\t---------- ---------- ---- ---- --- -------\n"); + g_string_append_printf(buf, "Way %u (%d %s)\n", + wi, sz, sz_text); + g_string_append_printf(buf, "\tVaddr Paddr " + "ASID Attr RWX Cache\n" + "\t---------- ---------- ---- " + "---- --- -------\n"); } - qemu_printf("\t0x%08x 0x%08x 0x%02x 0x%02x %c%c%c %-7s\n", - entry->vaddr, - entry->paddr, - entry->asid, - entry->attr, - (access & PAGE_READ) ? 'R' : '-', - (access & PAGE_WRITE) ? 'W' : '-', - (access & PAGE_EXEC) ? 'X' : '-', - cache_text[cache_idx] ? - cache_text[cache_idx] : "Invalid"); + g_string_append_printf(buf, "\t0x%08x 0x%08x 0x%02x " + "0x%02x %c%c%c %-7s\n", + entry->vaddr, + entry->paddr, + entry->asid, + entry->attr, + (access & PAGE_READ) ? 'R' : '-', + (access & PAGE_WRITE) ? 'W' : '-', + (access & PAGE_EXEC) ? 'X' : '-', + cache_text[cache_idx] ? + cache_text[cache_idx] : "Invalid"); } } } } static void dump_mpu(CPUXtensaState *env, - const xtensa_mpu_entry *entry, unsigned n) + const xtensa_mpu_entry *entry, unsigned n, GString *buf) { unsigned i; - qemu_printf("\t%s Vaddr Attr Ring0 Ring1 System Type CPU cache\n" - "\t%s ---------- ---------- ----- ----- ------------- ---------\n", - env ? "En" : " ", - env ? "--" : " "); + g_string_append_printf(buf, "\t%s Vaddr Attr " + "Ring0 Ring1 System Type CPU cache\n" + "\t%s ---------- ---------- ----- ----- " + "------------- ---------\n", + env ? "En" : " ", + env ? "--" : " "); for (i = 0; i < n; ++i) { uint32_t attr = entry[i].attr; @@ -1130,63 +1136,73 @@ static void dump_mpu(CPUXtensaState *env, unsigned type = mpu_attr_to_type(attr); char cpu_cache = (type & XTENSA_MPU_TYPE_CPU_CACHE) ? '-' : ' '; - qemu_printf("\t %c 0x%08x 0x%08x %c%c%c %c%c%c ", - env ? - ((env->sregs[MPUENB] & (1u << i)) ? '+' : '-') : ' ', - entry[i].vaddr, attr, - (access0 & PAGE_READ) ? 'R' : '-', - (access0 & PAGE_WRITE) ? 'W' : '-', - (access0 & PAGE_EXEC) ? 'X' : '-', - (access1 & PAGE_READ) ? 'R' : '-', - (access1 & PAGE_WRITE) ? 'W' : '-', - (access1 & PAGE_EXEC) ? 'X' : '-'); + g_string_append_printf(buf, "\t %c 0x%08x 0x%08x " + "%c%c%c %c%c%c ", + env ? ((env->sregs[MPUENB] & (1u << i)) ? + '+' : '-') : ' ', + entry[i].vaddr, attr, + (access0 & PAGE_READ) ? 'R' : '-', + (access0 & PAGE_WRITE) ? 'W' : '-', + (access0 & PAGE_EXEC) ? 'X' : '-', + (access1 & PAGE_READ) ? 'R' : '-', + (access1 & PAGE_WRITE) ? 'W' : '-', + (access1 & PAGE_EXEC) ? 'X' : '-'); switch (type & XTENSA_MPU_SYSTEM_TYPE_MASK) { case XTENSA_MPU_SYSTEM_TYPE_DEVICE: - qemu_printf("Device %cB %3s\n", - (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', - (type & XTENSA_MPU_TYPE_INT) ? "int" : ""); + g_string_append_printf(buf, "Device %cB %3s\n", + (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', + (type & XTENSA_MPU_TYPE_INT) ? "int" : ""); break; case XTENSA_MPU_SYSTEM_TYPE_NC: - qemu_printf("Sys NC %cB %c%c%c\n", - (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', - (type & XTENSA_MPU_TYPE_CPU_R) ? 'r' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_W) ? 'w' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); + g_string_append_printf(buf, "Sys NC %cB %c%c%c\n", + (type & XTENSA_MPU_TYPE_B) ? ' ' : 'n', + (type & XTENSA_MPU_TYPE_CPU_R) ? + 'r' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_W) ? + 'w' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_C) ? + 'c' : cpu_cache); break; case XTENSA_MPU_SYSTEM_TYPE_C: - qemu_printf("Sys C %c%c%c %c%c%c\n", - (type & XTENSA_MPU_TYPE_SYS_R) ? 'R' : '-', - (type & XTENSA_MPU_TYPE_SYS_W) ? 'W' : '-', - (type & XTENSA_MPU_TYPE_SYS_C) ? 'C' : '-', - (type & XTENSA_MPU_TYPE_CPU_R) ? 'r' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_W) ? 'w' : cpu_cache, - (type & XTENSA_MPU_TYPE_CPU_C) ? 'c' : cpu_cache); + g_string_append_printf(buf, "Sys C %c%c%c %c%c%c\n", + (type & XTENSA_MPU_TYPE_SYS_R) ? 'R' : '-', + (type & XTENSA_MPU_TYPE_SYS_W) ? 'W' : '-', + (type & XTENSA_MPU_TYPE_SYS_C) ? 'C' : '-', + (type & XTENSA_MPU_TYPE_CPU_R) ? + 'r' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_W) ? + 'w' : cpu_cache, + (type & XTENSA_MPU_TYPE_CPU_C) ? + 'c' : cpu_cache); break; default: - qemu_printf("Unknown\n"); + g_string_append_printf(buf, "Unknown\n"); break; } } } -void dump_mmu(CPUXtensaState *env) +void xtensa_cpu_format_tlb(CPUState *cpu, GString *buf) { + CPUXtensaState *env = cpu->env_ptr; + if (xtensa_option_bits_enabled(env->config, XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_PROTECTION) | XTENSA_OPTION_BIT(XTENSA_OPTION_REGION_TRANSLATION) | XTENSA_OPTION_BIT(XTENSA_OPTION_MMU))) { - qemu_printf("ITLB:\n"); - dump_tlb(env, false); - qemu_printf("\nDTLB:\n"); - dump_tlb(env, true); + g_string_append_printf(buf, "ITLB:\n"); + dump_tlb(env, false, buf); + g_string_append_printf(buf, "\nDTLB:\n"); + dump_tlb(env, true, buf); } else if (xtensa_option_enabled(env->config, XTENSA_OPTION_MPU)) { - qemu_printf("Foreground map:\n"); - dump_mpu(env, env->mpu_fg, env->config->n_mpu_fg_segments); - qemu_printf("\nBackground map:\n"); - dump_mpu(NULL, env->config->mpu_bg, env->config->n_mpu_bg_segments); + g_string_append_printf(buf, "Foreground map:\n"); + dump_mpu(env, env->mpu_fg, env->config->n_mpu_fg_segments, buf); + g_string_append_printf(buf, "\nBackground map:\n"); + dump_mpu(NULL, env->config->mpu_bg, + env->config->n_mpu_bg_segments, buf); } else { - qemu_printf("No TLB for this CPU core\n"); + g_string_append_printf(buf, "No TLB for this CPU core\n"); } } diff --git a/target/xtensa/monitor.c b/target/xtensa/monitor.c index fbf60d5553..99d35e8ef1 100644 --- a/target/xtensa/monitor.c +++ b/target/xtensa/monitor.c @@ -29,11 +29,15 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) { - CPUArchState *env1 = mon_get_cpu_env(mon); + g_autoptr(GString) buf = g_string_new(""); + CPUState *cpu = mon_get_cpu(mon); - if (!env1) { + if (!cpu) { monitor_printf(mon, "No CPU available\n"); return; } - dump_mmu(env1); + + cpu_format_tlb(cpu, buf); + + monitor_printf(mon, "%s", buf->str); } -- 2.31.1
next prev parent reply other threads:[~2021-09-14 15:39 UTC|newest] Thread overview: 216+ messages / expand[flat|nested] mbox.gz Atom feed top 2021-09-14 14:19 [PATCH v2 00/53] monitor: explicitly permit QMP commands to be added for all use cases Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-14 14:19 ` [PATCH v2 01/53] docs/devel: rename file for writing monitor commands Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-20 7:42 ` Markus Armbruster 2021-09-20 7:42 ` Markus Armbruster 2021-09-22 16:02 ` Daniel P. Berrangé 2021-09-22 16:02 ` Daniel P. Berrangé 2021-09-14 14:19 ` [PATCH v2 02/53] docs/devel: tweak headings in monitor command docs Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-20 7:42 ` Markus Armbruster 2021-09-20 7:42 ` Markus Armbruster 2021-09-14 14:19 ` [PATCH v2 03/53] docs/devel: document expectations for QAPI data modelling for QMP Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-20 7:44 ` Markus Armbruster 2021-09-20 7:44 ` Markus Armbruster 2021-09-14 14:19 ` [PATCH v2 04/53] docs/devel: add example of command returning unstructured text Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-20 7:51 ` Markus Armbruster 2021-09-20 7:51 ` Markus Armbruster 2021-09-14 14:19 ` [PATCH v2 05/53] docs/devel: document expectations for HMP commands in the future Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-20 8:06 ` Markus Armbruster 2021-09-20 8:06 ` Markus Armbruster 2021-09-22 16:14 ` Daniel P. Berrangé 2021-09-22 16:14 ` Daniel P. Berrangé 2021-09-14 14:19 ` [PATCH v2 06/53] hw/core: introduce 'format_state' callback to replace 'dump_state' Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-14 15:53 ` Philippe Mathieu-Daudé 2021-09-14 15:53 ` Philippe Mathieu-Daudé 2021-09-14 19:28 ` Greg Kurz 2021-09-14 19:28 ` Greg Kurz 2021-09-14 14:19 ` [PATCH v2 07/53] target/alpha: convert to use format_state instead of dump_state Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-15 7:10 ` Philippe Mathieu-Daudé 2021-09-15 7:10 ` Philippe Mathieu-Daudé 2021-09-14 14:19 ` [PATCH v2 08/53] target/arm: " Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-14 14:19 ` [PATCH v2 09/53] target/avr: " Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-15 7:13 ` Philippe Mathieu-Daudé 2021-09-15 7:13 ` Philippe Mathieu-Daudé 2021-09-15 8:49 ` Daniel P. Berrangé 2021-09-15 8:49 ` Daniel P. Berrangé 2021-09-15 8:58 ` Philippe Mathieu-Daudé 2021-09-15 8:58 ` Philippe Mathieu-Daudé 2021-09-14 14:19 ` [PATCH v2 10/53] target/cris: " Daniel P. Berrangé 2021-09-14 14:19 ` Daniel P. Berrangé 2021-09-15 7:33 ` Philippe Mathieu-Daudé 2021-09-15 7:33 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 11/53] target/hexagon: delete unused hexagon_debug() method Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:50 ` Taylor Simpson 2021-09-14 14:50 ` Taylor Simpson 2021-09-15 7:00 ` Philippe Mathieu-Daudé 2021-09-15 7:00 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 12/53] target/hexagon: convert to use format_state instead of dump_state Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:14 ` Philippe Mathieu-Daudé 2021-09-15 7:14 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 13/53] target/hppa: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:15 ` Philippe Mathieu-Daudé 2021-09-15 7:15 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 14/53] target/i386: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 15/53] target/m68k: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 19:58 ` Laurent Vivier 2021-09-14 19:58 ` Laurent Vivier 2021-09-15 7:17 ` Philippe Mathieu-Daudé 2021-09-15 7:17 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 16/53] target/microblaze: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:18 ` Philippe Mathieu-Daudé 2021-09-15 7:18 ` Philippe Mathieu-Daudé 2021-09-15 7:21 ` Philippe Mathieu-Daudé 2021-09-15 7:21 ` Philippe Mathieu-Daudé 2021-09-15 7:23 ` Philippe Mathieu-Daudé 2021-09-15 7:23 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 17/53] target/mips: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:04 ` Philippe Mathieu-Daudé 2021-09-15 7:04 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 18/53] target/nios2: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:08 ` Philippe Mathieu-Daudé 2021-09-15 7:08 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 19/53] target/openrisc: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:19 ` Philippe Mathieu-Daudé 2021-09-15 7:19 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 20/53] target/ppc: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 19:30 ` Greg Kurz 2021-09-14 19:30 ` Greg Kurz 2021-09-15 1:37 ` David Gibson 2021-09-15 1:37 ` David Gibson 2021-09-14 14:20 ` [PATCH v2 21/53] target/riscv: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 22/53] target/rx: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:20 ` Philippe Mathieu-Daudé 2021-09-15 7:20 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 23/53] target/s390x: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 24/53] target/sh: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:24 ` Philippe Mathieu-Daudé 2021-09-15 7:24 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 25/53] target/sparc: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:27 ` Philippe Mathieu-Daudé 2021-09-15 7:27 ` Philippe Mathieu-Daudé 2021-09-16 10:53 ` Mark Cave-Ayland 2021-09-16 10:53 ` Mark Cave-Ayland 2021-09-14 14:20 ` [PATCH v2 26/53] target/tricore: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:29 ` Philippe Mathieu-Daudé 2021-09-15 7:29 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 27/53] target/xtensa: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 7:32 ` Philippe Mathieu-Daudé 2021-09-15 7:32 ` Philippe Mathieu-Daudé 2021-09-15 7:54 ` Max Filippov 2021-09-15 7:54 ` Max Filippov 2021-09-15 8:52 ` Daniel P. Berrangé 2021-09-15 8:52 ` Daniel P. Berrangé 2021-09-15 9:01 ` Philippe Mathieu-Daudé 2021-09-15 9:01 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 28/53] monitor: remove 'info ioapic' HMP command Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 15:50 ` Philippe Mathieu-Daudé 2021-09-14 15:50 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 29/53] qapi: introduce x-query-registers QMP command Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 16:04 ` Eric Blake 2021-09-14 16:04 ` Eric Blake 2021-09-14 17:15 ` Philippe Mathieu-Daudé 2021-09-14 17:15 ` Philippe Mathieu-Daudé 2021-09-14 17:18 ` Philippe Mathieu-Daudé 2021-09-14 17:18 ` Philippe Mathieu-Daudé 2021-09-14 14:20 ` [PATCH v2 30/53] qapi: introduce x-query-roms " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 16:04 ` Philippe Mathieu-Daudé 2021-09-14 16:04 ` Philippe Mathieu-Daudé 2021-09-14 16:42 ` Daniel P. Berrangé 2021-09-14 16:42 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 31/53] qapi: introduce x-query-profile " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 32/53] qapi: introduce x-query-numa " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 33/53] qapi: introduce x-query-usb " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 34/53] qapi: introduce x-query-rdma " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 35/53] qapi: introduce x-query-ramblock " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 36/53] qapi: introduce x-query-skeys " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 37/53] qapi: introduce x-query-cmma " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 38/53] qapi: introduce x-query-lapic " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-21 5:27 ` Dongli Zhang 2021-09-21 5:27 ` Dongli Zhang 2021-09-22 16:30 ` Daniel P. Berrangé 2021-09-22 16:30 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 39/53] qapi: introduce x-query-irq " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 40/53] hw/core: drop "dump_state" callback from CPU targets Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 41/53] hw/core: drop support for NULL pointer for FILE * in cpu_dump_state Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 42/53] hw/core: introduce a 'format_tlb' callback Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 15:56 ` Philippe Mathieu-Daudé 2021-09-14 15:56 ` Philippe Mathieu-Daudé 2021-09-14 16:34 ` Daniel P. Berrangé 2021-09-14 16:34 ` Daniel P. Berrangé 2021-09-14 17:02 ` Philippe Mathieu-Daudé 2021-09-14 17:02 ` Philippe Mathieu-Daudé 2021-09-14 17:12 ` Daniel P. Berrangé 2021-09-14 17:12 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 43/53] target/i386: convert to use format_tlb callback Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 44/53] target/m68k: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 19:59 ` Laurent Vivier 2021-09-14 19:59 ` Laurent Vivier 2021-09-14 14:20 ` [PATCH v2 45/53] target/nios2: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 46/53] target/ppc: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 1:40 ` David Gibson 2021-09-15 1:40 ` David Gibson 2021-09-14 14:20 ` [PATCH v2 47/53] target/sh4: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 48/53] target/sparc: " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-16 10:54 ` Mark Cave-Ayland 2021-09-16 10:54 ` Mark Cave-Ayland 2021-09-14 14:20 ` Daniel P. Berrangé [this message] 2021-09-14 14:20 ` [PATCH v2 49/53] target/xtensa: " Daniel P. Berrangé 2021-09-15 8:01 ` Max Filippov 2021-09-15 8:01 ` Max Filippov 2021-09-14 14:20 ` [PATCH v2 50/53] monitor: merge duplicate "info tlb" handlers Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-15 1:41 ` David Gibson 2021-09-15 1:41 ` David Gibson 2021-09-14 14:20 ` [PATCH v2 51/53] qapi: introduce x-query-tlb QMP command Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 52/53] qapi: introduce x-query-jit " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé 2021-09-14 14:20 ` [PATCH v2 53/53] qapi: introduce x-query-opcount " Daniel P. Berrangé 2021-09-14 14:20 ` Daniel P. Berrangé
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20210914142042.1655100-50-berrange@redhat.com \ --to=berrange@redhat.com \ --cc=aleksandar.rikalo@syrmia.com \ --cc=alistair.francis@wdc.com \ --cc=armbru@redhat.com \ --cc=atar4qemu@gmail.com \ --cc=aurelien@aurel32.net \ --cc=bin.meng@windriver.com \ --cc=borntraeger@de.ibm.com \ --cc=cohuck@redhat.com \ --cc=crwulff@gmail.com \ --cc=david@gibson.dropbear.id.au \ --cc=david@redhat.com \ --cc=dgilbert@redhat.com \ --cc=eblake@redhat.com \ --cc=edgar.iglesias@gmail.com \ --cc=ehabkost@redhat.com \ --cc=f4bug@amsat.org \ --cc=groug@kaod.org \ --cc=jcmvbkbc@gmail.com \ --cc=kbastian@mail.uni-paderborn.de \ --cc=kraxel@redhat.com \ --cc=laurent@vivier.eu \ --cc=lvivier@redhat.com \ --cc=marex@denx.de \ --cc=mark.cave-ayland@ilande.co.uk \ --cc=mrolnik@gmail.com \ --cc=palmer@dabbelt.com \ --cc=pasic@linux.ibm.com \ --cc=pbonzini@redhat.com \ --cc=peter.maydell@linaro.org \ --cc=peterx@redhat.com \ --cc=qemu-arm@nongnu.org \ --cc=qemu-devel@nongnu.org \ --cc=qemu-ppc@nongnu.org \ --cc=qemu-riscv@nongnu.org \ --cc=qemu-s390x@nongnu.org \ --cc=richard.henderson@linaro.org \ --cc=shorne@gmail.com \ --cc=thuth@redhat.com \ --cc=tsimpson@quicinc.com \ --cc=ysato@users.sourceforge.jp \ --cc=yuval.shaia.ml@gmail.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.