From patchwork Thu Oct 12 13:06:02 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1847454 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.20230601.gappssmtp.com header.i=@daynix-com.20230601.gappssmtp.com header.a=rsa-sha256 header.s=20230601 header.b=Cn6dKjf/; 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 4S5qh773BDz1yqj for ; Fri, 13 Oct 2023 00:08:23 +1100 (AEDT) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qqvPO-0002A4-9b; Thu, 12 Oct 2023 09:07:22 -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 1qqvPF-0001xh-A2 for qemu-devel@nongnu.org; Thu, 12 Oct 2023 09:07:14 -0400 Received: from mail-pg1-x52b.google.com ([2607:f8b0:4864:20::52b]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qqvP4-0005Dv-09 for qemu-devel@nongnu.org; Thu, 12 Oct 2023 09:07:12 -0400 Received: by mail-pg1-x52b.google.com with SMTP id 41be03b00d2f7-577e62e2adfso637875a12.2 for ; Thu, 12 Oct 2023 06:07:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1697116021; x=1697720821; 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=DAXiVgK3SY16sTLGMXmBBZcg+fyxw8kEojOMtcTx9cc=; b=Cn6dKjf/6F0a4Sy+yj0AAgDNEbF7zHZRfdb+ukgWfLpADxggnLS/HxX5SMvjiuT6fz ih8bzrQINPO1GptzNwtMlTaIkHi+6lC9+niR9yQb5wcZDgSwVCAgL4InYkbwPU3l2XXR Z+QKLUGsQufZ77i2bVQ1dPnoRf6bxCuPvi0TU74jiDUbNQ/+RdRbqXaWc2OId23XhioE oiei/2/iw3YoQkCZSuxzmbwKhyzQ2WP3EZVKQ19VBmvmDwRJDSOCioff2MvFpOy6FOXK aZHyYRbq/9VeaKZ9wDzii5AOgbUzek1B5piFvZ43JiDH/Pypj0MjOtN05ACx7cxgJbCp uXiw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1697116021; x=1697720821; 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=DAXiVgK3SY16sTLGMXmBBZcg+fyxw8kEojOMtcTx9cc=; b=gBtQxdz/SmdKs3X4UaF6GQbwRAS7HTy+GjlLqUrMJcjdeeJVIEf0PenM9rmcGI7h6o dM0aSnahCsTsJ2nenBKAkxWFGTkYSollM0AWlukGZWi/NsWErTtgqXxtxUmvFSvnEoM5 xWZ5KqFEtKtHsdPYEf+TZUlF/D+SAv5Z1eIZFzZxMMUJhKGuG5NNLhc77s+Mokp6Wymd 1eq84Lh7RhBKcYXalOa3lIqHt14RBCjGHZM6kqKuZhuOi0AxYYKJOEMm5PSM4+Lf+9Kk 7APwLYZtSqSuSW5n5oeGaVhr4Jv1hxhSfbAfUNFrlom5QhtX7cFNJLqKg3NCTjXh1/w0 q+iA== X-Gm-Message-State: AOJu0YxtgCUhkiPbjl4PLjwFfviPD1+OZyqYbeR4bmOwyH6fHfsV6uvS X9eSEdKk83NtbrWlb2ISXlPCkw== X-Google-Smtp-Source: AGHT+IEi44GwCZFOEBOJZppp8peAcGIWm876Ol91x0FZcw/WNSr01k+Awo07c1h9rYja8GFaPsuOVA== X-Received: by 2002:a17:90b:3642:b0:27d:dc9:c67d with SMTP id nh2-20020a17090b364200b0027d0dc9c67dmr3735729pjb.36.1697116020695; Thu, 12 Oct 2023 06:07:00 -0700 (PDT) Received: from localhost ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with UTF8SMTPSA id mv21-20020a17090b199500b00276e8e4f1fbsm1814678pjb.1.2023.10.12.06.06.59 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Thu, 12 Oct 2023 06:07:00 -0700 (PDT) From: Akihiko Odaki To: Cc: =?utf-8?q?Alex_Benn=C3=A9e?= , Mikhail Tyutin , Aleksandr Anenkov , qemu-devel@nongnu.org, =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Akihiko Odaki Subject: [PATCH v11 08/18] gdbstub: Use GDBFeature for GDBRegisterState Date: Thu, 12 Oct 2023 22:06:02 +0900 Message-ID: <20231012130616.7941-9-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231012130616.7941-1-akihiko.odaki@daynix.com> References: <20231012130616.7941-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::52b; envelope-from=akihiko.odaki@daynix.com; helo=mail-pg1-x52b.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+incoming=patchwork.ozlabs.org@nongnu.org Sender: qemu-devel-bounces+incoming=patchwork.ozlabs.org@nongnu.org Simplify GDBRegisterState by replacing num_regs and xml members with one member that points to GDBFeature. Signed-off-by: Akihiko Odaki Reviewed-by: Alex Bennée --- gdbstub/gdbstub.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index 20586e0b6a..9a4124afc4 100644 --- a/gdbstub/gdbstub.c +++ b/gdbstub/gdbstub.c @@ -47,10 +47,9 @@ typedef struct GDBRegisterState { int base_reg; - int num_regs; gdb_get_reg_cb get_reg; gdb_set_reg_cb set_reg; - const char *xml; + const GDBFeature *feature; } GDBRegisterState; GDBState gdbserver_state; @@ -390,7 +389,7 @@ static const char *get_feature_xml(const char *p, const char **newp, g_ptr_array_add( xml, g_markup_printf_escaped("", - r->xml)); + r->feature->xmlname)); } g_ptr_array_add(xml, g_strdup("")); g_ptr_array_add(xml, NULL); @@ -504,7 +503,7 @@ static int gdb_read_register(CPUState *cpu, GByteArray *buf, int reg) for (guint i = 0; i < cpu->gdb_regs->len; i++) { r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) { return r->get_reg(env, buf, reg - r->base_reg); } } @@ -523,7 +522,7 @@ static int gdb_write_register(CPUState *cpu, uint8_t *mem_buf, int reg) for (guint i = 0; i < cpu->gdb_regs->len; i++) { r = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (r->base_reg <= reg && reg < r->base_reg + r->num_regs) { + if (r->base_reg <= reg && reg < r->base_reg + r->feature->num_regs) { return r->set_reg(env, mem_buf, reg - r->base_reg); } } @@ -541,7 +540,7 @@ void gdb_register_coprocessor(CPUState *cpu, for (i = 0; i < cpu->gdb_regs->len; i++) { /* Check for duplicates. */ s = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); - if (strcmp(s->xml, feature->xmlname) == 0) { + if (s->feature == feature) { return; } } @@ -553,10 +552,9 @@ void gdb_register_coprocessor(CPUState *cpu, g_array_set_size(cpu->gdb_regs, i + 1); s = &g_array_index(cpu->gdb_regs, GDBRegisterState, i); s->base_reg = cpu->gdb_num_regs; - s->num_regs = feature->num_regs; s->get_reg = get_reg; s->set_reg = set_reg; - s->xml = feature->xml; + s->feature = feature; /* Add to end of list. */ cpu->gdb_num_regs += feature->num_regs;