From patchwork Sat Jan 13 00:43:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Laurent Vivier X-Patchwork-Id: 860249 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=nongnu.org (client-ip=2001:4830:134:3::11; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=) Received: from lists.gnu.org (lists.gnu.org [IPv6:2001:4830:134:3::11]) (using TLSv1 with cipher AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3zJLd11jk9z9t2x for ; Sat, 13 Jan 2018 11:50:29 +1100 (AEDT) Received: from localhost ([::1]:51996 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eaA1j-0008Uz-Bv for incoming@patchwork.ozlabs.org; Fri, 12 Jan 2018 19:50:27 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:34398) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1ea9vU-00040F-Gd for qemu-devel@nongnu.org; Fri, 12 Jan 2018 19:44:02 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1ea9vR-0006dq-Ae for qemu-devel@nongnu.org; Fri, 12 Jan 2018 19:44:00 -0500 Received: from mout.kundenserver.de ([212.227.17.13]:61108) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1ea9vQ-0006d5-Un for qemu-devel@nongnu.org; Fri, 12 Jan 2018 19:43:57 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue103 [212.227.15.183]) with ESMTPSA (Nemesis) id 0MQtv4-1eQmFs3Cow-00UGTf; Sat, 13 Jan 2018 01:43:51 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Sat, 13 Jan 2018 01:43:38 +0100 Message-Id: <20180113004338.16867-8-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180113004338.16867-1-laurent@vivier.eu> References: <20180113004338.16867-1-laurent@vivier.eu> X-Provags-ID: V03:K0:zIaUara6Z8sPGkr8dZqfBcuNmYCiVcNFZ4KLCSd4qoIhWa5k18o 8fwujZ4A31ChpOosxg9Vufbl3fJg8Kpicq2oj/cKDoz++yAQIzzOrliFsBUfIT3dkHITiiY 17XJpwyml1BmfOQifFnGmlqSSLcOuQIUjPKoJ4kTLHUdwQUrCD2TJH3QFhvYuqUr20+Chsu HcNQZ8A+B/AwDZZ0BGtsg== X-UI-Out-Filterresults: notjunk:1; V01:K0:98/I5FQ0zAM=:cShJFstwUfK3VWaNTfkkT4 J3rLccMGAE3JVMMntaq+88eFPBWfqkC4f4zKybBWS7SrEnac31+4GdH5oDp69b1A0DQOvQN4p eZ5ZQO80CzgQqWBm2OGhqFYL6lgJBpzqIanzTfLzHHKoj1N5t/Vcvd7wlDeOOKnCzrrs5vRRq BEi40hn8cspgDoAIX1fnv0gnBrXMSPqioPfHaIYWpVtI18jrT9uuhwTD/wsGy/87z/P/hQ1ed raQuCkbndb3HImUb3SYjvG8umZvlvb/h8224oZsuXcklaJPgx5voJSrq6R9A12l63imJYhVk0 hZD7ZgmuaZhvzlesRqrq/b9atzXO6T2BahAWrYSKO5n86r36DAGy9zRSOqc6VueldQVJmt3hw QvgJotbmIwu/zykfdLHWWLqldAt3Itzh+QyTY5nqK1GsLh9Hip6ttdjzPqImrlEkyuodrKGi1 7At40kJRnWYfMplsxu/qY66Tl4vwZCvVe4XwDOkl0VJi6FGl5LHu7l5urQf1VN0Uiyxdqk5yC /26kJbBQq0rB0fSkq/iD5wYG19zkuTaNWnhLYQVPxCyRKudo08QGTDRucIacihDGwfxWWFUpB 3STu8glyjsfL5nzSW5V5fWhLkyeqEa2cesfaINQQuQ5kqaSH1XVeXvCTxy6At2MduqHM1A1M/ v3dK7aAut8407zlbfF9WlHWDRJlG2G26ZOHLh+hRiHL8DR3GE7f3OAcrABMcPSoydRT9LQYlB lsYpFz1Abd4KErEsOKc9LyouJAU96w3/puPc2A== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.13 Subject: [Qemu-devel] [PATCH v2 7/7] target/m68k: add HMP command "info tlb" X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Thomas Huth , Laurent Vivier , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Sender: "Qemu-devel" Dump MMU state and address mappings. Signed-off-by: Laurent Vivier Reviewed-by: Richard Henderson --- CC: Dr. David Alan Gilbert hmp-commands-info.hx | 2 +- target/m68k/cpu.h | 1 + target/m68k/helper.c | 216 ++++++++++++++++++++++++++++++++++++++++++++++++++ target/m68k/monitor.c | 13 +++ 4 files changed, 231 insertions(+), 1 deletion(-) diff --git a/hmp-commands-info.hx b/hmp-commands-info.hx index 54c3e5eac6..ad590a4ffb 100644 --- a/hmp-commands-info.hx +++ b/hmp-commands-info.hx @@ -216,7 +216,7 @@ Show PCI information. ETEXI #if defined(TARGET_I386) || defined(TARGET_SH4) || defined(TARGET_SPARC) || \ - defined(TARGET_PPC) || defined(TARGET_XTENSA) + defined(TARGET_PPC) || defined(TARGET_XTENSA) || defined(TARGET_M68K) { .name = "tlb", .args_type = "", diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index bb890f0561..f1721f0649 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -560,4 +560,5 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, target_ulong *pc, } } +void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUM68KState *env); #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 6950c03ada..6e79cd8621 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -374,6 +374,222 @@ int m68k_cpu_handle_mmu_fault(CPUState *cs, vaddr address, int size, int rw, /* MMU: 68040 only */ +static void print_address_zone(FILE *f, fprintf_function cpu_fprintf, + uint32_t logical, uint32_t physical, + uint32_t size, int attr) +{ + cpu_fprintf(f, "%08x - %08x -> %08x - %08x %c ", + logical, logical + size - 1, + physical, physical + size - 1, + attr & 4 ? 'W' : '-'); + size >>= 10; + if (size < 1024) { + cpu_fprintf(f, "(%d KiB)\n", size); + } else { + size >>= 10; + if (size < 1024) { + cpu_fprintf(f, "(%d MiB)\n", size); + } else { + size >>= 10; + cpu_fprintf(f, "(%d GiB)\n", size); + } + } +} + +static void dump_address_map(FILE *f, fprintf_function cpu_fprintf, + CPUM68KState *env, uint32_t root_pointer) +{ + int i, j, k; + int tic_size, tic_shift; + uint32_t tib_mask; + uint32_t tia, tib, tic; + uint32_t logical = 0xffffffff, physical = 0xffffffff; + uint32_t first_logical = 0xffffffff, first_physical = 0xffffffff; + uint32_t last_logical, last_physical; + int32_t size; + int last_attr = -1, attr = -1; + M68kCPU *cpu = m68k_env_get_cpu(env); + CPUState *cs = CPU(cpu); + + if (env->mmu.tcr & M68K_TCR_PAGE_8K) { + /* 8k page */ + tic_size = 32; + tic_shift = 13; + tib_mask = 0xffffff80; + } else { + /* 4k page */ + tic_size = 64; + tic_shift = 12; + tib_mask = 0xffffff00; + } + for (i = 0; i < 128; i++) { + tia = ldl_phys(cs->as, M68K_POINTER_BASE(root_pointer) + i * 4); + if (!M68K_UDT_VALID(tia)) { + continue; + } + for (j = 0; j < 128; j++) { + tib = ldl_phys(cs->as, M68K_POINTER_BASE(tia) + j * 4); + if (!M68K_UDT_VALID(tia)) { + continue; + } + for (k = 0; k < tic_size; k++) { + tic = ldl_phys(cs->as, (tib & tib_mask) + k * 4); + if (!M68K_PDT_VALID(tia)) { + continue; + } + if (M68K_PDT_INDIRECT(tic)) { + tic = ldl_phys(cs->as, M68K_INDIRECT_POINTER(tic)); + } + + last_logical = logical; + logical = (i << 25) | (j << 18) | (k << tic_shift); + + last_physical = physical; + physical = tic & ~((1 << tic_shift) - 1); + + last_attr = attr; + attr = tic & ((1 << tic_shift) - 1); + + if ((logical != (last_logical + (1 << tic_shift))) || + (physical != (last_physical + (1 << tic_shift))) || + (attr & 4) != (last_attr & 4)) { + + if (first_logical != 0xffffffff) { + size = last_logical + (1 << tic_shift) - + first_logical; + print_address_zone(f, cpu_fprintf, first_logical, + first_physical, size, last_attr); + } + first_logical = logical; + first_physical = physical; + } + } + } + } + if (first_logical != logical || (attr & 4) != (last_attr & 4)) { + size = logical + (1 << tic_shift) - first_logical; + print_address_zone(f, cpu_fprintf, first_logical, first_physical, size, + last_attr); + } +} + +#define DUMP_CACHEFLAGS(a) \ + switch (a & M68K_DESC_CACHEMODE) { \ + case M68K_DESC_CM_WRTHRU: /* cachable, write-through */ \ + cpu_fprintf(f, "T"); \ + break; \ + case M68K_DESC_CM_COPYBK: /* cachable, copyback */ \ + cpu_fprintf(f, "C"); \ + break; \ + case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ + cpu_fprintf(f, "S"); \ + break; \ + case M68K_DESC_CM_NCACHE: /* noncachable */ \ + cpu_fprintf(f, "N"); \ + break; \ + } + +static void dump_ttr(FILE *f, fprintf_function cpu_fprintf, uint32_t ttr) +{ + if ((ttr & M68K_TTR_ENABLED) == 0) { + cpu_fprintf(f, "disabled\n"); + return; + } + cpu_fprintf(f, "Base: 0x%08x Mask: 0x%08x Control: ", + ttr & M68K_TTR_ADDR_BASE, + (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); + switch (ttr & M68K_TTR_SFIELD) { + case M68K_TTR_SFIELD_USER: + cpu_fprintf(f, "U"); + break; + case M68K_TTR_SFIELD_SUPER: + cpu_fprintf(f, "S"); + break; + default: + cpu_fprintf(f, "*"); + break; + } + DUMP_CACHEFLAGS(ttr); + if (ttr & M68K_DESC_WRITEPROT) { + cpu_fprintf(f, "R"); + } else { + cpu_fprintf(f, "W"); + } + cpu_fprintf(f, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> + M68K_DESC_USERATTR_SHIFT); +} + +void dump_mmu(FILE *f, fprintf_function cpu_fprintf, CPUM68KState *env) +{ + if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { + cpu_fprintf(f, "Translation disabled\n"); + return; + } + cpu_fprintf(f, "Page Size: "); + if (env->mmu.tcr & M68K_TCR_PAGE_8K) { + cpu_fprintf(f, "8kB\n"); + } else { + cpu_fprintf(f, "4kB\n"); + } + + cpu_fprintf(f, "MMUSR: "); + if (env->mmu.mmusr & M68K_MMU_B_040) { + cpu_fprintf(f, "BUS ERROR\n"); + } else { + cpu_fprintf(f, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); + /* flags found on the page descriptor */ + if (env->mmu.mmusr & M68K_MMU_G_040) { + cpu_fprintf(f, "G"); /* Global */ + } else { + cpu_fprintf(f, "."); + } + if (env->mmu.mmusr & M68K_MMU_S_040) { + cpu_fprintf(f, "S"); /* Supervisor */ + } else { + cpu_fprintf(f, "."); + } + if (env->mmu.mmusr & M68K_MMU_M_040) { + cpu_fprintf(f, "M"); /* Modified */ + } else { + cpu_fprintf(f, "."); + } + if (env->mmu.mmusr & M68K_MMU_WP_040) { + cpu_fprintf(f, "W"); /* Write protect */ + } else { + cpu_fprintf(f, "."); + } + if (env->mmu.mmusr & M68K_MMU_T_040) { + cpu_fprintf(f, "T"); /* Transparent */ + } else { + cpu_fprintf(f, "."); + } + if (env->mmu.mmusr & M68K_MMU_R_040) { + cpu_fprintf(f, "R"); /* Resident */ + } else { + cpu_fprintf(f, "."); + } + cpu_fprintf(f, " Cache: "); + DUMP_CACHEFLAGS(env->mmu.mmusr); + cpu_fprintf(f, " U: %d\n", (env->mmu.mmusr >> 8) & 3); + cpu_fprintf(f, "\n"); + } + + cpu_fprintf(f, "ITTR0: "); + dump_ttr(f, cpu_fprintf, env->mmu.ttr[M68K_ITTR0]); + cpu_fprintf(f, "ITTR1: "); + dump_ttr(f, cpu_fprintf, env->mmu.ttr[M68K_ITTR1]); + cpu_fprintf(f, "DTTR0: "); + dump_ttr(f, cpu_fprintf, env->mmu.ttr[M68K_DTTR0]); + cpu_fprintf(f, "DTTR1: "); + dump_ttr(f, cpu_fprintf, env->mmu.ttr[M68K_DTTR1]); + + cpu_fprintf(f, "SRP: 0x%08x\n", env->mmu.srp); + dump_address_map(f, cpu_fprintf, env, env->mmu.srp); + + cpu_fprintf(f, "URP: 0x%08x\n", env->mmu.urp); + dump_address_map(f, cpu_fprintf, env, env->mmu.urp); +} + static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, int access_type) { diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 486213cd8b..db582a34ac 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -8,6 +8,19 @@ #include "qemu/osdep.h" #include "cpu.h" #include "monitor/hmp-target.h" +#include "monitor/monitor.h" + +void hmp_info_tlb(Monitor *mon, const QDict *qdict) +{ + CPUArchState *env1 = mon_get_cpu_env(); + + if (!env1) { + monitor_printf(mon, "No CPU available\n"); + return; + } + + dump_mmu((FILE *)mon, (fprintf_function)monitor_printf, env1); +} static const MonitorDef monitor_defs[] = { { "d0", offsetof(CPUM68KState, dregs[0]) },