From patchwork Wed Aug 2 08:46:05 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1815906 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org 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=) 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=zPbHPJIK; dkim-atps=neutral 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 4RG5LH3z4Pz1ydw for ; Wed, 2 Aug 2023 18:51:19 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qR7Xv-0007Nw-8g; Wed, 02 Aug 2023 04:49:31 -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 1qR7Xm-000714-TE for qemu-devel@nongnu.org; Wed, 02 Aug 2023 04:49:23 -0400 Received: from mail-pf1-x433.google.com ([2607:f8b0:4864:20::433]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qR7Xk-0008C9-02 for qemu-devel@nongnu.org; Wed, 02 Aug 2023 04:49:22 -0400 Received: by mail-pf1-x433.google.com with SMTP id d2e1a72fcca58-686b9920362so4713820b3a.1 for ; Wed, 02 Aug 2023 01:49:19 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20221208.gappssmtp.com; s=20221208; t=1690966159; x=1691570959; 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=i68gTXndm5g2JBfGSVbcpcLCWh9EafQ06rBdOr/hNg8=; b=zPbHPJIK6FiXB+zkQYrl1p4vc47YNlZwx4dsVHkLtpH8gEsibkyaoAcPHCP7E+T81T L3p3hXRqqnwTNsn2Pugvt7W/sFitJomOKLBDXYmmtHA/HiLTWRUO7efyYkY0+vOV9Swl l5emdPACZeKr4XDUOKY8Ez3rFXfKMMR7GMj+GgyFI1cWRk0u2qfBMlNbSE144AyGWYaY r8tS0Bmi0IopraG2dAQ0/jYX4fF+aWFo+vnbVkI665YKC/B9eZhuDFZ2IwpWN4PdpgdT V1EoHZcEvKsL/thbLXSUVr7N+8vvXvmuTGaLrFpKVQe5P01KiI0RnDlY8YE7hlI6L4qg r4fQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1690966159; x=1691570959; 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=i68gTXndm5g2JBfGSVbcpcLCWh9EafQ06rBdOr/hNg8=; b=Im0a8N5ta8h4pzH8iW5nEvgoTyTTwkyGXXf26dq/VXHmae1jVoNHi/w0rKA3sVw1Kx T4HbG6MN31vUu7CE3C+6R6dvRbEk37NIseLgWr9+w2QZFRGIQwqMQZ1ppm9wSZbYS8bj PHpB52wsmE/QVMMnzpSBkjmBzhSYfjhEXuv0g0ziSvQPwmR94Byc8Pa8nRYcDajh9UwS 7Mg0uKrJM8wsJaQs1nQ7M9mQuihIB7aT71KzDu4+dCsSfh7X7br9WqZtOGhU7xsm0h0j sq93+I9H+j8FGrl3OsYavdkTQ+1Yu4RwWZA0gVmyffbj7t3crTtdKYWJ8p8tGIjII2Qd clsQ== X-Gm-Message-State: ABy/qLaqDtrkvkULa8Ppqc6rx8ybNV2Ts28LMisgb+qviOnHs4dLKPUT E9jPCV7L23V2aZITkR1KacpS6A== X-Google-Smtp-Source: APBJJlFs/0Lyyo2poP1hVg2sI/C2SNqfz80TTITgo28IlbyxFxJl+qWlt1UT3L35LNW+0usyWMJOJA== X-Received: by 2002:a05:6a20:5526:b0:137:3803:33c with SMTP id ko38-20020a056a20552600b001373803033cmr13298373pzb.54.1690966158768; Wed, 02 Aug 2023 01:49:18 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with ESMTPSA id j22-20020aa79296000000b00659b8313d08sm10592860pfa.78.2023.08.02.01.49.09 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 02 Aug 2023 01:49:18 -0700 (PDT) From: Akihiko Odaki To: Cc: Paolo Bonzini , =?utf-8?q?Alex_Benn=C3=A9e?= , Thomas Huth , Alexandre Iooss , Mahmoud Mandour , Eduardo Habkost , Marcel Apfelbaum , =?utf-8?q?Philippe_Mathieu-D?= =?utf-8?q?aud=C3=A9?= , Yanan Wang , Richard Henderson , =?utf-8?q?Marc-Andr=C3=A9?= =?utf-8?q?_Lureau?= , =?utf-8?q?Daniel_P_=2E_B?= =?utf-8?q?errang=C3=A9?= , John Snow , Cleber Rosa , Peter Maydell , Michael Rolnik , "Edgar E . Iglesias" , Brian Cain , Song Gao , Xiaojuan Yang , Laurent Vivier , Aurelien Jarno , Jiaxun Yang , Aleksandar Rikalo , Chris Wulff , Marek Vasut , Stafford Horne , Daniel Henrique Barboza , =?utf-8?q?C=C3=A9dric_Le_G?= =?utf-8?q?oater?= , David Gibson , Greg Kurz , Nicholas Piggin , Palmer Dabbelt , Alistair Francis , Bin Meng , Weiwei Li , Liu Zhiwei , Yoshinori Sato , David Hildenbrand , Ilya Leoshkevich , Mark Cave-Ayland , Artyom Tarasenko , Bastian Koppelmann , Max Filippov , qemu-devel@nongnu.org, qemu-arm@nongnu.org, qemu-ppc@nongnu.org, qemu-riscv@nongnu.org, qemu-s390x@nongnu.org, Anton Kochkov , Akihiko Odaki Subject: [PATCH v2 17/24] target/riscv: Fill new members of GDBFeature Date: Wed, 2 Aug 2023 17:46:05 +0900 Message-ID: <20230802084614.23619-18-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20230802084614.23619-1-akihiko.odaki@daynix.com> References: <20230802084614.23619-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::433; envelope-from=akihiko.odaki@daynix.com; helo=mail-pf1-x433.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, 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: , 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. Signed-off-by: Akihiko Odaki --- target/riscv/gdbstub.c | 21 ++++++++++++++------- 1 file changed, 14 insertions(+), 7 deletions(-) diff --git a/target/riscv/gdbstub.c b/target/riscv/gdbstub.c index 224c69ea99..b3d4d4de3e 100644 --- a/target/riscv/gdbstub.c +++ b/target/riscv/gdbstub.c @@ -217,6 +217,7 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUState *cs, int base_reg) RISCVCPU *cpu = RISCV_CPU(cs); CPURISCVState *env = &cpu->env; GString *s = g_string_new(NULL); + const char **regs = g_new(const char *, CSR_TABLE_SIZE); riscv_csr_predicate_fn predicate; int bitsize = 16 << env->misa_mxl_max; int i; @@ -240,11 +241,10 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUState *cs, int base_reg) } predicate = csr_ops[i].predicate; if (predicate && (predicate(env, i) == RISCV_EXCP_NONE)) { - if (csr_ops[i].name) { - g_string_append_printf(s, "", base_reg + i); } @@ -252,6 +252,8 @@ static GDBFeature *riscv_gen_dynamic_csr_feature(CPUState *cs, int base_reg) g_string_append_printf(s, ""); + cpu->dyn_csr_feature.name = "org.gnu.gdb.riscv.csr"; + cpu->dyn_csr_feature.regs = regs; cpu->dyn_csr_feature.num_regs = CSR_TABLE_SIZE; cpu->dyn_csr_feature.xmlname = "riscv-csr.xml"; cpu->dyn_csr_feature.xml = g_string_free(s, false); @@ -268,10 +270,12 @@ static GDBFeature *ricsv_gen_dynamic_vector_feature(CPUState *cs, int base_reg) RISCVCPU *cpu = RISCV_CPU(cs); GString *s = g_string_new(NULL); g_autoptr(GString) ts = g_string_new(""); + const char **regs; int reg_width = cpu->cfg.vlen; int i; cpu->dyn_vreg_feature.num_regs = 32; + regs = g_new(const char *, cpu->dyn_vreg_feature.num_regs); g_string_printf(s, ""); g_string_append_printf(s, ""); @@ -297,15 +301,18 @@ static GDBFeature *ricsv_gen_dynamic_vector_feature(CPUState *cs, int base_reg) /* Define vector registers */ for (i = 0; i < cpu->dyn_vreg_feature.num_regs; i++) { + regs[i] = g_strdup_printf("v%d", i); g_string_append_printf(s, - "", - i, reg_width, base_reg++); + regs[i], reg_width, base_reg++); } g_string_append_printf(s, ""); + cpu->dyn_vreg_feature.name = "org.gnu.gdb.riscv.vector"; + cpu->dyn_vreg_feature.regs = regs; cpu->dyn_vreg_feature.xmlname = "riscv-vector.xml"; cpu->dyn_vreg_feature.xml = g_string_free(s, false); return &cpu->dyn_vreg_feature;