RISC-V: Add Zabha extension CAS instructions.

This patch update the cas instruction in Zabha extension [1],
when both Zabha and Zacas extension enabled.

[1] https://github.com/riscv/riscv-zabha/tags

bfd/ChangeLog:

	* elfxx-riscv.c (riscv_multi_subset_supports): New extension case.

gas/ChangeLog:

	* testsuite/gas/riscv/zabha-32.d: New instructions.
	* testsuite/gas/riscv/zabha.d: Ditto.
	* testsuite/gas/riscv/zabha.s: Ditto.

include/ChangeLog:

	* opcode/riscv-opc.h (MATCH_AMOCAS_B): New opcodes.
	(MASK_AMOCAS_B): Ditto.
	(MATCH_AMOCAS_H): Ditto.
	(MASK_AMOCAS_H): Ditto.
	(DECLARE_INSN): New instructions.
	* opcode/riscv.h (enum riscv_insn_class): New class case.

opcodes/ChangeLog:

	* riscv-opc.c: New instructions.

3 files changed, 26 insertions, 2 deletions

diff --git a/gas/testsuite/gas/riscv/zabha-32.d b/gas/testsuite/gas/riscv/zabha-32.d
index 1e6427e..7836ae9 100644
--- a/gas/testsuite/gas/riscv/zabha-32.d
+++ b/gas/testsuite/gas/riscv/zabha-32.d
@@ -1,4 +1,4 @@
-#as: -march=rv32i_zabha
+#as: -march=rv32i_zabha_zacas
 #source: zabha.s
 #objdump: -d -Mno-aliases
 
@@ -16,6 +16,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e0a5052f[ 	]+amomaxu.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+80a5052f[ 	]+amomin.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c0a5052f[ 	]+amominu.b[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+28a5052f[ 	]+amocas.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+04a5052f[ 	]+amoadd.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ca5052f[ 	]+amoswap.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+64a5052f[ 	]+amoand.b.aq[ 	]+a0,a0,\(a0\)
@@ -25,6 +26,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e4a5052f[ 	]+amomaxu.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+84a5052f[ 	]+amomin.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c4a5052f[ 	]+amominu.b.aq[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ca5052f[ 	]+amocas.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+02a5052f[ 	]+amoadd.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0aa5052f[ 	]+amoswap.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+62a5052f[ 	]+amoand.b.rl[ 	]+a0,a0,\(a0\)
@@ -34,6 +36,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e2a5052f[ 	]+amomaxu.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+82a5052f[ 	]+amomin.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c2a5052f[ 	]+amominu.b.rl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2aa5052f[ 	]+amocas.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+06a5052f[ 	]+amoadd.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ea5052f[ 	]+amoswap.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+66a5052f[ 	]+amoand.b.aqrl[ 	]+a0,a0,\(a0\)
@@ -43,6 +46,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e6a5052f[ 	]+amomaxu.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+86a5052f[ 	]+amomin.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c6a5052f[ 	]+amominu.b.aqrl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ea5052f[ 	]+amocas.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+00a5152f[ 	]+amoadd.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+08a5152f[ 	]+amoswap.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+60a5152f[ 	]+amoand.h[ 	]+a0,a0,\(a0\)
@@ -52,6 +56,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e0a5152f[ 	]+amomaxu.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+80a5152f[ 	]+amomin.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c0a5152f[ 	]+amominu.h[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+28a5152f[ 	]+amocas.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+04a5152f[ 	]+amoadd.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ca5152f[ 	]+amoswap.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+64a5152f[ 	]+amoand.h.aq[ 	]+a0,a0,\(a0\)
@@ -61,6 +66,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e4a5152f[ 	]+amomaxu.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+84a5152f[ 	]+amomin.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c4a5152f[ 	]+amominu.h.aq[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ca5152f[ 	]+amocas.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+02a5152f[ 	]+amoadd.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0aa5152f[ 	]+amoswap.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+62a5152f[ 	]+amoand.h.rl[ 	]+a0,a0,\(a0\)
@@ -70,6 +76,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e2a5152f[ 	]+amomaxu.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+82a5152f[ 	]+amomin.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c2a5152f[ 	]+amominu.h.rl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2aa5152f[ 	]+amocas.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+06a5152f[ 	]+amoadd.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ea5152f[ 	]+amoswap.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+66a5152f[ 	]+amoand.h.aqrl[ 	]+a0,a0,\(a0\)
@@ -79,3 +86,4 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e6a5152f[ 	]+amomaxu.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+86a5152f[ 	]+amomin.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c6a5152f[ 	]+amominu.h.aqrl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ea5152f[ 	]+amocas.h.aqrl[ 	]+a0,a0,\(a0\)
diff --git a/gas/testsuite/gas/riscv/zabha.d b/gas/testsuite/gas/riscv/zabha.d
index 7000452..86e2eb2 100644
--- a/gas/testsuite/gas/riscv/zabha.d
+++ b/gas/testsuite/gas/riscv/zabha.d
@@ -1,4 +1,4 @@
-#as: -march=rv64i_zabha
+#as: -march=rv64i_zabha_zacas
 #source: zabha.s
 #objdump: -d -Mno-aliases
 
@@ -16,6 +16,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e0a5052f[ 	]+amomaxu.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+80a5052f[ 	]+amomin.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c0a5052f[ 	]+amominu.b[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+28a5052f[ 	]+amocas.b[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+04a5052f[ 	]+amoadd.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ca5052f[ 	]+amoswap.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+64a5052f[ 	]+amoand.b.aq[ 	]+a0,a0,\(a0\)
@@ -25,6 +26,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e4a5052f[ 	]+amomaxu.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+84a5052f[ 	]+amomin.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c4a5052f[ 	]+amominu.b.aq[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ca5052f[ 	]+amocas.b.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+02a5052f[ 	]+amoadd.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0aa5052f[ 	]+amoswap.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+62a5052f[ 	]+amoand.b.rl[ 	]+a0,a0,\(a0\)
@@ -34,6 +36,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e2a5052f[ 	]+amomaxu.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+82a5052f[ 	]+amomin.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c2a5052f[ 	]+amominu.b.rl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2aa5052f[ 	]+amocas.b.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+06a5052f[ 	]+amoadd.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ea5052f[ 	]+amoswap.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+66a5052f[ 	]+amoand.b.aqrl[ 	]+a0,a0,\(a0\)
@@ -43,6 +46,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e6a5052f[ 	]+amomaxu.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+86a5052f[ 	]+amomin.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c6a5052f[ 	]+amominu.b.aqrl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ea5052f[ 	]+amocas.b.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+00a5152f[ 	]+amoadd.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+08a5152f[ 	]+amoswap.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+60a5152f[ 	]+amoand.h[ 	]+a0,a0,\(a0\)
@@ -52,6 +56,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e0a5152f[ 	]+amomaxu.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+80a5152f[ 	]+amomin.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c0a5152f[ 	]+amominu.h[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+28a5152f[ 	]+amocas.h[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+04a5152f[ 	]+amoadd.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ca5152f[ 	]+amoswap.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+64a5152f[ 	]+amoand.h.aq[ 	]+a0,a0,\(a0\)
@@ -61,6 +66,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e4a5152f[ 	]+amomaxu.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+84a5152f[ 	]+amomin.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c4a5152f[ 	]+amominu.h.aq[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ca5152f[ 	]+amocas.h.aq[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+02a5152f[ 	]+amoadd.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0aa5152f[ 	]+amoswap.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+62a5152f[ 	]+amoand.h.rl[ 	]+a0,a0,\(a0\)
@@ -70,6 +76,7 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e2a5152f[ 	]+amomaxu.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+82a5152f[ 	]+amomin.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c2a5152f[ 	]+amominu.h.rl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2aa5152f[ 	]+amocas.h.rl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+06a5152f[ 	]+amoadd.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+0ea5152f[ 	]+amoswap.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+66a5152f[ 	]+amoand.h.aqrl[ 	]+a0,a0,\(a0\)
@@ -79,3 +86,4 @@ Disassembly of section .text:
 [ 	]+[0-9a-f]+:[ 	]+e6a5152f[ 	]+amomaxu.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+86a5152f[ 	]+amomin.h.aqrl[ 	]+a0,a0,\(a0\)
 [ 	]+[0-9a-f]+:[ 	]+c6a5152f[ 	]+amominu.h.aqrl[ 	]+a0,a0,\(a0\)
+[ 	]+[0-9a-f]+:[ 	]+2ea5152f[ 	]+amocas.h.aqrl[ 	]+a0,a0,\(a0\)
diff --git a/gas/testsuite/gas/riscv/zabha.s b/gas/testsuite/gas/riscv/zabha.s
index 82b811a..4c4fd17 100644
--- a/gas/testsuite/gas/riscv/zabha.s
+++ b/gas/testsuite/gas/riscv/zabha.s
@@ -8,6 +8,7 @@ target:
 	amomaxu.b	a0, a0, 0(a0)
 	amomin.b	a0, a0, 0(a0)
 	amominu.b	a0, a0, 0(a0)
+	amocas.b	a0, a0, 0(a0)
 	amoadd.b.aq	a0, a0, 0(a0)
 	amoswap.b.aq	a0, a0, 0(a0)
 	amoand.b.aq	a0, a0, 0(a0)
@@ -17,6 +18,7 @@ target:
 	amomaxu.b.aq	a0, a0, 0(a0)
 	amomin.b.aq	a0, a0, 0(a0)
 	amominu.b.aq	a0, a0, 0(a0)
+	amocas.b.aq	a0, a0, 0(a0)
 	amoadd.b.rl	a0, a0, 0(a0)
 	amoswap.b.rl	a0, a0, 0(a0)
 	amoand.b.rl	a0, a0, 0(a0)
@@ -26,6 +28,7 @@ target:
 	amomaxu.b.rl	a0, a0, 0(a0)
 	amomin.b.rl	a0, a0, 0(a0)
 	amominu.b.rl	a0, a0, 0(a0)
+	amocas.b.rl	a0, a0, 0(a0)
 	amoadd.b.aqrl	a0, a0, 0(a0)
 	amoswap.b.aqrl	a0, a0, 0(a0)
 	amoand.b.aqrl	a0, a0, 0(a0)
@@ -35,6 +38,7 @@ target:
 	amomaxu.b.aqrl	a0, a0, 0(a0)
 	amomin.b.aqrl	a0, a0, 0(a0)
 	amominu.b.aqrl	a0, a0, 0(a0)
+	amocas.b.aqrl	a0, a0, 0(a0)
 	amoadd.h	a0, a0, 0(a0)
 	amoswap.h	a0, a0, 0(a0)
 	amoand.h	a0, a0, 0(a0)
@@ -44,6 +48,7 @@ target:
 	amomaxu.h	a0, a0, 0(a0)
 	amomin.h	a0, a0, 0(a0)
 	amominu.h	a0, a0, 0(a0)
+	amocas.h	a0, a0, 0(a0)
 	amoadd.h.aq	a0, a0, 0(a0)
 	amoswap.h.aq	a0, a0, 0(a0)
 	amoand.h.aq	a0, a0, 0(a0)
@@ -53,6 +58,7 @@ target:
 	amomaxu.h.aq	a0, a0, 0(a0)
 	amomin.h.aq	a0, a0, 0(a0)
 	amominu.h.aq	a0, a0, 0(a0)
+	amocas.h.aq	a0, a0, 0(a0)
 	amoadd.h.rl	a0, a0, 0(a0)
 	amoswap.h.rl	a0, a0, 0(a0)
 	amoand.h.rl	a0, a0, 0(a0)
@@ -62,6 +68,7 @@ target:
 	amomaxu.h.rl	a0, a0, 0(a0)
 	amomin.h.rl	a0, a0, 0(a0)
 	amominu.h.rl	a0, a0, 0(a0)
+	amocas.h.rl	a0, a0, 0(a0)
 	amoadd.h.aqrl	a0, a0, 0(a0)
 	amoswap.h.aqrl	a0, a0, 0(a0)
 	amoand.h.aqrl	a0, a0, 0(a0)
@@ -71,3 +78,4 @@ target:
 	amomaxu.h.aqrl	a0, a0, 0(a0)
 	amomin.h.aqrl	a0, a0, 0(a0)
 	amominu.h.aqrl	a0, a0, 0(a0)
+	amocas.h.aqrl	a0, a0, 0(a0)