On Sun, 2026-08-09 at 15:35 -0700, Richard Henderson wrote: > This allows each opcode table to be private to the decode file. > > Signed-off-by: Richard Henderson <[email protected]>
Reviewed-by: Alistair Francis <[email protected]> Alistair > --- > disas/riscv-xlrbr.h | 2 -- > disas/riscv-xthead.h | 2 -- > disas/riscv-xventana.h | 2 -- > disas/riscv-xlrbr.c | 4 +++- > disas/riscv-xthead.c | 13 ++++++++++++- > disas/riscv-xventana.c | 3 ++- > disas/riscv.c | 34 +++++++++++++++++----------------- > 7 files changed, 34 insertions(+), 26 deletions(-) > > diff --git a/disas/riscv-xlrbr.h b/disas/riscv-xlrbr.h > index 939a69ea6d..ebf3d4c133 100644 > --- a/disas/riscv-xlrbr.h > +++ b/disas/riscv-xlrbr.h > @@ -12,8 +12,6 @@ > > #include "disas/riscv.h" > > -extern const rv_opcode_data rv_xlrbr_opcode_data[]; > - > void decode_xlrbr(rv_decode *, rv_isa); > > #endif /* DISAS_RISCV_XLRBR_H */ > diff --git a/disas/riscv-xthead.h b/disas/riscv-xthead.h > index fcd42746e7..0c65c8e0af 100644 > --- a/disas/riscv-xthead.h > +++ b/disas/riscv-xthead.h > @@ -11,8 +11,6 @@ > > #include "disas/riscv.h" > > -extern const rv_opcode_data xthead_opcode_data[]; > - > void decode_xtheadba(rv_decode *, rv_isa); > void decode_xtheadbb(rv_decode *, rv_isa); > void decode_xtheadbs(rv_decode *, rv_isa); > diff --git a/disas/riscv-xventana.h b/disas/riscv-xventana.h > index 72be9ffa16..1006c3be00 100644 > --- a/disas/riscv-xventana.h > +++ b/disas/riscv-xventana.h > @@ -11,8 +11,6 @@ > > #include "disas/riscv.h" > > -extern const rv_opcode_data ventana_opcode_data[]; > - > void decode_xventanacondops(rv_decode*, rv_isa); > > #endif /* DISAS_RISCV_XVENTANA_H */ > diff --git a/disas/riscv-xlrbr.c b/disas/riscv-xlrbr.c > index 57cb434523..f61028fce9 100644 > --- a/disas/riscv-xlrbr.c > +++ b/disas/riscv-xlrbr.c > @@ -24,7 +24,7 @@ typedef enum { > rv_op_crc32c_d = 8, > } rv_xlrbr_op; > > -const rv_opcode_data rv_xlrbr_opcode_data[] = { > +static const rv_opcode_data xlrbr_opcode_data[] = { > { "illegal", rv_codec_illegal, rv_fmt_none, NULL, 0, 0, 0 }, > { "crc32.b", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 }, > { "crc32.h", rv_codec_r, rv_fmt_rd_rs1, NULL, 0, 0, 0 }, > @@ -75,5 +75,7 @@ void decode_xlrbr(rv_decode *dec, rv_isa isa) > } > break; > } > + > + dec->opcode_data = xlrbr_opcode_data; > dec->op = op; > } > diff --git a/disas/riscv-xthead.c b/disas/riscv-xthead.c > index 2f2ddb8dd9..96f80bc8e5 100644 > --- a/disas/riscv-xthead.c > +++ b/disas/riscv-xthead.c > @@ -127,7 +127,7 @@ typedef enum { > rv_op_th_sync_s, > } rv_xthead_op; > > -const rv_opcode_data xthead_opcode_data[] = { > +static const rv_opcode_data xthead_opcode_data[] = { > { "th.illegal", rv_codec_illegal, rv_fmt_none, NULL, 0, 0, 0 }, > /* XTheadBa */ > { "th.addsl", rv_codec_r_imm2, rv_fmt_rd_rs1_rs2_imm, NULL, 0, > 0, 0 }, > @@ -272,6 +272,7 @@ void decode_xtheadba(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -330,6 +331,7 @@ void decode_xtheadbb(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -356,6 +358,7 @@ void decode_xtheadbs(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -434,6 +437,7 @@ void decode_xtheadcmo(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -461,6 +465,7 @@ void decode_xtheadcondmov(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -498,6 +503,7 @@ void decode_xtheadfmemidx(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -533,6 +539,7 @@ void decode_xtheadfmv(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -564,6 +571,7 @@ void decode_xtheadmac(rv_decode *dec, rv_isa isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -638,6 +646,7 @@ void decode_xtheadmemidx(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -672,6 +681,7 @@ void decode_xtheadmempair(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > > @@ -706,5 +716,6 @@ void decode_xtheadsync(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = xthead_opcode_data; > dec->op = op; > } > diff --git a/disas/riscv-xventana.c b/disas/riscv-xventana.c > index cd694f15f3..4539173d95 100644 > --- a/disas/riscv-xventana.c > +++ b/disas/riscv-xventana.c > @@ -14,7 +14,7 @@ typedef enum { > ventana_op_vt_maskcn = 2, > } rv_ventana_op; > > -const rv_opcode_data ventana_opcode_data[] = { > +static const rv_opcode_data ventana_opcode_data[] = { > { "vt.illegal", rv_codec_illegal, rv_fmt_none, NULL, 0, 0, 0 }, > { "vt.maskc", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 }, > { "vt.maskcn", rv_codec_r, rv_fmt_rd_rs1_rs2, NULL, 0, 0, 0 }, > @@ -38,5 +38,6 @@ void decode_xventanacondops(rv_decode *dec, rv_isa > isa) > break; > } > > + dec->opcode_data = ventana_opcode_data; > dec->op = op; > } > diff --git a/disas/riscv.c b/disas/riscv.c > index 9880b8de20..eb6d132a2c 100644 > --- a/disas/riscv.c > +++ b/disas/riscv.c > @@ -1656,7 +1656,7 @@ static uint32_t operand_lpl(rv_inst inst) > > /* instruction metadata */ > > -const rv_opcode_data rvi_opcode_data[] = { > +static const rv_opcode_data rvi_opcode_data[] = { > { "illegal", rv_codec_illegal, rv_fmt_none, NULL, 0, 0, 0 }, > { "lui", rv_codec_u, rv_fmt_rd_uimm, NULL, 0, 0, 0 }, > { "auipc", rv_codec_u, rv_fmt_rd_uoffset, NULL, 0, 0, 0 }, > @@ -2948,6 +2948,7 @@ static void decode_inst_opcode(rv_decode *dec, > rv_isa isa) > { > rv_inst inst = dec->inst; > rv_opcode op = rv_op_illegal; > + > switch ((inst >> 0) & 0b11) { > case 0: > switch ((inst >> 13) & 0b111) { > @@ -4590,6 +4591,8 @@ static void decode_inst_opcode(rv_decode *dec, > rv_isa isa) > } > break; > } > + > + dec->opcode_data = rvi_opcode_data; > dec->op = op; > } > > @@ -5421,33 +5424,30 @@ static GString *disasm_inst(rv_isa isa, > uint64_t pc, rv_inst inst, > }; > const rv_opcode_data *op; > > - dec.opcode_data = rvi_opcode_data; > decode_inst_opcode(&dec, isa); > > if (dec.op == rv_op_illegal && cfg) { > static const struct { > bool (*guard_func)(const RISCVCPUConfig *); > - const rv_opcode_data *opcode_data; > void (*decode_func)(rv_decode *, rv_isa); > } decoders[] = { > - { has_xtheadba_p, xthead_opcode_data, decode_xtheadba }, > - { has_xtheadbb_p, xthead_opcode_data, decode_xtheadbb }, > - { has_xtheadbs_p, xthead_opcode_data, decode_xtheadbs }, > - { has_xtheadcmo_p, xthead_opcode_data, decode_xtheadcmo > }, > - { has_xtheadcondmov_p, xthead_opcode_data, > decode_xtheadcondmov }, > - { has_xtheadfmemidx_p, xthead_opcode_data, > decode_xtheadfmemidx }, > - { has_xtheadfmv_p, xthead_opcode_data, decode_xtheadfmv > }, > - { has_xtheadmac_p, xthead_opcode_data, decode_xtheadmac > }, > - { has_xtheadmemidx_p, xthead_opcode_data, > decode_xtheadmemidx }, > - { has_xtheadmempair_p, xthead_opcode_data, > decode_xtheadmempair }, > - { has_xtheadsync_p, xthead_opcode_data, > decode_xtheadsync }, > - { has_XVentanaCondOps_p, ventana_opcode_data, > decode_xventanacondops }, > - { has_xlrbr_p, rv_xlrbr_opcode_data, decode_xlrbr }, > + { has_xtheadba_p, decode_xtheadba }, > + { has_xtheadbb_p, decode_xtheadbb }, > + { has_xtheadbs_p, decode_xtheadbs }, > + { has_xtheadcmo_p, decode_xtheadcmo }, > + { has_xtheadcondmov_p, decode_xtheadcondmov }, > + { has_xtheadfmemidx_p, decode_xtheadfmemidx }, > + { has_xtheadfmv_p, decode_xtheadfmv }, > + { has_xtheadmac_p, decode_xtheadmac }, > + { has_xtheadmemidx_p, decode_xtheadmemidx }, > + { has_xtheadmempair_p, decode_xtheadmempair }, > + { has_xtheadsync_p, decode_xtheadsync }, > + { has_XVentanaCondOps_p, decode_xventanacondops }, > + { has_xlrbr_p, decode_xlrbr }, > }; > > for (size_t i = 0; i < ARRAY_SIZE(decoders); i++) { > if (decoders[i].guard_func(cfg)) { > - dec.opcode_data = decoders[i].opcode_data; > decoders[i].decode_func(&dec, isa); > if (dec.op != rv_op_illegal) { > break;
