Skip to content

Commit 7ac42d3

Browse files
committed
RISC-V: riscv-ext.def: Add allocated group IDs and group bit positions
The riscv-c-api-doc defines a group ID and and a bit position for some extension. Most of them are set in riscv-ext.def, but some are missing and one bit position (for Zilsd) is wrong. This patch replaces the `BITMASK_NOT_YET_ALLOCATED` value for the actual allocated value wherever possible and fixes the bit position for Zilsd. Currently, we don't have any infrastructure to utilize the information that is placed into riscv_ext_info_t::m_bitmask_group_id and riscv_ext_info_t::m_bitmask_group_bit_pos. This also means we can't test. gcc/ChangeLog: * config/riscv/riscv-ext.def: Add allocated group IDs and group bit positions. Signed-off-by: Christoph Müllner <[email protected]>
1 parent 13516af commit 7ac42d3

File tree

1 file changed

+15
-15
lines changed

1 file changed

+15
-15
lines changed

gcc/config/riscv/riscv-ext.def

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,8 @@ DEFINE_RISCV_EXT(
8080
/* DEP_EXTS */ ({}),
8181
/* SUPPORTED_VERSIONS */ ({{2, 0}}),
8282
/* FLAG_GROUP */ base,
83-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
84-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
83+
/* BITMASK_GROUP_ID */ 0,
84+
/* BITMASK_BIT_POSITION*/ 4,
8585
/* EXTRA_EXTENSION_FLAGS */ 0)
8686

8787
DEFINE_RISCV_EXT(
@@ -190,8 +190,8 @@ DEFINE_RISCV_EXT(
190190
/* DEP_EXTS */ ({"zba", "zbb", "zbs"}),
191191
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
192192
/* FLAG_GROUP */ base,
193-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
194-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
193+
/* BITMASK_GROUP_ID */ 0,
194+
/* BITMASK_BIT_POSITION*/ 1,
195195
/* EXTRA_EXTENSION_FLAGS */ EXT_FLAG_MACRO)
196196

197197
DEFINE_RISCV_EXT(
@@ -216,8 +216,8 @@ DEFINE_RISCV_EXT(
216216
/* DEP_EXTS */ ({}),
217217
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
218218
/* FLAG_GROUP */ base,
219-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
220-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
219+
/* BITMASK_GROUP_ID */ 0,
220+
/* BITMASK_BIT_POSITION*/ 7,
221221
/* EXTRA_EXTENSION_FLAGS */ 0)
222222

223223
DEFINE_RISCV_EXT(
@@ -398,8 +398,8 @@ DEFINE_RISCV_EXT(
398398
/* DEP_EXTS */ ({}),
399399
/* SUPPORTED_VERSIONS */ ({{2, 0}}),
400400
/* FLAG_GROUP */ zi,
401-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
402-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
401+
/* BITMASK_GROUP_ID */ 1,
402+
/* BITMASK_BIT_POSITION*/ 11,
403403
/* EXTRA_EXTENSION_FLAGS */ 0)
404404

405405
DEFINE_RISCV_EXT(
@@ -464,7 +464,7 @@ DEFINE_RISCV_EXT(
464464
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
465465
/* FLAG_GROUP */ zi,
466466
/* BITMASK_GROUP_ID */ 1,
467-
/* BITMASK_BIT_POSITION*/ 1,
467+
/* BITMASK_BIT_POSITION*/ 8,
468468
/* EXTRA_EXTENSION_FLAGS */ 0)
469469

470470
DEFINE_RISCV_EXT(
@@ -476,8 +476,8 @@ DEFINE_RISCV_EXT(
476476
/* DEP_EXTS */ ({}),
477477
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
478478
/* FLAG_GROUP */ zm,
479-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
480-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
479+
/* BITMASK_GROUP_ID */ 1,
480+
/* BITMASK_BIT_POSITION*/ 12,
481481
/* EXTRA_EXTENSION_FLAGS */ 0)
482482

483483
DEFINE_RISCV_EXT(
@@ -787,8 +787,8 @@ DEFINE_RISCV_EXT(
787787
/* DEP_EXTS */ ({"zca"}),
788788
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
789789
/* FLAG_GROUP */ zc,
790-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
791-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
790+
/* BITMASK_GROUP_ID */ 1,
791+
/* BITMASK_BIT_POSITION*/ 10,
792792
/* EXTRA_EXTENSION_FLAGS */ 0)
793793

794794
DEFINE_RISCV_EXT(
@@ -813,8 +813,8 @@ DEFINE_RISCV_EXT(
813813
/* DEP_EXTS */ ({"zca", "zilsd"}),
814814
/* SUPPORTED_VERSIONS */ ({{1, 0}}),
815815
/* FLAG_GROUP */ zc,
816-
/* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED,
817-
/* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED,
816+
/* BITMASK_GROUP_ID */ 1,
817+
/* BITMASK_BIT_POSITION*/ 9,
818818
/* EXTRA_EXTENSION_FLAGS */ 0)
819819

820820
DEFINE_RISCV_EXT(

0 commit comments

Comments
 (0)