target/arm: Simplify iteration over bit widths

Order suf[] by the log8 of the width.
Use ARRAY_SIZE instead of hard-coding 128.

This changes the order of the union definitions,
but retains the order of the union-of-union members.

Reviewed-by: Peter Maydell <peter.maydell@linaro.org>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
Message-id: 20230227213329.793795-10-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:24 -10:00 committed by Peter Maydell
parent 41c9ad8fb4
commit 55f0fc61f8
1 changed files with 6 additions and 4 deletions

View File

@ -240,8 +240,8 @@ static void output_vector_union_type(GString *s, int reg_width,
{ "int8", 8, 'b', 's' }, { "int8", 8, 'b', 's' },
}; };
static const char suf[] = { 'q', 'd', 's', 'h', 'b' }; static const char suf[] = { 'b', 'h', 's', 'd', 'q' };
int i, j, bits; int i, j;
/* 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++) {
@ -256,7 +256,9 @@ static void output_vector_union_type(GString *s, int reg_width,
* 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 (i = 0; i < ARRAY_SIZE(suf); i++) {
int bits = 8 << i;
g_string_append_printf(s, "<union id=\"%sn%c\">", name, 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) {
@ -270,7 +272,7 @@ static void output_vector_union_type(GString *s, int reg_width,
/* And now the final union of unions */ /* And now the final union of unions */
g_string_append_printf(s, "<union id=\"%s\">", name); g_string_append_printf(s, "<union id=\"%s\">", name);
for (bits = 128, i = 0; bits >= 8; bits /= 2, i++) { for (i = ARRAY_SIZE(suf) - 1; i >= 0; i--) {
g_string_append_printf(s, "<field name=\"%c\" type=\"%sn%c\"/>", g_string_append_printf(s, "<field name=\"%c\" type=\"%sn%c\"/>",
suf[i], name, suf[i]); suf[i], name, suf[i]);
} }