OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

target/arm: Add name argument to output_vector_union_type

Browse Source 
This will make the function usable between SVE and SME.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <philmd@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230227213329.793795-9-richard.henderson@linaro.org
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
This commit is contained in:
Richard Henderson 2023-02-27 11:33:23 -10:00 committed by Peter Maydell
parent fdfb214cf0
commit 41c9ad8fb4
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
target/arm/gdbstub64.c
View File

@ -210,7 +210,8 @@ int aarch64_gdb_set_sve_reg(CPUARMState *env, uint8_t *buf, int reg)
return 0; return 0;
} }
static void output_vector_union_type(GString *s, int reg_width) static void output_vector_union_type(GString *s, int reg_width,
const char *name)
{ {
struct TypeSize { struct TypeSize {
const char *gdb_type; const char *gdb_type;
@ -240,39 +241,38 @@ static void output_vector_union_type(GString *s, int reg_width)
}; };
static const char suf[] = { 'q', 'd', 's', 'h', 'b' }; static const char suf[] = { 'q', 'd', 's', 'h', 'b' };
g_autoptr(GString) ts = g_string_new("");
int i, j, bits; int i, j, bits;
/* First define types and totals in a whole VL */ /* First define types and totals in a whole VL */
for (i = 0; i < ARRAY_SIZE(vec_lanes); i++) { for (i = 0; i < ARRAY_SIZE(vec_lanes); i++) {
int count = reg_width / vec_lanes[i].size;
g_string_printf(ts, "svev%c%c", vec_lanes[i].sz, vec_lanes[i].suffix);
g_string_append_printf(s, g_string_append_printf(s,
"<vector id=\"%s\" type=\"%s\" count=\"%d\"/>", "<vector id=\"%s%c%c\" type=\"%s\" count=\"%d\"/>",
ts->str, vec_lanes[i].gdb_type, count); name, vec_lanes[i].sz, vec_lanes[i].suffix,
vec_lanes[i].gdb_type, reg_width / vec_lanes[i].size);
} }
/* /*
* Now define a union for each size group containing unsigned and * Now define a union for each size group containing unsigned and
* signed and potentially float versions of each size from 128 to * signed and potentially float versions of each size from 128 to
* 8 bits. * 8 bits.
*/ */
for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) { for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) {
g_string_append_printf(s, "<union id=\"svevn%c\">", suf[i]); g_string_append_printf(s, "<union id=\"%sn%c\">", name, suf[i]);
for (j = 0; j < ARRAY_SIZE(vec_lanes); j++) { for (j = 0; j < ARRAY_SIZE(vec_lanes); j++) {
if (vec_lanes[j].size == bits) { if (vec_lanes[j].size == bits) {
g_string_append_printf(s, "<field name=\"%c\" type=\"svev%c%c\"/>", g_string_append_printf(s, "<field name=\"%c\" type=\"%s%c%c\"/>",
vec_lanes[j].suffix, vec_lanes[j].suffix, name,
vec_lanes[j].sz, vec_lanes[j].suffix); vec_lanes[j].sz, vec_lanes[j].suffix);
} }
} }
g_string_append(s, "</union>"); g_string_append(s, "</union>");
} }
/* And now the final union of unions */ /* And now the final union of unions */
g_string_append(s, "<union id=\"svev\">"); g_string_append_printf(s, "<union id=\"%s\">", name);
for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) { for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) {
g_string_append_printf(s, "<field name=\"%c\" type=\"svevn%c\"/>", g_string_append_printf(s, "<field name=\"%c\" type=\"%sn%c\"/>",
suf[i], suf[i]); suf[i], name, suf[i]);
} }
g_string_append(s, "</union>"); g_string_append(s, "</union>");
} }
@ -292,7 +292,7 @@ int arm_gen_dynamic_svereg_xml(CPUState *cs, int orig_base_reg)
g_string_append_printf(s, "<feature name=\"org.gnu.gdb.aarch64.sve\">"); g_string_append_printf(s, "<feature name=\"org.gnu.gdb.aarch64.sve\">");
/* Create the vector union type. */ /* Create the vector union type. */
output_vector_union_type(s, reg_width); output_vector_union_type(s, reg_width, "svev");
/* Create the predicate vector type. */ /* Create the predicate vector type. */
g_string_append_printf(s, g_string_append_printf(s,