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 <christoph.muell...@vrull.eu> --- gcc/config/riscv/riscv-ext.def | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/gcc/config/riscv/riscv-ext.def b/gcc/config/riscv/riscv-ext.def index 6fc6d3886350..09f18adfd452 100644 --- a/gcc/config/riscv/riscv-ext.def +++ b/gcc/config/riscv/riscv-ext.def @@ -80,8 +80,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({}), /* SUPPORTED_VERSIONS */ ({{2, 0}}), /* FLAG_GROUP */ base, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 0, + /* BITMASK_BIT_POSITION*/ 4, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -190,8 +190,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({"zba", "zbb", "zbs"}), /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ base, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 0, + /* BITMASK_BIT_POSITION*/ 1, /* EXTRA_EXTENSION_FLAGS */ EXT_FLAG_MACRO) DEFINE_RISCV_EXT( @@ -216,8 +216,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({}), /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ base, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 0, + /* BITMASK_BIT_POSITION*/ 7, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -398,8 +398,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({}), /* SUPPORTED_VERSIONS */ ({{2, 0}}), /* FLAG_GROUP */ zi, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 1, + /* BITMASK_BIT_POSITION*/ 11, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -464,7 +464,7 @@ DEFINE_RISCV_EXT( /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ zi, /* BITMASK_GROUP_ID */ 1, - /* BITMASK_BIT_POSITION*/ 1, + /* BITMASK_BIT_POSITION*/ 8, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -476,8 +476,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({}), /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ zm, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 1, + /* BITMASK_BIT_POSITION*/ 12, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -787,8 +787,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({"zca"}), /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ zc, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 1, + /* BITMASK_BIT_POSITION*/ 10, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( @@ -813,8 +813,8 @@ DEFINE_RISCV_EXT( /* DEP_EXTS */ ({"zca", "zilsd"}), /* SUPPORTED_VERSIONS */ ({{1, 0}}), /* FLAG_GROUP */ zc, - /* BITMASK_GROUP_ID */ BITMASK_NOT_YET_ALLOCATED, - /* BITMASK_BIT_POSITION*/ BITMASK_NOT_YET_ALLOCATED, + /* BITMASK_GROUP_ID */ 1, + /* BITMASK_BIT_POSITION*/ 9, /* EXTRA_EXTENSION_FLAGS */ 0) DEFINE_RISCV_EXT( -- 2.50.1