From: Peter Maydell <peter.maydell@linaro.org>
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 [thread overview]
Message-ID: <20230306153435.490894-5-peter.maydell@linaro.org> (raw)
In-Reply-To: <20230306153435.490894-1-peter.maydell@linaro.org>
From: Richard Henderson <richard.henderson@linaro.org>
Create a subroutine for creating the union of unions
of the various type sizes that a vector may contain.
Reviewed-by: Fabiano Rosas <farosas@suse.de>
Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230227213329.793795-5-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---
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, "<?xml version=\"1.0\"?>");
- g_string_append_printf(s, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">");
- g_string_append_printf(s, "<feature name=\"org.gnu.gdb.aarch64.sve\">");
+ 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, "<union id=\"svevn%c\">", 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, "<union id=\"svev\">");
for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) {
- const char suf[] = { 'q', 'd', 's', 'h', 'b' };
g_string_append_printf(s, "<field name=\"%c\" type=\"svevn%c\"/>",
suf[i], suf[i]);
}
g_string_append(s, "</union>");
+}
+
+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, "<?xml version=\"1.0\"?>");
+ g_string_append_printf(s, "<!DOCTYPE target SYSTEM \"gdb-target.dtd\">");
+ g_string_append_printf(s, "<feature name=\"org.gnu.gdb.aarch64.sve\">");
+
+ output_vector_union_type(s, reg_width);
/* Finally the sve prefix type */
g_string_append_printf(s,
--
2.34.1
next prev parent reply other threads:[~2023-03-06 16:42 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-03-06 15:34 [PULL 00/21] target-arm queue Peter Maydell
2023-03-06 15:34 ` [PULL 01/21] target/arm: Normalize aarch64 gdbstub get/set function names Peter Maydell
2023-03-06 15:34 ` [PULL 02/21] target/arm: Unexport arm_gen_dynamic_sysreg_xml Peter Maydell
2023-03-06 15:34 ` [PULL 03/21] target/arm: Move arm_gen_dynamic_svereg_xml to gdbstub64.c Peter Maydell
2023-03-06 15:34 ` Peter Maydell [this message]
2023-03-06 15:34 ` [PULL 05/21] target/arm: Simplify register counting in arm_gen_dynamic_svereg_xml Peter Maydell
2023-03-06 15:34 ` [PULL 06/21] target/arm: Hoist pred_width " Peter Maydell
2023-03-06 15:34 ` [PULL 07/21] target/arm: Fix svep width " Peter Maydell
2023-03-06 15:34 ` [PULL 08/21] target/arm: Add name argument to output_vector_union_type Peter Maydell
2023-03-06 15:34 ` [PULL 09/21] target/arm: Simplify iteration over bit widths Peter Maydell
2023-03-06 15:34 ` [PULL 10/21] target/arm: Create pauth_ptr_mask Peter Maydell
2023-03-06 15:34 ` [PULL 11/21] target/arm: Implement gdbstub pauth extension Peter Maydell
2023-03-06 15:34 ` [PULL 12/21] target/arm: Export arm_v7m_mrs_control Peter Maydell
2023-03-06 15:34 ` [PULL 13/21] target/arm: Export arm_v7m_get_sp_ptr Peter Maydell
2023-03-06 15:34 ` [PULL 14/21] target/arm: Implement gdbstub m-profile systemreg and secext Peter Maydell
2023-03-06 15:34 ` [PULL 15/21] target/arm: Handle m-profile in arm_is_secure Peter Maydell
2023-03-06 15:34 ` [PULL 16/21] target/arm: Stub arm_hcr_el2_eff for m-profile Peter Maydell
2023-03-06 15:34 ` [PULL 17/21] target/arm: Diagnose incorrect usage of arm_is_secure subroutines Peter Maydell
2023-03-06 15:34 ` [PULL 18/21] target/arm: Rewrite check_s2_mmu_setup Peter Maydell
2023-03-06 15:34 ` [PULL 19/21] hw: arm: Support direct boot for Linux/arm64 EFI zboot images Peter Maydell
2023-03-06 15:34 ` [PULL 20/21] hw: allwinner-i2c: Fix TWI_CNTR_INT_FLAG on SUN6i SoCs Peter Maydell
2023-03-06 15:34 ` [PULL 21/21] hw: arm: allwinner-h3: Fix and complete H3 i2c devices Peter Maydell
2023-03-07 12:42 ` [PULL 00/21] target-arm queue Peter Maydell
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20230306153435.490894-5-peter.maydell@linaro.org \
--to=peter.maydell@linaro.org \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).