From a8d181c0fdae61f788d0332e3d9c0cff4b80eaa5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Christoph=20M=C3=BCllner?= Date: Mon, 7 Nov 2022 13:46:20 +0100 Subject: RISC-V: xtheadfmemidx: Use fp register in mnemonics MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Although the encoding for scalar and fp registers is identical, we should follow common pratice and use fp register names when referencing fp registers. The xtheadmemidx extension consists of indirect load/store instructions which all load to or store from fp registers. Let's use fp register names in this case and adjust the test cases accordingly. gas/ * testsuite/gas/riscv/x-thead-fmemidx-fail.l: Updated since rd need to be float register. * testsuite/gas/riscv/x-thead-fmemidx-fail.s: Likewise. * testsuite/gas/riscv/x-thead-fmemidx.d: Likewise. * testsuite/gas/riscv/x-thead-fmemidx.s: Likewise. opcodes/ * riscv-opc.c (riscv_opcodes): Updated since rd need to be float register. Signed-off-by: Christoph Müllner --- gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l | 1 + gas/testsuite/gas/riscv/x-thead-fmemidx-fail.s | 33 +++++++++++++------------- gas/testsuite/gas/riscv/x-thead-fmemidx.d | 32 ++++++++++++------------- gas/testsuite/gas/riscv/x-thead-fmemidx.s | 32 ++++++++++++------------- 4 files changed, 50 insertions(+), 48 deletions(-) (limited to 'gas') diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l index ef28f04..33cddac 100644 --- a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l +++ b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.l @@ -1,4 +1,5 @@ .*: Assembler messages: +.*: Error: illegal operands `th.flrd a0,a1,a2,0' .*: Error: improper immediate value \(18446744073709551615\) .*: Error: improper immediate value \(4\) .*: Error: improper immediate value \(18446744073709551615\) diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.s b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.s index e486c6a..8c6ee0c 100644 --- a/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.s +++ b/gas/testsuite/gas/riscv/x-thead-fmemidx-fail.s @@ -1,17 +1,18 @@ target: - th.flrd a0, a1, a2, -1 - th.flrd a0, a1, a2, 4 - th.flrw a0, a1, a2, -1 - th.flrw a0, a1, a2, 4 - th.flurd a0, a1, a2, -1 - th.flurd a0, a1, a2, 4 - th.flurw a0, a1, a2, -1 - th.flurw a0, a1, a2, 4 - th.fsrd a0, a1, a2, -1 - th.fsrd a0, a1, a2, 4 - th.fsrw a0, a1, a2, -1 - th.fsrw a0, a1, a2, 4 - th.fsurd a0, a1, a2, -1 - th.fsurd a0, a1, a2, 4 - th.fsurw a0, a1, a2, -1 - th.fsurw a0, a1, a2, 4 + th.flrd a0, a1, a2, 0 + th.flrd fa0, a1, a2, -1 + th.flrd fa0, a1, a2, 4 + th.flrw fa0, a1, a2, -1 + th.flrw fa0, a1, a2, 4 + th.flurd fa0, a1, a2, -1 + th.flurd fa0, a1, a2, 4 + th.flurw fa0, a1, a2, -1 + th.flurw fa0, a1, a2, 4 + th.fsrd fa0, a1, a2, -1 + th.fsrd fa0, a1, a2, 4 + th.fsrw fa0, a1, a2, -1 + th.fsrw fa0, a1, a2, 4 + th.fsurd fa0, a1, a2, -1 + th.fsurd fa0, a1, a2, 4 + th.fsurw fa0, a1, a2, -1 + th.fsurw fa0, a1, a2, 4 diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx.d b/gas/testsuite/gas/riscv/x-thead-fmemidx.d index dfa477c..e8d53a3 100644 --- a/gas/testsuite/gas/riscv/x-thead-fmemidx.d +++ b/gas/testsuite/gas/riscv/x-thead-fmemidx.d @@ -7,19 +7,19 @@ Disassembly of section .text: 0+000 : -[ ]+[0-9a-f]+:[ ]+60c5e50b[ ]+th.flrd[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+66c5e50b[ ]+th.flrd[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+40c5e50b[ ]+th.flrw[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+46c5e50b[ ]+th.flrw[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+70c5e50b[ ]+th.flurd[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+76c5e50b[ ]+th.flurd[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+50c5e50b[ ]+th.flurw[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+56c5e50b[ ]+th.flurw[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+60c5f50b[ ]+th.fsrd[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+66c5f50b[ ]+th.fsrd[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+40c5f50b[ ]+th.fsrw[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+46c5f50b[ ]+th.fsrw[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+70c5f50b[ ]+th.fsurd[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+76c5f50b[ ]+th.fsurd[ ]+a0,a1,a2,3 -[ ]+[0-9a-f]+:[ ]+50c5f50b[ ]+th.fsurw[ ]+a0,a1,a2,0 -[ ]+[0-9a-f]+:[ ]+56c5f50b[ ]+th.fsurw[ ]+a0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+60c5e50b[ ]+th.flrd[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+66c5e50b[ ]+th.flrd[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+40c5e50b[ ]+th.flrw[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+46c5e50b[ ]+th.flrw[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+70c5e50b[ ]+th.flurd[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+76c5e50b[ ]+th.flurd[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+50c5e50b[ ]+th.flurw[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+56c5e50b[ ]+th.flurw[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+60c5f50b[ ]+th.fsrd[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+66c5f50b[ ]+th.fsrd[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+40c5f50b[ ]+th.fsrw[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+46c5f50b[ ]+th.fsrw[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+70c5f50b[ ]+th.fsurd[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+76c5f50b[ ]+th.fsurd[ ]+fa0,a1,a2,3 +[ ]+[0-9a-f]+:[ ]+50c5f50b[ ]+th.fsurw[ ]+fa0,a1,a2,0 +[ ]+[0-9a-f]+:[ ]+56c5f50b[ ]+th.fsurw[ ]+fa0,a1,a2,3 diff --git a/gas/testsuite/gas/riscv/x-thead-fmemidx.s b/gas/testsuite/gas/riscv/x-thead-fmemidx.s index 0d70bb7..f26bdc3 100644 --- a/gas/testsuite/gas/riscv/x-thead-fmemidx.s +++ b/gas/testsuite/gas/riscv/x-thead-fmemidx.s @@ -1,17 +1,17 @@ target: - th.flrd a0, a1, a2, 0 - th.flrd a0, a1, a2, 3 - th.flrw a0, a1, a2, 0 - th.flrw a0, a1, a2, 3 - th.flurd a0, a1, a2, 0 - th.flurd a0, a1, a2, 3 - th.flurw a0, a1, a2, 0 - th.flurw a0, a1, a2, 3 - th.fsrd a0, a1, a2, 0 - th.fsrd a0, a1, a2, 3 - th.fsrw a0, a1, a2, 0 - th.fsrw a0, a1, a2, 3 - th.fsurd a0, a1, a2, 0 - th.fsurd a0, a1, a2, 3 - th.fsurw a0, a1, a2, 0 - th.fsurw a0, a1, a2, 3 + th.flrd fa0, a1, a2, 0 + th.flrd fa0, a1, a2, 3 + th.flrw fa0, a1, a2, 0 + th.flrw fa0, a1, a2, 3 + th.flurd fa0, a1, a2, 0 + th.flurd fa0, a1, a2, 3 + th.flurw fa0, a1, a2, 0 + th.flurw fa0, a1, a2, 3 + th.fsrd fa0, a1, a2, 0 + th.fsrd fa0, a1, a2, 3 + th.fsrw fa0, a1, a2, 0 + th.fsrw fa0, a1, a2, 3 + th.fsurd fa0, a1, a2, 0 + th.fsurd fa0, a1, a2, 3 + th.fsurw fa0, a1, a2, 0 + th.fsurw fa0, a1, a2, 3 -- cgit v1.1