From nobody Tue Oct 28 04:16:43 2025 Delivered-To: importer@patchew.org Received-SPF: pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) client-ip=208.118.235.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Authentication-Results: mx.zohomail.com; spf=pass (zoho.com: domain of gnu.org designates 208.118.235.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (208.118.235.17 [208.118.235.17]) by mx.zohomail.com with SMTPS id 1515453395913655.5082857269151; Mon, 8 Jan 2018 15:16:35 -0800 (PST) Received: from localhost ([::1]:37356 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYgeY-000411-NO for importer@patchew.org; Mon, 08 Jan 2018 18:16:26 -0500 Received: from eggs.gnu.org ([2001:4830:134:3::10]:58835) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1eYgZO-0008Hr-Tl for qemu-devel@nongnu.org; Mon, 08 Jan 2018 18:11:08 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1eYgZL-0007zD-C2 for qemu-devel@nongnu.org; Mon, 08 Jan 2018 18:11:06 -0500 Received: from mout.kundenserver.de ([212.227.17.24]:61296) by eggs.gnu.org with esmtps (TLS1.0:DHE_RSA_AES_128_CBC_SHA1:16) (Exim 4.71) (envelope-from ) id 1eYgZK-0007uw-TO for qemu-devel@nongnu.org; Mon, 08 Jan 2018 18:11:03 -0500 Received: from localhost.localdomain ([78.238.229.36]) by mrelayeu.kundenserver.de (mreue104 [212.227.15.183]) with ESMTPSA (Nemesis) id 0Lecww-1fEpxf2530-00qNqi; Tue, 09 Jan 2018 00:10:57 +0100 From: Laurent Vivier To: qemu-devel@nongnu.org Date: Tue, 9 Jan 2018 00:10:48 +0100 Message-Id: <20180108231048.23966-7-laurent@vivier.eu> X-Mailer: git-send-email 2.14.3 In-Reply-To: <20180108231048.23966-1-laurent@vivier.eu> References: <20180108231048.23966-1-laurent@vivier.eu> X-Provags-ID: V03:K0:qFL6b11jnRn5HQBxSR14/o9OghDWOAUHeuyP3t8F52AJrTCkN/Q wnGaZVWpwvZMZqtegepWcpCCc+/CDU6B+fD/bFV89txSKXlMsTcirGljDuyxeA7woGCMkPC IKNJxYbWz719hkXg16J6zADTLGmm5lBPbOGWO/+nVpfPmwl0ldcX5OuAoI932BcquL0Ml3u flRfvj3JyI6zfU/mTBFtQ== X-UI-Out-Filterresults: notjunk:1;V01:K0:grwielbIvog=:SDvAifbjlgO6uGCvQUxwg1 XIPtX2e4ifkk5/P9WXXRBI9ILaA1J9ssR/JpaIiA/O+eqplIyF/DcoCkEaKrKU0Hsw8Ets3Lb 3uQWwzgrj/XsdgGhQaqyzg4NEltpxc9HjSvgf6/tEJIEM1f00clJk1dScsZQBRz55tCjR5/0m VR28VkKVaZ1av1Ww00/MQT1A/n7TbOkGST1tnOfkiotg0S0apa9AIICQn+ygBcGb9ZwzwInzL 6Q0sdWOR10jO7dWEECAcijw5ND+Und6hPmxnTzGiObXY2qjVgb6ZAjaKShvLO+YAIoYge9nL6 iV/6fhKMIuV7WvqmGcTYinoXUmaBX2vl6H0XLUUQp/nBwTOYPe3OJU7VZ1zQSIlzOhgGUYDlC B0hU9wT7QhstFMfPo2YRTB1S5qWHUgwo2OpMxtjg/Hl79lO+lg8jyMndhHLn/rjRS/Tagw0kM qlJtzeI0ezMuq6nF1+h6a2QlfFhVJfLtcAF+Bbv4ARxVH9eGbTHOC/zMxYY7kHu+zISrKgkOk Mh1A2todtP2G6/Y7+n6d9r8a2qIIEEDfrd7EVGF3z+btkaS8Q+vH7Nl1ADwh6/kqt2afRCcWJ Orky7rqoQU/4eQ3GWx5OOjIUSH6hgFBsJV8jTeUyOIX28mPHMrSSmtUrcDFdqyhbjSg0uLfkM 7BU2buiOX07HCP7zBknNTcEmNM15JGD+BY+CXBjjKXEVKfBtBfh4PG93RYTABgZA4n1CIZNLr N+++U/19HqDJedf9fW/1kJMfhm9j5asm5m3k9w== X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.2.x-3.x [generic] [fuzzy] X-Received-From: 212.227.17.24 Subject: [Qemu-devel] [PATCH 6/6] 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: Laurent Vivier , "Dr . David Alan Gilbert" Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org Sender: "Qemu-devel" X-ZohoMail: RSF_0 Z_629925259 SPT_0 Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 Content-Type: text/plain; charset="utf-8" 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 =20 #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 =3D "tlb", .args_type =3D "", diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 2f5a716139..e9c6e19af4 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -558,4 +558,5 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *e= nv, target_ulong *pc, | ((env->macsr >> 4) & 0xf); /* Bits 0-3 */ } =20 +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 ef9ef6f55c..7ea30e9a3e 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -375,6 +375,222 @@ int m68k_cpu_handle_mmu_fault(CPUState *cs, vaddr add= ress, int size, int rw, =20 /* MMU: 68040 only */ =20 +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 >>=3D 10; + if (size < 1024) { + cpu_fprintf(f, "(%d KiB)\n", size); + } else { + size >>=3D 10; + if (size < 1024) { + cpu_fprintf(f, "(%d MiB)\n", size); + } else { + size >>=3D 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 =3D 0xffffffff, physical =3D 0xffffffff; + uint32_t first_logical =3D 0xffffffff, first_physical =3D 0xffffffff; + uint32_t last_logical, last_physical; + int32_t size; + int last_attr =3D -1, attr =3D -1; + M68kCPU *cpu =3D m68k_env_get_cpu(env); + CPUState *cs =3D CPU(cpu); + + if (env->mmu.tcr & M68K_TCR_PAGE_8K) { + /* 8k page */ + tic_size =3D 32; + tic_shift =3D 13; + tib_mask =3D 0xffffff80; + } else { + /* 4k page */ + tic_size =3D 64; + tic_shift =3D 12; + tib_mask =3D 0xffffff00; + } + for (i =3D 0; i < 128; i++) { + tia =3D ldl_phys(cs->as, M68K_POINTER_BASE(root_pointer) + i * 4); + if (!M68K_UDT_VALID(tia)) { + continue; + } + for (j =3D 0; j < 128; j++) { + tib =3D ldl_phys(cs->as, M68K_POINTER_BASE(tia) + j * 4); + if (!M68K_UDT_VALID(tia)) { + continue; + } + for (k =3D 0; k < tic_size; k++) { + tic =3D ldl_phys(cs->as, (tib & tib_mask) + k * 4); + if (!M68K_PDT_VALID(tia)) { + continue; + } + if (M68K_PDT_INDIRECT(tic)) { + tic =3D ldl_phys(cs->as, M68K_INDIRECT_POINTER(tic)); + } + + last_logical =3D logical; + logical =3D (i << 25) | (j << 18) | (k << tic_shift); + + last_physical =3D physical; + physical =3D tic & ~((1 << tic_shift) - 1); + + last_attr =3D attr; + attr =3D tic & ((1 << tic_shift) - 1); + + if ((logical !=3D (last_logical + (1 << tic_shift))) || + (physical !=3D (last_physical + (1 << tic_shift))) || + (attr & 4) !=3D (last_attr & 4)) { + + if (first_logical !=3D 0xffffffff) { + size =3D last_logical + (1 << tic_shift) - + first_logical; + print_address_zone(f, cpu_fprintf, first_logical, + first_physical, size, last_attr= ); + } + first_logical =3D logical; + first_physical =3D physical; + } + } + } + } + if (first_logical !=3D logical || (attr & 4) !=3D (last_attr & 4)) { + size =3D 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) =3D=3D 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) =3D=3D 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=3D%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 =3D mon_get_cpu_env(); + + if (!env1) { + monitor_printf(mon, "No CPU available\n"); + return; + } + + dump_mmu((FILE *)mon, (fprintf_function)monitor_printf, env1); +} =20 static const MonitorDef monitor_defs[] =3D { { "d0", offsetof(CPUM68KState, dregs[0]) }, --=20 2.14.3