From patchwork Thu Mar 21 15:48:21 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 781578 Delivered-To: patch@linaro.org Received: by 2002:adf:cf01:0:b0:33e:7753:30bd with SMTP id o1csp901771wrj; Thu, 21 Mar 2024 08:53:08 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCXPqAqmeQSaBianD//nMqNLPG0Nimdnn3REy4bPayyMSW+OSBKOdtttg5gMHX6HfyEgnH2Z/3uW0m2e1HxIT80j X-Google-Smtp-Source: AGHT+IFcw3TyxnNNbUDY4O3uTcYqxovo6iqbixm9wegNpfc1rHc0JvMIhleMfpyaldwbIHr0EMzm X-Received: by 2002:a5d:47ac:0:b0:341:9087:8a4 with SMTP id 12-20020a5d47ac000000b00341908708a4mr5413756wrb.13.1711036388325; Thu, 21 Mar 2024 08:53:08 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1711036388; cv=none; d=google.com; s=arc-20160816; b=Ow/EyffMNTOTLO7yb7bLj8bHlRlIinK9+FBo0oj/DT1HZCOqKRCYOlkywlPDGu8s6e mpXpFBVHJ7VgZvBBCof6gTtyMnLJJWBMi4m9IRdPCfHixoqhBER5Yk5QX0XfPA6bl4FQ 8YpwobOSYi9B8rszvJ1893IJ6sO78HzQF+bayA0/+IEr7n2HSLqt3VZ8irPOrtTs3PTE UOzckdI3l/r1Loh31cM2fd3dZ06gs+6Kx29GOliVZ7KoCGxNKHLyQqjV5mjmWzFiFJ9w jRSjt6DD9FOaPMnzWHX1G0OSjGHG0HUPr8Q4HcVeKNtYLXgxeIgMBttjM2E+JYEzkH5X 1mMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=jOvH0FD2iTYACKTsXepOOjEUMYdyz3d2ohX/Qxb33cM=; fh=T6rKnw5qbXdIf08MbaczezOCfCSVJgQaY05KIUhs/sE=; b=xdODdNqEIrEzHkJi6uSwvUKqWpX7v9fAd64jjBQMDVSnJmfTrLHSp1yE2jyZhUHZYE y5kN6ibAu41XYIRJY5rn+XYTF1Nv1CsSP+X1iBaNXP/OzM9P+zhr6T47eBRk5+BeQ8ad Teh4Jc4JVumDvQ+mhHQp8LdwCrRXAr1mz44GbGfuZmFKICONK/Az/XoRkxzOJUZVnel3 CNbqXl4rMZPHDe1UbjY+y72ze70nDLhQqlGv+V2pTgfABZ3ph4Zmx1Ln7A34GUCSNMpn lMhq4kVh8eiGUklafml9WfgaTKeM6rOUNdNO9JnYqbqjB/qZ17SsmSbaiFxMaXmp+piu x9Kw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RMPRmhq5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id k17-20020adff5d1000000b0033b80d76451si8531981wrp.654.2024.03.21.08.53.08 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Thu, 21 Mar 2024 08:53:08 -0700 (PDT) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=RMPRmhq5; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rnKfZ-0004yE-Dx; Thu, 21 Mar 2024 11:49:29 -0400 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rnKfX-0004v6-0I for qemu-devel@nongnu.org; Thu, 21 Mar 2024 11:49:27 -0400 Received: from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rnKfT-0001KR-6A for qemu-devel@nongnu.org; Thu, 21 Mar 2024 11:49:25 -0400 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-414783a9edcso1162645e9.0 for ; Thu, 21 Mar 2024 08:49:22 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1711036161; x=1711640961; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=jOvH0FD2iTYACKTsXepOOjEUMYdyz3d2ohX/Qxb33cM=; b=RMPRmhq5D02gZqUNSF/0sZBodbh/FXvpWO0DJV9nM4TstkqpcQH2H/rexVPCBhlr5D 0ioiL83RIUhqcFks/F/V6vrcc/PW7yQWyhZXwN7ylGJ0QWK/zfTXaYjkdgk7vZM2a79j 5z+53hHQZRkAt/wcOpox/L4WOvbbnK6fJVmnlEjjflRrKxconx6xZE49W+uOpg6BPz1T NI3a54o2A7MZOnoFCvpcxpSpqYf0VIWblKOXzEjjW6yvGuqfitIpYjjUiJSoHoO4Wc0p 9TcnwVukXB+lkrR8SzTa5ShC0qqTWvERXZ7r9FC45wC4imq8SvO2fZaB/17ToNjn1A8/ 5jSQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1711036161; x=1711640961; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=jOvH0FD2iTYACKTsXepOOjEUMYdyz3d2ohX/Qxb33cM=; b=IHOjZxqcJosEDtquIQTd3LiTs2BWhlqB5NfX2DL+G52b3kwmes9XENBPewkofj9+0s 5fZAhsj2IiQ41F2q9c4mmr4eNpn9Zz3AWjimpV0hG8uSqQq7xAwzXtS+LTAq8Rv7ME2z CK4IM4TKdRKwPcrc01MukUpaLlNmRqzTWonIJ8FfNl9lCrP2vCdIJ74r7TtPRF+t84aV J8WPwUE8Jp8clHnzIwXlaDGtNXint0tI1j9t1q7xSDiywRn+zNyfBIECmd+OxvPYF55b bU63qP6H2ZoLQFhR1rjFb+w3COr7hekcW1AY91kO/OVgdsYkciQOCK2ojeKV2Cp/RM8G c8gg== X-Gm-Message-State: AOJu0YyqQ2i0rD+P5cGEh/E0g4uAyvprm0OIhaJ/W9fOKqH+oUcgeJXw h6ItZ3fbBJgwga9bf8dWCrkLY7a5XTNxeBzx+VMXhlhXIjfw3k0dmfQcfnH6y7IXCsPYZgR61Uh +le8= X-Received: by 2002:a05:600c:5486:b0:413:2c11:f795 with SMTP id iv6-20020a05600c548600b004132c11f795mr4116109wmb.39.1711036161419; Thu, 21 Mar 2024 08:49:21 -0700 (PDT) Received: from m1x-phil.lan ([176.187.206.222]) by smtp.gmail.com with ESMTPSA id iv20-20020a05600c549400b004146bce65f4sm5887932wmb.13.2024.03.21.08.49.18 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Thu, 21 Mar 2024 08:49:20 -0700 (PDT) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Artyom Tarasenko , Chris Wulff , "Edgar E. Iglesias" , Marek Vasut , Max Filippov , "Dr . David Alan Gilbert" , Jiaxun Yang , Nicholas Piggin , Paolo Bonzini , Daniel Henrique Barboza , Yoshinori Sato , Markus Armbruster , Richard Henderson , qemu-ppc@nongnu.org, Laurent Vivier , Mark Cave-Ayland , =?utf-8?q?Philippe_Mathie?= =?utf-8?q?u-Daud=C3=A9?= Subject: [PATCH-for-9.1 05/21] target/m68k: Replace qemu_printf() by monitor_printf() in monitor Date: Thu, 21 Mar 2024 16:48:21 +0100 Message-ID: <20240321154838.95771-6-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240321154838.95771-1-philmd@linaro.org> References: <20240321154838.95771-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=philmd@linaro.org; helo=mail-wm1-x32d.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001 autolearn=unavailable autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org Replace qemu_printf() by monitor_printf() / monitor_puts() in monitor. Signed-off-by: Philippe Mathieu-Daudé Reviewed-by: Richard Henderson Reviewed-by: Dr. David Alan Gilbert Reviewed-by: Markus Armbruster --- target/m68k/cpu.h | 2 +- target/m68k/helper.c | 126 +++++++++++++++++++++--------------------- target/m68k/monitor.c | 4 +- 3 files changed, 67 insertions(+), 65 deletions(-) diff --git a/target/m68k/cpu.h b/target/m68k/cpu.h index 346427e144..4e4307956d 100644 --- a/target/m68k/cpu.h +++ b/target/m68k/cpu.h @@ -620,6 +620,6 @@ static inline void cpu_get_tb_cpu_state(CPUM68KState *env, vaddr *pc, } } -void dump_mmu(CPUM68KState *env); +void dump_mmu(Monitor *mon, CPUM68KState *env); #endif diff --git a/target/m68k/helper.c b/target/m68k/helper.c index 1a475f082a..310e26dfa1 100644 --- a/target/m68k/helper.c +++ b/target/m68k/helper.c @@ -25,7 +25,7 @@ #include "exec/helper-proto.h" #include "gdbstub/helpers.h" #include "fpu/softfloat.h" -#include "qemu/qemu-print.h" +#include "monitor/monitor.h" #define SIGNBIT (1u << 31) @@ -455,28 +455,30 @@ void m68k_switch_sp(CPUM68KState *env) #if !defined(CONFIG_USER_ONLY) /* MMU: 68040 only */ -static void print_address_zone(uint32_t logical, uint32_t physical, +static void print_address_zone(Monitor *mon, + uint32_t logical, uint32_t physical, uint32_t size, int attr) { - qemu_printf("%08x - %08x -> %08x - %08x %c ", - logical, logical + size - 1, - physical, physical + size - 1, - attr & 4 ? 'W' : '-'); + monitor_printf(mon, "%08x - %08x -> %08x - %08x %c ", + logical, logical + size - 1, + physical, physical + size - 1, + attr & 4 ? 'W' : '-'); size >>= 10; if (size < 1024) { - qemu_printf("(%d KiB)\n", size); + monitor_printf(mon, "(%d KiB)\n", size); } else { size >>= 10; if (size < 1024) { - qemu_printf("(%d MiB)\n", size); + monitor_printf(mon, "(%d MiB)\n", size); } else { size >>= 10; - qemu_printf("(%d GiB)\n", size); + monitor_printf(mon, "(%d GiB)\n", size); } } } -static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) +static void dump_address_map(Monitor *mon, CPUM68KState *env, + uint32_t root_pointer) { int i, j, k; int tic_size, tic_shift; @@ -545,7 +547,7 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) if (first_logical != 0xffffffff) { size = last_logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, + print_address_zone(mon, first_logical, first_physical, size, last_attr); } first_logical = logical; @@ -556,125 +558,125 @@ static void dump_address_map(CPUM68KState *env, uint32_t root_pointer) } if (first_logical != logical || (attr & 4) != (last_attr & 4)) { size = logical + (1 << tic_shift) - first_logical; - print_address_zone(first_logical, first_physical, size, last_attr); + print_address_zone(mon, first_logical, first_physical, size, last_attr); } } #define DUMP_CACHEFLAGS(a) \ switch (a & M68K_DESC_CACHEMODE) { \ case M68K_DESC_CM_WRTHRU: /* cacheable, write-through */ \ - qemu_printf("T"); \ + monitor_puts(mon, "T"); \ break; \ case M68K_DESC_CM_COPYBK: /* cacheable, copyback */ \ - qemu_printf("C"); \ + monitor_puts(mon, "C"); \ break; \ case M68K_DESC_CM_SERIAL: /* noncachable, serialized */ \ - qemu_printf("S"); \ + monitor_puts(mon, "S"); \ break; \ case M68K_DESC_CM_NCACHE: /* noncachable */ \ - qemu_printf("N"); \ + monitor_puts(mon, "N"); \ break; \ } -static void dump_ttr(uint32_t ttr) +static void dump_ttr(Monitor *mon, uint32_t ttr) { if ((ttr & M68K_TTR_ENABLED) == 0) { - qemu_printf("disabled\n"); + monitor_puts(mon, "disabled\n"); return; } - qemu_printf("Base: 0x%08x Mask: 0x%08x Control: ", - ttr & M68K_TTR_ADDR_BASE, - (ttr & M68K_TTR_ADDR_MASK) << M68K_TTR_ADDR_MASK_SHIFT); + monitor_printf(mon, "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: - qemu_printf("U"); + monitor_puts(mon, "U"); break; case M68K_TTR_SFIELD_SUPER: - qemu_printf("S"); + monitor_puts(mon, "S"); break; default: - qemu_printf("*"); + monitor_puts(mon, "*"); break; } DUMP_CACHEFLAGS(ttr); if (ttr & M68K_DESC_WRITEPROT) { - qemu_printf("R"); + monitor_puts(mon, "R"); } else { - qemu_printf("W"); + monitor_puts(mon, "W"); } - qemu_printf(" U: %d\n", (ttr & M68K_DESC_USERATTR) >> + monitor_printf(mon, " U: %d\n", (ttr & M68K_DESC_USERATTR) >> M68K_DESC_USERATTR_SHIFT); } -void dump_mmu(CPUM68KState *env) +void dump_mmu(Monitor *mon, CPUM68KState *env) { if ((env->mmu.tcr & M68K_TCR_ENABLED) == 0) { - qemu_printf("Translation disabled\n"); + monitor_puts(mon, "Translation disabled\n"); return; } - qemu_printf("Page Size: "); + monitor_puts(mon, "Page Size: "); if (env->mmu.tcr & M68K_TCR_PAGE_8K) { - qemu_printf("8kB\n"); + monitor_puts(mon, "8kB\n"); } else { - qemu_printf("4kB\n"); + monitor_puts(mon, "4kB\n"); } - qemu_printf("MMUSR: "); + monitor_puts(mon, "MMUSR: "); if (env->mmu.mmusr & M68K_MMU_B_040) { - qemu_printf("BUS ERROR\n"); + monitor_puts(mon, "BUS ERROR\n"); } else { - qemu_printf("Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); + monitor_printf(mon, "Phy=%08x Flags: ", env->mmu.mmusr & 0xfffff000); /* flags found on the page descriptor */ if (env->mmu.mmusr & M68K_MMU_G_040) { - qemu_printf("G"); /* Global */ + monitor_puts(mon, "G"); /* Global */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_S_040) { - qemu_printf("S"); /* Supervisor */ + monitor_puts(mon, "S"); /* Supervisor */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_M_040) { - qemu_printf("M"); /* Modified */ + monitor_puts(mon, "M"); /* Modified */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_WP_040) { - qemu_printf("W"); /* Write protect */ + monitor_puts(mon, "W"); /* Write protect */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_T_040) { - qemu_printf("T"); /* Transparent */ + monitor_puts(mon, "T"); /* Transparent */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } if (env->mmu.mmusr & M68K_MMU_R_040) { - qemu_printf("R"); /* Resident */ + monitor_puts(mon, "R"); /* Resident */ } else { - qemu_printf("."); + monitor_puts(mon, "."); } - qemu_printf(" Cache: "); + monitor_puts(mon, " Cache: "); DUMP_CACHEFLAGS(env->mmu.mmusr); - qemu_printf(" U: %d\n", (env->mmu.mmusr >> 8) & 3); - qemu_printf("\n"); + monitor_printf(mon, " U: %d\n", (env->mmu.mmusr >> 8) & 3); + monitor_puts(mon, "\n"); } - qemu_printf("ITTR0: "); - dump_ttr(env->mmu.ttr[M68K_ITTR0]); - qemu_printf("ITTR1: "); - dump_ttr(env->mmu.ttr[M68K_ITTR1]); - qemu_printf("DTTR0: "); - dump_ttr(env->mmu.ttr[M68K_DTTR0]); - qemu_printf("DTTR1: "); - dump_ttr(env->mmu.ttr[M68K_DTTR1]); + monitor_puts(mon, "ITTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR0]); + monitor_puts(mon, "ITTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_ITTR1]); + monitor_puts(mon, "DTTR0: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR0]); + monitor_puts(mon, "DTTR1: "); + dump_ttr(mon, env->mmu.ttr[M68K_DTTR1]); - qemu_printf("SRP: 0x%08x\n", env->mmu.srp); - dump_address_map(env, env->mmu.srp); + monitor_printf(mon, "SRP: 0x%08x\n", env->mmu.srp); + dump_address_map(mon, env, env->mmu.srp); - qemu_printf("URP: 0x%08x\n", env->mmu.urp); - dump_address_map(env, env->mmu.urp); + monitor_printf(mon, "URP: 0x%08x\n", env->mmu.urp); + dump_address_map(mon, env, env->mmu.urp); } static int check_TTR(uint32_t ttr, int *prot, target_ulong addr, diff --git a/target/m68k/monitor.c b/target/m68k/monitor.c index 2bdf6acae0..623c6ab635 100644 --- a/target/m68k/monitor.c +++ b/target/m68k/monitor.c @@ -15,11 +15,11 @@ void hmp_info_tlb(Monitor *mon, const QDict *qdict) CPUArchState *env1 = mon_get_cpu_env(mon); if (!env1) { - monitor_printf(mon, "No CPU available\n"); + monitor_puts(mon, "No CPU available\n"); return; } - dump_mmu(env1); + dump_mmu(mon, env1); } static const MonitorDef monitor_defs[] = {