[binutils-gdb] RISC-V: Fix T-Head Fmv vendor extension encoding

[binutils-gdb] RISC-V: Fix T-Head Fmv vendor extension encoding

[Philipp Tomsich]

https://sourceware.org/git/gitweb.cgi?p=binutils-gdb.git;h=767e2daed4da3245350d1e45e4eee42964d656f6

commit 767e2daed4da3245350d1e45e4eee42964d656f6
Author: Christoph Müllner <christoph.muellner@vrull.eu>
Date:   Fri Dec 16 19:44:07 2022 +0100

    RISC-V: Fix T-Head Fmv vendor extension encoding
    
    A recent change in the XTheadFmv spec fixed an encoding bug in the
    document. This patch changes the code to follow this bugfix.
    
    Spec patch can be found here:
      https://github.com/T-head-Semi/thead-extension-spec/pull/11
    
    Signed-off-by: Christoph Müllner <christoph.muellner@vrull.eu>

Diff:
---
 gas/testsuite/gas/riscv/x-thead-fmv.d | 4 ++--
 include/opcode/riscv-opc.h            | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/gas/testsuite/gas/riscv/x-thead-fmv.d b/gas/testsuite/gas/riscv/x-thead-fmv.d
index f2bbe010beb..af8ce0c8ee0 100644
--- a/gas/testsuite/gas/riscv/x-thead-fmv.d
+++ b/gas/testsuite/gas/riscv/x-thead-fmv.d
@@ -7,5 +7,5 @@
 Disassembly of section .text:
 
 0+000 <target>:
-[ 	]+[0-9a-f]+:[ 	]+6005950b[ 	]+th.fmv.hw.x[ 	]+a0,fa1
-[ 	]+[0-9a-f]+:[ 	]+5005158b[ 	]+th.fmv.x.hw[ 	]+a1,fa0
+[ 	]+[0-9a-f]+:[ 	]+5005950b[ 	]+th.fmv.hw.x[ 	]+a0,fa1
+[ 	]+[0-9a-f]+:[ 	]+6005158b[ 	]+th.fmv.x.hw[ 	]+a1,fa0
diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h
index 06e3df0f5a6..5420bfac91b 100644
--- a/include/opcode/riscv-opc.h
+++ b/include/opcode/riscv-opc.h
@@ -2209,9 +2209,9 @@
 #define MATCH_TH_FSURW 0x5000700b
 #define MASK_TH_FSURW 0xf800707f
 /* Vendor-specific (T-Head) XTheadFmv instructions. */
-#define MATCH_TH_FMV_HW_X 0x6000100b
+#define MATCH_TH_FMV_HW_X 0x5000100b
 #define MASK_TH_FMV_HW_X 0xfff0707f
-#define MATCH_TH_FMV_X_HW 0x5000100b
+#define MATCH_TH_FMV_X_HW 0x6000100b
 #define MASK_TH_FMV_X_HW 0xfff0707f
 /* Vendor-specific (T-Head) XTheadInt instructions. */
 #define MATCH_TH_IPOP 0x0050000b