[PATCH 3/7] include: sbi: Add GET_RDS_NUM/SET(_FP32/_FP64)_RDS macros

[Anup Patel]

On Tue, Feb 10, 2026 at 3:12 PM Bo Gan <ganboing at gmail.com> wrote:
>
> These macros can be used to decode rd' and set rd' in RVC instructions
>
> Signed-off-by: Bo Gan <ganboing at gmail.com>

LGTM.

Reviewed-by: Anup Patel <anup at brainfault.org>

Regards,
Anup

> ---
>  include/sbi/riscv_encoding.h |  1 +
>  include/sbi/riscv_fp.h       | 24 ++++++++++++++++++------
>  include/sbi/sbi_trap.h       |  1 +
>  3 files changed, 20 insertions(+), 6 deletions(-)
>
> diff --git a/include/sbi/riscv_encoding.h b/include/sbi/riscv_encoding.h
> index 8ab59abe..064ba9d1 100644
> --- a/include/sbi/riscv_encoding.h
> +++ b/include/sbi/riscv_encoding.h
> @@ -1414,6 +1414,7 @@
>  #define GET_RS2S_NUM(insn)             RVC_RS2S(insn)
>  #define GET_RS2C_NUM(insn)             RVC_RS2(insn)
>  #define GET_RD_NUM(insn)               ((insn & MASK_RD) >> SH_RD)
> +#define GET_RDS_NUM(insn)              RVC_RS2S(insn)
>  #define GET_CSR_NUM(insn)              ((insn & MASK_CSR) >> SHIFT_CSR)
>  #define GET_AQRL(insn)                 ((insn & MASK_AQRL) >> SHIFT_AQRL)
>
> diff --git a/include/sbi/riscv_fp.h b/include/sbi/riscv_fp.h
> index f523c56e..03011af9 100644
> --- a/include/sbi/riscv_fp.h
> +++ b/include/sbi/riscv_fp.h
> @@ -91,15 +91,27 @@
>  #define GET_F64_RS1(insn, regs) (GET_F64_REG(insn, 15, regs))
>  #define GET_F64_RS2(insn, regs) (GET_F64_REG(insn, 20, regs))
>  #define GET_F64_RS3(insn, regs) (GET_F64_REG(insn, 27, regs))
> -#define SET_F32_RD(insn, regs, val) \
> -       (SET_F32_REG(insn, 7, regs, val), SET_FS_DIRTY(regs))
> -#define SET_F64_RD(insn, regs, val) \
> -       (SET_F64_REG(insn, 7, regs, val), SET_FS_DIRTY(regs))
> +#define SET_F32_RD(insn, regs, val) do {       \
> +       SET_F32_REG(insn, 7, regs, val);        \
> +       SET_FS_DIRTY(regs);                     \
> +} while(0)
> +#define SET_F64_RD(insn, regs, val) do {       \
> +       SET_F64_REG(insn, 7, regs, val);        \
> +       SET_FS_DIRTY(regs);                     \
> +} while(0)
>
>  #define GET_F32_RS2C(insn, regs) (GET_F32_REG(insn, 2, regs))
> -#define GET_F32_RS2S(insn, regs) (GET_F32_REG(RVC_RS2S(insn), 0, regs))
> +#define GET_F32_RS2S(insn, regs) (GET_F32_REG(GET_RS2S_NUM(insn), 0, regs))
>  #define GET_F64_RS2C(insn, regs) (GET_F64_REG(insn, 2, regs))
> -#define GET_F64_RS2S(insn, regs) (GET_F64_REG(RVC_RS2S(insn), 0, regs))
> +#define GET_F64_RS2S(insn, regs) (GET_F64_REG(GET_RS2S_NUM(insn), 0, regs))
> +#define SET_F32_RDS(insn, regs, val) do {              \
> +       SET_F32_REG(GET_RDS_NUM(insn), 0, regs, val);   \
> +       SET_FS_DIRTY(regs);                             \
> +} while(0)
> +#define SET_F64_RDS(insn, regs, val) do {              \
> +       SET_F64_REG(GET_RDS_NUM(insn), 0, regs, val);   \
> +       SET_FS_DIRTY(regs);                             \
> +} while(0)
>
>  #endif
>
> diff --git a/include/sbi/sbi_trap.h b/include/sbi/sbi_trap.h
> index 4ef672f4..816e93c8 100644
> --- a/include/sbi/sbi_trap.h
> +++ b/include/sbi/sbi_trap.h
> @@ -218,6 +218,7 @@ _Static_assert(
>  #define GET_RS2S(insn, regs)           REG_VAL(GET_RS2S_NUM(insn), regs)
>  #define GET_RS2C(insn, regs)           REG_VAL(GET_RS2C_NUM(insn), regs)
>  #define SET_RD(insn, regs, val)                (REG_VAL(GET_RD_NUM(insn), regs) = (val))
> +#define SET_RDS(insn, regs, val)       (REG_VAL(GET_RDS_NUM(insn), regs) = (val))
>
>  /** Representation of trap details */
>  struct sbi_trap_info {
> --
> 2.34.1
>