From nobody Mon Sep 16 20:06:05 2024 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=1694851570; cv=none; d=zohomail.com; s=zohoarc; b=WmRzl5YdwIrev+ec770nfEXPv8Kd4aN0BGWNavfGZbncZY5mxF34TgwOcOx4hNtV3bNXpbTmfX05i5jzENw7ttD8Pl2nuGfP+Pmg/n0Veu+2EH9omAh2nb1MQRDVyQRXzyPfiZJMcMWqOxmTi4Q0Xifoij/zYNa2rnNaTqrKnoc= ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com; s=zohoarc; t=1694851570; h=Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject; bh=whWo5tKtnh96wOd8/J5aT9p6Pdm6/pTl0OTz7gsGvtU=; b=NXVI4LcyHvg6ctgjUP+EfjSuARuTIQYDI6Jd+YqfPGeM1EWtAzi/TCD2WY97F1weY0C7ks4+sBTij+2jFI+yObhTl5wrwAmDNGrbrTRnN5WGM0doWRaDwTUaN2iGSGBOOtiz/WNszO0lhdNWXrlz12U2y5bxOCR/SwbHkhvxTmk= 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 1694851570311716.3949531619559; Sat, 16 Sep 2023 01:06:10 -0700 (PDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qhQGg-0003xw-3v; Sat, 16 Sep 2023 04:03:06 -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 1qhQGe-0003rW-G2 for qemu-devel@nongnu.org; Sat, 16 Sep 2023 04:03:04 -0400 Received: from mail-pf1-x42f.google.com ([2607:f8b0:4864:20::42f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qhQGc-0006Bs-NG for qemu-devel@nongnu.org; Sat, 16 Sep 2023 04:03:04 -0400 Received: by mail-pf1-x42f.google.com with SMTP id d2e1a72fcca58-69042d398b1so1522678b3a.0 for ; Sat, 16 Sep 2023 01:03:01 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with ESMTPSA id z21-20020aa791d5000000b0068a46cd4120sm4029484pfa.199.2023.09.16.01.02.56 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 16 Sep 2023 01:02:59 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1694851380; x=1695456180; 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=whWo5tKtnh96wOd8/J5aT9p6Pdm6/pTl0OTz7gsGvtU=; b=mf7GeXWXpLy/2dkTeWKwmdjk9MCl7PH95CqxzfbKmTQDXC5o6wkth+VNPJMLVItT7f OA39xmcnlP6wb1McCbJmn7AgjIn/siDgixpI08J+SgZ64ylKID032C5XH6QeL95b4aez 8eMJgWaeFy3Nbw4/BVBlKU+R97yb3RnKQNWM7uSK8O1159M7Qv/CGKduXOfsjhFbfk0d Z57Gu+rSMYC90WoyiXwh1bgqa00gjvZlAjNMCUr3RVe0DHEYRXB98VsX2siO9OvTs/xW Mkf37cHV1ZYciN7nNsv1iq7a3js177iVPMs46kGRurHq09Klt/i2Q1fxJAvQnDRmgmlj GFkg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694851380; x=1695456180; 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=whWo5tKtnh96wOd8/J5aT9p6Pdm6/pTl0OTz7gsGvtU=; b=NFUODGrWr9sAQlF7UwFxE7HvEN2kOQSyAICzbN36nJkLRSd6fcI1lN6uTsEEsY6VK7 EhqSs/tgq2s8P3f8HrseqdPVVeg1TXxYxBvXF3B0z3IHoT3HwyFChmlC4dmHEHjEnYwJ 46ulX4Z2KShu6oXevPD9+DaMRiViRQBrSqOI86JG1zp1UdCkaAgmaZcrJ8upatEQ8s1W 8HjF3M5CV5+fimUXS3TU13XzrgCSPvEWpPN2JnloZuasX5ME4jqarjLz7Y5tDlet9N1M BvMcaYuH2RHo94uB203Od94B0TTyl7C0uIBAOyy+ctBL+Vu7jGYefwRzbershBBhfdeN tBcQ== X-Gm-Message-State: AOJu0YyKnF739Nh9osX3VdxTgNMFYm0sHunuy6dItmfwKJM9Chx7eZGS yPPm5TmPFsxxIucs9zMXR2ioSg== X-Google-Smtp-Source: AGHT+IHs4eqj7R0TWZiKbCJb7qVkQ6K5xUqwtEHOdo4jnz9QcoCHETz3pB6lSFj9YGSR/glVRTKGDQ== X-Received: by 2002:a05:6a20:8e27:b0:13a:43e8:3fb5 with SMTP id y39-20020a056a208e2700b0013a43e83fb5mr5238776pzj.51.1694851380323; Sat, 16 Sep 2023 01:03:00 -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 v8 13/19] gdbstub: Add members to identify registers to GDBFeature Date: Sat, 16 Sep 2023 17:01:30 +0900 Message-ID: <20230916080149.129989-14-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230916080149.129989-1-akihiko.odaki@daynix.com> References: <20230916080149.129989-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::42f; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x42f.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+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: 1694851571167100001 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 67f363132e..b2b2675f6f 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 8d45daf6d7..c6dd5fcd51 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