Re: [PATCH 33/56] disas/riscv: Drop format from DECOMP insns

Alistair <[email protected]>
Newsgroups org.nongnu.qemu-riscv,org.nongnu.qemu-devel
Message-ID <[email protected]> 
On Sun, 2026-08-09 at 15:35 -0700, Richard Henderson wrote:
> The format for these will never be used -- we will use
> the format from the decompressed insn.
> 
> Signed-off-by: Richard Henderson <[email protected]>

Reviewed-by: Alistair Francis <[email protected]>

Alistair

> ---
>  disas/riscv.c | 94 +++++++++++++++++++++++++------------------------
> --
>  1 file changed, 47 insertions(+), 47 deletions(-)
> 
> diff --git a/disas/riscv.c b/disas/riscv.c
> index 129e545c6e..9904b4db03 100644
> --- a/disas/riscv.c
> +++ b/disas/riscv.c
> @@ -1819,52 +1819,52 @@ static const rv_opcode_data rvi_opcode_data[]
> = {
>      { "fcvt.q.lu", rv_codec_r_m, rv_fmt_rm_frd_rs1 },
>      { "fmv.x.q", rv_codec_r, rv_fmt_rd_frs1 },
>      { "fmv.q.x", rv_codec_r, rv_fmt_frd_rs1 },
> -    { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_addi) },
> -    { "c.fld", rv_codec_cl_ld, rv_fmt_frd_offset_rs1,
> DECOMP(rv_op_fld) },
> -    { "c.lw", rv_codec_cl_lw, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lw)
> },
> -    { "c.flw", rv_codec_cl_lw, rv_fmt_frd_offset_rs1,
> DECOMP(rv_op_flw) },
> -    { "c.fsd", rv_codec_cs_sd, rv_fmt_frs2_offset_rs1,
> DECOMP(rv_op_fsd) },
> -    { "c.sw", rv_codec_cs_sw, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sw) },
> -    { "c.fsw", rv_codec_cs_sw, rv_fmt_frs2_offset_rs1,
> DECOMP(rv_op_fsw) },
> +    { "c.addi4spn", rv_codec_ciw_4spn, NULL, DECOMP(rv_op_addi) },
> +    { "c.fld", rv_codec_cl_ld, NULL, DECOMP(rv_op_fld) },
> +    { "c.lw", rv_codec_cl_lw, NULL, DECOMP(rv_op_lw) },
> +    { "c.flw", rv_codec_cl_lw, NULL, DECOMP(rv_op_flw) },
> +    { "c.fsd", rv_codec_cs_sd, NULL, DECOMP(rv_op_fsd) },
> +    { "c.sw", rv_codec_cs_sw, NULL, DECOMP(rv_op_sw) },
> +    { "c.fsw", rv_codec_cs_sw, NULL, DECOMP(rv_op_fsw) },
>      { },
> -    { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi)
> },
> -    { "c.jal", rv_codec_cj_jal, rv_fmt_rd_offset, DECOMP(rv_op_jal)
> },
> -    { "c.li", rv_codec_ci_li, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi)
> },
> -    { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_addi) },
> -    { "c.lui", rv_codec_ci_lui, rv_fmt_rd_uimm, DECOMP(rv_op_lui) },
> -    { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_srli) },
> -    { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_srai) },
> -    { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_andi) },
> -    { "c.sub", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_sub) },
> -    { "c.xor", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_xor) },
> -    { "c.or", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_or) },
> -    { "c.and", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_and) },
> -    { "c.subw", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_subw)
> },
> -    { "c.addw", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_addw)
> },
> -    { "c.j", rv_codec_cj, rv_fmt_rd_offset, DECOMP(rv_op_jal) },
> -    { "c.beqz", rv_codec_cb, rv_fmt_rs1_rs2_offset,
> DECOMP(rv_op_beq) },
> -    { "c.bnez", rv_codec_cb, rv_fmt_rs1_rs2_offset,
> DECOMP(rv_op_bne) },
> -    { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm,
> DECOMP(rv_op_slli) },
> -    { "c.fldsp", rv_codec_ci_ldsp, rv_fmt_frd_offset_rs1,
> DECOMP(rv_op_fld) },
> -    { "c.lwsp", rv_codec_ci_lwsp, rv_fmt_rd_offset_rs1,
> DECOMP(rv_op_lw) },
> -    { "c.flwsp", rv_codec_ci_lwsp, rv_fmt_frd_offset_rs1,
> DECOMP(rv_op_flw) },
> -    { "c.jr", rv_codec_cr_jr, rv_fmt_rd_rs1_offset,
> DECOMP(rv_op_jalr) },
> -    { "c.mv", rv_codec_cr_mv, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_addi)
> },
> -    { "c.ebreak", rv_codec_ci_none, rv_fmt_none,
> DECOMP(rv_op_ebreak) },
> -    { "c.jalr", rv_codec_cr_jalr, rv_fmt_rd_rs1_offset,
> DECOMP(rv_op_jalr) },
> -    { "c.add", rv_codec_cr, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_add) },
> -    { "c.fsdsp", rv_codec_css_sdsp, rv_fmt_frs2_offset_rs1,
> DECOMP(rv_op_fsd) },
> -    { "c.swsp", rv_codec_css_swsp, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sw) },
> -    { "c.fswsp", rv_codec_css_swsp, rv_fmt_frs2_offset_rs1,
> DECOMP(rv_op_fsw) },
> -    { "c.ld", rv_codec_cl_ld, rv_fmt_rd_offset_rs1, DECOMP(rv_op_ld)
> },
> -    { "c.sd", rv_codec_cs_sd, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sd) },
> -    { "c.addiw", rv_codec_ci, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addiw)
> },
> -    { "c.ldsp", rv_codec_ci_ldsp, rv_fmt_rd_offset_rs1,
> DECOMP(rv_op_ld) },
> -    { "c.sdsp", rv_codec_css_sdsp, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sd) },
> -    { "c.lq", rv_codec_cl_lq, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lq)
> },
> -    { "c.sq", rv_codec_cs_sq, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sq) },
> -    { "c.lqsp", rv_codec_ci_lqsp, rv_fmt_rd_offset_rs1,
> DECOMP(rv_op_lq) },
> -    { "c.sqsp", rv_codec_css_sqsp, rv_fmt_rs2_offset_rs1,
> DECOMP(rv_op_sq) },
> +    { "c.addi", rv_codec_ci, NULL, DECOMP(rv_op_addi) },
> +    { "c.jal", rv_codec_cj_jal, NULL, DECOMP(rv_op_jal) },
> +    { "c.li", rv_codec_ci_li, NULL, DECOMP(rv_op_addi) },
> +    { "c.addi16sp", rv_codec_ci_16sp, NULL, DECOMP(rv_op_addi) },
> +    { "c.lui", rv_codec_ci_lui, NULL, DECOMP(rv_op_lui) },
> +    { "c.srli", rv_codec_cb_sh6, NULL, DECOMP(rv_op_srli) },
> +    { "c.srai", rv_codec_cb_sh6, NULL, DECOMP(rv_op_srai) },
> +    { "c.andi", rv_codec_cb_imm, NULL, DECOMP(rv_op_andi) },
> +    { "c.sub", rv_codec_cs, NULL, DECOMP(rv_op_sub) },
> +    { "c.xor", rv_codec_cs, NULL, DECOMP(rv_op_xor) },
> +    { "c.or", rv_codec_cs, NULL, DECOMP(rv_op_or) },
> +    { "c.and", rv_codec_cs, NULL, DECOMP(rv_op_and) },
> +    { "c.subw", rv_codec_cs, NULL, DECOMP(rv_op_subw) },
> +    { "c.addw", rv_codec_cs, NULL, DECOMP(rv_op_addw) },
> +    { "c.j", rv_codec_cj, NULL, DECOMP(rv_op_jal) },
> +    { "c.beqz", rv_codec_cb, NULL, DECOMP(rv_op_beq) },
> +    { "c.bnez", rv_codec_cb, NULL, DECOMP(rv_op_bne) },
> +    { "c.slli", rv_codec_ci_sh6, NULL, DECOMP(rv_op_slli) },
> +    { "c.fldsp", rv_codec_ci_ldsp, NULL, DECOMP(rv_op_fld) },
> +    { "c.lwsp", rv_codec_ci_lwsp, NULL, DECOMP(rv_op_lw) },
> +    { "c.flwsp", rv_codec_ci_lwsp, NULL, DECOMP(rv_op_flw) },
> +    { "c.jr", rv_codec_cr_jr, NULL, DECOMP(rv_op_jalr) },
> +    { "c.mv", rv_codec_cr_mv, NULL, DECOMP(rv_op_addi) },
> +    { "c.ebreak", rv_codec_ci_none, NULL, DECOMP(rv_op_ebreak) },
> +    { "c.jalr", rv_codec_cr_jalr, NULL, DECOMP(rv_op_jalr) },
> +    { "c.add", rv_codec_cr, NULL, DECOMP(rv_op_add) },
> +    { "c.fsdsp", rv_codec_css_sdsp, NULL, DECOMP(rv_op_fsd) },
> +    { "c.swsp", rv_codec_css_swsp, NULL, DECOMP(rv_op_sw) },
> +    { "c.fswsp", rv_codec_css_swsp, NULL, DECOMP(rv_op_fsw) },
> +    { "c.ld", rv_codec_cl_ld, NULL, DECOMP(rv_op_ld) },
> +    { "c.sd", rv_codec_cs_sd, NULL, DECOMP(rv_op_sd) },
> +    { "c.addiw", rv_codec_ci, NULL, DECOMP(rv_op_addiw) },
> +    { "c.ldsp", rv_codec_ci_ldsp, NULL, DECOMP(rv_op_ld) },
> +    { "c.sdsp", rv_codec_css_sdsp, NULL, DECOMP(rv_op_sd) },
> +    { "c.lq", rv_codec_cl_lq, NULL, DECOMP(rv_op_lq) },
> +    { "c.sq", rv_codec_cs_sq, NULL, DECOMP(rv_op_sq) },
> +    { "c.lqsp", rv_codec_ci_lqsp, NULL, DECOMP(rv_op_lq) },
> +    { "c.sqsp", rv_codec_css_sqsp, NULL, DECOMP(rv_op_sq) },
>      { "nop", rv_codec_i, rv_fmt_none },
>      { "mv", rv_codec_i, rv_fmt_rd_rs1 },
>      { "not", rv_codec_i, rv_fmt_rd_rs1 },
> @@ -2546,8 +2546,8 @@ static const rv_opcode_data rvi_opcode_data[] =
> {
>      { "ssrdp", rv_codec_r, rv_fmt_rd },
>      { "ssamoswap.w", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1 },
>      { "ssamoswap.d", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1 },
> -    { "c.sspush", rv_codec_cmop_ss, rv_fmt_rs2, DECOMP(rv_op_sspush)
> },
> -    { "c.sspopchk", rv_codec_cmop_ss, rv_fmt_rs1,
> DECOMP(rv_op_sspopchk) },
> +    { "c.sspush", rv_codec_cmop_ss, NULL, DECOMP(rv_op_sspush) },
> +    { "c.sspopchk", rv_codec_cmop_ss, NULL, DECOMP(rv_op_sspopchk)
> },
>     { "cbo.inval", rv_codec_r, rv_fmt_rs1 },
>     { "cbo.clean", rv_codec_r, rv_fmt_rs1 },
>     { "cbo.flush", rv_codec_r, rv_fmt_rs1 },
lmpx.com only provides a reader for public news (NNTP) servers. It is not affiliated with the servers or forums shown here and is not responsible for the content of articles, which is written by their respective authors.