From 1b8b65328f8825444a7370a7817f2802b0e1a7c9 Mon Sep 17 00:00:00 2001 From: "Jose E. Marchesi" Date: Fri, 26 Aug 2016 07:31:31 -0700 Subject: [PATCH] opcodes, gas: fix mnemonic of sparc camellia_fl This patch fixes a typo in the mnemonic of the camellia_fl instruction, which was implemented before as camellia_fi. gas/ChangeLog: 2016-08-26 Jose E. Marchesi * testsuite/gas/sparc/crypto.d: Rename invalid opcode camellia_fi to camellia_fl. * testsuite/gas/sparc/crypto.s: Likewise. opcodes/ChangeLog: 2016-08-26 Jose E. Marchesi * sparc-opc.c (sparc_opcodes): Fix typo in opcode, camellia_fi -> camellia_fl. --- gas/ChangeLog | 6 ++++++ gas/testsuite/gas/sparc/crypto.d | 2 +- gas/testsuite/gas/sparc/crypto.s | 2 +- opcodes/ChangeLog | 5 +++++ opcodes/sparc-opc.c | 2 +- 5 files changed, 14 insertions(+), 3 deletions(-) diff --git a/gas/ChangeLog b/gas/ChangeLog index 61d4b48a867..abcdba7e9c5 100644 --- a/gas/ChangeLog +++ b/gas/ChangeLog @@ -1,3 +1,9 @@ +2016-08-26 Jose E. Marchesi + + * testsuite/gas/sparc/crypto.d: Rename invalid opcode camellia_fi + to camellia_fl. + * testsuite/gas/sparc/crypto.s: Likewise. + 2016-08-26 Thomas Preud'homme * config/tc-arm.c (v7m_psrs): Add MSPLIM, PSPLIM, MSPLIM_NS, diff --git a/gas/testsuite/gas/sparc/crypto.d b/gas/testsuite/gas/sparc/crypto.d index daebb6557b0..a7d8a38bb55 100644 --- a/gas/testsuite/gas/sparc/crypto.d +++ b/gas/testsuite/gas/sparc/crypto.d @@ -31,7 +31,7 @@ Disassembly of section .text: 54: 9f b2 e7 0d kasumi_fi_fi %f42, %f44, %f46 58: a6 cb 63 4f kasumi_fl_xor %f44, %f46, %f48, %f50 5c: aa cb e7 71 kasumi_fi_xor %f46, %f48, %f50, %f52 - 60: af b4 e7 95 camellia_fi %f50, %f52, %f54 + 60: af b4 e7 95 camellia_fl %f50, %f52, %f54 64: b3 b5 67 b7 camellia_fli %f52, %f54, %f56 68: ba cd f7 99 camellia_f %f54, %f56, %f58, %f60 6c: 81 b0 29 00 mpmul 0 diff --git a/gas/testsuite/gas/sparc/crypto.s b/gas/testsuite/gas/sparc/crypto.s index 217a742e7b7..455755128b6 100644 --- a/gas/testsuite/gas/sparc/crypto.s +++ b/gas/testsuite/gas/sparc/crypto.s @@ -24,7 +24,7 @@ kasumi_fi_fi %f42, %f44, %f46 kasumi_fl_xor %f44, %f46, %f48, %f50 kasumi_fi_xor %f46, %f48, %f50, %f52 - camellia_fi %f50, %f52, %f54 + camellia_fl %f50, %f52, %f54 camellia_fli %f52, %f54, %f56 camellia_f %f54, %f56, %f58, %f60 mpmul 0 diff --git a/opcodes/ChangeLog b/opcodes/ChangeLog index fe78a5f744e..9e41bc54882 100644 --- a/opcodes/ChangeLog +++ b/opcodes/ChangeLog @@ -1,3 +1,8 @@ +2016-08-26 Jose E. Marchesi + + * sparc-opc.c (sparc_opcodes): Fix typo in opcode, camellia_fi -> + camellia_fl. + 2016-08-26 Thomas Preud'homme * arm-dis.c (psr_name): Use hex as case labels. Add detection for diff --git a/opcodes/sparc-opc.c b/opcodes/sparc-opc.c index 9d682236649..04dd33888f3 100644 --- a/opcodes/sparc-opc.c +++ b/opcodes/sparc-opc.c @@ -2155,7 +2155,7 @@ SLCBCC("cbnefr", 15), { "des_iip", F3F(2, 0x36, 0x135), F3F(~2, ~0x36, ~0x135), "v,H", F_FLOAT, HWCAP_DES, 0, v9e }, { "des_kexpand",F3F(2, 0x36, 0x136), F3F(~2, ~0x36, ~0x136), "v,X,H", F_FLOAT, HWCAP_DES, 0, v9e }, {"kasumi_fi_fi",F3F(2, 0x36, 0x138), F3F(~2, ~0x36, ~0x138), "v,B,H", F_FLOAT, HWCAP_KASUMI, 0, v9e }, -{ "camellia_fi",F3F(2, 0x36, 0x13c), F3F(~2, ~0x36, ~0x13c), "v,B,H", F_FLOAT, HWCAP_CAMELLIA, 0, v9e }, +{ "camellia_fl",F3F(2, 0x36, 0x13c), F3F(~2, ~0x36, ~0x13c), "v,B,H", F_FLOAT, HWCAP_CAMELLIA, 0, v9e }, {"camellia_fli",F3F(2, 0x36, 0x13d), F3F(~2, ~0x36, ~0x13d), "v,B,H", F_FLOAT, HWCAP_CAMELLIA, 0, v9e }, { "md5", F3F(2, 0x36, 0x140), F3F(~2, ~0x36, ~0x140), "", F_FLOAT, HWCAP_MD5, 0, v9e }, { "sha1", F3F(2, 0x36, 0x141), F3F(~2, ~0x36, ~0x141), "", F_FLOAT, HWCAP_SHA1, 0, v9e }, -- 2.30.2