diff options
72 files changed, 811 insertions, 0 deletions
diff --git a/bfd/elfxx-riscv.c b/bfd/elfxx-riscv.c index c96d502..5cb063a 100644 --- a/bfd/elfxx-riscv.c +++ b/bfd/elfxx-riscv.c @@ -1456,6 +1456,7 @@ static struct riscv_supported_ext riscv_supported_vendor_x_ext[] = {"xcvalu", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"xcvelw", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"xcvbi", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, + {"xcvmem", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"xtheadba", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"xtheadbb", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, {"xtheadbs", ISA_SPEC_CLASS_DRAFT, 1, 0, 0 }, @@ -2680,6 +2681,8 @@ riscv_multi_subset_supports (riscv_parse_subset_t *rps, return riscv_subset_supports (rps, "xcvelw"); case INSN_CLASS_XCVBI: return riscv_subset_supports (rps, "xcvbi"); + case INSN_CLASS_XCVMEM: + return riscv_subset_supports (rps, "xcvmem"); case INSN_CLASS_XTHEADBA: return riscv_subset_supports (rps, "xtheadba"); case INSN_CLASS_XTHEADBB: @@ -2942,6 +2945,8 @@ riscv_multi_subset_supports_ext (riscv_parse_subset_t *rps, return "xcvelw"; case INSN_CLASS_XCVBI: return "xcvbi"; + case INSN_CLASS_XCVMEM: + return "xcvmem"; case INSN_CLASS_XTHEADBA: return "xtheadba"; case INSN_CLASS_XTHEADBB: diff --git a/gas/doc/c-riscv.texi b/gas/doc/c-riscv.texi index 9ffccdd..61bb7bc 100644 --- a/gas/doc/c-riscv.texi +++ b/gas/doc/c-riscv.texi @@ -760,6 +760,11 @@ The Xcvbi extension provides instructions for branch immediate operations. It is documented in @url{https://docs.openhwgroup.org/projects/cv32e40p-user-manual/en/latest/instruction_set_extensions.html} +@item Xcvmem +The Xcvmem extension provides instructions for post inc load/store operations. + +It is documented in @url{https://docs.openhwgroup.org/projects/cv32e40p-user-manual/en/latest/instruction_set_extensions.html} + @item XTheadBa The XTheadBa extension provides instructions for address calculations. diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-march.d b/gas/testsuite/gas/riscv/cv-mem-fail-march.d new file mode 100644 index 0000000..a2dff75 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-march.d @@ -0,0 +1,3 @@ +#as: -march=rv32i +#source: cv-mem-fail-march.s +#error_output: cv-mem-fail-march.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-march.l b/gas/testsuite/gas/riscv/cv-mem-fail-march.l new file mode 100644 index 0000000..4c33134 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-march.l @@ -0,0 +1,25 @@ +.*: Assembler messages: +.*: Error: unrecognized opcode `cv.lb t4,t2\(t0\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lbu t6,t1\(t4\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lh t2,t0\(t3\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lhu t0,t5\(t1\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lw t1,t3\(t6\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lb t4,\(t0\),t2', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lbu t6,\(t4\),t1', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lh t2,\(t3\),t0', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lhu t0,\(t1\),t5', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lw t1,\(t6\),t3', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lb t4,\(t0\),23', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lbu t6,\(t4\),0', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lh t2,\(t3\),77', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lhu t0,\(t1\),101', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.lw t1,\(t6\),6', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sb t0,t1\(t2\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sh t1,t3\(t4\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sw t1,t2\(t4\)', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sb t0,\(t2\),t1', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sh t1,\(t2\),t6', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sw t5,\(t2\),t6', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sb t6,\(t1\),10', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sh t3,\(t5\),80', extension `xcvmem' required +.*: Error: unrecognized opcode `cv.sw t1,\(t4\),20', extension `xcvmem' required diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-march.s b/gas/testsuite/gas/riscv/cv-mem-fail-march.s new file mode 100644 index 0000000..cd82d26 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-march.s @@ -0,0 +1,26 @@ +# Absence of xcvmem march option disables all CORE-V mem extensions +target: + cv.lb t4, t2(t0) + cv.lbu t6, t1(t4) + cv.lh t2, t0(t3) + cv.lhu t0, t5(t1) + cv.lw t1, t3(t6) + cv.lb t4, (t0), t2 + cv.lbu t6, (t4), t1 + cv.lh t2, (t3), t0 + cv.lhu t0, (t1), t5 + cv.lw t1, (t6), t3 + cv.lb t4, (t0), 23 + cv.lbu t6, (t4), 0 + cv.lh t2, (t3), 77 + cv.lhu t0, (t1), 101 + cv.lw t1, (t6), 6 + cv.sb t0, t1(t2) + cv.sh t1, t3(t4) + cv.sw t1, t2(t4) + cv.sb t0, (t2), t1 + cv.sh t1, (t2), t6 + cv.sw t5, (t2), t6 + cv.sb t6, (t1), 10 + cv.sh t3, (t5), 80 + cv.sw t1, (t4), 20 diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.d b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.d new file mode 100644 index 0000000..f1bb612 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.d @@ -0,0 +1,3 @@ +#as: -march=rv32i_xcvmem +#source: cv-mem-fail-operand-01.s +#error_output: cv-mem-fail-operand-01.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.l b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.l new file mode 100644 index 0000000..8399291 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.l @@ -0,0 +1,21 @@ +.*: Assembler messages: +.*: Error: illegal operands `cv.lb 20,10\(t1\)' +.*: Error: illegal operands `cv.lb 32,\(t2\),15' +.*: Error: illegal operands `cv.lb 40,t2\(t3\)' +.*: Error: illegal operands `cv.lb 28,\(t4\),t3' +.*: Error: illegal operands `cv.lbu 16,20\(t5\)' +.*: Error: illegal operands `cv.lbu 20,\(t6\),30' +.*: Error: illegal operands `cv.lbu 44,t4\(t1\)' +.*: Error: illegal operands `cv.lbu 48,\(t2\),t5' +.*: Error: illegal operands `cv.lh 52,25\(t3\)' +.*: Error: illegal operands `cv.lh 12,\(t4\),10' +.*: Error: illegal operands `cv.lh 16,t6\(t5\)' +.*: Error: illegal operands `cv.lh 36,\(t6\),t1' +.*: Error: illegal operands `cv.lhu 24,35\(t1\)' +.*: Error: illegal operands `cv.lhu 12,\(t2\),13' +.*: Error: illegal operands `cv.lhu 32,t2\(t3\)' +.*: Error: illegal operands `cv.lhu 40,\(t4\),t3' +.*: Error: illegal operands `cv.lw 44,18\(t5\)' +.*: Error: illegal operands `cv.lw 48,\(t6\),8' +.*: Error: illegal operands `cv.lw 24,t4\(t1\)' +.*: Error: illegal operands `cv.lw 12,\(t2\),t5' diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.s b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.s new file mode 100644 index 0000000..385b3f7 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-01.s @@ -0,0 +1,22 @@ +# Destination operand must be a register +target: + cv.lb 20, 10(t1) + cv.lb 32, (t2), 15 + cv.lb 40, t2(t3) + cv.lb 28, (t4), t3 + cv.lbu 16, 20(t5) + cv.lbu 20, (t6), 30 + cv.lbu 44, t4(t1) + cv.lbu 48, (t2), t5 + cv.lh 52, 25(t3) + cv.lh 12, (t4), 10 + cv.lh 16, t6(t5) + cv.lh 36, (t6), t1 + cv.lhu 24, 35(t1) + cv.lhu 12, (t2), 13 + cv.lhu 32, t2(t3) + cv.lhu 40, (t4), t3 + cv.lw 44, 18(t5) + cv.lw 48, (t6), 8 + cv.lw 24, t4(t1) + cv.lw 12, (t2), t5 diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.d b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.d new file mode 100644 index 0000000..bbf7237 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.d @@ -0,0 +1,3 @@ +#as: -march=rv32i_xcvmem +#source: cv-mem-fail-operand-02.s +#error_output: cv-mem-fail-operand-02.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.l b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.l new file mode 100644 index 0000000..871a221 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.l @@ -0,0 +1,13 @@ +.*: Assembler messages: +.*: Error: illegal operands `cv.sb 12,10\(t1\)' +.*: Error: illegal operands `cv.sb 14,\(t2\),20' +.*: Error: illegal operands `cv.sb 16,t1\(t3\)' +.*: Error: illegal operands `cv.sb 20,\(t4\),t2' +.*: Error: illegal operands `cv.sh 30,30\(t5\)' +.*: Error: illegal operands `cv.sh 15,\(t6\),40' +.*: Error: illegal operands `cv.sh 45,t3\(t1\)' +.*: Error: illegal operands `cv.sh 52,\(t2\),t4' +.*: Error: illegal operands `cv.sw 12,12\(t3\)' +.*: Error: illegal operands `cv.sw 10,\(t4\),16' +.*: Error: illegal operands `cv.sw 82,t5\(t5\)' +.*: Error: illegal operands `cv.sw 14,\(t1\),t6' diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.s b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.s new file mode 100644 index 0000000..8d7a41f --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-02.s @@ -0,0 +1,14 @@ +# Source operand must be a register +target: + cv.sb 12, 10(t1) + cv.sb 14, (t2), 20 + cv.sb 16, t1(t3) + cv.sb 20, (t4), t2 + cv.sh 30, 30(t5) + cv.sh 15, (t6), 40 + cv.sh 45, t3(t1) + cv.sh 52, (t2), t4 + cv.sw 12, 12(t3) + cv.sw 10, (t4), 16 + cv.sw 82, t5(t5) + cv.sw 14, (t1), t6 diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.d b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.d new file mode 100644 index 0000000..653c30a --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.d @@ -0,0 +1,3 @@ +#as: -march=rv32i_xcvmem +#source: cv-mem-fail-operand-03.s +#error_output: cv-mem-fail-operand-03.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.l b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.l new file mode 100644 index 0000000..4ffdbb3 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.l @@ -0,0 +1,33 @@ +.*: Assembler messages: +.*: Error: illegal operands `cv.sb t0,10\(12\)' +.*: Error: illegal operands `cv.sb t1,\(24\),20' +.*: Error: illegal operands `cv.sb t2,t1\(25\)' +.*: Error: illegal operands `cv.sb t3,\(75\),t2' +.*: Error: illegal operands `cv.sh t4,30\(13\)' +.*: Error: illegal operands `cv.sh t5,\(16\),40' +.*: Error: illegal operands `cv.sh t6,t3\(31\)' +.*: Error: illegal operands `cv.sh t0,\(37\),t4' +.*: Error: illegal operands `cv.sw t1,12\(51\)' +.*: Error: illegal operands `cv.sw t2,\(43\),16' +.*: Error: illegal operands `cv.sw t3,t5\(61\)' +.*: Error: illegal operands `cv.sw t4,\(67\),t6' +.*: Error: illegal operands `cv.lb t0,12\(12\)' +.*: Error: illegal operands `cv.lb t1,\(24\),13' +.*: Error: illegal operands `cv.lb t2,t3\(25\)' +.*: Error: illegal operands `cv.lb t3,\(75\),t4' +.*: Error: illegal operands `cv.lbu t4,22\(51\)' +.*: Error: illegal operands `cv.lbu t5,\(43\),10' +.*: Error: illegal operands `cv.lbu t6,t5\(61\)' +.*: Error: illegal operands `cv.lbu t0,\(67\),t6' +.*: Error: illegal operands `cv.lh t1,19\(13\)' +.*: Error: illegal operands `cv.lh t2,\(16\),41' +.*: Error: illegal operands `cv.lh t3,t0\(31\)' +.*: Error: illegal operands `cv.lh t4,\(37\),t1' +.*: Error: illegal operands `cv.lhu t5,15\(14\)' +.*: Error: illegal operands `cv.lhu t6,\(17\),12' +.*: Error: illegal operands `cv.lhu t0,t2\(14\)' +.*: Error: illegal operands `cv.lhu t1,\(39\),t3' +.*: Error: illegal operands `cv.lw t2,4\(24\)' +.*: Error: illegal operands `cv.lw t3,\(21\),6' +.*: Error: illegal operands `cv.lw t5,t4\(16\)' +.*: Error: illegal operands `cv.lw t4,\(47\),t5' diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.s b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.s new file mode 100644 index 0000000..e2e4092 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-03.s @@ -0,0 +1,34 @@ +# Base operand must be a register +target: + cv.sb t0, 10(12) + cv.sb t1, (24), 20 + cv.sb t2, t1(25) + cv.sb t3, (75), t2 + cv.sh t4, 30(13) + cv.sh t5, (16), 40 + cv.sh t6, t3(31) + cv.sh t0, (37), t4 + cv.sw t1, 12(51) + cv.sw t2, (43), 16 + cv.sw t3, t5(61) + cv.sw t4, (67), t6 + cv.lb t0, 12(12) + cv.lb t1, (24), 13 + cv.lb t2, t3(25) + cv.lb t3, (75), t4 + cv.lbu t4, 22(51) + cv.lbu t5, (43), 10 + cv.lbu t6, t5(61) + cv.lbu t0, (67), t6 + cv.lh t1, 19(13) + cv.lh t2, (16), 41 + cv.lh t3, t0(31) + cv.lh t4, (37), t1 + cv.lhu t5, 15(14) + cv.lhu t6, (17), 12 + cv.lhu t0, t2(14) + cv.lhu t1, (39), t3 + cv.lw t2, 4(24) + cv.lw t3, (21), 6 + cv.lw t5, t4(16) + cv.lw t4, (47), t5 diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.d b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.d new file mode 100644 index 0000000..e6fe398 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.d @@ -0,0 +1,3 @@ +#as: -march=rv32i_xcvmem +#source: cv-mem-fail-operand-04.s +#error_output: cv-mem-fail-operand-04.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.l b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.l new file mode 100644 index 0000000..a6d0722 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.l @@ -0,0 +1,41 @@ +.*: Assembler messages: +.*: Error: illegal operands `cv.lb t2,-2049\(t1\)' +.*: Error: illegal operands `cv.lb t2,\(t1\),-2049' +.*: Error: illegal operands `cv.lbu t2,-2049\(t1\)' +.*: Error: illegal operands `cv.lbu t2,\(t1\),-2049' +.*: Error: illegal operands `cv.lh t2,-2049\(t1\)' +.*: Error: illegal operands `cv.lh t2,\(t1\),-2049' +.*: Error: illegal operands `cv.lhu t2,-2049\(t1\)' +.*: Error: illegal operands `cv.lhu t2,\(t1\),-2049' +.*: Error: illegal operands `cv.lw t2,-2049\(t1\)' +.*: Error: illegal operands `cv.lw t2,\(t1\),-2049' +.*: Error: illegal operands `cv.lb t2,-3678\(t1\)' +.*: Error: illegal operands `cv.lb t2,\(t1\),-3678' +.*: Error: illegal operands `cv.lbu t2,-3678\(t1\)' +.*: Error: illegal operands `cv.lbu t2,\(t1\),-3678' +.*: Error: illegal operands `cv.lh t2,-3678\(t1\)' +.*: Error: illegal operands `cv.lh t2,\(t1\),-3678' +.*: Error: illegal operands `cv.lhu t2,-3678\(t1\)' +.*: Error: illegal operands `cv.lhu t2,\(t1\),-3678' +.*: Error: illegal operands `cv.lw t2,-3678\(t1\)' +.*: Error: illegal operands `cv.lw t2,\(t1\),-3678' +.*: Error: illegal operands `cv.lb t2,2048\(t1\)' +.*: Error: illegal operands `cv.lb t2,\(t1\),2048' +.*: Error: illegal operands `cv.lbu t2,2048\(t1\)' +.*: Error: illegal operands `cv.lbu t2,\(t1\),2048' +.*: Error: illegal operands `cv.lh t2,2048\(t1\)' +.*: Error: illegal operands `cv.lh t2,\(t1\),2048' +.*: Error: illegal operands `cv.lhu t2,2048\(t1\)' +.*: Error: illegal operands `cv.lhu t2,\(t1\),2048' +.*: Error: illegal operands `cv.lw t2,2048\(t1\)' +.*: Error: illegal operands `cv.lw t2,\(t1\),2048' +.*: Error: illegal operands `cv.lb t2,4595\(t1\)' +.*: Error: illegal operands `cv.lb t2,\(t1\),4595' +.*: Error: illegal operands `cv.lbu t2,4595\(t1\)' +.*: Error: illegal operands `cv.lbu t2,\(t1\),4595' +.*: Error: illegal operands `cv.lh t2,4595\(t1\)' +.*: Error: illegal operands `cv.lh t2,\(t1\),4595' +.*: Error: illegal operands `cv.lhu t2,4595\(t1\)' +.*: Error: illegal operands `cv.lhu t2,\(t1\),4595' +.*: Error: illegal operands `cv.lw t2,4595\(t1\)' +.*: Error: illegal operands `cv.lw t2,\(t1\),4595' diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.s b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.s new file mode 100644 index 0000000..a6307ce --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-04.s @@ -0,0 +1,42 @@ +# Offset operand must be in range [-2048, 2047] +target: + cv.lb t2, -2049(t1) + cv.lb t2, (t1), -2049 + cv.lbu t2, -2049(t1) + cv.lbu t2, (t1), -2049 + cv.lh t2, -2049(t1) + cv.lh t2, (t1), -2049 + cv.lhu t2, -2049(t1) + cv.lhu t2, (t1), -2049 + cv.lw t2, -2049(t1) + cv.lw t2, (t1), -2049 + cv.lb t2, -3678(t1) + cv.lb t2, (t1), -3678 + cv.lbu t2, -3678(t1) + cv.lbu t2, (t1), -3678 + cv.lh t2, -3678(t1) + cv.lh t2, (t1), -3678 + cv.lhu t2, -3678(t1) + cv.lhu t2, (t1), -3678 + cv.lw t2, -3678(t1) + cv.lw t2, (t1), -3678 + cv.lb t2, 2048(t1) + cv.lb t2, (t1), 2048 + cv.lbu t2, 2048(t1) + cv.lbu t2, (t1), 2048 + cv.lh t2, 2048(t1) + cv.lh t2, (t1), 2048 + cv.lhu t2, 2048(t1) + cv.lhu t2, (t1), 2048 + cv.lw t2, 2048(t1) + cv.lw t2, (t1), 2048 + cv.lb t2, 4595(t1) + cv.lb t2, (t1), 4595 + cv.lbu t2, 4595(t1) + cv.lbu t2, (t1), 4595 + cv.lh t2, 4595(t1) + cv.lh t2, (t1), 4595 + cv.lhu t2, 4595(t1) + cv.lhu t2, (t1), 4595 + cv.lw t2, 4595(t1) + cv.lw t2, (t1), 4595 diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.d b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.d new file mode 100644 index 0000000..c00880f --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.d @@ -0,0 +1,3 @@ +#as: -march=rv32i_xcvmem +#source: cv-mem-fail-operand-05.s +#error_output: cv-mem-fail-operand-05.l diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.l b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.l new file mode 100644 index 0000000..3069f54 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.l @@ -0,0 +1,25 @@ +.*: Assembler messages: +.*: Error: illegal operands `cv.sb t2,-2049\(t1\)' +.*: Error: illegal operands `cv.sb t2,\(t1\),-2049' +.*: Error: illegal operands `cv.sh t2,-2049\(t1\)' +.*: Error: illegal operands `cv.sh t2,\(t1\),-2049' +.*: Error: illegal operands `cv.sw t2,-2049\(t1\)' +.*: Error: illegal operands `cv.sw t2,\(t1\),-2049' +.*: Error: illegal operands `cv.sb t2,-3669\(t1\)' +.*: Error: illegal operands `cv.sb t2,\(t1\),-3669' +.*: Error: illegal operands `cv.sh t2,-3669\(t1\)' +.*: Error: illegal operands `cv.sh t2,\(t1\),-3669' +.*: Error: illegal operands `cv.sw t2,-3669\(t1\)' +.*: Error: illegal operands `cv.sw t2,\(t1\),-3669' +.*: Error: illegal operands `cv.sb t2,2048\(t1\)' +.*: Error: illegal operands `cv.sb t2,\(t1\),2048' +.*: Error: illegal operands `cv.sh t2,2048\(t1\)' +.*: Error: illegal operands `cv.sh t2,\(t1\),2048' +.*: Error: illegal operands `cv.sw t2,2048\(t1\)' +.*: Error: illegal operands `cv.sw t2,\(t1\),2048' +.*: Error: illegal operands `cv.sb t2,5341\(t1\)' +.*: Error: illegal operands `cv.sb t2,\(t1\),5341' +.*: Error: illegal operands `cv.sh t2,5341\(t1\)' +.*: Error: illegal operands `cv.sh t2,\(t1\),5341' +.*: Error: illegal operands `cv.sw t2,5341\(t1\)' +.*: Error: illegal operands `cv.sw t2,\(t1\),5341' diff --git a/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.s b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.s new file mode 100644 index 0000000..33b5883 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-fail-operand-05.s @@ -0,0 +1,26 @@ +# Offset operand must be in range [-2048, 2047] +target: + cv.sb t2, -2049(t1) + cv.sb t2, (t1), -2049 + cv.sh t2, -2049(t1) + cv.sh t2, (t1), -2049 + cv.sw t2, -2049(t1) + cv.sw t2, (t1), -2049 + cv.sb t2, -3669(t1) + cv.sb t2, (t1), -3669 + cv.sh t2, -3669(t1) + cv.sh t2, (t1), -3669 + cv.sw t2, -3669(t1) + cv.sw t2, (t1), -3669 + cv.sb t2, 2048(t1) + cv.sb t2, (t1), 2048 + cv.sh t2, 2048(t1) + cv.sh t2, (t1), 2048 + cv.sw t2, 2048(t1) + cv.sw t2, (t1), 2048 + cv.sb t2, 5341(t1) + cv.sb t2, (t1), 5341 + cv.sh t2, 5341(t1) + cv.sh t2, (t1), 5341 + cv.sw t2, 5341(t1) + cv.sw t2, (t1), 5341 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbpost.d b/gas/testsuite/gas/riscv/cv-mem-lbpost.d new file mode 100644 index 0000000..9e3dbd6 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+8003828b[ ]+cv.lb[ ]+t0,\(t2\),-2048 +[ ]+4:[ ]+00f30e8b[ ]+cv.lb[ ]+t4,\(t1\),15 +[ ]+8:[ ]+7fff0e0b[ ]+cv.lb[ ]+t3,\(t5\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbpost.s b/gas/testsuite/gas/riscv/cv-mem-lbpost.s new file mode 100644 index 0000000..a55a414 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbpost.s @@ -0,0 +1,4 @@ +target: + cv.lb t0, (t2), -2048 + cv.lb t4, (t1), 15 + cv.lb t3, (t5), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbrr.d b/gas/testsuite/gas/riscv/cv-mem-lbrr.d new file mode 100644 index 0000000..6183ac4 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0863b2ab[ ]+cv.lb[ ]+t0,t1\(t2\) +[ ]+4:[ ]+09c33eab[ ]+cv.lb[ ]+t4,t3\(t1\) +[ ]+8:[ ]+085f3e2b[ ]+cv.lb[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-lbrr.s b/gas/testsuite/gas/riscv/cv-mem-lbrr.s new file mode 100644 index 0000000..1cfaf24 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbrr.s @@ -0,0 +1,4 @@ +target: + cv.lb t0, t1(t2) + cv.lb t4, t3(t1) + cv.lb t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-lbrrpost.d b/gas/testsuite/gas/riscv/cv-mem-lbrrpost.d new file mode 100644 index 0000000..839915e --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0063b2ab[ ]+cv.lb[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+01c33eab[ ]+cv.lb[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+005f3e2b[ ]+cv.lb[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbrrpost.s b/gas/testsuite/gas/riscv/cv-mem-lbrrpost.s new file mode 100644 index 0000000..48f71ce --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbrrpost.s @@ -0,0 +1,4 @@ +target: + cv.lb t0, (t2), t1 + cv.lb t4, (t1), t3 + cv.lb t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbupost.d b/gas/testsuite/gas/riscv/cv-mem-lbupost.d new file mode 100644 index 0000000..0db23ad --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbupost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+8003c28b[ ]+cv.lbu[ ]+t0,\(t2\),-2048 +[ ]+4:[ ]+00f34e8b[ ]+cv.lbu[ ]+t4,\(t1\),15 +[ ]+8:[ ]+7fff4e0b[ ]+cv.lbu[ ]+t3,\(t5\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lbupost.s b/gas/testsuite/gas/riscv/cv-mem-lbupost.s new file mode 100644 index 0000000..e4d2ba8 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lbupost.s @@ -0,0 +1,4 @@ +target: + cv.lbu t0, (t2), -2048 + cv.lbu t4, (t1), 15 + cv.lbu t3, (t5), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lburr.d b/gas/testsuite/gas/riscv/cv-mem-lburr.d new file mode 100644 index 0000000..12fe6b0 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lburr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+1863b2ab[ ]+cv.lbu[ ]+t0,t1\(t2\) +[ ]+4:[ ]+19c33eab[ ]+cv.lbu[ ]+t4,t3\(t1\) +[ ]+8:[ ]+185f3e2b[ ]+cv.lbu[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-lburr.s b/gas/testsuite/gas/riscv/cv-mem-lburr.s new file mode 100644 index 0000000..20982b1 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lburr.s @@ -0,0 +1,4 @@ +target: + cv.lbu t0, t1(t2) + cv.lbu t4, t3(t1) + cv.lbu t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-lburrpost.d b/gas/testsuite/gas/riscv/cv-mem-lburrpost.d new file mode 100644 index 0000000..468a1df --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lburrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+1063b2ab[ ]+cv.lbu[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+11c33eab[ ]+cv.lbu[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+105f3e2b[ ]+cv.lbu[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lburrpost.s b/gas/testsuite/gas/riscv/cv-mem-lburrpost.s new file mode 100644 index 0000000..ea23a2f --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lburrpost.s @@ -0,0 +1,4 @@ +target: + cv.lbu t0, (t2), t1 + cv.lbu t4, (t1), t3 + cv.lbu t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhpost.d b/gas/testsuite/gas/riscv/cv-mem-lhpost.d new file mode 100644 index 0000000..d7ba406 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+8003928b[ ]+cv.lh[ ]+t0,\(t2\),-2048 +[ ]+4:[ ]+00f31e8b[ ]+cv.lh[ ]+t4,\(t1\),15 +[ ]+8:[ ]+7fff1e0b[ ]+cv.lh[ ]+t3,\(t5\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhpost.s b/gas/testsuite/gas/riscv/cv-mem-lhpost.s new file mode 100644 index 0000000..39a3b6f --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhpost.s @@ -0,0 +1,4 @@ +target: + cv.lh t0, (t2), -2048 + cv.lh t4, (t1), 15 + cv.lh t3, (t5), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhrr.d b/gas/testsuite/gas/riscv/cv-mem-lhrr.d new file mode 100644 index 0000000..606af40 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0a63b2ab[ ]+cv.lh[ ]+t0,t1\(t2\) +[ ]+4:[ ]+0bc33eab[ ]+cv.lh[ ]+t4,t3\(t1\) +[ ]+8:[ ]+0a5f3e2b[ ]+cv.lh[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-lhrr.s b/gas/testsuite/gas/riscv/cv-mem-lhrr.s new file mode 100644 index 0000000..fe8f761 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhrr.s @@ -0,0 +1,4 @@ +target: + cv.lh t0, t1(t2) + cv.lh t4, t3(t1) + cv.lh t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-lhrrpost.d b/gas/testsuite/gas/riscv/cv-mem-lhrrpost.d new file mode 100644 index 0000000..d0c9ac0 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0263b2ab[ ]+cv.lh[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+03c33eab[ ]+cv.lh[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+025f3e2b[ ]+cv.lh[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhrrpost.s b/gas/testsuite/gas/riscv/cv-mem-lhrrpost.s new file mode 100644 index 0000000..acfc110 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhrrpost.s @@ -0,0 +1,4 @@ +target: + cv.lh t0, (t2), t1 + cv.lh t4, (t1), t3 + cv.lh t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhupost.d b/gas/testsuite/gas/riscv/cv-mem-lhupost.d new file mode 100644 index 0000000..56c15ae --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhupost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+8003d28b[ ]+cv.lhu[ ]+t0,\(t2\),-2048 +[ ]+4:[ ]+00f35e8b[ ]+cv.lhu[ ]+t4,\(t1\),15 +[ ]+8:[ ]+7fff5e0b[ ]+cv.lhu[ ]+t3,\(t5\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhupost.s b/gas/testsuite/gas/riscv/cv-mem-lhupost.s new file mode 100644 index 0000000..7efa1ac --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhupost.s @@ -0,0 +1,4 @@ +target: + cv.lhu t0, (t2), -2048 + cv.lhu t4, (t1), 15 + cv.lhu t3, (t5), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhurr.d b/gas/testsuite/gas/riscv/cv-mem-lhurr.d new file mode 100644 index 0000000..9dd81fe --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhurr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+1a63b2ab[ ]+cv.lhu[ ]+t0,t1\(t2\) +[ ]+4:[ ]+1bc33eab[ ]+cv.lhu[ ]+t4,t3\(t1\) +[ ]+8:[ ]+1a5f3e2b[ ]+cv.lhu[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-lhurr.s b/gas/testsuite/gas/riscv/cv-mem-lhurr.s new file mode 100644 index 0000000..91511fd --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhurr.s @@ -0,0 +1,4 @@ +target: + cv.lhu t0, t1(t2) + cv.lhu t4, t3(t1) + cv.lhu t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-lhurrpost.d b/gas/testsuite/gas/riscv/cv-mem-lhurrpost.d new file mode 100644 index 0000000..66e1a90 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhurrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+1263b2ab[ ]+cv.lhu[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+13c33eab[ ]+cv.lhu[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+125f3e2b[ ]+cv.lhu[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lhurrpost.s b/gas/testsuite/gas/riscv/cv-mem-lhurrpost.s new file mode 100644 index 0000000..ff5d24d --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lhurrpost.s @@ -0,0 +1,4 @@ +target: + cv.lhu t0, (t2), t1 + cv.lhu t4, (t1), t3 + cv.lhu t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lwpost.d b/gas/testsuite/gas/riscv/cv-mem-lwpost.d new file mode 100644 index 0000000..e0f1c58 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+8003a28b[ ]+cv.lw[ ]+t0,\(t2\),-2048 +[ ]+4:[ ]+00f32e8b[ ]+cv.lw[ ]+t4,\(t1\),15 +[ ]+8:[ ]+7fff2e0b[ ]+cv.lw[ ]+t3,\(t5\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lwpost.s b/gas/testsuite/gas/riscv/cv-mem-lwpost.s new file mode 100644 index 0000000..3942d64 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwpost.s @@ -0,0 +1,4 @@ +target: + cv.lw t0, (t2), -2048 + cv.lw t4, (t1), 15 + cv.lw t3, (t5), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-lwrr.d b/gas/testsuite/gas/riscv/cv-mem-lwrr.d new file mode 100644 index 0000000..8a72c02 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0c63b2ab[ ]+cv.lw[ ]+t0,t1\(t2\) +[ ]+4:[ ]+0dc33eab[ ]+cv.lw[ ]+t4,t3\(t1\) +[ ]+8:[ ]+0c5f3e2b[ ]+cv.lw[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-lwrr.s b/gas/testsuite/gas/riscv/cv-mem-lwrr.s new file mode 100644 index 0000000..41be011 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwrr.s @@ -0,0 +1,4 @@ +target: + cv.lw t0, t1(t2) + cv.lw t4, t3(t1) + cv.lw t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-lwrrpost.d b/gas/testsuite/gas/riscv/cv-mem-lwrrpost.d new file mode 100644 index 0000000..502bd58 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+0463b2ab[ ]+cv.lw[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+05c33eab[ ]+cv.lw[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+045f3e2b[ ]+cv.lw[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-lwrrpost.s b/gas/testsuite/gas/riscv/cv-mem-lwrrpost.s new file mode 100644 index 0000000..5dc9c23 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-lwrrpost.s @@ -0,0 +1,4 @@ +target: + cv.lw t0, (t2), t1 + cv.lw t4, (t1), t3 + cv.lw t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-sbpost.d b/gas/testsuite/gas/riscv/cv-mem-sbpost.d new file mode 100644 index 0000000..ba24095 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+81f3002b[ ]+cv.sb[ ]+t6,\(t1\),-2048 +[ ]+4:[ ]+07d3822b[ ]+cv.sb[ ]+t4,\(t2\),100 +[ ]+8:[ ]+7fce8fab[ ]+cv.sb[ ]+t3,\(t4\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-sbpost.s b/gas/testsuite/gas/riscv/cv-mem-sbpost.s new file mode 100644 index 0000000..1e3ff72 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbpost.s @@ -0,0 +1,4 @@ +target: + cv.sb t6, (t1), -2048 + cv.sb t4, (t2), 100 + cv.sb t3, (t4), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-sbrr.d b/gas/testsuite/gas/riscv/cv-mem-sbrr.d new file mode 100644 index 0000000..8065089 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+2853b32b[ ]+cv.sb[ ]+t0,t1\(t2\) +[ ]+4:[ ]+29d33e2b[ ]+cv.sb[ ]+t4,t3\(t1\) +[ ]+8:[ ]+29cf32ab[ ]+cv.sb[ ]+t3,t0\(t5\) diff --git a/gas/testsuite/gas/riscv/cv-mem-sbrr.s b/gas/testsuite/gas/riscv/cv-mem-sbrr.s new file mode 100644 index 0000000..b3a9e52 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbrr.s @@ -0,0 +1,4 @@ +target: + cv.sb t0, t1(t2) + cv.sb t4, t3(t1) + cv.sb t3, t0(t5) diff --git a/gas/testsuite/gas/riscv/cv-mem-sbrrpost.d b/gas/testsuite/gas/riscv/cv-mem-sbrrpost.d new file mode 100644 index 0000000..830e4e4 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+2053b32b[ ]+cv.sb[ ]+t0,\(t2\),t1 +[ ]+4:[ ]+21d33e2b[ ]+cv.sb[ ]+t4,\(t1\),t3 +[ ]+8:[ ]+21cf32ab[ ]+cv.sb[ ]+t3,\(t5\),t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-sbrrpost.s b/gas/testsuite/gas/riscv/cv-mem-sbrrpost.s new file mode 100644 index 0000000..f481305 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-sbrrpost.s @@ -0,0 +1,4 @@ +target: + cv.sb t0, (t2), t1 + cv.sb t4, (t1), t3 + cv.sb t3, (t5), t0 diff --git a/gas/testsuite/gas/riscv/cv-mem-shpost.d b/gas/testsuite/gas/riscv/cv-mem-shpost.d new file mode 100644 index 0000000..2fc4775 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+81cf102b[ ]+cv.sh[ ]+t3,\(t5\),-2048 +[ ]+4:[ ]+026f9e2b[ ]+cv.sh[ ]+t1,\(t6\),60 +[ ]+8:[ ]+7e7e9fab[ ]+cv.sh[ ]+t2,\(t4\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-shpost.s b/gas/testsuite/gas/riscv/cv-mem-shpost.s new file mode 100644 index 0000000..d7ab172 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shpost.s @@ -0,0 +1,4 @@ +target: + cv.sh t3, (t5), -2048 + cv.sh t1, (t6), 60 + cv.sh t2, (t4), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-shrr.d b/gas/testsuite/gas/riscv/cv-mem-shrr.d new file mode 100644 index 0000000..0e88d9d --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+2a6ebe2b[ ]+cv.sh[ ]+t1,t3\(t4\) +[ ]+4:[ ]+2bd333ab[ ]+cv.sh[ ]+t4,t2\(t1\) +[ ]+8:[ ]+2bf3bf2b[ ]+cv.sh[ ]+t6,t5\(t2\) diff --git a/gas/testsuite/gas/riscv/cv-mem-shrr.s b/gas/testsuite/gas/riscv/cv-mem-shrr.s new file mode 100644 index 0000000..2f5ee98 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shrr.s @@ -0,0 +1,4 @@ +target: + cv.sh t1, t3(t4) + cv.sh t4, t2(t1) + cv.sh t6, t5(t2) diff --git a/gas/testsuite/gas/riscv/cv-mem-shrrpost.d b/gas/testsuite/gas/riscv/cv-mem-shrrpost.d new file mode 100644 index 0000000..f43cedd --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+2263bfab[ ]+cv.sh[ ]+t1,\(t2\),t6 +[ ]+4:[ ]+22733f2b[ ]+cv.sh[ ]+t2,\(t1\),t5 +[ ]+8:[ ]+23ee3eab[ ]+cv.sh[ ]+t5,\(t3\),t4 diff --git a/gas/testsuite/gas/riscv/cv-mem-shrrpost.s b/gas/testsuite/gas/riscv/cv-mem-shrrpost.s new file mode 100644 index 0000000..922a94f --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-shrrpost.s @@ -0,0 +1,4 @@ +target: + cv.sh t1, (t2), t6 + cv.sh t2, (t1), t5 + cv.sh t5, (t3), t4 diff --git a/gas/testsuite/gas/riscv/cv-mem-swpost.d b/gas/testsuite/gas/riscv/cv-mem-swpost.d new file mode 100644 index 0000000..2a5fee9 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+806ea02b[ ]+cv.sw[ ]+t1,\(t4\),-2048 +[ ]+4:[ ]+07cf222b[ ]+cv.sw[ ]+t3,\(t5\),100 +[ ]+8:[ ]+7e63afab[ ]+cv.sw[ ]+t1,\(t2\),2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-swpost.s b/gas/testsuite/gas/riscv/cv-mem-swpost.s new file mode 100644 index 0000000..7dd827a --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swpost.s @@ -0,0 +1,4 @@ +target: + cv.sw t1, (t4), -2048 + cv.sw t3, (t5), 100 + cv.sw t1, (t2), 2047 diff --git a/gas/testsuite/gas/riscv/cv-mem-swrr.d b/gas/testsuite/gas/riscv/cv-mem-swrr.d new file mode 100644 index 0000000..5bc0708 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swrr.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+2c6eb3ab[ ]+cv.sw[ ]+t1,t2\(t4\) +[ ]+4:[ ]+2dcf33ab[ ]+cv.sw[ ]+t3,t2\(t5\) +[ ]+8:[ ]+2c63bf2b[ ]+cv.sw[ ]+t1,t5\(t2\) diff --git a/gas/testsuite/gas/riscv/cv-mem-swrr.s b/gas/testsuite/gas/riscv/cv-mem-swrr.s new file mode 100644 index 0000000..652ac9a --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swrr.s @@ -0,0 +1,4 @@ +target: + cv.sw t1, t2(t4) + cv.sw t3, t2(t5) + cv.sw t1, t5(t2) diff --git a/gas/testsuite/gas/riscv/cv-mem-swrrpost.d b/gas/testsuite/gas/riscv/cv-mem-swrrpost.d new file mode 100644 index 0000000..d3b3385 --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swrrpost.d @@ -0,0 +1,12 @@ +#as: -march=rv32i_xcvmem +#objdump: -d + +.*:[ ]+file format .* + + +Disassembly of section .text: + +0+000 <target>: +[ ]+0:[ ]+25e3bfab[ ]+cv.sw[ ]+t5,\(t2\),t6 +[ ]+4:[ ]+25ceb32b[ ]+cv.sw[ ]+t3,\(t4\),t1 +[ ]+8:[ ]+24733eab[ ]+cv.sw[ ]+t2,\(t1\),t4 diff --git a/gas/testsuite/gas/riscv/cv-mem-swrrpost.s b/gas/testsuite/gas/riscv/cv-mem-swrrpost.s new file mode 100644 index 0000000..6210e1e --- /dev/null +++ b/gas/testsuite/gas/riscv/cv-mem-swrrpost.s @@ -0,0 +1,4 @@ +target: + cv.sw t5, (t2), t6 + cv.sw t3, (t4), t1 + cv.sw t2, (t1), t4 diff --git a/gas/testsuite/gas/riscv/march-help.l b/gas/testsuite/gas/riscv/march-help.l index d3db83d..5b5a366 100644 --- a/gas/testsuite/gas/riscv/march-help.l +++ b/gas/testsuite/gas/riscv/march-help.l @@ -107,6 +107,7 @@ All available -march extensions for RISC-V: xcvalu 1.0 xcvelw 1.0 xcvbi 1.0 + xcvmem 1.0 xtheadba 1.0 xtheadbb 1.0 xtheadbs 1.0 diff --git a/include/opcode/riscv-opc.h b/include/opcode/riscv-opc.h index 0661565..cd957ef 100644 --- a/include/opcode/riscv-opc.h +++ b/include/opcode/riscv-opc.h @@ -2477,6 +2477,55 @@ #define MASK_CV_BNEIMM 0x707f #define MATCH_CV_BEQIMM 0x600b #define MASK_CV_BEQIMM 0x707f +/* Vendor-specific (CORE-V) Xcvmem instructions. */ +#define MASK_CV_LBPOST 0x707f +#define MATCH_CV_LBPOST 0xb +#define MASK_CV_LBUPOST 0x707f +#define MATCH_CV_LBUPOST 0x400b +#define MASK_CV_LHPOST 0x707f +#define MATCH_CV_LHPOST 0x100b +#define MASK_CV_LHUPOST 0x707f +#define MATCH_CV_LHUPOST 0x500b +#define MASK_CV_LWPOST 0x707f +#define MATCH_CV_LWPOST 0x200b +#define MASK_CV_LBRRPOST 0xfe00707f +#define MATCH_CV_LBRRPOST 0x302b +#define MASK_CV_LBURRPOST 0xfe00707f +#define MATCH_CV_LBURRPOST 0x1000302b +#define MASK_CV_LHRRPOST 0xfe00707f +#define MATCH_CV_LHRRPOST 0x200302b +#define MASK_CV_LHURRPOST 0xfe00707f +#define MATCH_CV_LHURRPOST 0x1200302b +#define MASK_CV_LWRRPOST 0xfe00707f +#define MATCH_CV_LWRRPOST 0x400302b +#define MASK_CV_LBRR 0xfe00707f +#define MATCH_CV_LBRR 0x800302b +#define MASK_CV_LBURR 0xfe00707f +#define MATCH_CV_LBURR 0x1800302b +#define MASK_CV_LHRR 0xfe00707f +#define MATCH_CV_LHRR 0xa00302b +#define MASK_CV_LHURR 0xfe00707f +#define MATCH_CV_LHURR 0x1a00302b +#define MASK_CV_LWRR 0xfe00707f +#define MATCH_CV_LWRR 0xc00302b +#define MASK_CV_SBPOST 0x707f +#define MATCH_CV_SBPOST 0x2b +#define MASK_CV_SHPOST 0x707f +#define MATCH_CV_SHPOST 0x102b +#define MASK_CV_SWPOST 0x707f +#define MATCH_CV_SWPOST 0x202b +#define MASK_CV_SBRRPOST 0xfe00707f +#define MATCH_CV_SBRRPOST 0x2000302b +#define MASK_CV_SHRRPOST 0xfe00707f +#define MATCH_CV_SHRRPOST 0x2200302b +#define MASK_CV_SWRRPOST 0xfe00707f +#define MATCH_CV_SWRRPOST 0x2400302b +#define MASK_CV_SBRR 0xfe00707f +#define MATCH_CV_SBRR 0x2800302b +#define MASK_CV_SHRR 0xfe00707f +#define MATCH_CV_SHRR 0x2a00302b +#define MASK_CV_SWRR 0xfe00707f +#define MATCH_CV_SWRR 0x2c00302b /* Vendor-specific (T-Head) XTheadBa instructions. */ #define MATCH_TH_ADDSL 0x0000100b #define MASK_TH_ADDSL 0xf800707f diff --git a/include/opcode/riscv.h b/include/opcode/riscv.h index f6e6dae..0653ae5 100644 --- a/include/opcode/riscv.h +++ b/include/opcode/riscv.h @@ -494,6 +494,7 @@ enum riscv_insn_class INSN_CLASS_XCVALU, INSN_CLASS_XCVELW, INSN_CLASS_XCVBI, + INSN_CLASS_XCVMEM, INSN_CLASS_XTHEADBA, INSN_CLASS_XTHEADBB, INSN_CLASS_XTHEADBS, diff --git a/opcodes/riscv-opc.c b/opcodes/riscv-opc.c index aa6be3d..4bb54b7 100644 --- a/opcodes/riscv-opc.c +++ b/opcodes/riscv-opc.c @@ -2214,6 +2214,32 @@ const struct riscv_opcode riscv_opcodes[] = {"cv.beqimm", 0, INSN_CLASS_XCVBI, "s,Xc4,p", MATCH_CV_BEQIMM, MASK_CV_BEQIMM, match_opcode, 0}, {"cv.bneimm", 0, INSN_CLASS_XCVBI, "s,Xc4,p", MATCH_CV_BNEIMM, MASK_CV_BNEIMM, match_opcode, 0}, +/* Vendor-specific (CORE-V) Xcvmem instructions. */ +{"cv.lb", 0, INSN_CLASS_XCVMEM, "d,(s),o", MATCH_CV_LBPOST, MASK_CV_LBPOST, match_opcode, 0}, +{"cv.lb", 0, INSN_CLASS_XCVMEM, "d,(s),t", MATCH_CV_LBRRPOST, MASK_CV_LBRRPOST, match_opcode, 0}, +{"cv.lb", 0, INSN_CLASS_XCVMEM, "d,t(s)", MATCH_CV_LBRR, MASK_CV_LBRR, match_opcode, 0}, +{"cv.lbu",0, INSN_CLASS_XCVMEM, "d,(s),o", MATCH_CV_LBUPOST, MASK_CV_LBUPOST, match_opcode, 0}, +{"cv.lbu",0, INSN_CLASS_XCVMEM, "d,(s),t", MATCH_CV_LBURRPOST, MASK_CV_LBURRPOST, match_opcode, 0}, +{"cv.lbu",0, INSN_CLASS_XCVMEM, "d,t(s)", MATCH_CV_LBURR, MASK_CV_LBURR, match_opcode, 0}, +{"cv.lh", 0, INSN_CLASS_XCVMEM, "d,(s),o", MATCH_CV_LHPOST, MASK_CV_LHPOST, match_opcode, 0}, +{"cv.lh", 0, INSN_CLASS_XCVMEM, "d,(s),t", MATCH_CV_LHRRPOST, MASK_CV_LHRRPOST, match_opcode, 0}, +{"cv.lh", 0, INSN_CLASS_XCVMEM, "d,t(s)", MATCH_CV_LHRR, MASK_CV_LHRR, match_opcode, 0}, +{"cv.lhu",0, INSN_CLASS_XCVMEM, "d,(s),o", MATCH_CV_LHUPOST, MASK_CV_LHUPOST, match_opcode, 0}, +{"cv.lhu",0, INSN_CLASS_XCVMEM, "d,(s),t", MATCH_CV_LHURRPOST, MASK_CV_LHURRPOST, match_opcode, 0}, +{"cv.lhu",0, INSN_CLASS_XCVMEM, "d,t(s)", MATCH_CV_LHURR, MASK_CV_LHURR, match_opcode, 0}, +{"cv.lw", 0, INSN_CLASS_XCVMEM, "d,(s),o", MATCH_CV_LWPOST, MASK_CV_LWPOST, match_opcode, 0}, +{"cv.lw", 0, INSN_CLASS_XCVMEM, "d,(s),t", MATCH_CV_LWRRPOST, MASK_CV_LWRRPOST, match_opcode, 0}, +{"cv.lw", 0, INSN_CLASS_XCVMEM, "d,t(s)", MATCH_CV_LWRR, MASK_CV_LWRR, match_opcode, 0}, +{"cv.sb", 0, INSN_CLASS_XCVMEM, "t,(s),q", MATCH_CV_SBPOST, MASK_CV_SBPOST, match_opcode, 0}, +{"cv.sb", 0, INSN_CLASS_XCVMEM, "t,d(s)", MATCH_CV_SBRR, MASK_CV_SBRR, match_opcode, 0}, +{"cv.sb", 0, INSN_CLASS_XCVMEM, "t,(s),d", MATCH_CV_SBRRPOST, MASK_CV_SBRRPOST, match_opcode, 0}, +{"cv.sh", 0, INSN_CLASS_XCVMEM, "t,(s),q", MATCH_CV_SHPOST, MASK_CV_SHPOST, match_opcode, 0}, +{"cv.sh", 0, INSN_CLASS_XCVMEM, "t,d(s)", MATCH_CV_SHRR, MASK_CV_SHRR, match_opcode, 0}, +{"cv.sh", 0, INSN_CLASS_XCVMEM, "t,(s),d", MATCH_CV_SHRRPOST, MASK_CV_SHRRPOST, match_opcode, 0}, +{"cv.sw", 0, INSN_CLASS_XCVMEM, "t,(s),q", MATCH_CV_SWPOST, MASK_CV_SWPOST, match_opcode, 0}, +{"cv.sw", 0, INSN_CLASS_XCVMEM, "t,d(s)", MATCH_CV_SWRR, MASK_CV_SWRR, match_opcode, 0}, +{"cv.sw", 0, INSN_CLASS_XCVMEM, "t,(s),d", MATCH_CV_SWRRPOST, MASK_CV_SWRRPOST, match_opcode, 0}, + /* Vendor-specific (T-Head) XTheadBa instructions. */ {"th.addsl", 0, INSN_CLASS_XTHEADBA, "d,s,t,Xtu2@25", MATCH_TH_ADDSL, MASK_TH_ADDSL, match_opcode, 0}, |