aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gas/ChangeLog6
-rw-r--r--gas/testsuite/gas/sparc/crypto.d2
-rw-r--r--gas/testsuite/gas/sparc/crypto.s2
-rw-r--r--opcodes/ChangeLog5
-rw-r--r--opcodes/sparc-opc.c2
5 files changed, 14 insertions, 3 deletions
diff --git a/gas/ChangeLog b/gas/ChangeLog
index 61d4b48..abcdba7 100644
--- a/gas/ChangeLog
+++ b/gas/ChangeLog
@@ -1,3 +1,9 @@
+2016-08-26 Jose E. Marchesi <jose.marchesi@oracle.com>
+
+ * 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 <thomas.preudhomme@arm.com>
* 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 daebb65..a7d8a38 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 217a742..4557551 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 fe78a5f..9e41bc5 100644
--- a/opcodes/ChangeLog
+++ b/opcodes/ChangeLog
@@ -1,3 +1,8 @@
+2016-08-26 Jose E. Marchesi <jose.marchesi@oracle.com>
+
+ * sparc-opc.c (sparc_opcodes): Fix typo in opcode, camellia_fi ->
+ camellia_fl.
+
2016-08-26 Thomas Preud'homme <thomas.preudhomme@arm.com>
* 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 9d68223..04dd338 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 },