{"id":1882151,"url":"http://patchwork.ozlabs.org/api/patches/1882151/?format=json","web_url":"http://patchwork.ozlabs.org/project/qemu-devel/patch/20240103173349.398526-36-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-36-alex.bennee@linaro.org>","list_archive_url":null,"date":"2024-01-03T17:33:41","name":"[v2,35/43] gdbstub: Add members to identify registers to GDBFeature","commit_ref":null,"pull_url":null,"state":"new","archived":false,"hash":"7cadc40cc7bd23488d945c688b2101688ccc3771","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-36-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/1882151/comments/","check":"pending","checks":"http://patchwork.ozlabs.org/api/patches/1882151/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=LILrE4u+;\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 4T4y0N21VYz1yQ5\n\tfor ; Thu, 4 Jan 2024 04:49:40 +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 1rL5Mi-0000kV-Rw; Wed, 03 Jan 2024 12:49:16 -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 1rL5Mf-0000To-HW\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:49:13 -0500","from mail-wm1-x32d.google.com ([2a00:1450:4864:20::32d])\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 1rL5Ma-0000Io-7S\n for qemu-devel@nongnu.org; Wed, 03 Jan 2024 12:49:13 -0500","by mail-wm1-x32d.google.com with SMTP id\n 5b1f17b1804b1-40d88fff7faso25006585e9.3\n for ; Wed, 03 Jan 2024 09:49:07 -0800 (PST)","from draig.lan ([85.9.250.243]) by smtp.gmail.com with ESMTPSA id\n iw13-20020a05600c54cd00b0040c11fbe581sm2950995wmb.27.2024.01.03.09.49.05\n (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);\n Wed, 03 Jan 2024 09:49:05 -0800 (PST)","from draig.lan (localhost [IPv6:::1])\n by draig.lan (Postfix) with ESMTP id E20355F9D1;\n Wed, 3 Jan 2024 17:33:52 +0000 (GMT)"],"DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=linaro.org; s=google; t=1704304146; x=1704908946; 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=iz4XjWcI1n0170OiHCw9kC1AKAhw4u9LezlV3t4Jyjw=;\n b=LILrE4u+5KDcp5xNCD3jhTp6XtnhoIplAwTQRWfT6iBy/COOP8/rL7NBGBdg4zJGvI\n 1ReBBlMD7mbQ3+NEKH1zRiG1WRcGpsuBmWO174/5wu2NWunG0xuR5zLW0QnK55i4KrMw\n ulV493HGHWFJ2PBLKLt2vE9I1hxQCG5Lfmr06E9hYItIx9wu+JlLVPSNw91ty1T623Hk\n Ex+BPk6eLNFsnYGSrO1LUvG/ka8rdtAWLU5MilUPCKsB1mGrtn0vEZAvt5aLf5ktQRlv\n RBNZz5NGLLdKB0Z1fDhLE0D9aLSZtRELi27qEeI4Qe6RBydtncDbrYmHOam913EXJxoe\n uIng==","X-Google-DKIM-Signature":"v=1; a=rsa-sha256; c=relaxed/relaxed;\n d=1e100.net; s=20230601; t=1704304146; x=1704908946;\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=iz4XjWcI1n0170OiHCw9kC1AKAhw4u9LezlV3t4Jyjw=;\n b=pAJzjihsJ4Dx7Oj/mQBbtdRUr1Fs8Kc12pz+LVjZzih6ezezzwxbiNL6spIE5VyoXP\n B7XZ+DaLOU7pcWfIWKKEyrVtKeEFsB4GBCCWIKTGoQj7qHwEXbIfUhDhQGDIEpWhdJ7d\n k0t6k2hGCVukb+6xtJQSTnVEDV3RuJNAyZQ0JOlCYHoXs/sQ+d3sBj6rF3MUyfA1F/Fs\n atLYxiSN9EXtQqqi9v9lswdQ163kvx37L38U2ZpSCpq0PqcDs1k3ZgTbwdcuMBZZmqeX\n /PvB1YoVCB6u9UaquOxBszT4jOat7S7fOJ5+DdsbUB03Wf1u2ow8L79e4s3g79dEiy3p\n QyWg==","X-Gm-Message-State":"AOJu0YyN9aBs67ATfoXKNR6aS+QAYbpLB28LPq9HO1E4YFvxZ8FEKTGu\n ezIeguq1xAtglwL56ckX6pkLFNqsc5dAtQ==","X-Google-Smtp-Source":"\n AGHT+IFFhFNThwbNxnKEcz50mxpTxjSXE3Fddiq/923Qw2xp5S0Uf2TMaX5iL3sX5aTkzitqwDiMCw==","X-Received":"by 2002:a05:600c:22c3:b0:40d:6085:b90 with SMTP id\n 3-20020a05600c22c300b0040d60850b90mr2707802wmg.363.1704304146473;\n Wed, 03 Jan 2024 09:49:06 -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 35/43] gdbstub: Add members to identify registers to\n GDBFeature","Date":"Wed, 3 Jan 2024 17:33:41 +0000","Message-Id":"<20240103173349.398526-36-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::32d;\n 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,\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\nThese members will be used to help plugins to identify registers.\nThe added members in instances of GDBFeature dynamically generated by\nCPUs will be filled in later changes.\n\nSigned-off-by: Akihiko Odaki \nMessage-Id: <20231213-gdb-v17-10-777047380591@daynix.com>\nSigned-off-by: Alex Bennée \n---\n include/exec/gdbstub.h | 3 +++\n gdbstub/gdbstub.c | 12 +++++++++---\n target/riscv/gdbstub.c | 4 +---\n scripts/feature_to_c.py | 14 +++++++++++++-\n 4 files changed, 26 insertions(+), 7 deletions(-)","diff":"diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h\nindex 82a8afa237f..da9ddfe54c5 100644\n--- a/include/exec/gdbstub.h\n+++ b/include/exec/gdbstub.h\n@@ -13,12 +13,15 @@\n typedef struct GDBFeature {\n const char *xmlname;\n const char *xml;\n+ const char *name;\n+ const char * const *regs;\n int num_regs;\n } GDBFeature;\n \n typedef struct GDBFeatureBuilder {\n GDBFeature *feature;\n GPtrArray *xml;\n+ GPtrArray *regs;\n int base_reg;\n } GDBFeatureBuilder;\n \ndiff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c\nindex 801eba9a0b0..420ab2a3766 100644\n--- a/gdbstub/gdbstub.c\n+++ b/gdbstub/gdbstub.c\n@@ -419,9 +419,10 @@ void gdb_feature_builder_init(GDBFeatureBuilder *builder, GDBFeature *feature,\n builder->feature = feature;\n builder->xml = g_ptr_array_new();\n g_ptr_array_add(builder->xml, header);\n+ builder->regs = g_ptr_array_new();\n builder->base_reg = base_reg;\n feature->xmlname = xmlname;\n- feature->num_regs = 0;\n+ feature->name = name;\n }\n \n void gdb_feature_builder_append_tag(const GDBFeatureBuilder *builder,\n@@ -440,10 +441,12 @@ void gdb_feature_builder_append_reg(const GDBFeatureBuilder *builder,\n const char *type,\n const char *group)\n {\n- if (builder->feature->num_regs < regnum) {\n- builder->feature->num_regs = regnum;\n+ if (builder->regs->len <= regnum) {\n+ g_ptr_array_set_size(builder->regs, regnum + 1);\n }\n \n+ builder->regs->pdata[regnum] = (gpointer *)name;\n+\n if (group) {\n gdb_feature_builder_append_tag(\n builder,\n@@ -469,6 +472,9 @@ void gdb_feature_builder_end(const GDBFeatureBuilder *builder)\n }\n \n g_ptr_array_free(builder->xml, TRUE);\n+\n+ builder->feature->num_regs = builder->regs->len;\n+ builder->feature->regs = (void *)g_ptr_array_free(builder->regs, FALSE);\n }\n \n const GDBFeature *gdb_find_static_feature(const char *xmlname)\ndiff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c\nindex 68d0fdc1fd6..d9b52ffd09b 100644\n--- a/target/riscv/gdbstub.c\n+++ b/target/riscv/gdbstub.c\n@@ -266,11 +266,9 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUState *cs, int base_reg)\n }\n predicate = csr_ops[i].predicate;\n if (predicate && (predicate(env, i) == RISCV_EXCP_NONE)) {\n- g_autofree char *dynamic_name = NULL;\n name = csr_ops[i].name;\n if (!name) {\n- dynamic_name = g_strdup_printf(\"csr%03x\", i);\n- name = dynamic_name;\n+ name = g_strdup_printf(\"csr%03x\", i);\n }\n \n gdb_feature_builder_append_reg(&builder, name, bitsize, i,\ndiff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py\nindex e04d6b2df7f..807af0e685c 100644\n--- a/scripts/feature_to_c.py\n+++ b/scripts/feature_to_c.py\n@@ -50,7 +50,9 @@ def writeliteral(indent, bytes):\n sys.stderr.write(f'unexpected start tag: {element.tag}\\n')\n exit(1)\n \n+ feature_name = element.attrib['name']\n regnum = 0\n+ regnames = []\n regnums = []\n tags = ['feature']\n for event, element in events:\n@@ -67,6 +69,7 @@ def writeliteral(indent, bytes):\n if 'regnum' in element.attrib:\n regnum = int(element.attrib['regnum'])\n \n+ regnames.append(element.attrib['name'])\n regnums.append(regnum)\n regnum += 1\n \n@@ -85,6 +88,15 @@ def writeliteral(indent, bytes):\n writeliteral(8, bytes(os.path.basename(input), 'utf-8'))\n sys.stdout.write(',\\n')\n writeliteral(8, read)\n- sys.stdout.write(f',\\n {num_regs},\\n }},\\n')\n+ sys.stdout.write(',\\n')\n+ writeliteral(8, bytes(feature_name, 'utf-8'))\n+ sys.stdout.write(',\\n (const char * const []) {\\n')\n+\n+ for index, regname in enumerate(regnames):\n+ sys.stdout.write(f' [{regnums[index] - base_reg}] =\\n')\n+ writeliteral(16, bytes(regname, 'utf-8'))\n+ sys.stdout.write(',\\n')\n+\n+ sys.stdout.write(f' }},\\n {num_regs},\\n }},\\n')\n \n sys.stdout.write(' { NULL }\\n};\\n')\n","prefixes":["v2","35/43"]}