diff options
| author | Nelson Chu <nelson.chu@sifive.com> | 2021-11-30 13:25:05 +0800 |
|---|---|---|
| committer | Nelson Chu <nelson.chu@sifive.com> | 2021-11-30 15:14:31 +0800 |
| commit | ee083a9e7cca3f2946a259303b4594d6329602fd (patch) | |
| tree | 221b5a5f47d3d9db8cce1b4ba43c8d36fcaed1e5 /opcodes/riscv-dis.c | |
| parent | ae8e528122be3e0344b2ee533b4b050389e8dcad (diff) | |
| download | binutils-gdb-ee083a9e7cca3f2946a259303b4594d6329602fd.tar.gz | |
RISC-V: Dump vset[i]vli immediate as numbers once vsew or vlmul is reserved.
Consider the following case,
vsetvli a0, a1, 0x4 # unrecognized vlmul
vsetvli a0, a1, 0x20 # unrecognized vsew
vsetivli a0, 0xb, 0x4 # unrecognized vlmul
vsetivli a0, 0xb, 0x20 # unrecognized vsew
For the current dis-assembler, we get the result,
0000000000000000 <.text>:
0: 0045f557 vsetvli a0,a1,e8,(null),tu,mu
4: 0205f557 vsetvli a0,a1,e128,m1,tu,mu
8: c045f557 vsetivli a0,11,e8,(null),tu,mu
c: c205f557 vsetivli a0,11,e128,m1,tu,mu
The vsew e128 and vlmul (null) are preserved according to the spec,
so dump these fields looks wrong. Consider that we are used to dump
the unrecognized csr as csr numbers directly, we should also dump
the whole vset[i]vli immediates as numbers, once the vsew or vlmul
is reserved. Therefore, following is what I expected,
0000000000000000 <.text>:
0: 0045f557 vsetvli a0,a1,4
4: 0205f557 vsetvli a0,a1,32
8: c045f557 vsetivli a0,11,4
c: c205f557 vsetivli a0,11,32
gas/
* testsuite/gas/riscv/vector-insns.d: Rewrite the vset[i]vli
testcases since we should dump the immediate as numbers once
the vsew or vlmul is reserved.
* testsuite/gas/riscv/vector-insns.s: Likewise.
opcodes/
* riscv-dis.c (print_insn_args): The reserved vsew and vlmul
are NULL string in the riscv_vsew and riscv_vlmul, so dump the
whole imm as numbers once one of them is NULL.
* riscv-opc.c (riscv_vsew): Set the reserved vsew to NULL.
(riscv_vlmul): Set the reserved vlmul to NULL.
Diffstat (limited to 'opcodes/riscv-dis.c')
| -rw-r--r-- | opcodes/riscv-dis.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/opcodes/riscv-dis.c b/opcodes/riscv-dis.c index 18e498a0f22..a3c85067530 100644 --- a/opcodes/riscv-dis.c +++ b/opcodes/riscv-dis.c @@ -334,7 +334,9 @@ print_insn_args (const char *oparg, insn_t l, bfd_vma pc, disassemble_info *info && imm_vlmul < ARRAY_SIZE (riscv_vlmul) && imm_vta < ARRAY_SIZE (riscv_vta) && imm_vma < ARRAY_SIZE (riscv_vma) - && !imm_vtype_res) + && !imm_vtype_res + && riscv_vsew[imm_vsew] != NULL + && riscv_vlmul[imm_vlmul] != NULL) print (info->stream, "%s,%s,%s,%s", riscv_vsew[imm_vsew], riscv_vlmul[imm_vlmul], riscv_vta[imm_vta], riscv_vma[imm_vma]); |