From de1fbe7889eb4f363b979c14735b8fd51131621b Mon Sep 17 00:00:00 2001 From: Yoshinori Sato Date: Mon, 31 Oct 2022 10:46:37 +0000 Subject: [PATCH] RX assembler: switch arguments of thw MVTACGU insn. --- gas/ChangeLog | 4 ++++ gas/testsuite/gas/rx/mvtacgu.d | 8 ++++---- opcodes/ChangeLog | 5 +++++ opcodes/rx-decode.c | 12 ++++++------ opcodes/rx-decode.opc | 4 ++-- 5 files changed, 21 insertions(+), 12 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 0be692c6401..a299d024d95 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,7 @@ +2022-10-31 Nick Clifton + + * testsuite/gas/rx/mvtacgu.d: Update expected disassembly. + 2022-10-11 Nick Clifton * symbols.c (S_GET_VALUE): If the unresolved symbol is the fake diff --git a/gas/testsuite/gas/rx/mvtacgu.d b/gas/testsuite/gas/rx/mvtacgu.d index 334cafa902e..67e8e857509 100644 --- a/gas/testsuite/gas/rx/mvtacgu.d +++ b/gas/testsuite/gas/rx/mvtacgu.d @@ -7,7 +7,7 @@ Disassembly of section \.text: 00000000 <\.text>: - 0: fd 17 30 mvtacgu a0, r0 - 3: fd 17 3f mvtacgu a0, r15 - 6: fd 17 b0 mvtacgu a1, r0 - 9: fd 17 bf mvtacgu a1, r15 + 0: fd 17 30 mvtacgu r0, a0 + 3: fd 17 3f mvtacgu r15, a0 + 6: fd 17 b0 mvtacgu r0, a1 + 9: fd 17 bf mvtacgu r15, a1 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index bbd3544b83d..5bddae5c626 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2022-10-31 Yoshinori Sato + + * rx-decode.opc: Switch arguments of the MVTACGU insn. + * rx-decode.c: Regenerate. + 2022-09-22 Yoshinori Sato * sh-dis.c (print_insn_sh): Enforce bit7 of LDC Rm,Rn_BANK and STC diff --git a/opcodes/rx-decode.c b/opcodes/rx-decode.c index 17fbcfcfe6c..8ccb12674a7 100644 --- a/opcodes/rx-decode.c +++ b/opcodes/rx-decode.c @@ -12476,22 +12476,22 @@ rx_decode_opcode (unsigned long pc AU, break; case 0x30: { - /** 1111 1101 0001 0111 a011 rdst mvtacgu %0, %1 */ + /** 1111 1101 0001 0111 a011 rsrc mvtacgu %1, %0 */ #line 1110 "rx-decode.opc" int a AU = (op[2] >> 7) & 0x01; #line 1110 "rx-decode.opc" - int rdst AU = op[2] & 0x0f; + int rsrc AU = op[2] & 0x0f; if (trace) { printf ("\033[33m%s\033[0m %02x %02x %02x\n", - "/** 1111 1101 0001 0111 a011 rdst mvtacgu %0, %1 */", + "/** 1111 1101 0001 0111 a011 rsrc mvtacgu %1, %0 */", op[0], op[1], op[2]); printf (" a = 0x%x,", a); - printf (" rdst = 0x%x\n", rdst); + printf (" rsrc = 0x%x\n", rsrc); } - SYNTAX("mvtacgu %0, %1"); + SYNTAX("mvtacgu %1, %0"); #line 1110 "rx-decode.opc" - ID(mvtacgu); DR(a+32); SR(rdst); F_____; + ID(mvtacgu); SR(rsrc); DR(a+32); F_____; } break; diff --git a/opcodes/rx-decode.opc b/opcodes/rx-decode.opc index 86effc39862..1b303ed8b19 100644 --- a/opcodes/rx-decode.opc +++ b/opcodes/rx-decode.opc @@ -1106,8 +1106,8 @@ rx_decode_opcode (unsigned long pc AU, /** 1111 1101 0001 111i a m11 rdst mvfacgu #%2, %1, %0 */ ID(mvfacgu); S2C(((i^1)<<1)|m); SR(a+32); DR(rdst); F_____; -/** 1111 1101 0001 0111 a011 rdst mvtacgu %0, %1 */ - ID(mvtacgu); DR(a+32); SR(rdst); F_____; +/** 1111 1101 0001 0111 a011 rsrc mvtacgu %1, %0 */ + ID(mvtacgu); SR(rsrc); DR(a+32); F_____; /** 1111 1101 0001 1001 a00i 0000 racl #%1, %0 */ ID(racl); SC(i+1); DR(a+32); F_____; -- 2.30.2