From patchwork Fri Aug 18 03:36:36 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1822658 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=daynix-com.20221208.gappssmtp.com header.i=@daynix-com.20221208.gappssmtp.com header.a=rsa-sha256 header.s=20221208 header.b=qZ6EGnFu; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=nongnu.org (client-ip=209.51.188.17; helo=lists.gnu.org; envelope-from=qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org; receiver=patchwork.ozlabs.org) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-ECDSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4RRnf32CS1z1ygH for ; Fri, 18 Aug 2023 13:38:35 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qWqJA-00039p-Ek; Thu, 17 Aug 2023 23:37:56 -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 1qWqJ8-0002vm-Cf for qemu-devel@nongnu.org; Thu, 17 Aug 2023 23:37:54 -0400 Received: from mail-oi1-x22a.google.com ([2607:f8b0:4864:20::22a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qWqJ6-00062v-3A for qemu-devel@nongnu.org; Thu, 17 Aug 2023 23:37:54 -0400 Received: by mail-oi1-x22a.google.com with SMTP id 5614622812f47-3a8036d805eso341500b6e.3 for ; Thu, 17 Aug 2023 20:37:50 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1692329870; x=1692934670; 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=H1emdzczPX1kf85OC8CWYij+GP4tyOMLxPaUXdolahU=; b=qZ6EGnFut/wssFFasxWCRqHd4MrJ0jEMOMuLpPVufS+CDrHWVwzaOv82OEcrtLDG6K cCaGcDJfODTKHz09XjRYjMOCkNhHBXLlh1IjExuEwPjlju8FwzcQdlG2ke65etfaaOkd ttm3KMQaCDuQI32vaKx0OHo/3GSDK8hr7Hw6+Te0TfuEaIXS49X1Wrxzq0hyIBy9BZOZ nmk22VYKzDyk5jqhG/NdB3gKHdP13Zw1IHJW3ADNZ+5uvbbDCsR3u5fqVnMX5HCsd0zQ MzVxhByHHD8MbBLNhOgopNhTrA7Ggag7feF0mwt7kf7n9PTaVks0bVoTiQ9a58un7ozV nF0A== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692329870; x=1692934670; 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=H1emdzczPX1kf85OC8CWYij+GP4tyOMLxPaUXdolahU=; b=leM3y178b/2ZM7uw+eZ/RrsTwVpat7SIUnQGHF9oU8bCFLvVw6qYPPPj5g09vv4aOZ IXKRtM6g3tQycSc+0fOYbrzVpp1V0RaU2HDthuNd/2nbTme3xZIU+OaOzz+/jMAuWnhF REMHpsb0LrOzmLXzYPpld+t4Ow7HfOvBHpIhYO3V5tie/diqhz5x/zbnIzAZ0RuqNKbQ EItQec9sbI83b90aVp8WZPysshErCx81H/9SSZEy+WYstU4z6paEpIrEJDq7WOnvW5Ki T0I69ZYjmRod0vi9QxKFwKPaFsoTkCthXJYFq4qxCoKzRhk4cHqPdUAfu+uwSwksj7xW qjxw== X-Gm-Message-State: AOJu0Yw4HyvJqI68ZuE6YXQu2XbrvqXJy7U5pBGWV1RZ6th1gupEbTLc Fs+00hjf81kkRi4Ry9NROjrYqQ== X-Google-Smtp-Source: AGHT+IGQ5Knb+NQmkR+R3mOv8/kdPLfxvKjjiqE1GJbdc0bpk++Hp+etUncd5YdtByD2BtrVgnfNuQ== X-Received: by 2002:a05:6808:21aa:b0:3a4:225d:8135 with SMTP id be42-20020a05680821aa00b003a4225d8135mr1929676oib.31.1692329869927; Thu, 17 Aug 2023 20:37:49 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with ESMTPSA id c24-20020aa781d8000000b00686a80f431dsm484135pfn.126.2023.08.17.20.37.46 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 17 Aug 2023 20:37:49 -0700 (PDT) From: Akihiko Odaki To: Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Mikhail Tyutin , Aleksandr Anenkov , qemu-devel@nongnu.org, Akihiko Odaki , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , John Snow , Cleber Rosa , Peter Maydell , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-arm@nongnu.org (open list:ARM TCG CPUs), qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PATCH RESEND v5 17/26] gdbstub: Add members to identify registers to GDBFeature Date: Fri, 18 Aug 2023 12:36:36 +0900 Message-ID: <20230818033648.8326-18-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230818033648.8326-1-akihiko.odaki@daynix.com> References: <20230818033648.8326-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::22a; envelope-from=akihiko.odaki@daynix.com; helo=mail-oi1-x22a.google.com X-Spam_score_int: -18 X-Spam_score: -1.9 X-Spam_bar: - X-Spam_report: (-1.9 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_NONE=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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org These members will be used to help plugins to identify registers. The added members in instances of GDBFeature dynamically generated by CPUs will be filled in later changes. Signed-off-by: Akihiko Odaki --- include/exec/gdbstub.h | 3 +++ gdbstub/gdbstub.c | 8 ++++++-- target/arm/gdbstub.c | 2 +- target/riscv/gdbstub.c | 4 +--- scripts/feature_to_c.py | 14 +++++++++++++- 5 files changed, 24 insertions(+), 7 deletions(-) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 572abada63..f3f2c40b1a 100644 --- a/include/exec/gdbstub.h +++ b/include/exec/gdbstub.h @@ -13,12 +13,15 @@ typedef struct GDBFeature { const char *xmlname; const char *xml; + const char *name; + const char * const *regs; int num_regs; } GDBFeature; typedef struct GDBFeatureBuilder { GDBFeature *feature; GPtrArray *xml; + GPtrArray *regs; } GDBFeatureBuilder; diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 4648a56088..e52a739491 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -418,9 +418,10 @@ void gdb_feature_builder_init(GDBFeatureBuilder *builder, GDBFeature *feature, builder->feature = feature; builder->xml = g_ptr_array_new(); + builder->regs = g_ptr_array_new(); g_ptr_array_add(builder->xml, header); feature->xmlname = xmlname; - feature->num_regs = 0; + feature->name = name; } void gdb_feature_builder_append_tag(const GDBFeatureBuilder *builder, @@ -449,7 +450,7 @@ void gdb_feature_builder_append_reg(const GDBFeatureBuilder *builder, name, bitsize, type); } - builder->feature->num_regs++; + g_ptr_array_add(builder->regs, (void *)name); } void gdb_feature_builder_end(const GDBFeatureBuilder *builder) @@ -464,6 +465,9 @@ void gdb_feature_builder_end(const GDBFeatureBuilder *builder) } g_ptr_array_free(builder->xml, TRUE); + + builder->feature->num_regs = builder->regs->len; + builder->feature->regs = (void *)g_ptr_array_free(builder->regs, FALSE); } const GDBFeature *gdb_find_static_feature(const char *xmlname) diff --git a/target/arm/gdbstub.c b/target/arm/gdbstub.c index fc5ed89e80..dbc396a88b 100644 --- a/target/arm/gdbstub.c +++ b/target/arm/gdbstub.c @@ -264,7 +264,7 @@ static void arm_gen_one_feature_sysreg(GDBFeatureBuilder *builder, ARMCPRegInfo *ri, uint32_t ri_key, int bitsize) { - dyn_feature->data.cpregs.keys[dyn_feature->desc.num_regs] = ri_key; + dyn_feature->data.cpregs.keys[builder->regs->len] = ri_key; gdb_feature_builder_append_reg(builder, ri->name, bitsize, "int", "cp_regs"); diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index d4f9eb1516..a2ec9a3701 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -240,11 +240,9 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUState *cs) } predicate = csr_ops[i].predicate; if (predicate && (predicate(env, i) == RISCV_EXCP_NONE)) { - g_autofree char *dynamic_name = NULL; name = csr_ops[i].name; if (!name) { - dynamic_name = g_strdup_printf("csr%03x", i); - name = dynamic_name; + name = g_strdup_printf("csr%03x", i); } gdb_feature_builder_append_reg(&builder, name, bitsize, diff --git a/scripts/feature_to_c.py b/scripts/feature_to_c.py index e04d6b2df7..807af0e685 100755 --- a/scripts/feature_to_c.py +++ b/scripts/feature_to_c.py @@ -50,7 +50,9 @@ def writeliteral(indent, bytes): sys.stderr.write(f'unexpected start tag: {element.tag}\n') exit(1) + feature_name = element.attrib['name'] regnum = 0 + regnames = [] regnums = [] tags = ['feature'] for event, element in events: @@ -67,6 +69,7 @@ def writeliteral(indent, bytes): if 'regnum' in element.attrib: regnum = int(element.attrib['regnum']) + regnames.append(element.attrib['name']) regnums.append(regnum) regnum += 1 @@ -85,6 +88,15 @@ def writeliteral(indent, bytes): writeliteral(8, bytes(os.path.basename(input), 'utf-8')) sys.stdout.write(',\n') writeliteral(8, read) - sys.stdout.write(f',\n {num_regs},\n }},\n') + sys.stdout.write(',\n') + writeliteral(8, bytes(feature_name, 'utf-8')) + sys.stdout.write(',\n (const char * const []) {\n') + + for index, regname in enumerate(regnames): + sys.stdout.write(f' [{regnums[index] - base_reg}] =\n') + writeliteral(16, bytes(regname, 'utf-8')) + sys.stdout.write(',\n') + + sys.stdout.write(f' }},\n {num_regs},\n }},\n') sys.stdout.write(' { NULL }\n};\n')