diff options
26 files changed, 952 insertions, 176 deletions
diff --git a/gas/config/tc-aarch64.c b/gas/config/tc-aarch64.c index 7c94e9b..ce76128 100644 --- a/gas/config/tc-aarch64.c +++ b/gas/config/tc-aarch64.c @@ -99,6 +99,17 @@ enum vector_el_type NT_merge }; +/* SME horizontal or vertical slice indicator, encoded in "V". + Values: + 0 - Horizontal + 1 - vertical +*/ +enum sme_hv_slice +{ + HV_horizontal = 0, + HV_vertical = 1 +}; + /* Bits for DEFINED field in vector_type_el. */ #define NTA_HASTYPE 1 #define NTA_HASINDEX 2 @@ -279,6 +290,8 @@ struct reloc_entry BASIC_REG_TYPE(ZN) /* z[0-31] */ \ BASIC_REG_TYPE(PN) /* p[0-15] */ \ BASIC_REG_TYPE(ZA) /* za[0-15] */ \ + BASIC_REG_TYPE(ZAH) /* za[0-15]h */ \ + BASIC_REG_TYPE(ZAV) /* za[0-15]v */ \ /* Typecheck: any 64-bit int reg (inc SP exc XZR). */ \ MULTI_REG_TYPE(R64_SP, REG_TYPE(R_64) | REG_TYPE(SP_64)) \ /* Typecheck: same, plus SVE registers. */ \ @@ -4276,6 +4289,178 @@ parse_sme_zada_operand (char **str, aarch64_opnd_qualifier_t *qualifier) return regno; } +/* Parse STR for unsigned, immediate (1-2 digits) in format: + + #<imm> + <imm> + + Function return TRUE if immediate was found, or FALSE. +*/ +static bool +parse_sme_immediate (char **str, int64_t *imm) +{ + int64_t val; + if (! parse_constant_immediate (str, &val, REG_TYPE_R_N)) + return false; + + *imm = val; + return true; +} + +/* Parse index with vector select register and immediate: + + [<Wv>, <imm>] + [<Wv>, #<imm>] + where <Wv> is in W12-W15 range and # is optional for immediate. + + Function performs extra check for mandatory immediate value if REQUIRE_IMM + is set to true. + + On success function returns TRUE and populated VECTOR_SELECT_REGISTER and + IMM output. +*/ +static bool +parse_sme_za_hv_tiles_operand_index (char **str, + int *vector_select_register, + int64_t *imm) +{ + const reg_entry *reg; + + if (!skip_past_char (str, '[')) + { + set_syntax_error (_("expected '['")); + return false; + } + + /* Vector select register W12-W15 encoded in the 2-bit Rv field. */ + reg = parse_reg (str); + if (reg == NULL || reg->type != REG_TYPE_R_32 + || reg->number < 12 || reg->number > 15) + { + set_syntax_error (_("expected vector select register W12-W15")); + return false; + } + *vector_select_register = reg->number; + + if (!skip_past_char (str, ',')) /* Optional index offset immediate. */ + { + set_syntax_error (_("expected ','")); + return false; + } + + if (!parse_sme_immediate (str, imm)) + { + set_syntax_error (_("index offset immediate expected")); + return false; + } + + if (!skip_past_char (str, ']')) + { + set_syntax_error (_("expected ']'")); + return false; + } + + return true; +} + +/* Parse SME ZA horizontal or vertical vector access to tiles. + Function extracts from STR to SLICE_INDICATOR <HV> horizontal (0) or + vertical (1) ZA tile vector orientation. VECTOR_SELECT_REGISTER + contains <Wv> select register and corresponding optional IMMEDIATE. + In addition QUALIFIER is extracted. + + Field format examples: + + ZA0<HV>.B[<Wv>, #<imm>] + <ZAn><HV>.H[<Wv>, #<imm>] + <ZAn><HV>.S[<Wv>, #<imm>] + <ZAn><HV>.D[<Wv>, #<imm>] + <ZAn><HV>.Q[<Wv>, #<imm>] + + Function returns <ZAda> register number or PARSE_FAIL. +*/ +static int +parse_sme_za_hv_tiles_operand (char **str, + enum sme_hv_slice *slice_indicator, + int *vector_select_register, + int *imm, + aarch64_opnd_qualifier_t *qualifier) +{ + char *qh, *qv; + int regno; + int regno_limit; + int64_t imm_limit; + int64_t imm_value; + const reg_entry *reg; + + qh = qv = *str; + if ((reg = parse_reg_with_qual (&qh, REG_TYPE_ZAH, qualifier)) != NULL) + { + *slice_indicator = HV_horizontal; + *str = qh; + } + else if ((reg = parse_reg_with_qual (&qv, REG_TYPE_ZAV, qualifier)) != NULL) + { + *slice_indicator = HV_vertical; + *str = qv; + } + else + return PARSE_FAIL; + regno = reg->number; + + switch (*qualifier) + { + case AARCH64_OPND_QLF_S_B: + regno_limit = 0; + imm_limit = 15; + break; + case AARCH64_OPND_QLF_S_H: + regno_limit = 1; + imm_limit = 7; + break; + case AARCH64_OPND_QLF_S_S: + regno_limit = 3; + imm_limit = 3; + break; + case AARCH64_OPND_QLF_S_D: + regno_limit = 7; + imm_limit = 1; + break; + case AARCH64_OPND_QLF_S_Q: + regno_limit = 15; + imm_limit = 0; + break; + default: + set_syntax_error (_("invalid ZA tile element size, allowed b, h, s, d and q")); + return PARSE_FAIL; + } + + /* Check if destination register ZA tile vector is in range for given + instruction variant. */ + if (regno < 0 || regno > regno_limit) + { + set_syntax_error (_("ZA tile vector out of range")); + return PARSE_FAIL; + } + + if (!parse_sme_za_hv_tiles_operand_index (str, vector_select_register, + &imm_value)) + return PARSE_FAIL; + + /* Check if optional index offset is in the range for instruction + variant. */ + if (imm_value < 0 || imm_value > imm_limit) + { + set_syntax_error (_("index offset out of range")); + return PARSE_FAIL; + } + + *imm = imm_value; + + return regno; +} + + /* Parse a system register or a PSTATE field name for an MSR/MRS instruction. Returns the encoding for the option, or PARSE_FAIL. @@ -6989,6 +7174,26 @@ parse_operands (char *str, const aarch64_opcode *opcode) info->qualifier = qualifier; break; + case AARCH64_OPND_SME_ZA_HV_idx_src: + case AARCH64_OPND_SME_ZA_HV_idx_dest: + { + enum sme_hv_slice vector_indicator; + int vector_select_register; + int imm; + val = parse_sme_za_hv_tiles_operand (&str, &vector_indicator, + &vector_select_register, + &imm, + &qualifier); + if (val == PARSE_FAIL) + goto failure; + info->za_tile_vector.regno = val; + info->za_tile_vector.index.regno = vector_select_register; + info->za_tile_vector.index.imm = imm; + info->za_tile_vector.v = vector_indicator; + info->qualifier = qualifier; + break; + } + default: as_fatal (_("unhandled operand code %d"), operands[i]); } @@ -7533,11 +7738,17 @@ aarch64_canonicalize_symbol_name (char *name) #define REGDEF(s,n,t) { #s, n, REG_TYPE_##t, true } #define REGDEF_ALIAS(s, n, t) { #s, n, REG_TYPE_##t, false} #define REGNUM(p,n,t) REGDEF(p##n, n, t) +#define REGNUMS(p,n,s,t) REGDEF(p##n##s, n, t) #define REGSET16(p,t) \ REGNUM(p, 0,t), REGNUM(p, 1,t), REGNUM(p, 2,t), REGNUM(p, 3,t), \ REGNUM(p, 4,t), REGNUM(p, 5,t), REGNUM(p, 6,t), REGNUM(p, 7,t), \ REGNUM(p, 8,t), REGNUM(p, 9,t), REGNUM(p,10,t), REGNUM(p,11,t), \ REGNUM(p,12,t), REGNUM(p,13,t), REGNUM(p,14,t), REGNUM(p,15,t) +#define REGSET16S(p,s,t) \ + REGNUMS(p, 0,s,t), REGNUMS(p, 1,s,t), REGNUMS(p, 2,s,t), REGNUMS(p, 3,s,t), \ + REGNUMS(p, 4,s,t), REGNUMS(p, 5,s,t), REGNUMS(p, 6,s,t), REGNUMS(p, 7,s,t), \ + REGNUMS(p, 8,s,t), REGNUMS(p, 9,s,t), REGNUMS(p,10,s,t), REGNUMS(p,11,s,t), \ + REGNUMS(p,12,s,t), REGNUMS(p,13,s,t), REGNUMS(p,14,s,t), REGNUMS(p,15,s,t) #define REGSET31(p,t) \ REGSET16(p, t), \ REGNUM(p,16,t), REGNUM(p,17,t), REGNUM(p,18,t), REGNUM(p,19,t), \ @@ -7588,7 +7799,13 @@ static const reg_entry reg_names[] = { REGSET16 (p, PN), REGSET16 (P, PN), /* SME ZA tile registers. */ - REGSET16 (za, ZA), REGSET16 (ZA, ZA) + REGSET16 (za, ZA), REGSET16 (ZA, ZA), + + /* SME ZA tile registers (horizontal slice). */ + REGSET16S (za, h, ZAH), REGSET16S (ZA, H, ZAH), + + /* SME ZA tile registers (vertical slice). */ + REGSET16S (za, v, ZAV), REGSET16S (ZA, V, ZAV) }; #undef REGDEF diff --git a/gas/testsuite/gas/aarch64/sme-2-illegal.d b/gas/testsuite/gas/aarch64/sme-2-illegal.d new file mode 100644 index 0000000..0ff10535 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2-illegal.d @@ -0,0 +1,3 @@ +#as: -march=armv8-a+sme +#source: sme-2-illegal.s +#error_output: sme-2-illegal.l diff --git a/gas/testsuite/gas/aarch64/sme-2-illegal.l b/gas/testsuite/gas/aarch64/sme-2-illegal.l new file mode 100644 index 0000000..d364561 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2-illegal.l @@ -0,0 +1,27 @@ +[^:]*: Assembler messages: +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 3 -- `mova z0\.b,p0/m,za1h\.b\[w12,#0\]' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 3 -- `mova z0\.h,p0/m,za2h\.h\[w12,#0\]' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 3 -- `mova z0\.s,p0/m,za4h\.s\[w12,#0\]' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 3 -- `mova z0\.d,p0/m,za8h\.d\[w12,#0\]' +[^:]*:[0-9]+: Error: operand 3 must be an SME horizontal or vertical vector access register -- `mova z0\.q,p0/m,za16h.q\[w12\]' +[^:]*:[0-9]+: Error: index offset out of range at operand 3 -- `mova z31\.b,p7/m,za0v\.b\[w15,#16\]' +[^:]*:[0-9]+: Error: index offset out of range at operand 3 -- `mova z31\.h,p7/m,za1v\.h\[w15,#8\]' +[^:]*:[0-9]+: Error: index offset out of range at operand 3 -- `mova z31\.s,p7/m,za3v\.s\[w15,#4\]' +[^:]*:[0-9]+: Error: index offset out of range at operand 3 -- `mova z31\.d,p7/m,za7v\.d\[w15,#2\]' +[^:]*:[0-9]+: Error: index offset out of range at operand 3 -- `mova z31\.q,p7/m,za15v\.q\[w15,#1\]' +[^:]*:[0-9]+: Error: expected ',' at operand 3 -- `mova z31\.q,p7/m,za15v\.q\[w15\]' +[^:]*:[0-9]+: Error: expected '\[' at operand 3 -- `mova z0\.b,p0/m,za0v.b' +[^:]*:[0-9]+: Error: expected vector select register W12-W15 at operand 3 -- `mova z31\.b,p7/m,za0v\.b\[15,w15\]' +[^:]*:[0-9]+: Error: expected ',' at operand 3 -- `mova z0\.h,p0/m,za0v\.h\[w12\. 0\]' +[^:]*:[0-9]+: Error: expected vector select register W12-W15 at operand 3 -- `mova z0\.s,p0/m,za0v\.s\[x12,0]' +[^:]*:[0-9]+: Error: expected vector select register W12-W15 at operand 3 -- `mova z0\.d,p0/m,za0v\.d\[w21,0\]' +[^:]*:[0-9]+: Error: expected vector select register W12-W15 at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[s12\]' +[^:]*:[0-9]+: Error: expected vector select register W12-W15 at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[d12\]' +[^:]*:[0-9]+: Error: index offset immediate expected at operand 3 -- `mova z0.q,p0/m,za0v\.q\[w12,\]' +[^:]*:[0-9]+: Error: expected ',' at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12\.\]' +[^:]*:[0-9]+: Error: index offset immediate expected at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,abc\]' +[^:]*:[0-9]+: Error: index offset immediate expected at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,#abc\]' +[^:]*:[0-9]+: Error: expected '\]' at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,1a\]' +[^:]*:[0-9]+: Error: expected '\]' at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,#1a\]' +[^:]*:[0-9]+: Error: expected '\]' at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,1a2\]' +[^:]*:[0-9]+: Error: expected '\]' at operand 3 -- `mova z0\.q,p0/m,za0v\.q\[w12,#1a2\]' diff --git a/gas/testsuite/gas/aarch64/sme-2-illegal.s b/gas/testsuite/gas/aarch64/sme-2-illegal.s new file mode 100644 index 0000000..28eb671 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2-illegal.s @@ -0,0 +1,32 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOVA (tile to vector) variant. */ +mova z0.b, p0/m, za1h.b[w12, #0] +mova z0.h, p0/m, za2h.h[w12, #0] +mova z0.s, p0/m, za4h.s[w12, #0] +mova z0.d, p0/m, za8h.d[w12, #0] +mova z0.q, p0/m, za16h.q[w12] + +mova z31.b, p7/m, za0v.b[w15, #16] +mova z31.h, p7/m, za1v.h[w15, #8] +mova z31.s, p7/m, za3v.s[w15, #4] +mova z31.d, p7/m, za7v.d[w15, #2] +mova z31.q, p7/m, za15v.q[w15, #1] +mova z31.q, p7/m, za15v.q[w15] + +/* Syntax issues. */ +mova z0.b, p0/m, za0v.b +mova z31.b, p7/m, za0v.b[15, w15] +mova z0.h, p0/m, za0v.h[w12. 0] +mova z0.s, p0/m, za0v.s[x12, 0] +mova z0.d, p0/m, za0v.d[w21, 0] +mova z0.q, p0/m, za0v.q[s12] +mova z0.q, p0/m, za0v.q[d12] +mova z0.q, p0/m, za0v.q[w12,] +mova z0.q, p0/m, za0v.q[w12.] +mova z0.q, p0/m, za0v.q[w12, abc] +mova z0.q, p0/m, za0v.q[w12, #abc] +mova z0.q, p0/m, za0v.q[w12, 1a] +mova z0.q, p0/m, za0v.q[w12, #1a] +mova z0.q, p0/m, za0v.q[w12, 1a2] +mova z0.q, p0/m, za0v.q[w12, #1a2] diff --git a/gas/testsuite/gas/aarch64/sme-2.d b/gas/testsuite/gas/aarch64/sme-2.d new file mode 100644 index 0000000..2764aac --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2.d @@ -0,0 +1,43 @@ +#name: SME extension, MOVA (tile to vector) +#as: -march=armv8-a+sme +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0+ <.*>: + 0: c0028000 mov z0.b, p0/m, za0v.b\[w12, 0\] + 4: c0428000 mov z0.h, p0/m, za0v.h\[w12, 0\] + 8: c0828000 mov z0.s, p0/m, za0v.s\[w12, 0\] + c: c0c28000 mov z0.d, p0/m, za0v.d\[w12, 0\] + 10: c0c38000 mov z0.q, p0/m, za0v.q\[w12, 0\] + 14: c002fdff mov z31.b, p7/m, za0v.b\[w15, 15\] + 18: c042fdff mov z31.h, p7/m, za1v.h\[w15, 7\] + 1c: c082fdff mov z31.s, p7/m, za3v.s\[w15, 3\] + 20: c0c2fdff mov z31.d, p7/m, za7v.d\[w15, 1\] + 24: c0c3fdff mov z31.q, p7/m, za15v.q\[w15, 0\] + 28: c0020000 mov z0.b, p0/m, za0h.b\[w12, 0\] + 2c: c0420000 mov z0.h, p0/m, za0h.h\[w12, 0\] + 30: c0820000 mov z0.s, p0/m, za0h.s\[w12, 0\] + 34: c0c20000 mov z0.d, p0/m, za0h.d\[w12, 0\] + 38: c0c30000 mov z0.q, p0/m, za0h.q\[w12, 0\] + 3c: c0027dff mov z31.b, p7/m, za0h.b\[w15, 15\] + 40: c0427dff mov z31.h, p7/m, za1h.h\[w15, 7\] + 44: c0827dff mov z31.s, p7/m, za3h.s\[w15, 3\] + 48: c0c27dff mov z31.d, p7/m, za7h.d\[w15, 1\] + 4c: c0c37dff mov z31.q, p7/m, za15h.q\[w15, 0\] + 50: c0027dff mov z31.b, p7/m, za0h.b\[w15, 15\] + 54: c0427dff mov z31.h, p7/m, za1h.h\[w15, 7\] + 58: c0827dff mov z31.s, p7/m, za3h.s\[w15, 3\] + 5c: c0c27dff mov z31.d, p7/m, za7h.d\[w15, 1\] + 60: c0c37dff mov z31.q, p7/m, za15h.q\[w15, 0\] + 64: c0027dff mov z31.b, p7/m, za0h.b\[w15, 15\] + 68: c0427dff mov z31.h, p7/m, za1h.h\[w15, 7\] + 6c: c0827dff mov z31.s, p7/m, za3h.s\[w15, 3\] + 70: c0c27dff mov z31.d, p7/m, za7h.d\[w15, 1\] + 74: c0c37dff mov z31.q, p7/m, za15h.q\[w15, 0\] + 78: c0c27dff mov z31.d, p7/m, za7h.d\[w15, 1\] + 7c: c0c37dff mov z31.q, p7/m, za15h.q\[w15, 0\] + 80: c002a400 mov z0.b, p1/m, za0v.b\[w13, 0\] + 84: c002a4e0 mov z0.b, p1/m, za0v.b\[w13, 7\] diff --git a/gas/testsuite/gas/aarch64/sme-2.s b/gas/testsuite/gas/aarch64/sme-2.s new file mode 100644 index 0000000..a2d0f0a --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2.s @@ -0,0 +1,52 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOVA (tile to vector) variant. */ +mova z0.b, p0/m, za0v.b[w12, 0] +mova z0.h, p0/m, za0v.h[w12, 0] +mova z0.s, p0/m, za0v.s[w12, 0] +mova z0.d, p0/m, za0v.d[w12, 0] +mova z0.q, p0/m, za0v.q[w12, 0] + +mova z31.b, p7/m, za0v.b[w15, 15] +mova z31.h, p7/m, za1v.h[w15, 7] +mova z31.s, p7/m, za3v.s[w15, 3] +mova z31.d, p7/m, za7v.d[w15, 1] +mova z31.q, p7/m, za15v.q[w15, 0] + +mova z0.b, p0/m, za0h.b[w12, 0] +mova z0.h, p0/m, za0h.h[w12, 0] +mova z0.s, p0/m, za0h.s[w12, 0] +mova z0.d, p0/m, za0h.d[w12, 0] +mova z0.q, p0/m, za0h.q[w12, 0] + +mova z31.b, p7/m, za0h.b[w15, 15] +mova z31.h, p7/m, za1h.h[w15, 7] +mova z31.s, p7/m, za3h.s[w15, 3] +mova z31.d, p7/m, za7h.d[w15, 1] +mova z31.q, p7/m, za15h.q[w15, 0] + +/* Parser checks. */ +mova z31.b , p7/m , za0h.b [ w15 , 15 ] +mova z31.h , p7/m , za1h.h [ w15 , 7 ] +mova z31.s , p7/m , za3h.s [ w15 , 3 ] +mova z31.d , p7/m , za7h.d [ w15 , 1 ] +mova z31.q , p7/m , za15h.q [ w15 , #0 ] +mova z31.b , p7/m , za0h.b [ w15 , #15 ] +mova z31.h , p7/m , za1h.h [ w15 , #7 ] +mova z31.s , p7/m , za3h.s [ w15 , #3 ] +mova z31.d , p7/m , za7h.d [ w15 , #1 ] +mova z31.q , p7/m , za15h.q [ w15, #0 ] + +/* Register aliases. */ +foo .req w15 +bar .req za7h +baz .req z31 + +mova z31.d , p7/m , bar.d [ foo , #1 ] +mova baz.q , p7/m , za15h.q [ foo , #0 ] + +/* Named immediate. */ +val_zero = 0 +val_seven = 7 +mova z0.b, p1/m, za0v.b[w13, #val_zero] +mova z0.b, p1/m, za0v.b[w13, #val_seven] diff --git a/gas/testsuite/gas/aarch64/sme-2a.d b/gas/testsuite/gas/aarch64/sme-2a.d new file mode 100644 index 0000000..9515e3f --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2a.d @@ -0,0 +1,29 @@ +#name: SME extension, MOV (tile to vector) +#as: -march=armv8-a+sme +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0+ <.*>: + 0: c0028000 mov z0\.b, p0/m, za0v\.b\[w12, 0\] + 4: c0428000 mov z0\.h, p0/m, za0v\.h\[w12, 0\] + 8: c0828000 mov z0\.s, p0/m, za0v\.s\[w12, 0\] + c: c0c28000 mov z0\.d, p0/m, za0v\.d\[w12, 0\] + 10: c0c38000 mov z0\.q, p0/m, za0v\.q\[w12, 0\] + 14: c002fdff mov z31\.b, p7/m, za0v\.b\[w15, 15\] + 18: c042fdff mov z31\.h, p7/m, za1v\.h\[w15, 7\] + 1c: c082fdff mov z31\.s, p7/m, za3v\.s\[w15, 3\] + 20: c0c2fdff mov z31\.d, p7/m, za7v\.d\[w15, 1\] + 24: c0c3fdff mov z31\.q, p7/m, za15v\.q\[w15, 0\] + 28: c0020000 mov z0\.b, p0/m, za0h\.b\[w12, 0\] + 2c: c0420000 mov z0\.h, p0/m, za0h\.h\[w12, 0\] + 30: c0820000 mov z0\.s, p0/m, za0h\.s\[w12, 0\] + 34: c0c20000 mov z0\.d, p0/m, za0h\.d\[w12, 0\] + 38: c0c30000 mov z0\.q, p0/m, za0h\.q\[w12, 0\] + 3c: c0027dff mov z31\.b, p7/m, za0h\.b\[w15, 15\] + 40: c0427dff mov z31\.h, p7/m, za1h\.h\[w15, 7\] + 44: c0827dff mov z31\.s, p7/m, za3h\.s\[w15, 3\] + 48: c0c27dff mov z31\.d, p7/m, za7h\.d\[w15, 1\] + 4c: c0c37dff mov z31\.q, p7/m, za15h\.q\[w15, 0\] diff --git a/gas/testsuite/gas/aarch64/sme-2a.s b/gas/testsuite/gas/aarch64/sme-2a.s new file mode 100644 index 0000000..4754981 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-2a.s @@ -0,0 +1,26 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOV alias (tile to vector) variant. */ +mov z0.b, p0/m, za0v.b[w12, 0] +mov z0.h, p0/m, za0v.h[w12, 0] +mov z0.s, p0/m, za0v.s[w12, 0] +mov z0.d, p0/m, za0v.d[w12, 0] +mov z0.q, p0/m, za0v.q[w12, 0] + +mov z31.b, p7/m, za0v.b[w15, 15] +mov z31.h, p7/m, za1v.h[w15, 7] +mov z31.s, p7/m, za3v.s[w15, 3] +mov z31.d, p7/m, za7v.d[w15, 1] +mov z31.q, p7/m, za15v.q[w15, 0] + +mov z0.b, p0/m, za0h.b[w12, 0] +mov z0.h, p0/m, za0h.h[w12, 0] +mov z0.s, p0/m, za0h.s[w12, 0] +mov z0.d, p0/m, za0h.d[w12, 0] +mov z0.q, p0/m, za0h.q[w12, 0] + +mov z31.b, p7/m, za0h.b[w15, 15] +mov z31.h, p7/m, za1h.h[w15, 7] +mov z31.s, p7/m, za3h.s[w15, 3] +mov z31.d, p7/m, za7h.d[w15, 1] +mov z31.q, p7/m, za15h.q[w15, 0] diff --git a/gas/testsuite/gas/aarch64/sme-3-illegal.d b/gas/testsuite/gas/aarch64/sme-3-illegal.d new file mode 100644 index 0000000..5ee89d3 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3-illegal.d @@ -0,0 +1,3 @@ +#as: -march=armv8-a+sme +#source: sme-3-illegal.s +#error_output: sme-3-illegal.l diff --git a/gas/testsuite/gas/aarch64/sme-3-illegal.l b/gas/testsuite/gas/aarch64/sme-3-illegal.l new file mode 100644 index 0000000..8babf4c --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3-illegal.l @@ -0,0 +1,11 @@ +[^:]*: Assembler messages: +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 1 -- `mova za1v\.b\[w12,#0\],p0/m,z0.b' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 1 -- `mova za2v\.h\[w12,#0\],p0/m,z0.h' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 1 -- `mova za4v\.s\[w12,#0\],p0/m,z0.s' +[^:]*:[0-9]+: Error: ZA tile vector out of range at operand 1 -- `mova za8v\.d\[w12,#0\],p0/m,z0.d' +[^:]*:[0-9]+: Error: operand 1 must be an SME horizontal or vertical vector access register -- `mova za16v\.q\[w12\],p0/m,z0.q' +[^:]*:[0-9]+: Error: index offset out of range at operand 1 -- `mova za0v\.b\[w15,#16\],p7/m,z31.b' +[^:]*:[0-9]+: Error: index offset out of range at operand 1 -- `mova za1v\.h\[w15,#8\],p7/m,z31.h' +[^:]*:[0-9]+: Error: index offset out of range at operand 1 -- `mova za3v\.s\[w15,#4\],p7/m,z31.s' +[^:]*:[0-9]+: Error: index offset out of range at operand 1 -- `mova za7v\.d\[w15,#2\],p7/m,z31.d' +[^:]*:[0-9]+: Error: index offset out of range at operand 1 -- `mova za15v\.q\[w15,#1\],p7/m,z31.q' diff --git a/gas/testsuite/gas/aarch64/sme-3-illegal.s b/gas/testsuite/gas/aarch64/sme-3-illegal.s new file mode 100644 index 0000000..6ed58ec --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3-illegal.s @@ -0,0 +1,14 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOVA (vector to tile) variant. */ +mova za1v.b[w12, #0], p0/m, z0.b +mova za2v.h[w12, #0], p0/m, z0.h +mova za4v.s[w12, #0], p0/m, z0.s +mova za8v.d[w12, #0], p0/m, z0.d +mova za16v.q[w12], p0/m, z0.q + +mova za0v.b[w15, #16], p7/m, z31.b +mova za1v.h[w15, #8], p7/m, z31.h +mova za3v.s[w15, #4], p7/m, z31.s +mova za7v.d[w15, #2], p7/m, z31.d +mova za15v.q[w15, #1], p7/m, z31.q diff --git a/gas/testsuite/gas/aarch64/sme-3.d b/gas/testsuite/gas/aarch64/sme-3.d new file mode 100644 index 0000000..82f72ac --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3.d @@ -0,0 +1,31 @@ +#name: SME extension, MOVA (vector to tile) +#as: -march=armv8-a+sme +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0+ <.*>: + 0: c0008000 mov za0v\.b\[w12, 0\], p0/m, z0\.b + 4: c0408000 mov za0v\.h\[w12, 0\], p0/m, z0\.h + 8: c0808000 mov za0v\.s\[w12, 0\], p0/m, z0\.s + c: c0c08000 mov za0v\.d\[w12, 0\], p0/m, z0\.d + 10: c0c18000 mov za0v\.q\[w12, 0\], p0/m, z0\.q + 14: c000ffef mov za0v\.b\[w15, 15\], p7/m, z31\.b + 18: c040ffef mov za1v\.h\[w15, 7\], p7/m, z31\.h + 1c: c080ffef mov za3v\.s\[w15, 3\], p7/m, z31\.s + 20: c0c0ffef mov za7v\.d\[w15, 1\], p7/m, z31\.d + 24: c0c1ffef mov za15v\.q\[w15, 0\], p7/m, z31\.q + 28: c0000000 mov za0h\.b\[w12, 0\], p0/m, z0\.b + 2c: c0400000 mov za0h\.h\[w12, 0\], p0/m, z0\.h + 30: c0800000 mov za0h\.s\[w12, 0\], p0/m, z0\.s + 34: c0c00000 mov za0h\.d\[w12, 0\], p0/m, z0\.d + 38: c0c10000 mov za0h\.q\[w12, 0\], p0/m, z0\.q + 3c: c0007fef mov za0h\.b\[w15, 15\], p7/m, z31\.b + 40: c0407fef mov za1h\.h\[w15, 7\], p7/m, z31\.h + 44: c0807fef mov za3h\.s\[w15, 3\], p7/m, z31\.s + 48: c0c07fef mov za7h\.d\[w15, 1\], p7/m, z31\.d + 4c: c0c17fef mov za15h\.q\[w15, 0\], p7/m, z31\.q + 50: c0008000 mov za0v\.b\[w12, 0\], p0/m, z0\.b + 54: c0c17fef mov za15h\.q\[w15, 0\], p7/m, z31\.q diff --git a/gas/testsuite/gas/aarch64/sme-3.s b/gas/testsuite/gas/aarch64/sme-3.s new file mode 100644 index 0000000..8efc896 --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3.s @@ -0,0 +1,31 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOVA (vector to tile) variant. */ +mova za0v.b[w12, 0], p0/m, z0.b +mova za0v.h[w12, 0], p0/m, z0.h +mova za0v.s[w12, 0], p0/m, z0.s +mova za0v.d[w12, 0], p0/m, z0.d +mova za0v.q[w12, 0], p0/m, z0.q + +mova za0v.b[w15, 15], p7/m, z31.b +mova za1v.h[w15, 7], p7/m, z31.h +mova za3v.s[w15, 3], p7/m, z31.s +mova za7v.d[w15, 1], p7/m, z31.d +mova za15v.q[w15, 0], p7/m, z31.q + +mova za0h.b[w12, 0], p0/m, z0.b +mova za0h.h[w12, 0], p0/m, z0.h +mova za0h.s[w12, 0], p0/m, z0.s +mova za0h.d[w12, 0], p0/m, z0.d +mova za0h.q[w12, 0], p0/m, z0.q + +mova za0h.b[w15, 15], p7/m, z31.b +mova za1h.h[w15, 7], p7/m, z31.h +mova za3h.s[w15, 3], p7/m, z31.s +mova za7h.d[w15, 1], p7/m, z31.d +mova za15h.q[w15, 0], p7/m, z31.q + +foo .req w12 +bar .req w15 +mova za0v.b[foo, 0], p0/m, z0.b +mova za15h.q[bar, 0], p7/m, z31.q diff --git a/gas/testsuite/gas/aarch64/sme-3a.d b/gas/testsuite/gas/aarch64/sme-3a.d new file mode 100644 index 0000000..82835ae --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3a.d @@ -0,0 +1,29 @@ +#name: SME extension, MOV (vector to tile) +#as: -march=armv8-a+sme +#objdump: -dr + +.*: file format .* + +Disassembly of section \.text: + +0+ <.*>: + 0: c0008000 mov za0v\.b\[w12, 0\], p0/m, z0\.b + 4: c0408000 mov za0v\.h\[w12, 0\], p0/m, z0\.h + 8: c0808000 mov za0v\.s\[w12, 0\], p0/m, z0\.s + c: c0c08000 mov za0v\.d\[w12, 0\], p0/m, z0\.d + 10: c0c18000 mov za0v\.q\[w12, 0\], p0/m, z0\.q + 14: c000ffef mov za0v\.b\[w15, 15\], p7/m, z31\.b + 18: c040ffef mov za1v\.h\[w15, 7\], p7/m, z31\.h + 1c: c080ffef mov za3v\.s\[w15, 3\], p7/m, z31\.s + 20: c0c0ffef mov za7v\.d\[w15, 1\], p7/m, z31\.d + 24: c0c1ffef mov za15v\.q\[w15, 0\], p7/m, z31\.q + 28: c0000000 mov za0h\.b\[w12, 0\], p0/m, z0\.b + 2c: c0400000 mov za0h\.h\[w12, 0\], p0/m, z0\.h + 30: c0800000 mov za0h\.s\[w12, 0\], p0/m, z0\.s + 34: c0c00000 mov za0h\.d\[w12, 0\], p0/m, z0\.d + 38: c0c10000 mov za0h\.q\[w12, 0\], p0/m, z0\.q + 3c: c0007fef mov za0h\.b\[w15, 15\], p7/m, z31\.b + 40: c0407fef mov za1h\.h\[w15, 7\], p7/m, z31\.h + 44: c0807fef mov za3h\.s\[w15, 3\], p7/m, z31\.s + 48: c0c07fef mov za7h\.d\[w15, 1\], p7/m, z31\.d + 4c: c0c17fef mov za15h\.q\[w15, 0\], p7/m, z31\.q diff --git a/gas/testsuite/gas/aarch64/sme-3a.s b/gas/testsuite/gas/aarch64/sme-3a.s new file mode 100644 index 0000000..892a30e --- /dev/null +++ b/gas/testsuite/gas/aarch64/sme-3a.s @@ -0,0 +1,26 @@ +/* Scalable Matrix Extension (SME). */ + +/* MOV alias (vector to tile) variant. */ +mov za0v.b[w12, 0], p0/m, z0.b +mov za0v.h[w12, 0], p0/m, z0.h +mov za0v.s[w12, 0], p0/m, z0.s +mov za0v.d[w12, 0], p0/m, z0.d +mov za0v.q[w12, 0], p0/m, z0.q + +mov za0v.b[w15, 15], p7/m, z31.b +mov za1v.h[w15, 7], p7/m, z31.h +mov za3v.s[w15, 3], p7/m, z31.s +mov za7v.d[w15, 1], p7/m, z31.d +mov za15v.q[w15, 0], p7/m, z31.q + +mov za0h.b[w12, 0], p0/m, z0.b +mov za0h.h[w12, 0], p0/m, z0.h +mov za0h.s[w12, 0], p0/m, z0.s +mov za0h.d[w12, 0], p0/m, z0.d +mov za0h.q[w12, 0], p0/m, z0.q + +mov za0h.b[w15, 15], p7/m, z31.b +mov za1h.h[w15, 7], p7/m, z31.h +mov za3h.s[w15, 3], p7/m, z31.s +mov za7h.d[w15, 1], p7/m, z31.d +mov za15h.q[w15, 0], p7/m, z31.q diff --git a/include/opcode/aarch64.h b/include/opcode/aarch64.h index cc5a5f3..249450c 100644 --- a/include/opcode/aarch64.h +++ b/include/opcode/aarch64.h @@ -447,6 +447,8 @@ enum aarch64_opnd AARCH64_OPND_SVE_ZtxN, /* SVE vector register list in Zt. */ AARCH64_OPND_SME_ZAda_2b, /* SME <ZAda>.S, 2-bits. */ AARCH64_OPND_SME_ZAda_3b, /* SME <ZAda>.D, 3-bits. */ + AARCH64_OPND_SME_ZA_HV_idx_src, /* SME source ZA tile vector. */ + AARCH64_OPND_SME_ZA_HV_idx_dest, /* SME destination ZA tile vector. */ AARCH64_OPND_SME_Pm, /* SME scalable predicate register, bits [15:13]. */ AARCH64_OPND_TME_UIMM16, /* TME unsigned 16-bit immediate. */ AARCH64_OPND_SM3_IMM2, /* SM3 encodes lane in bits [13, 14]. */ @@ -1114,6 +1116,18 @@ struct aarch64_opnd_info uint32_t flags; } sysreg; + /* ZA tile vector, e.g. <ZAn><HV>.D[<Wv>{, <imm>}] */ + struct + { + int regno; /* <ZAn> */ + struct + { + int regno; /* <Wv> */ + int imm; /* <imm> */ + } index; + unsigned v : 1; /* <HV> horizontal or vertical vector indicator. */ + } za_tile_vector; + const aarch64_cond *cond; /* The encoding of the PSTATE field. */ aarch64_insn pstatefield; diff --git a/opcodes/aarch64-asm-2.c b/opcodes/aarch64-asm-2.c index 4839fef..eda943e 100644 --- a/opcodes/aarch64-asm-2.c +++ b/opcodes/aarch64-asm-2.c @@ -663,7 +663,7 @@ aarch64_insert_operand (const aarch64_operand *self, case 207: case 209: case 210: - case 211: + case 213: return aarch64_ins_regno (self, info, code, inst, errors); case 15: return aarch64_ins_reg_extended (self, info, code, inst, errors); @@ -675,7 +675,7 @@ aarch64_insert_operand (const aarch64_operand *self, case 33: case 34: case 35: - case 213: + case 215: return aarch64_ins_reglane (self, info, code, inst, errors); case 36: return aarch64_ins_reglist (self, info, code, inst, errors); @@ -720,7 +720,7 @@ aarch64_insert_operand (const aarch64_operand *self, case 187: case 188: case 189: - case 212: + case 214: return aarch64_ins_imm (self, info, code, inst, errors); case 44: case 45: @@ -879,6 +879,9 @@ aarch64_insert_operand (const aarch64_operand *self, case 206: case 208: return aarch64_ins_sve_reglist (self, info, code, inst, errors); + case 211: + case 212: + return aarch64_ins_sme_za_hv_tiles (self, info, code, inst, errors); default: assert (0); abort (); } } diff --git a/opcodes/aarch64-asm.c b/opcodes/aarch64-asm.c index 7cc8146..9a77d0f 100644 --- a/opcodes/aarch64-asm.c +++ b/opcodes/aarch64-asm.c @@ -1325,6 +1325,61 @@ aarch64_ins_sve_float_zero_one (const aarch64_operand *self, return true; } +/* Encode in SME instruction such as MOVA ZA tile vector register number, + vector indicator, vector selector and immediate. */ +bool +aarch64_ins_sme_za_hv_tiles (const aarch64_operand *self, + const aarch64_opnd_info *info, + aarch64_insn *code, + const aarch64_inst *inst ATTRIBUTE_UNUSED, + aarch64_operand_error *errors ATTRIBUTE_UNUSED) +{ + int fld_size; + int fld_q; + int fld_v = info->za_tile_vector.v; + int fld_rv = info->za_tile_vector.index.regno - 12; + int fld_zan_imm = info->za_tile_vector.index.imm; + int regno = info->za_tile_vector.regno; + + switch (info->qualifier) + { + case AARCH64_OPND_QLF_S_B: + fld_size = 0; + fld_q = 0; + break; + case AARCH64_OPND_QLF_S_H: + fld_size = 1; + fld_q = 0; + fld_zan_imm |= regno << 3; + break; + case AARCH64_OPND_QLF_S_S: + fld_size = 2; + fld_q = 0; + fld_zan_imm |= regno << 2; + break; + case AARCH64_OPND_QLF_S_D: + fld_size = 3; + fld_q = 0; + fld_zan_imm |= regno << 1; + break; + case AARCH64_OPND_QLF_S_Q: + fld_size = 3; + fld_q = 1; + fld_zan_imm = regno; + break; + default: + assert (0); + } + + insert_field (self->fields[0], code, fld_size, 0); + insert_field (self->fields[1], code, fld_q, 0); + insert_field (self->fields[2], code, fld_v, 0); + insert_field (self->fields[3], code, fld_rv, 0); + insert_field (self->fields[4], code, fld_zan_imm, 0); + + return true; +} + /* Miscellaneous encoding functions. */ /* Encode size[0], i.e. bit 22, for diff --git a/opcodes/aarch64-asm.h b/opcodes/aarch64-asm.h index 5ea24ba..9cbcd7a 100644 --- a/opcodes/aarch64-asm.h +++ b/opcodes/aarch64-asm.h @@ -98,6 +98,7 @@ AARCH64_DECL_OPD_INSERTER (ins_sve_reglist); AARCH64_DECL_OPD_INSERTER (ins_sve_scale); AARCH64_DECL_OPD_INSERTER (ins_sve_shlimm); AARCH64_DECL_OPD_INSERTER (ins_sve_shrimm); +AARCH64_DECL_OPD_INSERTER (ins_sme_za_hv_tiles); AARCH64_DECL_OPD_INSERTER (ins_imm_rotate1); AARCH64_DECL_OPD_INSERTER (ins_imm_rotate2); diff --git a/opcodes/aarch64-dis-2.c b/opcodes/aarch64-dis-2.c index 4376e3b..6bde0f3 100644 --- a/opcodes/aarch64-dis-2.c +++ b/opcodes/aarch64-dis-2.c @@ -38,23 +38,23 @@ aarch64_opcode_lookup_1 (uint32_t word) { if (((word >> 21) & 0x1) == 0) { - if (((word >> 22) & 0x1) == 0) + if (((word >> 29) & 0x1) == 0) { - if (((word >> 23) & 0x1) == 0) - { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - xxx00000000xxxxxxxxxxxxxxxxxxxxx - udf. */ - return 754; - } - else + if (((word >> 30) & 0x1) == 0) { - if (((word >> 4) & 0x1) == 0) + if (((word >> 22) & 0x1) == 0) { - if (((word >> 29) & 0x1) == 0) + if (((word >> 23) & 0x1) == 0) { - if (((word >> 30) & 0x1) == 0) + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x0000000000xxxxxxxxxxxxxxxxxxxxx + udf. */ + return 754; + } + else + { + if (((word >> 4) & 0x1) == 0) { /* 33222222222211111111110000000000 10987654321098765432109876543210 @@ -64,85 +64,85 @@ aarch64_opcode_lookup_1 (uint32_t word) } else { - if (((word >> 16) & 0x1) == 0) - { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - x1000000100xxxx0xxxxxxxxxxx0xxxx - addha. */ - return 2348; - } - else - { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - x1000000100xxxx1xxxxxxxxxxx0xxxx - addva. */ - return 2350; - } + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x0000000100xxxxxxxxxxxxxxxx1xxxx + fmops. */ + return 2357; } } - else - { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - xx100000100xxxxxxxxxxxxxxxx0xxxx - smopa. */ - return 2360; - } } else { - if (((word >> 29) & 0x1) == 0) + if (((word >> 4) & 0x1) == 0) { /* 33222222222211111111110000000000 10987654321098765432109876543210 - xx000000100xxxxxxxxxxxxxxxx1xxxx - fmops. */ - return 2357; + x0000000x10xxxxxxxxxxxxxxxx0xxxx + fmopa. */ + return 2355; } else { /* 33222222222211111111110000000000 10987654321098765432109876543210 - xx100000100xxxxxxxxxxxxxxxx1xxxx - smops. */ - return 2362; + x0000000x10xxxxxxxxxxxxxxxx1xxxx + fmops. */ + return 2358; } } } - } - else - { - if (((word >> 4) & 0x1) == 0) + else { - if (((word >> 29) & 0x1) == 0) + if (((word >> 17) & 0x1) == 0) { - if (((word >> 30) & 0x1) == 0) + if (((word >> 20) & 0x1) == 0) { /* 33222222222211111111110000000000 10987654321098765432109876543210 - x0000000x10xxxxxxxxxxxxxxxx0xxxx - fmopa. */ - return 2355; + x1000000xx00xx0xxxxxxxxxxxxxxxxx + mov. */ + return 2377; } else { if (((word >> 16) & 0x1) == 0) { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - x1000000x10xxxx0xxxxxxxxxxx0xxxx - addha. */ - return 2349; + if (((word >> 22) & 0x1) == 0) + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x1000000x001xx00xxxxxxxxxxxxxxxx + addha. */ + return 2348; + } + else + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x1000000x101xx00xxxxxxxxxxxxxxxx + addha. */ + return 2349; + } } else { - /* 33222222222211111111110000000000 - 10987654321098765432109876543210 - x1000000x10xxxx1xxxxxxxxxxx0xxxx - addva. */ - return 2351; + if (((word >> 22) & 0x1) == 0) + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x1000000x001xx01xxxxxxxxxxxxxxxx + addva. */ + return 2350; + } + else + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + x1000000x101xx01xxxxxxxxxxxxxxxx + addva. */ + return 2351; + } } } } @@ -150,6 +150,28 @@ aarch64_opcode_lookup_1 (uint32_t word) { /* 33222222222211111111110000000000 10987654321098765432109876543210 + x1000000xx0xxx1xxxxxxxxxxxxxxxxx + mov. */ + return 2376; + } + } + } + else + { + if (((word >> 4) & 0x1) == 0) + { + if (((word >> 22) & 0x1) == 0) + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 + xx100000x00xxxxxxxxxxxxxxxx0xxxx + smopa. */ + return 2360; + } + else + { + /* 33222222222211111111110000000000 + 10987654321098765432109876543210 xx100000x10xxxxxxxxxxxxxxxx0xxxx smopa. */ return 2361; @@ -157,13 +179,13 @@ aarch64_opcode_lookup_1 (uint32_t word) } else { - if (((word >> 29) & 0x1) == 0) + if (((word >> 22) & 0x1) == 0) { /* 33222222222211111111110000000000 10987654321098765432109876543210 - xx000000x10xxxxxxxxxxxxxxxx1xxxx - fmops. */ - return 2358; + xx100000x00xxxxxxxxxxxxxxxx1xxxx + smops. */ + return 2362; } else { @@ -2731,7 +2753,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 00011001000xxxxxxxxx00xxxxxxxxxx stlurb. */ - return 2416; + return 2420; } else { @@ -2739,7 +2761,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 10011001000xxxxxxxxx00xxxxxxxxxx stlur. */ - return 2424; + return 2428; } } else @@ -2750,7 +2772,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 01011001000xxxxxxxxx00xxxxxxxxxx stlurh. */ - return 2420; + return 2424; } else { @@ -2758,7 +2780,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 11011001000xxxxxxxxx00xxxxxxxxxx stlur. */ - return 2427; + return 2431; } } } @@ -2838,7 +2860,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 00011001010xxxxxxxxx00xxxxxxxxxx ldapurb. */ - return 2417; + return 2421; } else { @@ -2846,7 +2868,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 10011001010xxxxxxxxx00xxxxxxxxxx ldapur. */ - return 2425; + return 2429; } } else @@ -2857,7 +2879,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 01011001010xxxxxxxxx00xxxxxxxxxx ldapurh. */ - return 2421; + return 2425; } else { @@ -2865,7 +2887,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 11011001010xxxxxxxxx00xxxxxxxxxx ldapur. */ - return 2428; + return 2432; } } } @@ -2948,7 +2970,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 00011001100xxxxxxxxx00xxxxxxxxxx ldapursb. */ - return 2419; + return 2423; } else { @@ -2956,7 +2978,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 10011001100xxxxxxxxx00xxxxxxxxxx ldapursw. */ - return 2426; + return 2430; } } else @@ -2965,7 +2987,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1011001100xxxxxxxxx00xxxxxxxxxx ldapursh. */ - return 2423; + return 2427; } } else @@ -2976,7 +2998,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x0011001110xxxxxxxxx00xxxxxxxxxx ldapursb. */ - return 2418; + return 2422; } else { @@ -2984,7 +3006,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1011001110xxxxxxxxx00xxxxxxxxxx ldapursh. */ - return 2422; + return 2426; } } } @@ -3470,7 +3492,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxx11010x00xxxxxx0xx10xxxxxxxxxx setf8. */ - return 2414; + return 2418; } else { @@ -3478,7 +3500,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxx11010x00xxxxxx1xx10xxxxxxxxxx setf16. */ - return 2415; + return 2419; } } else @@ -3624,7 +3646,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xxx11010000xxxxxxxxx01xxxxxxxxxx rmif. */ - return 2413; + return 2417; } else { @@ -4673,7 +4695,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x01x1xxxxx000110xxxxxxxxxx usdot. */ - return 2433; + return 2437; } } } @@ -4747,7 +4769,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x01x1xxxxx000111xxxxxxxxxx sudot. */ - return 2434; + return 2438; } } } @@ -7366,7 +7388,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x0xx0xxxxx011110xxxxxxxxxx usdot. */ - return 2432; + return 2436; } } } @@ -9070,7 +9092,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0100xxx10101xxxxxxxxxxxxx bfcvtnt. */ - return 2461; + return 2465; } } else @@ -9313,7 +9335,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x00x1xxxxxx00xxxxxxxxxxxxx ld1rob. */ - return 2437; + return 2441; } else { @@ -9321,7 +9343,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x01x1xxxxxx00xxxxxxxxxxxxx ld1roh. */ - return 2438; + return 2442; } } else @@ -9553,7 +9575,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0011xxxxx010xxxxxxxxxxxxx bfdot. */ - return 2458; + return 2462; } else { @@ -9574,7 +9596,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0111xxxxx010xx0xxxxxxxxxx bfmlalb. */ - return 2465; + return 2469; } else { @@ -9582,7 +9604,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0111xxxxx010xx1xxxxxxxxxx bfmlalt. */ - return 2464; + return 2468; } } else @@ -9637,7 +9659,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x11001x0011xxxxx1x0xxxxxxxxxxxxx bfdot. */ - return 2457; + return 2461; } else { @@ -9649,7 +9671,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0111xxxxx1x0xx0xxxxxxxxxx bfmlalb. */ - return 2463; + return 2467; } else { @@ -9657,7 +9679,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0111xxxxx1x0xx1xxxxxxxxxx bfmlalt. */ - return 2462; + return 2466; } } else @@ -9708,7 +9730,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x00x1xxxxx001xxxxxxxxxxxxx ld1rob. */ - return 2441; + return 2445; } else { @@ -9716,7 +9738,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x01x1xxxxx001xxxxxxxxxxxxx ld1roh. */ - return 2442; + return 2446; } } else @@ -10075,7 +10097,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0101xxxxx111xxxxxxxxxxxxx fmmla. */ - return 2435; + return 2439; } else { @@ -10108,7 +10130,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0011xxxxx111xxxxxxxxxxxxx bfmmla. */ - return 2459; + return 2463; } else { @@ -10138,7 +10160,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x0111xxxxx111xxxxxxxxxxxxx fmmla. */ - return 2436; + return 2440; } else { @@ -10267,7 +10289,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000x00xxxxxxxxxx zip1. */ - return 2445; + return 2449; } else { @@ -10277,7 +10299,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000010xxxxxxxxxx uzp1. */ - return 2447; + return 2451; } else { @@ -10285,7 +10307,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000110xxxxxxxxxx trn1. */ - return 2449; + return 2453; } } } @@ -10297,7 +10319,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000x01xxxxxxxxxx zip2. */ - return 2446; + return 2450; } else { @@ -10307,7 +10329,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000011xxxxxxxxxx uzp2. */ - return 2448; + return 2452; } else { @@ -10315,7 +10337,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000001x1101xxxxx000111xxxxxxxxxx trn2. */ - return 2450; + return 2454; } } } @@ -11363,7 +11385,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x1000xxxxx100110xxxxxxxxxx smmla. */ - return 2429; + return 2433; } else { @@ -11371,7 +11393,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x1100xxxxx100110xxxxxxxxxx usmmla. */ - return 2431; + return 2435; } } else @@ -11380,7 +11402,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010001x1x10xxxxx100110xxxxxxxxxx ummla. */ - return 2430; + return 2434; } } } @@ -12876,7 +12898,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x10x1xxxxx000xxxxxxxxxxxxx ld1row. */ - return 2439; + return 2443; } else { @@ -12884,7 +12906,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x11x1xxxxx000xxxxxxxxxxxxx ld1rod. */ - return 2440; + return 2444; } } } @@ -13258,7 +13280,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x10x1xxxxx001xxxxxxxxxxxxx ld1row. */ - return 2443; + return 2447; } else { @@ -13266,7 +13288,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 101001x11x1xxxxx001xxxxxxxxxxxxx ld1rod. */ - return 2444; + return 2448; } } } @@ -14700,7 +14722,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 011001x110001x10101xxxxxxxxxxxxx bfcvt. */ - return 2460; + return 2464; } } else @@ -16769,7 +16791,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 0x001110xx0xxxxx1x1001xxxxxxxxxx smmla. */ - return 2451; + return 2455; } } } @@ -16802,7 +16824,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 0x001110xx0xxxxx1x0101xxxxxxxxxx sdot. */ - return 2377; + return 2381; } } else @@ -16876,7 +16898,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 0x001110xx0xxxxx1x1011xxxxxxxxxx usmmla. */ - return 2453; + return 2457; } } } @@ -16909,7 +16931,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 0x001110xx0xxxxx1x0111xxxxxxxxxx usdot. */ - return 2454; + return 2458; } } else @@ -16956,7 +16978,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110000xxxxxxxxxxxxxxxxxxxxx eor3. */ - return 2384; + return 2388; } else { @@ -16964,7 +16986,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110100xxxxxxxxxxxxxxxxxxxxx xar. */ - return 2386; + return 2390; } } else @@ -16975,7 +16997,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110x10xxxxx0xxxxxxxxxxxxxxx sm3ss1. */ - return 2388; + return 2392; } else { @@ -16989,7 +17011,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110010xxxxx1xxx00xxxxxxxxxx sm3tt1a. */ - return 2389; + return 2393; } else { @@ -16997,7 +17019,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110110xxxxx1xxx00xxxxxxxxxx sha512su0. */ - return 2382; + return 2386; } } else @@ -17006,7 +17028,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110x10xxxxx1xxx10xxxxxxxxxx sm3tt2a. */ - return 2391; + return 2395; } } else @@ -17019,7 +17041,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110010xxxxx1xxx01xxxxxxxxxx sm3tt1b. */ - return 2390; + return 2394; } else { @@ -17027,7 +17049,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110110xxxxx1xxx01xxxxxxxxxx sm4e. */ - return 2395; + return 2399; } } else @@ -17036,7 +17058,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110x10xxxxx1xxx11xxxxxxxxxx sm3tt2b. */ - return 2392; + return 2396; } } } @@ -17217,7 +17239,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx101110xx0xxxxx100101xxxxxxxxxx udot. */ - return 2376; + return 2380; } } else @@ -17248,7 +17270,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx101110xx0xxxxx101x01xxxxxxxxxx ummla. */ - return 2452; + return 2456; } else { @@ -17267,7 +17289,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx101110xx0xxxxx1x1011xxxxxxxxxx bfmmla. */ - return 2468; + return 2472; } else { @@ -17277,7 +17299,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx1011100x0xxxxx1x1111xxxxxxxxxx bfdot. */ - return 2466; + return 2470; } else { @@ -17287,7 +17309,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x01011101x0xxxxx1x1111xxxxxxxxxx bfmlalb. */ - return 2473; + return 2477; } else { @@ -17295,7 +17317,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x11011101x0xxxxx1x1111xxxxxxxxxx bfmlalt. */ - return 2472; + return 2476; } } } @@ -17879,7 +17901,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 000011101x1xxxx1011010xxxxxxxxxx bfcvtn. */ - return 2469; + return 2473; } else { @@ -17887,7 +17909,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 010011101x1xxxx1011010xxxxxxxxxx bfcvtn2. */ - return 2470; + return 2474; } } } @@ -18205,7 +18227,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110xx1xxxxx0xxxxxxxxxxxxxxx bcax. */ - return 2387; + return 2391; } } else @@ -18816,7 +18838,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 11001110xx1xxxxx100000xxxxxxxxxx sha512h. */ - return 2380; + return 2384; } } } @@ -18868,7 +18890,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 11001110xx1xxxxx110000xxxxxxxxxx sm3partw1. */ - return 2393; + return 2397; } } } @@ -19111,7 +19133,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110xx1xxxxx100010xxxxxxxxxx sha512su1. */ - return 2383; + return 2387; } } else @@ -19187,7 +19209,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x0011100x1xxxxx110010xxxxxxxxxx sm4ekey. */ - return 2396; + return 2400; } } else @@ -20013,7 +20035,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110xx1xxxxx100001xxxxxxxxxx sha512h2. */ - return 2381; + return 2385; } } else @@ -20045,7 +20067,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x0011100x1xxxxx110001xxxxxxxxxx sm3partw2. */ - return 2394; + return 2398; } } else @@ -20285,7 +20307,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 1x001110xx1xxxxx100011xxxxxxxxxx rax1. */ - return 2385; + return 2389; } } else @@ -20317,7 +20339,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x01011100x1xxxxx110011xxxxxxxxxx fmlal2. */ - return 2399; + return 2403; } else { @@ -20325,7 +20347,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x11011100x1xxxxx110011xxxxxxxxxx fmlal2. */ - return 2403; + return 2407; } } } @@ -20347,7 +20369,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x01011101x1xxxxx110011xxxxxxxxxx fmlsl2. */ - return 2400; + return 2404; } else { @@ -20355,7 +20377,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x11011101x1xxxxx110011xxxxxxxxxx fmlsl2. */ - return 2404; + return 2408; } } } @@ -20394,7 +20416,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x00011100x1xxxxx111011xxxxxxxxxx fmlal. */ - return 2397; + return 2401; } else { @@ -20402,7 +20424,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x10011100x1xxxxx111011xxxxxxxxxx fmlal. */ - return 2401; + return 2405; } } else @@ -20424,7 +20446,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x00011101x1xxxxx111011xxxxxxxxxx fmlsl. */ - return 2398; + return 2402; } else { @@ -20432,7 +20454,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x10011101x1xxxxx111011xxxxxxxxxx fmlsl. */ - return 2402; + return 2406; } } else @@ -22240,7 +22262,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x0001111xxxxxxxx0000x0xxxxxxxxxx fmlal. */ - return 2405; + return 2409; } else { @@ -22248,7 +22270,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1001111xxxxxxxx0000x0xxxxxxxxxx fmlal. */ - return 2409; + return 2413; } } else @@ -22270,7 +22292,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x0001111xxxxxxxx0100x0xxxxxxxxxx fmlsl. */ - return 2406; + return 2410; } else { @@ -22278,7 +22300,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1001111xxxxxxxx0100x0xxxxxxxxxx fmlsl. */ - return 2410; + return 2414; } } else @@ -22784,7 +22806,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x0101111xxxxxxxx1000x0xxxxxxxxxx fmlal2. */ - return 2407; + return 2411; } else { @@ -22792,7 +22814,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1101111xxxxxxxx1000x0xxxxxxxxxx fmlal2. */ - return 2411; + return 2415; } } } @@ -22814,7 +22836,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x0101111xxxxxxxx1100x0xxxxxxxxxx fmlsl2. */ - return 2408; + return 2412; } else { @@ -22822,7 +22844,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x1101111xxxxxxxx1100x0xxxxxxxxxx fmlsl2. */ - return 2412; + return 2416; } } } @@ -22878,7 +22900,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx001111xxxxxxxx1110x0xxxxxxxxxx sdot. */ - return 2379; + return 2383; } else { @@ -22886,7 +22908,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx101111xxxxxxxx1110x0xxxxxxxxxx udot. */ - return 2378; + return 2382; } } } @@ -22989,7 +23011,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx00111100xxxxxx1111x0xxxxxxxxxx sudot. */ - return 2456; + return 2460; } else { @@ -22997,7 +23019,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx00111110xxxxxx1111x0xxxxxxxxxx usdot. */ - return 2455; + return 2459; } } else @@ -23008,7 +23030,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 xx00111101xxxxxx1111x0xxxxxxxxxx bfdot. */ - return 2467; + return 2471; } else { @@ -23018,7 +23040,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x000111111xxxxxx1111x0xxxxxxxxxx bfmlalb. */ - return 2475; + return 2479; } else { @@ -23026,7 +23048,7 @@ aarch64_opcode_lookup_1 (uint32_t word) 10987654321098765432109876543210 x100111111xxxxxx1111x0xxxxxxxxxx bfmlalt. */ - return 2474; + return 2478; } } } @@ -23513,6 +23535,10 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode) int value; switch (key) { + case 2377: value = 2379; break; /* mov --> mova. */ + case 2379: return NULL; /* mova --> NULL. */ + case 2376: value = 2378; break; /* mov --> mova. */ + case 2378: return NULL; /* mova --> NULL. */ case 12: value = 19; break; /* add --> addg. */ case 19: return NULL; /* addg --> NULL. */ case 16: value = 20; break; /* sub --> subg. */ @@ -23660,8 +23686,8 @@ aarch64_find_next_opcode (const aarch64_opcode *opcode) case 824: return NULL; /* fsqrt --> NULL. */ case 832: value = 833; break; /* frintz --> frintz. */ case 833: return NULL; /* frintz --> NULL. */ - case 825: value = 2471; break; /* fcvt --> bfcvt. */ - case 2471: return NULL; /* bfcvt --> NULL. */ + case 825: value = 2475; break; /* fcvt --> bfcvt. */ + case 2475: return NULL; /* bfcvt --> NULL. */ case 834: value = 835; break; /* frinta --> frinta. */ case 835: return NULL; /* frinta --> NULL. */ case 836: value = 837; break; /* frintx --> frintx. */ @@ -24164,7 +24190,7 @@ aarch64_extract_operand (const aarch64_operand *self, case 207: case 209: case 210: - case 211: + case 213: return aarch64_ext_regno (self, info, code, inst, errors); case 10: return aarch64_ext_regrt_sysins (self, info, code, inst, errors); @@ -24180,7 +24206,7 @@ aarch64_extract_operand (const aarch64_operand *self, case 33: case 34: case 35: - case 213: + case 215: return aarch64_ext_reglane (self, info, code, inst, errors); case 36: return aarch64_ext_reglist (self, info, code, inst, errors); @@ -24226,7 +24252,7 @@ aarch64_extract_operand (const aarch64_operand *self, case 187: case 188: case 189: - case 212: + case 214: return aarch64_ext_imm (self, info, code, inst, errors); case 44: case 45: @@ -24387,6 +24413,9 @@ aarch64_extract_operand (const aarch64_operand *self, case 206: case 208: return aarch64_ext_sve_reglist (self, info, code, inst, errors); + case 211: + case 212: + return aarch64_ext_sme_za_hv_tiles (self, info, code, inst, errors); default: assert (0); abort (); } } diff --git a/opcodes/aarch64-dis.c b/opcodes/aarch64-dis.c index cbc9051..94d3f8c 100644 --- a/opcodes/aarch64-dis.c +++ b/opcodes/aarch64-dis.c @@ -1748,6 +1748,64 @@ aarch64_ext_sve_float_zero_one (const aarch64_operand *self, return true; } +/* Decode ZA tile vector, vector indicator, vector selector, qualifier and + immediate on numerous SME instruction fields such as MOVA. */ +bool +aarch64_ext_sme_za_hv_tiles (const aarch64_operand *self, + aarch64_opnd_info *info, aarch64_insn code, + const aarch64_inst *inst ATTRIBUTE_UNUSED, + aarch64_operand_error *errors ATTRIBUTE_UNUSED) +{ + int fld_size = extract_field (self->fields[0], code, 0); + int fld_q = extract_field (self->fields[1], code, 0); + int fld_v = extract_field (self->fields[2], code, 0); + int fld_rv = extract_field (self->fields[3], code, 0); + int fld_zan_imm = extract_field (self->fields[4], code, 0); + + /* Deduce qualifier encoded in size and Q fields. */ + if (fld_size == 0) + info->qualifier = AARCH64_OPND_QLF_S_B; + else if (fld_size == 1) + info->qualifier = AARCH64_OPND_QLF_S_H; + else if (fld_size == 2) + info->qualifier = AARCH64_OPND_QLF_S_S; + else if (fld_size == 3 && fld_q == 0) + info->qualifier = AARCH64_OPND_QLF_S_D; + else if (fld_size == 3 && fld_q == 1) + info->qualifier = AARCH64_OPND_QLF_S_Q; + + info->za_tile_vector.index.regno = fld_rv + 12; + info->za_tile_vector.v = fld_v; + + switch (info->qualifier) + { + case AARCH64_OPND_QLF_S_B: + info->za_tile_vector.regno = 0; + info->za_tile_vector.index.imm = fld_zan_imm; + break; + case AARCH64_OPND_QLF_S_H: + info->za_tile_vector.regno = fld_zan_imm >> 3; + info->za_tile_vector.index.imm = fld_zan_imm & 0x07; + break; + case AARCH64_OPND_QLF_S_S: + info->za_tile_vector.regno = fld_zan_imm >> 2; + info->za_tile_vector.index.imm = fld_zan_imm & 0x03; + break; + case AARCH64_OPND_QLF_S_D: + info->za_tile_vector.regno = fld_zan_imm >> 1; + info->za_tile_vector.index.imm = fld_zan_imm & 0x01; + break; + case AARCH64_OPND_QLF_S_Q: + info->za_tile_vector.regno = fld_zan_imm; + info->za_tile_vector.index.imm = 0; + break; + default: + assert (0); + } + + return true; +} + /* Decode Zn[MM], where MM has a 7-bit triangular encoding. The fields array specifies which field to use for Zn. MM is encoded in the concatenation of imm5 and SVE_tszh, with imm5 being the less diff --git a/opcodes/aarch64-dis.h b/opcodes/aarch64-dis.h index 09305b9..842ec55 100644 --- a/opcodes/aarch64-dis.h +++ b/opcodes/aarch64-dis.h @@ -122,6 +122,7 @@ AARCH64_DECL_OPD_EXTRACTOR (ext_sve_reglist); AARCH64_DECL_OPD_EXTRACTOR (ext_sve_scale); AARCH64_DECL_OPD_EXTRACTOR (ext_sve_shlimm); AARCH64_DECL_OPD_EXTRACTOR (ext_sve_shrimm); +AARCH64_DECL_OPD_EXTRACTOR (ext_sme_za_hv_tiles); AARCH64_DECL_OPD_EXTRACTOR (ext_imm_rotate1); AARCH64_DECL_OPD_EXTRACTOR (ext_imm_rotate2); diff --git a/opcodes/aarch64-opc-2.c b/opcodes/aarch64-opc-2.c index cf1ce0b..e80cbf2 100644 --- a/opcodes/aarch64-opc-2.c +++ b/opcodes/aarch64-opc-2.c @@ -235,6 +235,8 @@ const struct aarch64_operand aarch64_operands[] = {AARCH64_OPND_CLASS_SVE_REG, "SVE_ZtxN", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SVE_Zt}, "a list of SVE vector registers"}, {AARCH64_OPND_CLASS_SVE_REG, "SME_ZAda_2b", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SME_ZAda_2b}, "an SME ZA tile ZA0-ZA3"}, {AARCH64_OPND_CLASS_SVE_REG, "SME_ZAda_3b", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SME_ZAda_3b}, "an SME ZA tile ZA0-ZA7"}, + {AARCH64_OPND_CLASS_SVE_REG, "SME_ZA_HV_idx_src", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SME_size_10,FLD_SME_Q,FLD_SME_V,FLD_SME_Rv,FLD_imm4_5}, "an SME horizontal or vertical vector access register"}, + {AARCH64_OPND_CLASS_SVE_REG, "SME_ZA_HV_idx_dest", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SME_size_10,FLD_SME_Q,FLD_SME_V,FLD_SME_Rv,FLD_imm4_2}, "an SME horizontal or vertical vector access register"}, {AARCH64_OPND_CLASS_PRED_REG, "SME_Pm", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SME_Pm}, "an SVE predicate register"}, {AARCH64_OPND_CLASS_IMMEDIATE, "TME_UIMM16", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_imm16}, "a 16-bit unsigned immediate for TME tcancel"}, {AARCH64_OPND_CLASS_SIMD_ELEMENT, "SM3_IMM2", OPD_F_HAS_INSERTER | OPD_F_HAS_EXTRACTOR, {FLD_SM3_imm2}, "an indexed SM3 vector immediate"}, diff --git a/opcodes/aarch64-opc.c b/opcodes/aarch64-opc.c index 8ced8e0..b12bf3e 100644 --- a/opcodes/aarch64-opc.c +++ b/opcodes/aarch64-opc.c @@ -242,6 +242,7 @@ const aarch64_field fields[] = { 11, 4 }, /* imm4: in advsimd ext and advsimd ins instructions. */ { 0, 4 }, /* imm4_2: in rmif instructions. */ { 10, 4 }, /* imm4_3: in adddg/subg instructions. */ + { 5, 4 }, /* imm4_5: in SME instructions. */ { 16, 5 }, /* imm5: in conditional compare (immediate) instructions. */ { 15, 7 }, /* imm7: in load/store pair pre/post index instructions. */ { 13, 8 }, /* imm8: in floating-point scalar move immediate inst. */ @@ -323,6 +324,10 @@ const aarch64_field fields[] = { 22, 1 }, /* SVE_xs_22: UXTW/SXTW select (bit 22). */ { 0, 2 }, /* SME ZAda tile ZA0-ZA3. */ { 0, 3 }, /* SME ZAda tile ZA0-ZA7. */ + { 22, 2 }, /* SME_size_10: size<1>, size<0> class field, [23:22]. */ + { 16, 1 }, /* SME_Q: Q class bit, bit 16. */ + { 15, 1 }, /* SME_V: (horizontal / vertical tiles), bit 15. */ + { 13, 2 }, /* SME_Rv: vector select register W12-W15, bits [14:13]. */ { 13, 3 }, /* SME Pm second source scalable predicate register P0-P7. */ { 11, 2 }, /* rotate1: FCMLA immediate rotate. */ { 13, 2 }, /* rotate2: Indexed element FCMLA immediate rotate. */ @@ -3355,6 +3360,16 @@ aarch64_print_operand (char *buf, size_t size, bfd_vma pc, aarch64_get_qualifier_name (opnd->qualifier)); break; + case AARCH64_OPND_SME_ZA_HV_idx_src: + case AARCH64_OPND_SME_ZA_HV_idx_dest: + snprintf (buf, size, "za%d%c.%s[w%d, %d]", + opnd->za_tile_vector.regno, + opnd->za_tile_vector.v == 1 ? 'v' : 'h', + aarch64_get_qualifier_name (opnd->qualifier), + opnd->za_tile_vector.index.regno, + opnd->za_tile_vector.index.imm); + break; + case AARCH64_OPND_CRn: case AARCH64_OPND_CRm: snprintf (buf, size, "C%" PRIi64, opnd->imm.value); diff --git a/opcodes/aarch64-opc.h b/opcodes/aarch64-opc.h index ba19c12..9c657df 100644 --- a/opcodes/aarch64-opc.h +++ b/opcodes/aarch64-opc.h @@ -71,6 +71,7 @@ enum aarch64_field_kind FLD_imm4, FLD_imm4_2, FLD_imm4_3, + FLD_imm4_5, FLD_imm5, FLD_imm7, FLD_imm8, @@ -152,6 +153,10 @@ enum aarch64_field_kind FLD_SVE_xs_22, FLD_SME_ZAda_2b, FLD_SME_ZAda_3b, + FLD_SME_size_10, + FLD_SME_Q, + FLD_SME_V, + FLD_SME_Rv, FLD_SME_Pm, FLD_rotate1, FLD_rotate2, @@ -186,7 +191,7 @@ struct aarch64_operand /* The associated instruction bit-fields; no operand has more than 4 bit-fields */ - enum aarch64_field_kind fields[4]; + enum aarch64_field_kind fields[5]; /* Brief description */ const char *desc; diff --git a/opcodes/aarch64-tbl.h b/opcodes/aarch64-tbl.h index f725f2f..5307cda 100644 --- a/opcodes/aarch64-tbl.h +++ b/opcodes/aarch64-tbl.h @@ -2203,6 +2203,14 @@ { \ QLF5(S_D,P_M,P_M,S_H,S_H) \ } +#define OP_SME_BHSDQ_PM_BHSDQ \ +{ \ + QLF3(S_B,P_M,S_B), \ + QLF3(S_H,P_M,S_H), \ + QLF3(S_S,P_M,S_S), \ + QLF3(S_D,P_M,S_D), \ + QLF3(S_Q,P_M,S_Q) \ +} /* e.g. UDOT <Vd>.2S, <Vn>.8B, <Vm>.8B. */ #define QL_V3DOT \ @@ -5123,6 +5131,11 @@ const struct aarch64_opcode aarch64_opcode_table[] = SME_INSN ("usmops", 0xa1800010, 0xffe0001c, sme_misc, 0, OP5 (SME_ZAda_2b, SVE_Pg3, SME_Pm, SVE_Zn, SVE_Zm_16), OP_SME_ZADA_S_PM_PM_B_B, 0, 0), SME_I64_INSN ("usmops", 0xa1c00010, 0xffe00018, sme_misc, 0, OP5 (SME_ZAda_3b, SVE_Pg3, SME_Pm, SVE_Zn, SVE_Zm_16), OP_SME_ZADA_D_PM_PM_H_H, 0, 0), + SME_INSN ("mov", 0xc0020000, 0xff3e0200, sme_misc, 0, OP3 (SVE_Zd, SVE_Pg3, SME_ZA_HV_idx_src), OP_SME_BHSDQ_PM_BHSDQ, 0, 0), + SME_INSN ("mov", 0xc0000000, 0xff3e0010, sme_misc, 0, OP3 (SME_ZA_HV_idx_dest, SVE_Pg3, SVE_Zn), OP_SME_BHSDQ_PM_BHSDQ, 0, 0), + SME_INSN ("mova", 0xc0020000, 0xff3e0200, sme_misc, 0, OP3 (SVE_Zd, SVE_Pg3, SME_ZA_HV_idx_src), OP_SME_BHSDQ_PM_BHSDQ, 0, 0), + SME_INSN ("mova", 0xc0000000, 0xff3e0010, sme_misc, 0, OP3 (SME_ZA_HV_idx_dest, SVE_Pg3, SVE_Zn), OP_SME_BHSDQ_PM_BHSDQ, 0, 0), + /* SIMD Dot Product (optional in v8.2-A). */ DOT_INSN ("udot", 0x2e009400, 0xbf20fc00, dotproduct, OP3 (Vd, Vn, Vm), QL_V3DOT, F_SIZEQ), DOT_INSN ("sdot", 0xe009400, 0xbf20fc00, dotproduct, OP3 (Vd, Vn, Vm), QL_V3DOT, F_SIZEQ), @@ -5694,6 +5707,12 @@ const struct aarch64_opcode aarch64_opcode_table[] = "an SME ZA tile ZA0-ZA3") \ Y(SVE_REG, regno, "SME_ZAda_3b", 0, F(FLD_SME_ZAda_3b), \ "an SME ZA tile ZA0-ZA7") \ + Y(SVE_REG, sme_za_hv_tiles, "SME_ZA_HV_idx_src", 0, \ + F(FLD_SME_size_10,FLD_SME_Q,FLD_SME_V,FLD_SME_Rv,FLD_imm4_5),\ + "an SME horizontal or vertical vector access register") \ + Y(SVE_REG, sme_za_hv_tiles, "SME_ZA_HV_idx_dest", 0, \ + F(FLD_SME_size_10,FLD_SME_Q,FLD_SME_V,FLD_SME_Rv,FLD_imm4_2),\ + "an SME horizontal or vertical vector access register") \ Y(PRED_REG, regno, "SME_Pm", 0, F(FLD_SME_Pm), \ "an SVE predicate register") \ Y(IMMEDIATE, imm, "TME_UIMM16", 0, F(FLD_imm16), \ |