From nobody Wed Feb 11 00:49:21 2026 Delivered-To: importer@patchew.org Authentication-Results: mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org ARC-Seal: i=1; a=rsa-sha256; t=1697254965; cv=none; d=zohomail.com; s=zohoarc; b=Jp8vmxPea7Xf+F55FUesAHSJNHA8QVuLSqXTTRo18CIwykLQnLXPbuxUk2bbBGvUD+KIesZBk2yCe9DmmOWywLoUrhFMBo61SZ1jbqKS3wSmGyFbi4zqsPfOMpAqbrneCEkALdHko07/C4EyqMQCfGbLYEcx0SKzoXXOCAJZRww= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1697254965; h=Content-Transfer-Encoding:Cc:Cc:Date:Date:From:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:Subject:Message-Id:Reply-To:To; bh=li3n6jKGoV5jBpdCylYK+xu/0A7CknnDKoYQERs8Hbk=; b=WdZcitZ6Jys6A6DgBcB3tPzinGAeoF+7o/n+xzYc8Y5vl3nmruXzOSQ4HPTFVSdgDLB54Xm6CCPTcWQIkc/rafXze+6kJtDnlNHo+qjRJUGCB7jTjPGjBJfZHwQ7y3CC3eJ5FsQZdIr+3TDPYUyulh+omVrGooLNryxYEnnDtBI= ARC-Authentication-Results: i=1; mx.zohomail.com; dkim=pass; spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org Return-Path: Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by mx.zohomail.com with SMTPS id 1697254965067895.376306560304; Fri, 13 Oct 2023 20:42:45 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qrVWP-0004cx-3Z; Fri, 13 Oct 2023 23:41:01 -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 1qrVWJ-0004Ih-GY for qemu-devel@nongnu.org; Fri, 13 Oct 2023 23:40:57 -0400 Received: from mail-ot1-x331.google.com ([2607:f8b0:4864:20::331]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qrVWH-00050d-2v for qemu-devel@nongnu.org; Fri, 13 Oct 2023 23:40:54 -0400 Received: by mail-ot1-x331.google.com with SMTP id 46e09a7af769-6c4c594c0eeso1776694a34.0 for ; Fri, 13 Oct 2023 20:40:52 -0700 (PDT) Received: from localhost ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with UTF8SMTPSA id fe1-20020a056a002f0100b00690c52267easm14210467pfb.40.2023.10.13.20.40.48 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Fri, 13 Oct 2023 20:40:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1697254851; x=1697859651; 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=li3n6jKGoV5jBpdCylYK+xu/0A7CknnDKoYQERs8Hbk=; b=uPBD9ddveTlBo1DkgHDeJativr2sLPkTSGpzKIohfzOBqa6zYxmo6Yr64JB7rSJwp0 I6g82VITHCikMMdu0Kp+7MPzIaG+B7f+VZiZudBlZHEz2PEJqwZsqBvq22ZqfVvllBK0 swbNxOMvObA8jufAbR2VYkTzpZZ1HfIeeMeYsdd0MiywkjCtjEpFnlzx2zKiB5X3IRQB DNz1XJEmsG9nYv/XuM7n0bfFgUMSpWZ8EzOOMIPE/ox4V81V2OOsBBUOLE0fwHR4MyF6 7KXXIwNZ+a/yV3/b866km4qMW/BADCwhAPI80upwn7g4J1mgUfM1d9yITMSy8rDgcK2i drtQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697254851; x=1697859651; 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=li3n6jKGoV5jBpdCylYK+xu/0A7CknnDKoYQERs8Hbk=; b=ipv6GxwHjpvZB3t+tFl7Tbc0QZtSpUIwkkCk3+v98A5JNbSueuwRrLdOB3EMXRqiht iZYEDqLjp5Y57kPhsr56Fj2bHsoi7bPRydawQSvlD8bFb+PucJJhapBwd+QxrDJYnpZa qjAWP88CYik6qh7Ahus3qqQWnT7vb5t+DDv76DJ6xe7/G6W2CsqVIxAl4d2lhxRzA2tG i41FCI9Cd/TfpS2tvkVSkFCILuxwDnaIB5uf4+5ISzZ+YdezRmlQhEntgPlG4gHtx3PQ 7DcArrl8QsUrwTpTU2uAJ50qR3+dPgKDsCUq3oxzKqhCtM71ow7IS3zOCMS1cxWgBqLK YKBg== X-Gm-Message-State: AOJu0YzU8nkXRNA2avciEJHjkjM0colXkojgOCY23MXPIN9cd4sV9iWj Oq7SefQZt1MftljxjtiuMdkh6Q== X-Google-Smtp-Source: AGHT+IFBJBe9mXgbBQ0tZMi8F2mmXRM2VOpLLFZIfp1ctdranWr61U7uWUAxt4qqqEqQPXqVwM7kgA== X-Received: by 2002:a05:6358:7f0e:b0:140:e7af:44c9 with SMTP id p14-20020a0563587f0e00b00140e7af44c9mr27783233rwn.23.1697254851685; Fri, 13 Oct 2023 20:40:51 -0700 (PDT) From: Akihiko Odaki To: Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= , Mikhail Tyutin , Aleksandr Anenkov , qemu-devel@nongnu.org, =?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= , Akihiko Odaki , John Snow , Cleber Rosa , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Daniel Henrique Barboza , Liu Zhiwei , qemu-riscv@nongnu.org (open list:RISC-V TCG CPUs) Subject: [PATCH v12 13/18] gdbstub: Add members to identify registers to GDBFeature Date: Sat, 14 Oct 2023 12:39:32 +0900 Message-ID: <20231014033940.15679-14-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231014033940.15679-1-akihiko.odaki@daynix.com> References: <20231014033940.15679-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org; helo=lists.gnu.org; Received-SPF: none client-ip=2607:f8b0:4864:20::331; envelope-from=akihiko.odaki@daynix.com; helo=mail-ot1-x331.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=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+importer=patchew.org@nongnu.org Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org X-ZohoMail-DKIM: pass (identity @daynix-com.20230601.gappssmtp.com) X-ZM-MESSAGEID: 1697254966935100007 Content-Type: text/plain; charset="utf-8" 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 | 10 ++++++++-- target/riscv/gdbstub.c | 4 +--- scripts/feature_to_c.py | 14 +++++++++++++- 4 files changed, 25 insertions(+), 6 deletions(-) diff --git a/include/exec/gdbstub.h b/include/exec/gdbstub.h index 70e16be79e..229fa382bc 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; =20 typedef struct GDBFeatureBuilder { GDBFeature *feature; GPtrArray *xml; + GPtrArray *regs; } GDBFeatureBuilder; =20 =20 diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 625a3347c3..f8c7f427d7 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -417,9 +417,10 @@ void gdb_feature_builder_init(GDBFeatureBuilder *build= er, GDBFeature *feature, =20 builder->feature =3D feature; builder->xml =3D g_ptr_array_new(); + builder->regs =3D g_ptr_array_new(); g_ptr_array_add(builder->xml, header); feature->xmlname =3D xmlname; - feature->num_regs =3D 0; + feature->name =3D name; } =20 void gdb_feature_builder_append_tag(const GDBFeatureBuilder *builder, @@ -448,7 +449,9 @@ int gdb_feature_builder_append_reg(const GDBFeatureBuil= der *builder, name, bitsize, type); } =20 - return builder->feature->num_regs++; + g_ptr_array_add(builder->regs, (void *)name); + + return builder->regs->len - 1; } =20 void gdb_feature_builder_end(const GDBFeatureBuilder *builder) @@ -463,6 +466,9 @@ void gdb_feature_builder_end(const GDBFeatureBuilder *b= uilder) } =20 g_ptr_array_free(builder->xml, TRUE); + + builder->feature->num_regs =3D builder->regs->len; + builder->feature->regs =3D (void *)g_ptr_array_free(builder->regs, FAL= SE); } =20 const GDBFeature *gdb_find_static_feature(const char *xmlname) diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index c8525794ef..f125109787 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -262,11 +262,9 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUSt= ate *cs) } predicate =3D csr_ops[i].predicate; if (predicate && (predicate(env, i) =3D=3D RISCV_EXCP_NONE)) { - g_autofree char *dynamic_name =3D NULL; name =3D csr_ops[i].name; if (!name) { - dynamic_name =3D g_strdup_printf("csr%03x", i); - name =3D dynamic_name; + name =3D g_strdup_printf("csr%03x", i); } =20 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) =20 + feature_name =3D element.attrib['name'] regnum =3D 0 + regnames =3D [] regnums =3D [] tags =3D ['feature'] for event, element in events: @@ -67,6 +69,7 @@ def writeliteral(indent, bytes): if 'regnum' in element.attrib: regnum =3D int(element.attrib['regnum']) =20 + regnames.append(element.attrib['name']) regnums.append(regnum) regnum +=3D 1 =20 @@ -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}] =3D\n= ') + writeliteral(16, bytes(regname, 'utf-8')) + sys.stdout.write(',\n') + + sys.stdout.write(f' }},\n {num_regs},\n }},\n') =20 sys.stdout.write(' { NULL }\n};\n') --=20 2.42.0