From patchwork Mon Mar 6 15:34:18 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Peter Maydell X-Patchwork-Id: 659258 Delivered-To: patch@linaro.org Received: by 2002:adf:a3c6:0:0:0:0:0 with SMTP id m6csp1913136wrb; Mon, 6 Mar 2023 08:42:03 -0800 (PST) X-Google-Smtp-Source: AK7set+Q95MJk1EuDO+6lpmVbREH8sitUBdXefMMH8czzot4uzjctnCsJ+Rj2MBltGzm2mXdzKqJ X-Received: by 2002:ac8:58ce:0:b0:3bf:a061:6cb1 with SMTP id u14-20020ac858ce000000b003bfa0616cb1mr20392916qta.46.1678120923678; Mon, 06 Mar 2023 08:42:03 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1678120923; cv=none; d=google.com; s=arc-20160816; b=G+REYWf/Oy/CHzRd71n6PT7Ojp9pyQ8qd5RUEDBVCvBaVn7RNBeJXp55LJ/YjM2QU+ kkfV4sNuFq3Vjbe7kzl+PKqqWLOFg5K3XT+FzdGHf5EMkdrNNFArmt2FR/37e1+PoFZ3 uO5kYitPQI2CGGaHRpCKWbeSbDadm1pw5qB0ZXK0hkIf1ySZNfOIBDe4goH2Qio6ZIlF GW5Wmrl9Pyf1KCjdcm0ZRVgNPp/7StMN3uSKJ0mSk9ggeY9bHUSiEIGtiO+HfBDuukO8 DCcLEb4bmDUia9Kgh9Hykv5kwQBYdG8tnssdntqxfD/1f7r3JbGkuam9xFxmJS2ARAAb +/Ag== 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=8bAF/+U7+nkoPmy+fZgk3AeR5JQZaU99p3R4ntkDnNU=; b=CfzpsijogxKkJjKddXMdQNWSKKb7BBcuzVugs7xxxNKtb5e4Cmuarw6wJtTXev7BhT XQH3zW8UseMA6yzMiWxeBzu/IS6tPZ1/8mXRTZDj/lyHISmA4vzBQGEIAzyw3BWQSYDo V6f+jltMTo7+DqFhGrYCcCftjG+Cv2ohyj8XkT5htrcSNVqUZ++aFZBYDMzLJ5om5hka hvI1yR1L14y4jDJT6reayFz950WyD61TMxi/Ql4RkEz/9NeiPArC3pTCfOUK07xEOnXT uB/eFdxeR/SfHBIOKwAvC4kDXVql2jdZt/HKkSwQ8sgAZRCArPQMkUK+IHxgmki6dJ5L 9rWQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=Dkky7gUr; 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 s17-20020ac85cd1000000b003b855d7adeasi7607682qta.653.2023.03.06.08.42.03 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Mon, 06 Mar 2023 08:42:03 -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=Dkky7gUr; 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 1pZCrR-00043l-30; Mon, 06 Mar 2023 10:34:49 -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-0003z6-6O for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:44 -0500 Received: from mail-wm1-x32f.google.com ([2a00:1450:4864:20::32f]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1pZCrK-00028L-77 for qemu-devel@nongnu.org; Mon, 06 Mar 2023 10:34:43 -0500 Received: by mail-wm1-x32f.google.com with SMTP id r19-20020a05600c459300b003eb3e2a5e7bso5467690wmo.0 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=8bAF/+U7+nkoPmy+fZgk3AeR5JQZaU99p3R4ntkDnNU=; b=Dkky7gUrzcEWSXGjEMozIBcvTKfNE1Ag5nCsAKtOnsJEd3q73uG03BK5CAq9lQBZc5 vjXs4rTPwe+ZtEPKoNjluBBK7BPP6HeTeVrzwLN2E5EqQnO6Yz9brAGbjdlNiGJ7DoRD nqUZq+9qEGvE1+0h6Zd2Wf3PD18bGrxbbbAIiMz5XCAw+zAxDxArWozweNbPgKTtQ9O5 q/uXLSSDADcXS+txFbPjesEyZhp+/79nyIallseiZzdQpdGoAZceQhNSe22oBU3kCQ3F 1KPquURsQ+9mbsHPmRaVMwL4jY7Ka4dp8hkCn/Nn6aiB7NZu1b81KOb4crGaDSYUDAbx 1qLg== 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=8bAF/+U7+nkoPmy+fZgk3AeR5JQZaU99p3R4ntkDnNU=; b=JX1lxGDxVNuEVswPDIeTva6nW1v7kvOOJIT+BV4ZcTg9CDnsPGqgrS+oGQxqCOJzbR T4gZ0F/bTfSrtPLR+0abI6yKoU3ouVbuqwLk5Oosha8jou1ZZEdRFAAuulyINVyFz4qA Qc3gLn24WIOLjt17XWIhlwnLr2q4ZwLCmjOmzrViXpicb70rEgbJjTVHg4/IsnU+eLxy HLH+zmzfZgwwrO8vfYfrR2ufgNw58qVi+EbDJnO54wVhtSDTspNsuh0ZOtz28Pl/YCa5 GJ2raomfYfgCWelJdb+Bpw4oEX8mv4vGl+pGTyyQEPg2OGx3BKgIJ5JBN/4oJxnLGtUE g82g== X-Gm-Message-State: AO0yUKVHXLgXXC09HBjcYyY+qezaP0Wi4S1M1KZ8hqQBdA5IqzbaVWT0 rbCRdQG2nWfFQUxQtDoSiwV411uXBIIqbgYuZJ8= X-Received: by 2002:a05:600c:4e8b:b0:3eb:3b7e:7b82 with SMTP id f11-20020a05600c4e8b00b003eb3b7e7b82mr9759701wmq.27.1678116880821; Mon, 06 Mar 2023 07:34:40 -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:40 -0800 (PST) From: Peter Maydell To: qemu-devel@nongnu.org Subject: [PULL 04/21] target/arm: Split out output_vector_union_type Date: Mon, 6 Mar 2023 15:34:18 +0000 Message-Id: <20230306153435.490894-5-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::32f; envelope-from=peter.maydell@linaro.org; helo=mail-wm1-x32f.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 Create a subroutine for creating the union of unions of the various type sizes that a vector may contain. Reviewed-by: Fabiano Rosas Reviewed-by: Peter Maydell Signed-off-by: Richard Henderson Message-id: 20230227213329.793795-5-richard.henderson@linaro.org Signed-off-by: Peter Maydell --- target/arm/gdbstub64.c | 83 +++++++++++++++++++++++------------------- 1 file changed, 45 insertions(+), 38 deletions(-) diff --git a/target/arm/gdbstub64.c b/target/arm/gdbstub64.c index 59fb5465d5c..811833d8dec 100644 --- a/target/arm/gdbstub64.c +++ b/target/arm/gdbstub64.c @@ -210,44 +210,39 @@ int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg) return 0; } -struct TypeSize { - const char *gdb_type; - short size; - char sz, suffix; -}; - -static const struct TypeSize vec_lanes[] = { - /* quads */ - { "uint128", 128, 'q', 'u' }, - { "int128", 128, 'q', 's' }, - /* 64 bit */ - { "ieee_double", 64, 'd', 'f' }, - { "uint64", 64, 'd', 'u' }, - { "int64", 64, 'd', 's' }, - /* 32 bit */ - { "ieee_single", 32, 's', 'f' }, - { "uint32", 32, 's', 'u' }, - { "int32", 32, 's', 's' }, - /* 16 bit */ - { "ieee_half", 16, 'h', 'f' }, - { "uint16", 16, 'h', 'u' }, - { "int16", 16, 'h', 's' }, - /* bytes */ - { "uint8", 8, 'b', 'u' }, - { "int8", 8, 'b', 's' }, -}; - -int arm_gen_dynamic_svereg_xml(CPUState *cs, int base_reg) +static void output_vector_union_type(GString *s, int reg_width) { - ARMCPU *cpu = ARM_CPU(cs); - GString *s = g_string_new(NULL); - DynamicGDBXMLInfo *info = &cpu->dyn_svereg_xml; + struct TypeSize { + const char *gdb_type; + short size; + char sz, suffix; + }; + + static const struct TypeSize vec_lanes[] = { + /* quads */ + { "uint128", 128, 'q', 'u' }, + { "int128", 128, 'q', 's' }, + /* 64 bit */ + { "ieee_double", 64, 'd', 'f' }, + { "uint64", 64, 'd', 'u' }, + { "int64", 64, 'd', 's' }, + /* 32 bit */ + { "ieee_single", 32, 's', 'f' }, + { "uint32", 32, 's', 'u' }, + { "int32", 32, 's', 's' }, + /* 16 bit */ + { "ieee_half", 16, 'h', 'f' }, + { "uint16", 16, 'h', 'u' }, + { "int16", 16, 'h', 's' }, + /* bytes */ + { "uint8", 8, 'b', 'u' }, + { "int8", 8, 'b', 's' }, + }; + + static const char suf[] = { 'q', 'd', 's', 'h', 'b' }; + g_autoptr(GString) ts = g_string_new(""); - int i, j, bits, reg_width = (cpu->sve_max_vq * 128); - info->num = 0; - g_string_printf(s, ""); - g_string_append_printf(s, ""); - g_string_append_printf(s, ""); + int i, j, bits; /* First define types and totals in a whole VL */ for (i = 0; i < ARRAY_SIZE(vec_lanes); i++) { @@ -263,7 +258,6 @@ int arm_gen_dynamic_svereg_xml(CPUState *cs, int base_reg) * 8 bits. */ for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) { - const char suf[] = { 'q', 'd', 's', 'h', 'b' }; g_string_append_printf(s, "", suf[i]); for (j = 0; j < ARRAY_SIZE(vec_lanes); j++) { if (vec_lanes[j].size == bits) { @@ -277,11 +271,24 @@ int arm_gen_dynamic_svereg_xml(CPUState *cs, int base_reg) /* And now the final union of unions */ g_string_append(s, ""); for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) { - const char suf[] = { 'q', 'd', 's', 'h', 'b' }; g_string_append_printf(s, "", suf[i], suf[i]); } g_string_append(s, ""); +} + +int arm_gen_dynamic_svereg_xml(CPUState *cs, int 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; + g_string_printf(s, ""); + g_string_append_printf(s, ""); + g_string_append_printf(s, ""); + + output_vector_union_type(s, reg_width); /* Finally the sve prefix type */ g_string_append_printf(s,