From patchwork Tue Jan 16 10:47:53 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Alex_Benn=C3=A9e?= X-Patchwork-Id: 763015 Delivered-To: patch@linaro.org Received: by 2002:a5d:5903:0:b0:337:62d3:c6d5 with SMTP id v3csp1550819wrd; Tue, 16 Jan 2024 02:49:11 -0800 (PST) X-Google-Smtp-Source: AGHT+IH8I0Gt2QXM5nC3WecB1gPypKT41c5dpNArry0OSSFT0neeTZh/vgsfBrpIWdemyG31ldt7 X-Received: by 2002:a05:6214:19ed:b0:681:37b8:62c6 with SMTP id q13-20020a05621419ed00b0068137b862c6mr8883909qvc.25.1705402151259; Tue, 16 Jan 2024 02:49:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1705402151; cv=none; d=google.com; s=arc-20160816; b=xiiXCXbBxeI8AUFZOWXl8cKnvFnFWFhKPOzWY8mfcwBQQcHy6TmHeakv7Vuxlvn0QD rL03tukK9G7mG9Wi0YHEOiqsT5E+xPZ2YvVxgnUlXh5Ixk7ciKa38UjGAsiN+klANz0u o5s1VapcWesM26E/uT3Tqtvb6JrCBVx47eTrum5eHBn1qevsT6b5PLp9zsuuMfvuqG+f fG8C/7lqqzwe/0YTTA7FeLujEqxDgnTceYrB8p5TsY7v+WCxptwwIPsQ+PgftdGF9S4E s9qdPVvLWfFmbq0b6db+we8ydMb9pELGRGMpjAp9nbmOKwi+GUgXAtGrck8FlHv753p1 Bs5A== 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=fpjAwrcL0GZjeh2F1/9qUCCoX+OMPy0LoAzQQFhtVX4=; fh=p/TfpsHyxmqS4i8nnqEg8kKRUI6FpRRoSSmBh7QP7WE=; b=B7GxC75nN9wX1bOONfXNDixiqKDkxNY2QWSsrmxlTYj5YR1oWUgdlS57Gya291kUwQ oEIhHnoFaB5oiWS+kbPhHZlmDW5rxZmYWQZN0fRWCaDns0bMHJR6BQrXpVaY8JYkj0kY I1/PxkCE1LglGyGH9jD0Js08dVenDhncehzxWqaqkkVWaS32tkn+wp984BEySWGb4YxQ bw+AVmat0YksCyUunVk3X5dRi6nWG8lNB6hHs4TdP99RijJY2IS3ILWRDguDyEKoch7a dSCH/l+wprnNFkk7rkcrn37sSfuHQkOlkyVSvfTO4Mgi7Gx+3p1nx1p8tvHi51U4iEwb LHTA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Oi2Z3oRj; 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 u25-20020a0cb699000000b0067fae30acd4si9549114qvd.511.2024.01.16.02.49.11 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 16 Jan 2024 02:49:11 -0800 (PST) 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=Oi2Z3oRj; 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 1rPgzn-0002T8-Db; Tue, 16 Jan 2024 05:48:41 -0500 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 1rPgzU-0002Ih-Ft for qemu-devel@nongnu.org; Tue, 16 Jan 2024 05:48:21 -0500 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 1rPgzQ-0007CE-GL for qemu-devel@nongnu.org; Tue, 16 Jan 2024 05:48:18 -0500 Received: by mail-wm1-x32d.google.com with SMTP id 5b1f17b1804b1-40e60e137aaso49312925e9.0 for ; Tue, 16 Jan 2024 02:48:16 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1705402095; x=1706006895; 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=fpjAwrcL0GZjeh2F1/9qUCCoX+OMPy0LoAzQQFhtVX4=; b=Oi2Z3oRjt0Cb9aJEYwVnaYaaPQ4XeK7pFY0n9WDbp1iVTp//xdzFwsd9zF2+hjdeX8 zsQPLpMJ8y+9TzRfYwvASo+pVtKp2/+iu/T9+T5EqYNqzwxz5HyGDSsGuKTFkLasc/CA eyZ7j1I62kxAIf7g1F3ZdLlA/NgyDUbEM0JgPhQgylP4Smv83oSqNJqRSxSSVVWtW0Xi VhxOMLzOT/l61CsSgfH6cR1HG2WGaWogERLFo+6NA49OMIk5Pmr85fP8/prUO9Mrjj6C b3aZUOA18tHOsAU6a2xaHfmVlwxMbItqRrnLU2RhsPt7qHCXTuiPJraVjEaGlKPhJFO8 8TkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1705402095; x=1706006895; 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=fpjAwrcL0GZjeh2F1/9qUCCoX+OMPy0LoAzQQFhtVX4=; b=NAX101+6O7PBvqn3macZx3qqBiIS+KoVBjZlU3vL24O+TghVBPqCq39h1oX+MZsd3t SbfYql43OYHJGUDCTFBz0dLS8E48l8FD8GUg0nwI4IUkdinIhDjLWO9DVgCIoqIRFGzx W5uZrXK4sHa40BAWI2D5bZIj/0vU8Psirxx2YkBBojAEMDDnBGzJzPXAf55Z1k0vLOFD HsecWpPU+kB+yeTkKdg9AKxWcrMu86SfBq68o9pAMpydZQJV2CA2CZkO+tY8nCn9Eags 04taAsG2Clk5SoCOwEBqhc7rm3fHf/bXX92Q82T6QJ+lSZup0hzmzf7O6ZKTa8aWQaLD MfcA== X-Gm-Message-State: AOJu0YyfWmd9ehNiBtEnur9xvZgu/awyiuk27nQDdl2yg3Xdw4VWBX2/ rGc1xjiLfiiNm3kr2IuDlMW74LwGkgbu5g== X-Received: by 2002:a05:600c:22cf:b0:40e:3a68:ac9b with SMTP id 15-20020a05600c22cf00b0040e3a68ac9bmr4080526wmg.186.1705402095210; Tue, 16 Jan 2024 02:48:15 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id az32-20020a05600c602000b0040e85e0b8ecsm1102195wmb.19.2024.01.16.02.48.10 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 Jan 2024 02:48:12 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id D44BB5F8E9; Tue, 16 Jan 2024 10:48:09 +0000 (GMT) From: =?utf-8?q?Alex_Benn=C3=A9e?= To: qemu-devel@nongnu.org Cc: Akihiko Odaki , Richard Henderson , =?utf-8?q?Alex_Benn=C3=A9?= =?utf-8?q?e?= , Nicholas Piggin , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , qemu-ppc@nongnu.org (open list:PowerPC TCG CPUs) Subject: [PULL 06/22] target/ppc: Use GDBFeature for dynamic XML Date: Tue, 16 Jan 2024 10:47:53 +0000 Message-Id: <20240116104809.250076-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240116104809.250076-1-alex.bennee@linaro.org> References: <20240116104809.250076-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::32d; envelope-from=alex.bennee@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, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham 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 From: Akihiko Odaki In preparation for a change to use GDBFeature as a parameter of gdb_register_coprocessor(), convert the internal representation of dynamic feature from plain XML to GDBFeature. Signed-off-by: Akihiko Odaki Reviewed-by: Richard Henderson Message-Id: <20240103173349.398526-28-alex.bennee@linaro.org> Message-Id: <20231213-gdb-v17-2-777047380591@daynix.com> Signed-off-by: Alex Bennée diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h index 0241609efef..8247fa23367 100644 --- a/target/ppc/cpu-qom.h +++ b/target/ppc/cpu-qom.h @@ -20,6 +20,7 @@ #ifndef QEMU_PPC_CPU_QOM_H #define QEMU_PPC_CPU_QOM_H +#include "exec/gdbstub.h" #include "hw/core/cpu.h" #ifdef TARGET_PPC64 diff --git a/target/ppc/cpu.h b/target/ppc/cpu.h index f8101ffa296..f87c26f98a6 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1471,8 +1471,7 @@ struct PowerPCCPUClass { int bfd_mach; uint32_t l1_dcache_size, l1_icache_size; #ifndef CONFIG_USER_ONLY - unsigned int gdb_num_sprs; - const char *gdb_spr_xml; + GDBFeature gdb_spr; #endif const PPCHash64Options *hash64_opts; struct ppc_radix_page_info *radix_page_info; @@ -1525,7 +1524,6 @@ int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg); int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg); #ifndef CONFIG_USER_ONLY hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr); -void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu); const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name); #endif int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs, diff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c index 344196a8ce3..a7b593dbfac 100644 --- a/target/ppc/cpu_init.c +++ b/target/ppc/cpu_init.c @@ -6682,10 +6682,6 @@ static void init_ppc_proc(PowerPCCPU *cpu) /* PowerPC implementation specific initialisations (SPRs, timers, ...) */ (*pcc->init_proc)(env); -#if !defined(CONFIG_USER_ONLY) - ppc_gdb_gen_spr_xml(cpu); -#endif - /* MSR bits & flags consistency checks */ if (env->msr_mask & (1 << 25)) { switch (env->flags & (POWERPC_FLAG_SPE | POWERPC_FLAG_VRE)) { diff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c index ec5731e5d67..e3be3dbd109 100644 --- a/target/ppc/gdbstub.c +++ b/target/ppc/gdbstub.c @@ -300,15 +300,23 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n) } #ifndef CONFIG_USER_ONLY -void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu) +static void gdb_gen_spr_feature(CPUState *cs) { - PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu); + PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs); + PowerPCCPU *cpu = POWERPC_CPU(cs); CPUPPCState *env = &cpu->env; - GString *xml; - char *spr_name; + GDBFeatureBuilder builder; unsigned int num_regs = 0; int i; + if (pcc->gdb_spr.xml) { + return; + } + + gdb_feature_builder_init(&builder, &pcc->gdb_spr, + "org.qemu.power.spr", "power-spr.xml", + cs->gdb_num_regs); + for (i = 0; i < ARRAY_SIZE(env->spr_cb); i++) { ppc_spr_t *spr = &env->spr_cb[i]; @@ -326,35 +334,13 @@ void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu) */ spr->gdb_id = num_regs; num_regs++; - } - - if (pcc->gdb_spr_xml) { - return; - } - xml = g_string_new(""); - g_string_append(xml, ""); - g_string_append(xml, ""); - - for (i = 0; i < ARRAY_SIZE(env->spr_cb); i++) { - ppc_spr_t *spr = &env->spr_cb[i]; - - if (!spr->name) { - continue; - } - - spr_name = g_ascii_strdown(spr->name, -1); - g_string_append_printf(xml, ""); + gdb_feature_builder_append_reg(&builder, g_ascii_strdown(spr->name, -1), + TARGET_LONG_BITS, num_regs, + "int", "spr"); } - g_string_append(xml, ""); - - pcc->gdb_num_sprs = num_regs; - pcc->gdb_spr_xml = g_string_free(xml, false); + gdb_feature_builder_end(&builder); } const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name) @@ -362,7 +348,7 @@ const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name) PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs); if (strcmp(xml_name, "power-spr.xml") == 0) { - return pcc->gdb_spr_xml; + return pcc->gdb_spr.xml; } return NULL; } @@ -599,7 +585,8 @@ void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *pcc) 32, "power-vsx.xml", 0); } #ifndef CONFIG_USER_ONLY + gdb_gen_spr_feature(cs); gdb_register_coprocessor(cs, gdb_get_spr_reg, gdb_set_spr_reg, - pcc->gdb_num_sprs, "power-spr.xml", 0); + pcc->gdb_spr.num_regs, "power-spr.xml", 0); #endif }