{"id":1882068,"url":"http://patchwork.ozlabs.org/api/patches/1882068/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-28-alex.bennee@linaro.org/","project":{"id":14,"url":"http://patchwork.ozlabs.org/api/projects/14/?format=json","name":"QEMU Development","link_name":"qemu-devel","list_id":"qemu-devel.nongnu.org","list_email":"qemu-devel@nongnu.org","web_url":"","scm_url":"","webscm_url":"","list_archive_url":"","list_archive_url_format":"","commit_url_format":""},"msgid":"<20240103173349.398526-28-alex.bennee@linaro.org>","list_archive_url":null,"date":"2024-01-03T17:33:33","name":"[v2,27/43] target/ppc: Use GDBFeature for dynamic XML","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"fc9be2bbf0eb829a5c9cb7108dc65324f3c5f884","submitter":{"id":39532,"url":"http://patchwork.ozlabs.org/api/people/39532/?format=json","name":"Alex Bennée","email":"alex.bennee@linaro.org"},"delegate":null,"mbox":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-28-alex.bennee@linaro.org/mbox/","series":[{"id":388742,"url":"http://patchwork.ozlabs.org/api/series/388742/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/list/?series=388742","date":"2024-01-03T17:33:08","name":"testing and plugin updates for 9.0 (pre-PR)","version":2,"mbox":"http://patchwork.ozlabs.org/series/388742/mbox/"}],"comments":"http://patchwork.ozlabs.org/api/patches/1882068/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1882068/checks/","tags":{},"related":[],"headers":{"Return-Path":"","X-Original-To":"incoming@patchwork.ozlabs.org","Delivered-To":"patchwork-incoming@legolas.ozlabs.org","Authentication-Results":["legolas.ozlabs.org;\n\tdkim=pass (2048-bit key;\n unprotected) header.d=linaro.org header.i=@linaro.org header.a=rsa-sha256\n header.s=google header.b=SV4oGXXK;\n\tdkim-atps=neutral","legolas.ozlabs.org;\n spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org\n (client-ip=209.51.188.17; helo=lists.gnu.org;\n envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org;\n receiver=patchwork.ozlabs.org)"],"Received":["from lists.gnu.org (lists.gnu.org [209.51.188.17])\n\t(using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits))\n\t(No client certificate requested)\n\tby legolas.ozlabs.org (Postfix) with ESMTPS id 4T4xjt3cj6z23d9\n\tfor ; Thu, 4 Jan 2024 04:37:06 +1100 (AEDT)","from localhost ([::1] helo=lists1p.gnu.org)\n\tby lists.gnu.org with esmtp (Exim 4.90_1)\n\t(envelope-from )\n\tid 1rL58c-00046i-4w; Wed, 03 Jan 2024 12:34:43 -0500","from eggs.gnu.org ([2001:470:142:3::10])\n by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)\n (Exim 4.90_1) (envelope-from )\n id 1rL58N-0003vW-PE\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:27 -0500","from mail-wm1-x32b.google.com ([2a00:1450:4864:20::32b])\n by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)\n (Exim 4.90_1) (envelope-from )\n id 1rL584-0002XQ-1f\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:34:27 -0500","by mail-wm1-x32b.google.com with SMTP id\n 5b1f17b1804b1-40b5155e154so138758745e9.3\n for ; Wed, 03 Jan 2024 09:34:06 -0800 (PST)","from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id\n bg40-20020a05600c3ca800b0040d87b5a87csm2886253wmb.48.2024.01.03.09.33.57\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 03 Jan 2024 09:34:02 -0800 (PST)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id D8A215F95A;\n Wed, 3 Jan 2024 17:33:51 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1704303245; x=1704908045; darn=nongnu.org;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:from:to:cc:subject:date\n :message-id:reply-to;\n bh=jmYJ2fC1lZn0rQD/zyego8qIqXmQTboU/MlKw2VVHwg=;\n b=SV4oGXXKV8ceqjyCgDydaMUeX/s/VoYyfszV2nH4LDfDGkaknsjy16hL5HeFoHJZY0\n 60zqvcyLPsasDYYxIoz8OseDsV8uF/C4Sl8hLq7LxQzWFRj1g4H0ddOr1t6b5aROm8YW\n Ri9Hp0sy3t75OV1LxCiTdRn1WdoYsZE3TCGnzHBc4+dqOmvryqDw4PdiliqU8aahf0cQ\n DpE0Z50GwoH47ZT6SF7bXuxYORiqmfDEe0nY5S9PbutFNm7Kh0gjz1Y1mB9UBLhBlGyU\n 3O0akA8DKGpW7zLnMU6ljJxvD6kn7DqfO/nuka8MdgQyGjn7zFLOlcrQLqEqwtH+iLPS\n VuPg==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1704303245; x=1704908045;\n h=content-transfer-encoding:mime-version:references:in-reply-to\n :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc\n :subject:date:message-id:reply-to;\n bh=jmYJ2fC1lZn0rQD/zyego8qIqXmQTboU/MlKw2VVHwg=;\n b=aL7i5g9mmKmP9V1VuHGTyVwOC5rGXzdz70uJJ8qgtQ/8RpC12M3OSTLak07BfY5tXt\n 9GJUQ7rnM5aHP2rGPqDytRXIE+xD9PlppaDpHZ/okirONJpjY+bW72jmCaAJZrIavZKx\n Xxm/XDzsgWHhMOqtet00ZHZV6oOeRrdD/vwicvDPSmVOMj9l7/wuVaVGThkbS59RRCKA\n SSoRiWnO+FepAn6IzVu4U5/XV7fKFWFUGVF50v+zXZzWF5xEWwdzDQILEo7dM1cGsZcz\n fvG/8qdy1GObGAD8m7OaD9Z2ocaC5jmnkHPFkFh4D/0Ead9g2EoJ1L4loDo0trpmt7+h\n cTrw==","X-Gm-Message-State":"AOJu0YzxSAVa4wH0e0IVJgp6E0GJCBTUed7gWN66ZA5bB1ndupFTkolq\n JlOufJzUlCjgtbHdcmvcdZqWCnK7UDXjTQ==","X-Google-Smtp-Source":"\n AGHT+IGD0/lFoafa7j9O1TEB7CULKnDxqTzBFbCQnS1tJ7Chih4zpCyz6M0KkFqXXUbpJE3wnR/jtQ==","X-Received":"by 2002:a05:600c:3212:b0:409:79cb:1df6 with SMTP id\n r18-20020a05600c321200b0040979cb1df6mr10062086wmp.14.1704303245186;\n Wed, 03 Jan 2024 09:34:05 -0800 (PST)","From":"=?utf-8?q?Alex_Benn=C3=A9e?= ","To":"qemu-devel@nongnu.org","Cc":"qemu-s390x@nongnu.org, qemu-ppc@nongnu.org,\n Richard Henderson ,\n Song Gao ,\n =?utf-8?q?Marc-Andr=C3=A9_Lureau?= ,\n David Hildenbrand , Aurelien Jarno ,\n Yoshinori Sato ,\n Yanan Wang , Bin Meng ,\n Laurent Vivier , Michael Rolnik ,\n Alexandre Iooss , David Woodhouse ,\n Laurent Vivier , Paolo Bonzini ,\n Brian Cain ,\n Daniel Henrique Barboza ,\n Beraldo Leal , Paul Durrant ,\n Mahmoud Mandour , Thomas Huth ,\n Liu Zhiwei , Cleber Rosa ,\n kvm@vger.kernel.org, Peter Maydell ,\n Wainer dos Santos Moschetta , =?utf-8?q?Alex_Benn?=\n\t=?utf-8?q?=C3=A9e?= , qemu-arm@nongnu.org,\n Weiwei Li ,\n =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= ,\n John Snow ,\n Daniel Henrique Barboza ,\n Nicholas Piggin , Palmer Dabbelt ,\n Marcel Apfelbaum ,\n Ilya Leoshkevich ,\n =?utf-8?q?C=C3=A9dric_Le_Goater?= ,\n \"Edgar E. Iglesias\" ,\n Eduardo Habkost ,\n Pierrick Bouvier , qemu-riscv@nongnu.org,\n Alistair Francis ,\n Akihiko Odaki ","Subject":"[PATCH v2 27/43] target/ppc: Use GDBFeature for dynamic XML","Date":"Wed, 3 Jan 2024 17:33:33 +0000","Message-Id":"<20240103173349.398526-28-alex.bennee@linaro.org>","X-Mailer":"git-send-email 2.39.2","In-Reply-To":"<20240103173349.398526-1-alex.bennee@linaro.org>","References":"<20240103173349.398526-1-alex.bennee@linaro.org>","MIME-Version":"1.0","Content-Type":"text/plain; charset=UTF-8","Content-Transfer-Encoding":"8bit","Received-SPF":"pass client-ip=2a00:1450:4864:20::32b;\n envelope-from=alex.bennee@linaro.org; helo=mail-wm1-x32b.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,\n DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1,\n RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,\n T_SCC_BODY_TEXT_LINE=-0.01 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":",\n ","List-Archive":"","List-Post":"","List-Help":"","List-Subscribe":",\n ","Errors-To":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org","Sender":"qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org"},"content":"From: Akihiko Odaki \n\nIn preparation for a change to use GDBFeature as a parameter of\ngdb_register_coprocessor(), convert the internal representation of\ndynamic feature from plain XML to GDBFeature.\n\nSigned-off-by: Akihiko Odaki \nReviewed-by: Richard Henderson \nMessage-Id: <20231213-gdb-v17-2-777047380591@daynix.com>\nSigned-off-by: Alex Bennée \n---\n target/ppc/cpu-qom.h | 1 +\n target/ppc/cpu.h | 4 +---\n target/ppc/cpu_init.c | 4 ----\n target/ppc/gdbstub.c | 51 ++++++++++++++++---------------------------\n 4 files changed, 21 insertions(+), 39 deletions(-)","diff":"diff --git a/target/ppc/cpu-qom.h b/target/ppc/cpu-qom.h\nindex 0241609efef..8247fa23367 100644\n--- a/target/ppc/cpu-qom.h\n+++ b/target/ppc/cpu-qom.h\n@@ -20,6 +20,7 @@\n #ifndef QEMU_PPC_CPU_QOM_H\n #define QEMU_PPC_CPU_QOM_H\n \n+#include \"exec/gdbstub.h\"\n #include \"hw/core/cpu.h\"\n \n #ifdef TARGET_PPC64\ndiff --git a/target/ppc/cpu.h b/target/ppc/cpu.h\nindex f8101ffa296..f87c26f98a6 100644\n--- a/target/ppc/cpu.h\n+++ b/target/ppc/cpu.h\n@@ -1471,8 +1471,7 @@ struct PowerPCCPUClass {\n int bfd_mach;\n uint32_t l1_dcache_size, l1_icache_size;\n #ifndef CONFIG_USER_ONLY\n- unsigned int gdb_num_sprs;\n- const char *gdb_spr_xml;\n+ GDBFeature gdb_spr;\n #endif\n const PPCHash64Options *hash64_opts;\n struct ppc_radix_page_info *radix_page_info;\n@@ -1525,7 +1524,6 @@ int ppc_cpu_gdb_write_register(CPUState *cpu, uint8_t *buf, int reg);\n int ppc_cpu_gdb_write_register_apple(CPUState *cpu, uint8_t *buf, int reg);\n #ifndef CONFIG_USER_ONLY\n hwaddr ppc_cpu_get_phys_page_debug(CPUState *cpu, vaddr addr);\n-void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu);\n const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name);\n #endif\n int ppc64_cpu_write_elf64_note(WriteCoreDumpFunction f, CPUState *cs,\ndiff --git a/target/ppc/cpu_init.c b/target/ppc/cpu_init.c\nindex 40fe14a6c25..a0178c3ce80 100644\n--- a/target/ppc/cpu_init.c\n+++ b/target/ppc/cpu_init.c\n@@ -6682,10 +6682,6 @@ static void init_ppc_proc(PowerPCCPU *cpu)\n /* PowerPC implementation specific initialisations (SPRs, timers, ...) */\n (*pcc->init_proc)(env);\n \n-#if !defined(CONFIG_USER_ONLY)\n- ppc_gdb_gen_spr_xml(cpu);\n-#endif\n-\n /* MSR bits & flags consistency checks */\n if (env->msr_mask & (1 << 25)) {\n switch (env->flags & (POWERPC_FLAG_SPE | POWERPC_FLAG_VRE)) {\ndiff --git a/target/ppc/gdbstub.c b/target/ppc/gdbstub.c\nindex ec5731e5d67..e3be3dbd109 100644\n--- a/target/ppc/gdbstub.c\n+++ b/target/ppc/gdbstub.c\n@@ -300,15 +300,23 @@ int ppc_cpu_gdb_write_register_apple(CPUState *cs, uint8_t *mem_buf, int n)\n }\n \n #ifndef CONFIG_USER_ONLY\n-void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu)\n+static void gdb_gen_spr_feature(CPUState *cs)\n {\n- PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cpu);\n+ PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);\n+ PowerPCCPU *cpu = POWERPC_CPU(cs);\n CPUPPCState *env = &cpu->env;\n- GString *xml;\n- char *spr_name;\n+ GDBFeatureBuilder builder;\n unsigned int num_regs = 0;\n int i;\n \n+ if (pcc->gdb_spr.xml) {\n+ return;\n+ }\n+\n+ gdb_feature_builder_init(&builder, &pcc->gdb_spr,\n+ \"org.qemu.power.spr\", \"power-spr.xml\",\n+ cs->gdb_num_regs);\n+\n for (i = 0; i < ARRAY_SIZE(env->spr_cb); i++) {\n ppc_spr_t *spr = &env->spr_cb[i];\n \n@@ -326,35 +334,13 @@ void ppc_gdb_gen_spr_xml(PowerPCCPU *cpu)\n */\n spr->gdb_id = num_regs;\n num_regs++;\n- }\n-\n- if (pcc->gdb_spr_xml) {\n- return;\n- }\n \n- xml = g_string_new(\"\");\n- g_string_append(xml, \"\");\n- g_string_append(xml, \"\");\n-\n- for (i = 0; i < ARRAY_SIZE(env->spr_cb); i++) {\n- ppc_spr_t *spr = &env->spr_cb[i];\n-\n- if (!spr->name) {\n- continue;\n- }\n-\n- spr_name = g_ascii_strdown(spr->name, -1);\n- g_string_append_printf(xml, \"\");\n+ gdb_feature_builder_append_reg(&builder, g_ascii_strdown(spr->name, -1),\n+ TARGET_LONG_BITS, num_regs,\n+ \"int\", \"spr\");\n }\n \n- g_string_append(xml, \"\");\n-\n- pcc->gdb_num_sprs = num_regs;\n- pcc->gdb_spr_xml = g_string_free(xml, false);\n+ gdb_feature_builder_end(&builder);\n }\n \n const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name)\n@@ -362,7 +348,7 @@ const char *ppc_gdb_get_dynamic_xml(CPUState *cs, const char *xml_name)\n PowerPCCPUClass *pcc = POWERPC_CPU_GET_CLASS(cs);\n \n if (strcmp(xml_name, \"power-spr.xml\") == 0) {\n- return pcc->gdb_spr_xml;\n+ return pcc->gdb_spr.xml;\n }\n return NULL;\n }\n@@ -599,7 +585,8 @@ void ppc_gdb_init(CPUState *cs, PowerPCCPUClass *pcc)\n 32, \"power-vsx.xml\", 0);\n }\n #ifndef CONFIG_USER_ONLY\n+ gdb_gen_spr_feature(cs);\n gdb_register_coprocessor(cs, gdb_get_spr_reg, gdb_set_spr_reg,\n- pcc->gdb_num_sprs, \"power-spr.xml\", 0);\n+ pcc->gdb_spr.num_regs, \"power-spr.xml\", 0);\n #endif\n }\n","prefixes":["v2","27/43"]}