Skip to content
This repository has been archived by the owner on Aug 17, 2022. It is now read-only.

Commit

Permalink
Update the CRS testcases and remove the expand for 'k'
Browse files Browse the repository at this point in the history 
Update the CRS testcases and remove the expand for 'k',‘zkn’,'zks'.
  • Loading branch information
@pz9115
pz9115 committed Jun 9, 2021
1 parent 104733f commit 3b3c319
Show file tree
Hide file tree
Showing 7 changed files with 8 additions and 60 deletions.
60 changes: 0 additions & 60 deletions bfd/elfxx-riscv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1761,66 +1761,6 @@ riscv_parse_add_implicit_subsets (riscv_parse_subset_t *rps)
riscv_parse_add_subset (rps, "zicsr",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
else if ((riscv_lookup_subset (rps->subset_list, "k", &subset)))
{
riscv_parse_add_subset (rps, "zkg",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkb",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkr",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkne",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zknd",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zknh",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zksed",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zksh",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
}
else if ((riscv_lookup_subset (rps->subset_list, "zkn", &subset)))
{
riscv_parse_add_subset (rps, "zkg",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkb",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkne",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zknd",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zknh",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
}
else if ((riscv_lookup_subset (rps->subset_list, "zks", &subset)))
{
riscv_parse_add_subset (rps, "zkg",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zkb",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zksed",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
riscv_parse_add_subset (rps, "zksh",
RISCV_UNKNOWN_VERSION,
RISCV_UNKNOWN_VERSION, TRUE);
}

if ((riscv_lookup_subset (rps->subset_list, "g", &subset)))
{
Expand Down
3 changes: 3 additions & 0 deletions gas/config/tc-riscv.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,15 @@ static const struct riscv_ext_version ext_version_table[] =
{"zba", ISA_SPEC_CLASS_DRAFT, 0, 93},
{"zbc", ISA_SPEC_CLASS_DRAFT, 0, 93},

{"k", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zkg", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zkb", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zkr", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zkn", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zkne", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zknd", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zknh", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zks", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zksed", ISA_SPEC_CLASS_DRAFT, 0, 90},
{"zksh", ISA_SPEC_CLASS_DRAFT, 0, 90},

Expand Down
1 change: 1 addition & 0 deletions gas/testsuite/gas/riscv/priv-reg-version-1p10.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Disassembly of section .text:
[ ]+[0-9a-f]+:[ ]+f1202573[ ]+csrr[ ]+a0,marchid
[ ]+[0-9a-f]+:[ ]+f1302573[ ]+csrr[ ]+a0,mimpid
[ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid
[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,mentorpy
[ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus
[ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa
[ ]+[0-9a-f]+:[ ]+30202573[ ]+csrr[ ]+a0,medeleg
Expand Down
1 change: 1 addition & 0 deletions gas/testsuite/gas/riscv/priv-reg-version-1p11.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Disassembly of section .text:
[ ]+[0-9a-f]+:[ ]+f1202573[ ]+csrr[ ]+a0,marchid
[ ]+[0-9a-f]+:[ ]+f1302573[ ]+csrr[ ]+a0,mimpid
[ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid
[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,mentorpy
[ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus
[ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa
[ ]+[0-9a-f]+:[ ]+30202573[ ]+csrr[ ]+a0,medeleg
Expand Down
1 change: 1 addition & 0 deletions gas/testsuite/gas/riscv/priv-reg-version-1p9p1.d
View file
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,7 @@ Disassembly of section .text:
[ ]+[0-9a-f]+:[ ]+f1202573[ ]+csrr[ ]+a0,marchid
[ ]+[0-9a-f]+:[ ]+f1302573[ ]+csrr[ ]+a0,mimpid
[ ]+[0-9a-f]+:[ ]+f1402573[ ]+csrr[ ]+a0,mhartid
[ ]+[0-9a-f]+:[ ]+f1502573[ ]+csrr[ ]+a0,mentorpy
[ ]+[0-9a-f]+:[ ]+30002573[ ]+csrr[ ]+a0,mstatus
[ ]+[0-9a-f]+:[ ]+30102573[ ]+csrr[ ]+a0,misa
[ ]+[0-9a-f]+:[ ]+30202573[ ]+csrr[ ]+a0,medeleg
Expand Down
1 change: 1 addition & 0 deletions gas/testsuite/gas/riscv/priv-reg.s
View file
Original file line number Diff line number Diff line change
Expand Up @@ -97,6 +97,7 @@
csr marchid
csr mimpid
csr mhartid
csr mentorpy

csr mstatus
csr misa # 0xf10 in 1.9, but changed to 0x301 since 1.9.1.
Expand Down
1 change: 1 addition & 0 deletions include/opcode/riscv-opc.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1353,6 +1353,7 @@ DECLARE_CSR(mvendorid, CSR_MVENDORID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_S
DECLARE_CSR(marchid, CSR_MARCHID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
DECLARE_CSR(mimpid, CSR_MIMPID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
DECLARE_CSR(mhartid, CSR_MHARTID, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
DECLARE_CSR(mentropy, CSR_MENTROPY, CSR_CLASS_DEBUG, PRIV_SPEC_CLASS_NONE, PRIV_SPEC_CLASS_NONE)
DECLARE_CSR(mstatus, CSR_MSTATUS, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
DECLARE_CSR(misa, CSR_MISA, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
DECLARE_CSR(medeleg, CSR_MEDELEG, CSR_CLASS_I, PRIV_SPEC_CLASS_1P9P1, PRIV_SPEC_CLASS_DRAFT)
Expand Down

0 comments on commit 3b3c319

Please sign in to comment.