From patchwork Wed Feb 28 11:56:38 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: 776465 Delivered-To: patch@linaro.org Received: by 2002:adf:e94d:0:b0:33d:f458:43ce with SMTP id m13csp251217wrn; Wed, 28 Feb 2024 03:59:31 -0800 (PST) X-Forwarded-Encrypted: i=2; AJvYcCV1VNFRqWMeTsYhcfrEBeWG+1XRmDnDgl48mcFLRpbj8F7wcYG8cQa0meBRoUB3XoojR8QoQ26bqY32JpBhuqN1 X-Google-Smtp-Source: AGHT+IFdFpvUrO0C2VKEhv+d59X70NyfSFZfOPKZnsdxlPIKoRdC12sp9b9JLKVOxu5hdLAg8Bks X-Received: by 2002:a05:6214:2aa8:b0:690:3813:cf24 with SMTP id js8-20020a0562142aa800b006903813cf24mr923692qvb.7.1709121571404; Wed, 28 Feb 2024 03:59:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1709121571; cv=none; d=google.com; s=arc-20160816; b=jPNCVgA1R9ZtfXtMK571UP9hj3m/A3iVcLMdFARR73kLak7gjTTvB1fhYEvdf309zV 75r+T7wwCcLCPes/m8vuDsNFysNJkNoDGbNaIs7228xPnaR2kS8gVaojM1ixCE6Bjv18 pbwXwEjapA5FPsJYm0pL8RfaORaWdX6k0B1NyixqjaxtgiKVvgYHl0+k+0n/0Wp1ul0+ wKOPAo9jZb7ReP4XpgdJU1NviIC74hIuJgTmDoanoevwwmWVqf2puJkyHp2yI4YbeqQ1 xuXTHVyGsaQD53i7ok3wNJkfVBSuBOB/w/clHteTTbCHDNzsgaElb/M2pXSkx2xl8rDk zNBg== 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=8sM8dwb0jrcajUThrx/FFIuuSH/69cUsX7EmmYQ2YL8=; fh=p/TfpsHyxmqS4i8nnqEg8kKRUI6FpRRoSSmBh7QP7WE=; b=FRpOnvfW4dL4fKvBjh4mrzpPGa3SVEdLnO8inf0JdrVuziBVPwmkPwfbKyxO4jYDGZ 5y1MWU37KR2H3M8HW2wMzT0KrTTALRm/ILnpxiwl0gnWrs+AkPQNlGuk70DUN1tPjwqD 1Zunvle8oQazbCc33uYPtuGiDJeS7/IXwYapJXUar6MehoRS6n3gkBHQXknWstAxSU3u 6nXokznvZDylS9mLC+LBEwaab0a/3PIFhBwQ520CsvUX96/RwGwxZHRfU5tdkjkMgIDQ w0DifyW7ZSXU08JVRU5uvA8CLK3quBeEiThjkadZ1OPTiM7w637750INcLvlkA5lCOgI UvXQ==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=zweQDmK7; 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 kj16-20020a056214529000b0068cb0d39be6si9338887qvb.521.2024.02.28.03.59.31 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 28 Feb 2024 03:59:31 -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=zweQDmK7; 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 1rfIYm-0005qh-40; Wed, 28 Feb 2024 06:57:16 -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 1rfIYk-0005mz-8T for qemu-devel@nongnu.org; Wed, 28 Feb 2024 06:57:14 -0500 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rfIYf-0005jA-IT for qemu-devel@nongnu.org; Wed, 28 Feb 2024 06:57:13 -0500 Received: by mail-wr1-x430.google.com with SMTP id ffacd0b85a97d-33d6f26ff33so3694635f8f.0 for ; Wed, 28 Feb 2024 03:57:09 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1709121428; x=1709726228; 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=8sM8dwb0jrcajUThrx/FFIuuSH/69cUsX7EmmYQ2YL8=; b=zweQDmK7wn7iP7+LiUzHVEGNYKAfr8buBlXhtEOcnGWmeY31YqY6/ZApnz+FZ+zw1p uh+eEoYW+IqCIj+cRkSCS+fDUakTH7FFiieAb9zqXd/vxIL9w87WSz5F2dP8mnPRJ9ty j5SXiw9HzMe4A6h3RCSykLCa353Xh42KMlfN6K6AMGCRWy9cmTl+Evpj5sAN4bVII8kr ZL4wtQd82aRnqbLoUDLI9+7DHyMn4zOI67ggLLsSOguAydxEQlPhXakG7+jmaMoPAavp YapxIuqS9ti5DZtf5d6l2ojk25S9F9g5nCcZzLzC9mUblIgsHNB9yroaSCiev82/20o2 2n4A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1709121428; x=1709726228; 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=8sM8dwb0jrcajUThrx/FFIuuSH/69cUsX7EmmYQ2YL8=; b=hlRXCiN2MNRUqkqx46USiHgli6eEvFvYxMD4jqWo7/t40DeRRrB48jKUqTwHLNOit5 pIl2xjbY29YiXTFL21NuMDS1/rMqAYgIdd/Mnt25G8rsvN9xk/K2kNnbbgadgvOT82Mf oIpEw5d0+4rAfgnz/ZCy4HMLymMoekXCGIrWBknSbuyPOeojVSGD2Tg0ZSZyQqXm7ZD2 1OG7/XnPfq3DQPMloqjubpeSP/pUxJv3nvQw3I/elb4WkhRJuvvTUOVT9vqSVWSkdtgx v7NlXLLo6x03DeS5phNAdNRciTdVTcHlLrVPLYcJZRBw7OqFgPXg8z/OBWkhmeBJjpAZ KFIA== X-Gm-Message-State: AOJu0YxSo2crR7w9h0Cpsxug/Nslt6m/0IKhCc/f6f7uMF7NGdwKr7pd CxDozXtQ6NzaH9jBXVR5uUB9kcNtcNStTWGbbg64KVIzQ3Ode4AT8ORYZsq3DJY= X-Received: by 2002:adf:e6c8:0:b0:33d:6334:e14 with SMTP id y8-20020adfe6c8000000b0033d63340e14mr8413517wrm.11.1709121428107; Wed, 28 Feb 2024 03:57:08 -0800 (PST) Received: from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id f14-20020adff98e000000b0033cf60e268fsm14397679wrr.116.2024.02.28.03.57.03 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 28 Feb 2024 03:57:06 -0800 (PST) Received: from draig.lan (localhost [IPv6:::1]) by draig.lan (Postfix) with ESMTP id 7010B5F900; Wed, 28 Feb 2024 11:57:02 +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/29] target/ppc: Use GDBFeature for dynamic XML Date: Wed, 28 Feb 2024 11:56:38 +0000 Message-Id: <20240228115701.1416107-7-alex.bennee@linaro.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240228115701.1416107-1-alex.bennee@linaro.org> References: <20240228115701.1416107-1-alex.bennee@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::430; envelope-from=alex.bennee@linaro.org; helo=mail-wr1-x430.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: <20231213-gdb-v17-2-777047380591@daynix.com> Signed-off-by: Alex Bennée Message-Id: <20240227144335.1196131-7-alex.bennee@linaro.org> 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 ec14574d142..c66989a5e60 100644 --- a/target/ppc/cpu.h +++ b/target/ppc/cpu.h @@ -1492,8 +1492,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; @@ -1546,7 +1545,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 9bccddb350c..5f0ecf443d8 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 dfe31d0f47f..c4c55961083 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; } @@ -635,7 +621,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 }