espressif/binutils-gdb
1
0
Fork 0
mirror of https://github.com/espressif/binutils-gdb.git synced 2025-06-28 15:18:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

RISC-V: Add .insn CA support.

Browse Source 
gas/
	* config/tc-riscv.c (validate_riscv_insn) <'F'>: Add support for CF6
	and CF2 operands.
	(riscv_ip) <'F'>: Likewise.
	* doc/c-riscv.texi (RISC-V-Formats): Add func6 abbreviation.  Use rs2
	instead of rs1 in CR description.  Add CA docs.
	* gas/testsuite/riscv/insn.s: Add use of .insn ca.
	* gas/testsuite/riscv/insn.d: Update to match.
	include/
	* opcode/riscv.h (OP_MASK_CFUNCT6, OP_SH_CFUNCT6): New.
	(OP_MASK_CFUNCT2, OP_SH_CFUNCT2): New.
	opcodes/
	* riscv-opc.c (ciw): Fix whitespace to align columns.
	(ca): New.
This commit is contained in:
Jim Wilson
2018-11-27 11:29:23 -08:00
parent b5ab31636d
commit 4765cd6119
9 changed files with 86 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
gas/ChangeLog
View File

@ -1,3 +1,13 @@
2018-11-27 Jim Wilson <jimw@sifive.com>
* config/tc-riscv.c (validate_riscv_insn) <'F'>: Add support for CF6
and CF2 operands.
(riscv_ip) <'F'>: Likewise.
* doc/c-riscv.texi (RISC-V-Formats): Add func6 abbreviation. Use rs2
instead of rs1 in CR description. Add CA docs.
* gas/testsuite/riscv/insn.s: Add use of .insn ca.
* gas/testsuite/riscv/insn.d: Update to match.
2018-11-27 Thomas Preud'homme <thomas.preudhomme@linaro.org> 2018-11-27 Thomas Preud'homme <thomas.preudhomme@linaro.org>
* testsuite/gas/arm/cpu-arm1020.d: New testcase. * testsuite/gas/arm/cpu-arm1020.d: New testcase.

31
gas/config/tc-riscv.c
View File

@ -707,8 +707,10 @@ validate_riscv_insn (const struct riscv_opcode *opc, int length)
case 'F': /* funct */ case 'F': /* funct */
switch (c = *p++) switch (c = *p++)
{ {
case '6': USE_BITS (OP_MASK_CFUNCT6, OP_SH_CFUNCT6); break;
case '4': USE_BITS (OP_MASK_CFUNCT4, OP_SH_CFUNCT4); break; case '4': USE_BITS (OP_MASK_CFUNCT4, OP_SH_CFUNCT4); break;
case '3': USE_BITS (OP_MASK_CFUNCT3, OP_SH_CFUNCT3); break; case '3': USE_BITS (OP_MASK_CFUNCT3, OP_SH_CFUNCT3); break;
case '2': USE_BITS (OP_MASK_CFUNCT2, OP_SH_CFUNCT2); break;
default: default:
as_bad (_("internal: bad RISC-V opcode" as_bad (_("internal: bad RISC-V opcode"
" (unknown operand type `CF%c'): %s %s"), " (unknown operand type `CF%c'): %s %s"),
@ -1741,6 +1743,21 @@ rvc_lui:
case 'F': case 'F':
switch (*++args) switch (*++args)
{ {
case '6':
if (my_getSmallExpression (imm_expr, imm_reloc, s, p)
|| imm_expr->X_op != O_constant
|| imm_expr->X_add_number < 0
|| imm_expr->X_add_number >= 64)
{
as_bad (_("bad value for funct6 field, "
"value must be 0...64"));
break;
}
INSERT_OPERAND (CFUNCT6, *ip, imm_expr->X_add_number);
imm_expr->X_op = O_absent;
s = expr_end;
continue;
case '4': case '4':
if (my_getSmallExpression (imm_expr, imm_reloc, s, p) if (my_getSmallExpression (imm_expr, imm_reloc, s, p)
|| imm_expr->X_op != O_constant || imm_expr->X_op != O_constant
@ -1770,6 +1787,20 @@ rvc_lui:
imm_expr->X_op = O_absent; imm_expr->X_op = O_absent;
s = expr_end; s = expr_end;
continue; continue;
case '2':
if (my_getSmallExpression (imm_expr, imm_reloc, s, p)
|| imm_expr->X_op != O_constant
|| imm_expr->X_add_number < 0
|| imm_expr->X_add_number >= 4)
{
as_bad (_("bad value for funct2 field, "
"value must be 0...3"));
break;
}
INSERT_OPERAND (CFUNCT2, *ip, imm_expr->X_add_number);
imm_expr->X_op = O_absent;
s = expr_end;
continue;
default: default:
as_bad (_("bad compressed FUNCT field" as_bad (_("bad compressed FUNCT field"
" specifier 'CF%c'\n"), " specifier 'CF%c'\n"),

11
gas/doc/c-riscv.texi
View File

@ -190,6 +190,7 @@ instruction formats:
@item opcode @tab Unsigned immediate or opcode name for 7-bits opcode. @item opcode @tab Unsigned immediate or opcode name for 7-bits opcode.
@item opcode2 @tab Unsigned immediate or opcode name for 2-bits opcode. @item opcode2 @tab Unsigned immediate or opcode name for 2-bits opcode.
@item func7 @tab Unsigned immediate for 7-bits function code. @item func7 @tab Unsigned immediate for 7-bits function code.
@item func6 @tab Unsigned immediate for 6-bits function code.
@item func4 @tab Unsigned immediate for 4-bits function code. @item func4 @tab Unsigned immediate for 4-bits function code.
@item func3 @tab Unsigned immediate for 3-bits function code. @item func3 @tab Unsigned immediate for 3-bits function code.
@item func2 @tab Unsigned immediate for 2-bits function code. @item func2 @tab Unsigned immediate for 2-bits function code.
@ -355,7 +356,7 @@ with the @samp{.insn} pseudo directive:
31 30 21 20 12 7 0 31 30 21 20 12 7 0
@end verbatim @end verbatim
@item CR type: .insn cr opcode2, func4, rd, rs1 @item CR type: .insn cr opcode2, func4, rd, rs2
@verbatim @verbatim
+---------+--------+-----+---------+ +---------+--------+-----+---------+
| func4 | rd/rs1 | rs2 | opcode2 | | func4 | rd/rs1 | rs2 | opcode2 |
@ -379,6 +380,14 @@ with the @samp{.insn} pseudo directive:
15 13 7 2 0 15 13 7 2 0
@end verbatim @end verbatim
@item CA type: .insn ca opcode2, func6, func2, rd, rs2
@verbatim
+---------+----------+-------+------+--------+
| func6 | rd'/rs1' | func2 | rs2' | opcode |
+---------+----------+-------+------+--------+
15 10 7 5 2 0
@end verbatim
@item CB type: .insn cb opcode2, func3, rs1, symbol @item CB type: .insn cb opcode2, func3, rs1, symbol
@verbatim @verbatim
+---------+--------+------+--------+---------+ +---------+--------+------+--------+---------+

25
gas/testsuite/gas/riscv/insn.d
View File

@ -37,15 +37,16 @@ Disassembly of section .text:
[ ]+4a:[ ]+0511[ ]+addi[ ]+a0,a0,4 [ ]+4a:[ ]+0511[ ]+addi[ ]+a0,a0,4
[ ]+4c:[ ]+852e[ ]+mv[ ]+a0,a1 [ ]+4c:[ ]+852e[ ]+mv[ ]+a0,a1
[ ]+4e:[ ]+002c[ ]+addi[ ]+a1,sp,8 [ ]+4e:[ ]+002c[ ]+addi[ ]+a1,sp,8
[ ]+50:[ ]+d9c5[ ]+beqz[ ]+a1,0 \<target\> [ ]+50:[ ]+8d6d[ ]+and[ ]+a0,a0,a1
[ ]+50: R_RISCV_RVC_BRANCH[ ]+target [ ]+52:[ ]+d5dd[ ]+beqz[ ]+a1,0 \<target\>
[ ]+52:[ ]+b77d[ ]+j[ ]+0 \<target\> [ ]+52: R_RISCV_RVC_BRANCH[ ]+target
[ ]+52: R_RISCV_RVC_JUMP[ ]+target [ ]+54:[ ]+b775[ ]+j[ ]+0 \<target\>
[ ]+54:[ ]+68c58543[ ]+fmadd.s[ ]+fa0,fa1,fa2,fa3,rne [ ]+54: R_RISCV_RVC_JUMP[ ]+target
[ ]+58:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+56:[ ]+68c58543[ ]+fmadd.s[ ]+fa0,fa1,fa2,fa3,rne
[ ]+5c:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+5a:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+60:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+5e:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+64:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+62:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+68:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+66:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+6c:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+6a:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+70:[ ]+00c58533[ ]+add[ ]+a0,a1,a2 [ ]+6e:[ ]+00c58533[ ]+add[ ]+a0,a1,a2
[ ]+72:[ ]+00c58533[ ]+add[ ]+a0,a1,a2

1
gas/testsuite/gas/riscv/insn.s
View File

@ -26,6 +26,7 @@ target:
.insn ci C1, 0x0, a0, 4 .insn ci C1, 0x0, a0, 4
.insn cr C2, 0x8, a0, a1 .insn cr C2, 0x8, a0, a1
.insn ciw C0, 0x0, a1, 1 .insn ciw C0, 0x0, a1, 1
.insn ca C1, 0x23, 0x3, a0, a1
.insn cb C1, 0x6, a1, target .insn cb C1, 0x6, a1, target
.insn cj C1, 0x5, target .insn cj C1, 0x5, target

5
include/ChangeLog
View File

@ -1,3 +1,8 @@
2018-11-27 Jim Wilson <jimw@sifive.com>
* opcode/riscv.h (OP_MASK_CFUNCT6, OP_SH_CFUNCT6): New.
(OP_MASK_CFUNCT2, OP_SH_CFUNCT2): New.
2018-11-13 Thomas Preud'homme <thomas.preudhomme@arm.com> 2018-11-13 Thomas Preud'homme <thomas.preudhomme@arm.com>
* opcode/arm.h (ARM_AEXT_V6M_ONLY): Merge into its use in ARM_AEXT_V6M. * opcode/arm.h (ARM_AEXT_V6M_ONLY): Merge into its use in ARM_AEXT_V6M.

4
include/opcode/riscv.h
View File

@ -247,10 +247,14 @@ static const char * const riscv_pred_succ[16] =
#define OP_MASK_CRS2S 0x7 #define OP_MASK_CRS2S 0x7
#define OP_SH_CRS2S 2 #define OP_SH_CRS2S 2
#define OP_MASK_CFUNCT6 0x3f
#define OP_SH_CFUNCT6 10
#define OP_MASK_CFUNCT4 0xf #define OP_MASK_CFUNCT4 0xf
#define OP_SH_CFUNCT4 12 #define OP_SH_CFUNCT4 12
#define OP_MASK_CFUNCT3 0x7 #define OP_MASK_CFUNCT3 0x7
#define OP_SH_CFUNCT3 13 #define OP_SH_CFUNCT3 13
#define OP_MASK_CFUNCT2 0x3
#define OP_SH_CFUNCT2 5
/* ABI names for selected x-registers. */ /* ABI names for selected x-registers. */

5
opcodes/ChangeLog
View File

@ -1,3 +1,8 @@
2018-11-27 Jim Wilson <jimw@sifive.com>
* riscv-opc.c (ciw): Fix whitespace to align columns.
(ca): New.
2018-11-21 John Darrington <john@darrington.wattle.id.au> 2018-11-21 John Darrington <john@darrington.wattle.id.au>
* s12z-dis.c (print_insn_shift) [SB_REG_REG_N]: Enter special case * s12z-dis.c (print_insn_shift) [SB_REG_REG_N]: Enter special case

9
opcodes/riscv-opc.c
View File

@ -842,8 +842,13 @@ const struct riscv_opcode riscv_insn_types[] =
{"ci", 0, {"C", 0}, "O2,CF3,d,Co", 0, 0, match_opcode, 0 }, {"ci", 0, {"C", 0}, "O2,CF3,d,Co", 0, 0, match_opcode, 0 },
{"ci", 0, {"C", 0}, "O2,CF3,D,Co", 0, 0, match_opcode, 0 }, {"ci", 0, {"C", 0}, "O2,CF3,D,Co", 0, 0, match_opcode, 0 },
{"ciw", 0, {"C", 0}, "O2,CF3,Ct,C8", 0, 0, match_opcode, 0 }, {"ciw", 0, {"C", 0}, "O2,CF3,Ct,C8", 0, 0, match_opcode, 0 },
{"ciw", 0, {"C", 0}, "O2,CF3,CD,C8", 0, 0, match_opcode, 0 }, {"ciw", 0, {"C", 0}, "O2,CF3,CD,C8", 0, 0, match_opcode, 0 },
{"ca", 0, {"C", 0}, "O2,CF6,CF2,Cs,Ct", 0, 0, match_opcode, 0 },
{"ca", 0, {"C", 0}, "O2,CF6,CF2,CS,Ct", 0, 0, match_opcode, 0 },
{"ca", 0, {"C", 0}, "O2,CF6,CF2,Cs,CD", 0, 0, match_opcode, 0 },
{"ca", 0, {"C", 0}, "O2,CF6,CF2,CS,CD", 0, 0, match_opcode, 0 },
{"cb", 0, {"C", 0}, "O2,CF3,Cs,Cp", 0, 0, match_opcode, 0 }, {"cb", 0, {"C", 0}, "O2,CF3,Cs,Cp", 0, 0, match_opcode, 0 },
{"cb", 0, {"C", 0}, "O2,CF3,CS,Cp", 0, 0, match_opcode, 0 }, {"cb", 0, {"C", 0}, "O2,CF3,CS,Cp", 0, 0, match_opcode, 0 },