From patchwork Mon Mar 6 15:34:19 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659249 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1905843wrb; Mon, 6 Mar 2023 08:27:39 -0800 (PST) X-Google-Smtp-Source: AK7set+VEvrefOSVIfqF8TO5fFfv0wM1HLJQvKZizxJw3OilxN3+jAnZbE9wLS+8RT2N/H4H0cmK X-Received: by 2002:a05:622a:134b:b0:3b6:3260:fa1d with SMTP id w11-20020a05622a134b00b003b63260fa1dmr19161398qtk.45.1678120059599; Mon, 06 Mar 2023 08:27:39 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678120059; cv=none; d=google.com; s=arc-20160816; b=KCyis2oCFmt7uAu9a288rD5yRRhPGU8WwlVO+8GWMdvDUf8SHDkhnIqfGPAPoxdAmq BEafkHUXDZOditUAxbEAutr7rFkGH77pT29L7EJsTm+3pAUkwdSy1pgP0E3MypXfXWco lYJvlLLq8FRpuD2Jis77Lu/obzO4h8CyP2KtOqoC5uuH29zSgqiIV2DXVvX0BL+1Ic/0 X8opDzNW3XeK7POoleZTPU1bLM2dGuQL8fCrPT0QXk9S00IQ/8ASleKnHdC0eTg0Gpkv 0k617I+bQP5M1fTiICgHNEi3gmYB66aW3f0tnX9gW35C9Q3Rud98s8+MEgk4V9JE1Bhh g9Pw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:to:from :dkim-signature; bh=OVuuzGVy3oGWRblHp623aytTERnHyys4g3WWhXo/bgU=; b=Mi4+j2toviP9GWUFIkWlssbiUyMlfeLAUJ+HLAyXvciuR3kA8lYonFcXwJe9b+HGOI NLf5UcXpltWi3ytlPwKOmBequ7cRvTFtKXivfAcPjyhilT6+0wwlLdBfF/rihq02KZ8n J+0lLrP/gF+z5Wt6PDpFejn79mFDwklv49tEOWeSqwbYVa/EWVTPVBwvi9db7cWTo5nb uYNkK7qIKEhVISG0+n0RXBI6UzZrhdES96oely+Hd+2QlARLj/T8sPBt7+2oOqqHgO3O 2RgFKop1AYwzfm/EpYv+LrHJKF2MHhl9zBxZECaAMiGafmXn/+RVCuHdSMRwkmIbf9q2 cdAw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YwZx5vNQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id o9-20020a05622a008900b003ba26e22eb6si7428275qtw.113.2023.03.06.08.27.39 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:27:39 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=YwZx5vNQ; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pZCrO-000426-Ny; Mon, 06 Mar 2023 10:34:46 -0500 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 1pZCrM-0003z8-EP for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:44 -0500 Received: from mail-wm1-x331.google.com ([2a00:1450: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 1pZCrK-00027j-Ew for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:44 -0500 Received: by mail-wm1-x331.google.com with SMTP id c18so5930869wmr.3 for ; Mon, 06 Mar 2023 07:34:41 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1678116881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:from:to:cc:subject:date:message-id :reply-to; bh=OVuuzGVy3oGWRblHp623aytTERnHyys4g3WWhXo/bgU=; b=YwZx5vNQQamsQ05ROLsyC37KPYTxAh+4NSf1jO54ckLX7vTCB5JHD1rAawtOwcmZR/ zTObyWDvimiClSGQVTEozVE9r8xRkCMwQM3rsVXrATgvwtd2yCPy+ao16lZ51XsQpE+m g/Dg7Fq2AhSDMMgbdqOgY7iAhBKhHg8txTu/ePQ9BZR5pRVgaGQI/5NwPiUU4HByI3Cq Wn1sjc29XF1ycycmz1/QrZ7J5afngIo5cTPg9GTkJ3QI2MOZY3eqDwohn+GVU7HAL+Sk qRzH186OSzASSa+Oec/zXj3ldbDw+SoOT0lGuFLOhiqzKStwJqvXHnp1lmWDuAcwMKo5 jZrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; t=1678116881; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=OVuuzGVy3oGWRblHp623aytTERnHyys4g3WWhXo/bgU=; b=CImLrqzx0llrCAdS7X6oYouR1mf8f3l/kvKgfe4QDmug9oJaGqgxMp6FSoZh1pG7EN VxSOigGwAUpISKItvaggCTyp5cn6AK3W3H4o/7kGi/r7Cv6CxHVquHNWhdP/ePrsekIL 4rnbFPu7sdTwU6I3UHpp/vHGp3faxQx3ZcwxVMj+mUmAFByg7xrK8yhMdan0Qzl+Q8Vh X6bykIsVMbHFcTflFkrIPT6djhS5eD99u8CYQdSdZkR2mQIzKQ1H0+d2OdHXAchFO+3C FQjo2aYHjtppVpfld7I1VUPi92oftt+agA3oZHFfPtEXnDvzzNc/RooPpT4DY6eh8C7e 7sJg== X-Gm-Message-State: AO0yUKVvs67Pj1PtwIAl7w1atnKdx3r870lk82e98ura4X4C2REnvW8i wLjpb+Mw/PZFXeF1txvMmtTPKfKPil1ttiSPLc0= X-Received: by 2002:a05:600c:4751:b0:3eb:578d:decb with SMTP id w17-20020a05600c475100b003eb578ddecbmr8957015wmo.28.1678116881496; Mon, 06 Mar 2023 07:34:41 -0800 (PST) Received: from orth.archaic.org.uk (orth.archaic.org.uk. [2001:8b0:1d0::2]) by smtp.gmail.com with ESMTPSA id v7-20020a05600c444700b003eb0d6f48f3sm15287432wmn.27.2023.03.06.07.34.40 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 06 Mar 2023 07:34:41 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 05/21] target/arm: Simplify register counting in arm_gen_dynamic_svereg_xml Date: Mon, 6 Mar 2023 15:34:19 +0000 Message-Id: <20230306153435.490894-6-peter.maydell@linaro.org> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org> References: <20230306153435.490894-1-peter.maydell@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::331; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x331.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-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+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Richard Henderson Rather than increment base_reg and num, compute num from the change to base_reg at the end. Clean up some nearby comments. Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Richard Henderson Message-id: 20230227213329.793795-6-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/gdbstub64.c | 27 ++++++++++++++++----------- 1 file changed, 16 insertions(+), 11 deletions(-) diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 811833d8dec..070ba20d991 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -277,32 +277,35 @@ static void output_vector_union_type(GString *s, int reg_width) g_string_append(s, ""); } -int arm_gen_dynamic_svereg_xml(CPUState *cs, int base_reg) +int arm_gen_dynamic_svereg_xml(CPUState *cs, int orig_base_reg) { ARMCPU *cpu = ARM_CPU(cs); GString *s = g_string_new(NULL); DynamicGDBXMLInfo *info = &cpu->dyn_svereg_xml; - int i, reg_width = (cpu->sve_max_vq * 128); - info->num = 0; + int reg_width = cpu->sve_max_vq * 128; + int base_reg = orig_base_reg; + int i; + g_string_printf(s, ""); g_string_append_printf(s, ""); g_string_append_printf(s, ""); + /* Create the vector union type. */ output_vector_union_type(s, reg_width); - /* Finally the sve prefix type */ + /* Create the predicate vector type. */ g_string_append_printf(s, "", reg_width / 8); - /* Then define each register in parts for each vq */ + /* Define the vector registers. */ for (i = 0; i < 32; i++) { g_string_append_printf(s, "", i, reg_width, base_reg++); - info->num++; } + /* fpscr & status registers */ g_string_append_printf(s, "", base_reg++); - info->num += 2; + /* Define the predicate registers. */ for (i = 0; i < 16; i++) { g_string_append_printf(s, "", i, cpu->sve_max_vq * 16, base_reg++); - info->num++; } g_string_append_printf(s, "", cpu->sve_max_vq * 16, base_reg++); + + /* Define the vector length pseudo-register. */ g_string_append_printf(s, "", base_reg++); - info->num += 2; - g_string_append_printf(s, ""); - info->desc = g_string_free(s, false); + g_string_append_printf(s, ""); + + info->desc = g_string_free(s, false); + info->num = base_reg - orig_base_reg; return info->num; }