disas/riscv: Drop format from DECOMP insns
The format for these will never be used -- we will use the format from the decompressed insn. Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Signed-off-by: Richard Henderson <richard.henderson@linaro.org> Message-ID: <20260812223142.349142-29-richard.henderson@linaro.org> Signed-off-by: Alistair Francis <alistair.francis@wdc.com>
Richard Henderson committed
Aug 12, 2026 at 15:31 UTC
ed3a538849dab7e945a2e76df4bcd6f48898d618
1 file changed
+47
-47
disas/riscv.c
+47
-47
@@ -1819,52 +1819,52 @@ static const rv_opcode_data rvi_opcode_data[] = {
1819
{ "fcvt.q.lu", rv_codec_r_m, rv_fmt_rm_frd_rs1 },
1820
{ "fmv.x.q", rv_codec_r, rv_fmt_rd_frs1 },
1821
{ "fmv.q.x", rv_codec_r, rv_fmt_frd_rs1 },
1822
- { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi) },
1823
- { "c.fld", rv_codec_cl_ld, rv_fmt_frd_offset_rs1, DECOMP(rv_op_fld) },
1824
- { "c.lw", rv_codec_cl_lw, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lw) },
1825
- { "c.flw", rv_codec_cl_lw, rv_fmt_frd_offset_rs1, DECOMP(rv_op_flw) },
1826
- { "c.fsd", rv_codec_cs_sd, rv_fmt_frs2_offset_rs1, DECOMP(rv_op_fsd) },
1827
- { "c.sw", rv_codec_cs_sw, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sw) },
1828
- { "c.fsw", rv_codec_cs_sw, rv_fmt_frs2_offset_rs1, DECOMP(rv_op_fsw) },
1822
+ { "c.addi4spn", rv_codec_ciw_4spn, NULL, DECOMP(rv_op_addi) },
1823
+ { "c.fld", rv_codec_cl_ld, NULL, DECOMP(rv_op_fld) },
1824
+ { "c.lw", rv_codec_cl_lw, NULL, DECOMP(rv_op_lw) },
1825
+ { "c.flw", rv_codec_cl_lw, NULL, DECOMP(rv_op_flw) },
1826
+ { "c.fsd", rv_codec_cs_sd, NULL, DECOMP(rv_op_fsd) },
1827
+ { "c.sw", rv_codec_cs_sw, NULL, DECOMP(rv_op_sw) },
1828
+ { "c.fsw", rv_codec_cs_sw, NULL, DECOMP(rv_op_fsw) },
1829
{ },
1830
- { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi) },
1831
- { "c.jal", rv_codec_cj_jal, rv_fmt_rd_offset, DECOMP(rv_op_jal) },
1832
- { "c.li", rv_codec_ci_li, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi) },
1833
- { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addi) },
1834
- { "c.lui", rv_codec_ci_lui, rv_fmt_rd_uimm, DECOMP(rv_op_lui) },
1835
- { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, DECOMP(rv_op_srli) },
1836
- { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, DECOMP(rv_op_srai) },
1837
- { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, DECOMP(rv_op_andi) },
1838
- { "c.sub", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_sub) },
1839
- { "c.xor", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_xor) },
1840
- { "c.or", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_or) },
1841
- { "c.and", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_and) },
1842
- { "c.subw", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_subw) },
1843
- { "c.addw", rv_codec_cs, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_addw) },
1844
- { "c.j", rv_codec_cj, rv_fmt_rd_offset, DECOMP(rv_op_jal) },
1845
- { "c.beqz", rv_codec_cb, rv_fmt_rs1_rs2_offset, DECOMP(rv_op_beq) },
1846
- { "c.bnez", rv_codec_cb, rv_fmt_rs1_rs2_offset, DECOMP(rv_op_bne) },
1847
- { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, DECOMP(rv_op_slli) },
1848
- { "c.fldsp", rv_codec_ci_ldsp, rv_fmt_frd_offset_rs1, DECOMP(rv_op_fld) },
1849
- { "c.lwsp", rv_codec_ci_lwsp, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lw) },
1850
- { "c.flwsp", rv_codec_ci_lwsp, rv_fmt_frd_offset_rs1, DECOMP(rv_op_flw) },
1851
- { "c.jr", rv_codec_cr_jr, rv_fmt_rd_rs1_offset, DECOMP(rv_op_jalr) },
1852
- { "c.mv", rv_codec_cr_mv, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_addi) },
1853
- { "c.ebreak", rv_codec_ci_none, rv_fmt_none, DECOMP(rv_op_ebreak) },
1854
- { "c.jalr", rv_codec_cr_jalr, rv_fmt_rd_rs1_offset, DECOMP(rv_op_jalr) },
1855
- { "c.add", rv_codec_cr, rv_fmt_rd_rs1_rs2, DECOMP(rv_op_add) },
1856
- { "c.fsdsp", rv_codec_css_sdsp, rv_fmt_frs2_offset_rs1, DECOMP(rv_op_fsd) },
1857
- { "c.swsp", rv_codec_css_swsp, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sw) },
1858
- { "c.fswsp", rv_codec_css_swsp, rv_fmt_frs2_offset_rs1, DECOMP(rv_op_fsw) },
1859
- { "c.ld", rv_codec_cl_ld, rv_fmt_rd_offset_rs1, DECOMP(rv_op_ld) },
1860
- { "c.sd", rv_codec_cs_sd, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sd) },
1861
- { "c.addiw", rv_codec_ci, rv_fmt_rd_rs1_imm, DECOMP(rv_op_addiw) },
1862
- { "c.ldsp", rv_codec_ci_ldsp, rv_fmt_rd_offset_rs1, DECOMP(rv_op_ld) },
1863
- { "c.sdsp", rv_codec_css_sdsp, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sd) },
1864
- { "c.lq", rv_codec_cl_lq, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lq) },
1865
- { "c.sq", rv_codec_cs_sq, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sq) },
1866
- { "c.lqsp", rv_codec_ci_lqsp, rv_fmt_rd_offset_rs1, DECOMP(rv_op_lq) },
1867
- { "c.sqsp", rv_codec_css_sqsp, rv_fmt_rs2_offset_rs1, DECOMP(rv_op_sq) },
1830
+ { "c.addi", rv_codec_ci, NULL, DECOMP(rv_op_addi) },
1831
+ { "c.jal", rv_codec_cj_jal, NULL, DECOMP(rv_op_jal) },
1832
+ { "c.li", rv_codec_ci_li, NULL, DECOMP(rv_op_addi) },
1833
+ { "c.addi16sp", rv_codec_ci_16sp, NULL, DECOMP(rv_op_addi) },
1834
+ { "c.lui", rv_codec_ci_lui, NULL, DECOMP(rv_op_lui) },
1835
+ { "c.srli", rv_codec_cb_sh6, NULL, DECOMP(rv_op_srli) },
1836
+ { "c.srai", rv_codec_cb_sh6, NULL, DECOMP(rv_op_srai) },
1837
+ { "c.andi", rv_codec_cb_imm, NULL, DECOMP(rv_op_andi) },
1838
+ { "c.sub", rv_codec_cs, NULL, DECOMP(rv_op_sub) },
1839
+ { "c.xor", rv_codec_cs, NULL, DECOMP(rv_op_xor) },
1840
+ { "c.or", rv_codec_cs, NULL, DECOMP(rv_op_or) },
1841
+ { "c.and", rv_codec_cs, NULL, DECOMP(rv_op_and) },
1842
+ { "c.subw", rv_codec_cs, NULL, DECOMP(rv_op_subw) },
1843
+ { "c.addw", rv_codec_cs, NULL, DECOMP(rv_op_addw) },
1844
+ { "c.j", rv_codec_cj, NULL, DECOMP(rv_op_jal) },
1845
+ { "c.beqz", rv_codec_cb, NULL, DECOMP(rv_op_beq) },
1846
+ { "c.bnez", rv_codec_cb, NULL, DECOMP(rv_op_bne) },
1847
+ { "c.slli", rv_codec_ci_sh6, NULL, DECOMP(rv_op_slli) },
1848
+ { "c.fldsp", rv_codec_ci_ldsp, NULL, DECOMP(rv_op_fld) },
1849
+ { "c.lwsp", rv_codec_ci_lwsp, NULL, DECOMP(rv_op_lw) },
1850
+ { "c.flwsp", rv_codec_ci_lwsp, NULL, DECOMP(rv_op_flw) },
1851
+ { "c.jr", rv_codec_cr_jr, NULL, DECOMP(rv_op_jalr) },
1852
+ { "c.mv", rv_codec_cr_mv, NULL, DECOMP(rv_op_addi) },
1853
+ { "c.ebreak", rv_codec_ci_none, NULL, DECOMP(rv_op_ebreak) },
1854
+ { "c.jalr", rv_codec_cr_jalr, NULL, DECOMP(rv_op_jalr) },
1855
+ { "c.add", rv_codec_cr, NULL, DECOMP(rv_op_add) },
1856
+ { "c.fsdsp", rv_codec_css_sdsp, NULL, DECOMP(rv_op_fsd) },
1857
+ { "c.swsp", rv_codec_css_swsp, NULL, DECOMP(rv_op_sw) },
1858
+ { "c.fswsp", rv_codec_css_swsp, NULL, DECOMP(rv_op_fsw) },
1859
+ { "c.ld", rv_codec_cl_ld, NULL, DECOMP(rv_op_ld) },
1860
+ { "c.sd", rv_codec_cs_sd, NULL, DECOMP(rv_op_sd) },
1861
+ { "c.addiw", rv_codec_ci, NULL, DECOMP(rv_op_addiw) },
1862
+ { "c.ldsp", rv_codec_ci_ldsp, NULL, DECOMP(rv_op_ld) },
1863
+ { "c.sdsp", rv_codec_css_sdsp, NULL, DECOMP(rv_op_sd) },
1864
+ { "c.lq", rv_codec_cl_lq, NULL, DECOMP(rv_op_lq) },
1865
+ { "c.sq", rv_codec_cs_sq, NULL, DECOMP(rv_op_sq) },
1866
+ { "c.lqsp", rv_codec_ci_lqsp, NULL, DECOMP(rv_op_lq) },
1867
+ { "c.sqsp", rv_codec_css_sqsp, NULL, DECOMP(rv_op_sq) },
1868
{ "nop", rv_codec_i, rv_fmt_none },
1869
{ "mv", rv_codec_i, rv_fmt_rd_rs1 },
1870
{ "not", rv_codec_i, rv_fmt_rd_rs1 },
@@ -2546,8 +2546,8 @@ static const rv_opcode_data rvi_opcode_data[] = {
2546
{ "ssrdp", rv_codec_r, rv_fmt_rd },
2547
{ "ssamoswap.w", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1 },
2548
{ "ssamoswap.d", rv_codec_r_a, rv_fmt_aqrl_rd_rs2_rs1 },
2549
- { "c.sspush", rv_codec_cmop_ss, rv_fmt_rs2, DECOMP(rv_op_sspush) },
2550
- { "c.sspopchk", rv_codec_cmop_ss, rv_fmt_rs1, DECOMP(rv_op_sspopchk) },
2549
+ { "c.sspush", rv_codec_cmop_ss, NULL, DECOMP(rv_op_sspush) },
2550
+ { "c.sspopchk", rv_codec_cmop_ss, NULL, DECOMP(rv_op_sspopchk) },
2551
{ "cbo.inval", rv_codec_r, rv_fmt_rs1 },
2552
{ "cbo.clean", rv_codec_r, rv_fmt_rs1 },
2553
{ "cbo.flush", rv_codec_r, rv_fmt_rs1 },