From patchwork Tue Sep 12 07:11:55 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Akihiko Odaki X-Patchwork-Id: 1832745 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=W+bLDbQf; 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 4RlFJM4Grtz1yhm for ; Tue, 12 Sep 2023 17:16:51 +1000 (AEST) Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1qfxZu-0002l3-E5; Tue, 12 Sep 2023 03:12:55 -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 1qfxZs-0002kS-Vr for qemu-devel@nongnu.org; Tue, 12 Sep 2023 03:12:52 -0400 Received: from mail-ot1-x32a.google.com ([2607:f8b0:4864:20::32a]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1qfxZp-0006bX-W1 for qemu-devel@nongnu.org; Tue, 12 Sep 2023 03:12:52 -0400 Received: by mail-ot1-x32a.google.com with SMTP id 46e09a7af769-6bf2427b947so3415276a34.3 for ; Tue, 12 Sep 2023 00:12:49 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=daynix-com.20230601.gappssmtp.com; s=20230601; t=1694502769; x=1695107569; 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=t7BoVj8YCjLAGwVUCL1fmwUCD+gEibvnpmUSo+oMN5o=; b=W+bLDbQfNk3J5RluPkblyktxp3YlTUn1pKp7NMW3JswSvudFBN8vbucEcAJNWrVKYP SalbfDVqJIwKgKyjp8xh+RSLRqK/XRLEu7M18/soAvZXIe52QdYdV2sijn7y7el3WAGV wQEKoxchyRKUHdDjq9VdSwvPiWXwkwKW3AfG9MdVwUP9TCf6US+FjzwO/yOocWMizhG4 k3QJtIMBd9aWwpxMzdqB2xD2bdqM9zUBoaieXSepFZTn25Gbs7Yu2FNNIabEdcotfen6 nnMx7MLy5tyWIo2xG1EhAvhncL1h0pWXC+GU+YhyRThybOrGwPKe+rGMBDz3csITAXcn xmNA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1694502769; x=1695107569; 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=t7BoVj8YCjLAGwVUCL1fmwUCD+gEibvnpmUSo+oMN5o=; b=K3UCSE6FQZDmELcxpEk1BJxgHX2q3ASXmNH02zYpjOzVXm3ogMfSRWriallNARXWmF fOT6WHUfRFDDJE1x7YBGlvRKiDM0jeM+rmtlJ27P89JjN4SFjyT+HBHVY7zPbc8Po65X I56XEPxViWeL4BxvlQDAXtvU7nEU4lC8LbFjfGUHEb+oAY1DbDh9wpm3j/ybAb8tVK25 4lZAGc8QMHzBdWnjikdATYu5az/363AjsP4fDy52gsYxM/ZQLnETTOpa0tP1C2oOjjUg 8IXp4MH9jJIOzgDQLYLk/lO59ixuHCotS+QMDRJ46MdvIKJq7H8EZkr79an4KCYa3Q4o AZWw== X-Gm-Message-State: AOJu0Yyi5CBfVhSa1+B1/M14lUYW/tDyTdF8onG5cAk0w8m6jaA/4xNO e615wALa0W88cQkhAJTUuvK/pA== X-Google-Smtp-Source: AGHT+IEqzwcamTJ9CDOa5RRYBnik1DgXAOkZfNuN+FGLw5acECY+KHTM7XrJnUj3ZpsrsznmKdu93w== X-Received: by 2002:a05:6830:16c1:b0:6b9:c49f:1af7 with SMTP id l1-20020a05683016c100b006b9c49f1af7mr11374170otr.20.1694502768973; Tue, 12 Sep 2023 00:12:48 -0700 (PDT) Received: from alarm.flets-east.jp ([2400:4050:a840:1e00:78d2:b862:10a7:d486]) by smtp.gmail.com with ESMTPSA id f13-20020aa78b0d000000b0068be348e35fsm6647495pfd.166.2023.09.12.00.12.47 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 12 Sep 2023 00:12:48 -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?= Subject: [PATCH v7 09/18] gdbstub: Use GDBFeature for GDBRegisterState Date: Tue, 12 Sep 2023 16:11:55 +0900 Message-ID: <20230912071206.30751-10-akihiko.odaki@daynix.com> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20230912071206.30751-1-akihiko.odaki@daynix.com> References: <20230912071206.30751-1-akihiko.odaki@daynix.com> MIME-Version: 1.0 Received-SPF: none client-ip=2607:f8b0:4864:20::32a; envelope-from=akihiko.odaki@daynix.com; helo=mail-ot1-x32a.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 --- gdbstub/gdbstub.c | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/gdbstub/gdbstub.c b/gdbstub/gdbstub.c index a30ffdd6b8..7554318118 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; } } else { @@ -552,10 +551,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;