[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [PATCH v2 8/8] disas/riscv.c: Remove redundant parentheses
|
From: |
Alistair Francis |
|
Subject: |
Re: [PATCH v2 8/8] disas/riscv.c: Remove redundant parentheses |
|
Date: |
Fri, 26 May 2023 11:26:20 +1000 |
On Tue, May 23, 2023 at 7:38 PM Weiwei Li <liweiwei@iscas.ac.cn> wrote:
>
> Remove redundant parenthese and fix multi-line comments.
>
> Signed-off-by: Weiwei Li <liweiwei@iscas.ac.cn>
> Signed-off-by: Junqiang Wang <wangjunqiang@iscas.ac.cn>
> Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
Acked-by: Alistair Francis <alistair.francis@wdc.com>
Alistair
> ---
> disas/riscv.c | 219 +++++++++++++++++++++++++-------------------------
> 1 file changed, 110 insertions(+), 109 deletions(-)
>
> diff --git a/disas/riscv.c b/disas/riscv.c
> index e5d3cefd17..5b9205ab9b 100644
> --- a/disas/riscv.c
> +++ b/disas/riscv.c
> @@ -2386,9 +2386,9 @@ 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)) {
> + switch ((inst >> 0) & 0b11) {
> case 0:
> - switch (((inst >> 13) & 0b111)) {
> + switch ((inst >> 13) & 0b111) {
> case 0: op = rv_op_c_addi4spn; break;
> case 1:
> if (isa == rv128) {
> @@ -2441,9 +2441,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 1:
> - switch (((inst >> 13) & 0b111)) {
> + switch ((inst >> 13) & 0b111) {
> case 0:
> - switch (((inst >> 2) & 0b11111111111)) {
> + switch ((inst >> 2) & 0b11111111111) {
> case 0: op = rv_op_c_nop; break;
> default: op = rv_op_c_addi; break;
> }
> @@ -2457,13 +2457,13 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> break;
> case 2: op = rv_op_c_li; break;
> case 3:
> - switch (((inst >> 7) & 0b11111)) {
> + switch ((inst >> 7) & 0b11111) {
> case 2: op = rv_op_c_addi16sp; break;
> default: op = rv_op_c_lui; break;
> }
> break;
> case 4:
> - switch (((inst >> 10) & 0b11)) {
> + switch ((inst >> 10) & 0b11) {
> case 0:
> op = rv_op_c_srli;
> break;
> @@ -2500,7 +2500,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 2:
> - switch (((inst >> 13) & 0b111)) {
> + switch ((inst >> 13) & 0b111) {
> case 0:
> op = rv_op_c_slli;
> break;
> @@ -2520,17 +2520,17 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 4:
> - switch (((inst >> 12) & 0b1)) {
> + switch ((inst >> 12) & 0b1) {
> case 0:
> - switch (((inst >> 2) & 0b11111)) {
> + switch ((inst >> 2) & 0b11111) {
> case 0: op = rv_op_c_jr; break;
> default: op = rv_op_c_mv; break;
> }
> break;
> case 1:
> - switch (((inst >> 2) & 0b11111)) {
> + switch ((inst >> 2) & 0b11111) {
> case 0:
> - switch (((inst >> 7) & 0b11111)) {
> + switch ((inst >> 7) & 0b11111) {
> case 0: op = rv_op_c_ebreak; break;
> default: op = rv_op_c_jalr; break;
> }
> @@ -2604,9 +2604,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 3:
> - switch (((inst >> 2) & 0b11111)) {
> + switch ((inst >> 2) & 0b11111) {
> case 0:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_lb; break;
> case 1: op = rv_op_lh; break;
> case 2: op = rv_op_lw; break;
> @@ -2618,17 +2618,17 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 1:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b111111111111)) {
> + switch ((inst >> 20) & 0b111111111111) {
> case 40: op = rv_op_vl1re8_v; break;
> case 552: op = rv_op_vl2re8_v; break;
> case 1576: op = rv_op_vl4re8_v; break;
> case 3624: op = rv_op_vl8re8_v; break;
> }
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vle8_v; break;
> case 11: op = rv_op_vlm_v; break;
> case 16: op = rv_op_vle8ff_v; break;
> @@ -2643,15 +2643,15 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 3: op = rv_op_fld; break;
> case 4: op = rv_op_flq; break;
> case 5:
> - switch (((inst >> 20) & 0b111111111111)) {
> + switch ((inst >> 20) & 0b111111111111) {
> case 40: op = rv_op_vl1re16_v; break;
> case 552: op = rv_op_vl2re16_v; break;
> case 1576: op = rv_op_vl4re16_v; break;
> case 3624: op = rv_op_vl8re16_v; break;
> }
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vle16_v; break;
> case 16: op = rv_op_vle16ff_v; break;
> }
> @@ -2662,15 +2662,15 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 6:
> - switch (((inst >> 20) & 0b111111111111)) {
> + switch ((inst >> 20) & 0b111111111111) {
> case 40: op = rv_op_vl1re32_v; break;
> case 552: op = rv_op_vl2re32_v; break;
> case 1576: op = rv_op_vl4re32_v; break;
> case 3624: op = rv_op_vl8re32_v; break;
> }
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vle32_v; break;
> case 16: op = rv_op_vle32ff_v; break;
> }
> @@ -2681,15 +2681,15 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 7:
> - switch (((inst >> 20) & 0b111111111111)) {
> + switch ((inst >> 20) & 0b111111111111) {
> case 40: op = rv_op_vl1re64_v; break;
> case 552: op = rv_op_vl2re64_v; break;
> case 1576: op = rv_op_vl4re64_v; break;
> case 3624: op = rv_op_vl8re64_v; break;
> }
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vle64_v; break;
> case 16: op = rv_op_vle64ff_v; break;
> }
> @@ -2702,25 +2702,25 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 3:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fence; break;
> case 1: op = rv_op_fence_i; break;
> case 2: op = rv_op_lq; break;
> }
> break;
> case 4:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_addi; break;
> case 1:
> - switch (((inst >> 27) & 0b11111)) {
> + switch ((inst >> 27) & 0b11111) {
> case 0b00000: op = rv_op_slli; break;
> case 0b00001:
> - switch (((inst >> 20) & 0b1111111)) {
> + switch ((inst >> 20) & 0b1111111) {
> case 0b0001111: op = rv_op_zip; break;
> }
> break;
> case 0b00010:
> - switch (((inst >> 20) & 0b1111111)) {
> + switch ((inst >> 20) & 0b1111111) {
> case 0b0000000: op = rv_op_sha256sum0; break;
> case 0b0000001: op = rv_op_sha256sum1; break;
> case 0b0000010: op = rv_op_sha256sig0; break;
> @@ -2735,7 +2735,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> break;
> case 0b00101: op = rv_op_bseti; break;
> case 0b00110:
> - switch (((inst >> 20) & 0b1111111)) {
> + switch ((inst >> 20) & 0b1111111) {
> case 0b0000000: op = rv_op_aes64im; break;
> default:
> if (((inst >> 24) & 0b0111) == 0b001) {
> @@ -2747,7 +2747,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 0b01001: op = rv_op_bclri; break;
> case 0b01101: op = rv_op_binvi; break;
> case 0b01100:
> - switch (((inst >> 20) & 0b1111111)) {
> + switch ((inst >> 20) & 0b1111111) {
> case 0b0000000: op = rv_op_clz; break;
> case 0b0000001: op = rv_op_ctz; break;
> case 0b0000010: op = rv_op_cpop; break;
> @@ -2762,10 +2762,10 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 3: op = rv_op_sltiu; break;
> case 4: op = rv_op_xori; break;
> case 5:
> - switch (((inst >> 27) & 0b11111)) {
> + switch ((inst >> 27) & 0b11111) {
> case 0b00000: op = rv_op_srli; break;
> case 0b00001:
> - switch (((inst >> 20) & 0b1111111)) {
> + switch ((inst >> 20) & 0b1111111) {
> case 0b0001111: op = rv_op_unzip; break;
> }
> break;
> @@ -2788,10 +2788,10 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> break;
> case 5: op = rv_op_auipc; break;
> case 6:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_addiw; break;
> case 1:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_slliw; break;
> case 2: op = rv_op_slli_uw; break;
> case 24:
> @@ -2804,7 +2804,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 5:
> - switch (((inst >> 25) & 0b1111111)) {
> + switch ((inst >> 25) & 0b1111111) {
> case 0: op = rv_op_srliw; break;
> case 32: op = rv_op_sraiw; break;
> case 48: op = rv_op_roriw; break;
> @@ -2813,7 +2813,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 8:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_sb; break;
> case 1: op = rv_op_sh; break;
> case 2: op = rv_op_sw; break;
> @@ -2822,17 +2822,17 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 9:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b111111111111)) {
> + switch ((inst >> 20) & 0b111111111111) {
> case 40: op = rv_op_vs1r_v; break;
> case 552: op = rv_op_vs2r_v; break;
> case 1576: op = rv_op_vs4r_v; break;
> case 3624: op = rv_op_vs8r_v; break;
> }
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vse8_v; break;
> case 11: op = rv_op_vsm_v; break;
> }
> @@ -2846,9 +2846,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 3: op = rv_op_fsd; break;
> case 4: op = rv_op_fsq; break;
> case 5:
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vse16_v; break;
> }
> break;
> @@ -2858,9 +2858,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 6:
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vse32_v; break;
> }
> break;
> @@ -2870,9 +2870,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 7:
> - switch (((inst >> 26) & 0b111)) {
> + switch ((inst >> 26) & 0b111) {
> case 0:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_vse64_v; break;
> }
> break;
> @@ -2893,17 +2893,17 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 11: op = rv_op_amoswap_d; break;
> case 12: op = rv_op_amoswap_q; break;
> case 18:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_lr_w; break;
> }
> break;
> case 19:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_lr_d; break;
> }
> break;
> case 20:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_lr_q; break;
> }
> break;
> @@ -3033,35 +3033,35 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 16:
> - switch (((inst >> 25) & 0b11)) {
> + switch ((inst >> 25) & 0b11) {
> case 0: op = rv_op_fmadd_s; break;
> case 1: op = rv_op_fmadd_d; break;
> case 3: op = rv_op_fmadd_q; break;
> }
> break;
> case 17:
> - switch (((inst >> 25) & 0b11)) {
> + switch ((inst >> 25) & 0b11) {
> case 0: op = rv_op_fmsub_s; break;
> case 1: op = rv_op_fmsub_d; break;
> case 3: op = rv_op_fmsub_q; break;
> }
> break;
> case 18:
> - switch (((inst >> 25) & 0b11)) {
> + switch ((inst >> 25) & 0b11) {
> case 0: op = rv_op_fnmsub_s; break;
> case 1: op = rv_op_fnmsub_d; break;
> case 3: op = rv_op_fnmsub_q; break;
> }
> break;
> case 19:
> - switch (((inst >> 25) & 0b11)) {
> + switch ((inst >> 25) & 0b11) {
> case 0: op = rv_op_fnmadd_s; break;
> case 1: op = rv_op_fnmadd_d; break;
> case 3: op = rv_op_fnmadd_q; break;
> }
> break;
> case 20:
> - switch (((inst >> 25) & 0b1111111)) {
> + switch ((inst >> 25) & 0b1111111) {
> case 0: op = rv_op_fadd_s; break;
> case 1: op = rv_op_fadd_d; break;
> case 3: op = rv_op_fadd_q; break;
> @@ -3075,100 +3075,100 @@ static void decode_inst_opcode(rv_decode *dec,
> rv_isa isa)
> case 13: op = rv_op_fdiv_d; break;
> case 15: op = rv_op_fdiv_q; break;
> case 16:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fsgnj_s; break;
> case 1: op = rv_op_fsgnjn_s; break;
> case 2: op = rv_op_fsgnjx_s; break;
> }
> break;
> case 17:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fsgnj_d; break;
> case 1: op = rv_op_fsgnjn_d; break;
> case 2: op = rv_op_fsgnjx_d; break;
> }
> break;
> case 19:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fsgnj_q; break;
> case 1: op = rv_op_fsgnjn_q; break;
> case 2: op = rv_op_fsgnjx_q; break;
> }
> break;
> case 20:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fmin_s; break;
> case 1: op = rv_op_fmax_s; break;
> }
> break;
> case 21:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fmin_d; break;
> case 1: op = rv_op_fmax_d; break;
> }
> break;
> case 23:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fmin_q; break;
> case 1: op = rv_op_fmax_q; break;
> }
> break;
> case 32:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 1: op = rv_op_fcvt_s_d; break;
> case 3: op = rv_op_fcvt_s_q; break;
> }
> break;
> case 33:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_d_s; break;
> case 3: op = rv_op_fcvt_d_q; break;
> }
> break;
> case 35:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_q_s; break;
> case 1: op = rv_op_fcvt_q_d; break;
> }
> break;
> case 44:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fsqrt_s; break;
> }
> break;
> case 45:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fsqrt_d; break;
> }
> break;
> case 47:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fsqrt_q; break;
> }
> break;
> case 80:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fle_s; break;
> case 1: op = rv_op_flt_s; break;
> case 2: op = rv_op_feq_s; break;
> }
> break;
> case 81:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fle_d; break;
> case 1: op = rv_op_flt_d; break;
> case 2: op = rv_op_feq_d; break;
> }
> break;
> case 83:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_fle_q; break;
> case 1: op = rv_op_flt_q; break;
> case 2: op = rv_op_feq_q; break;
> }
> break;
> case 96:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_w_s; break;
> case 1: op = rv_op_fcvt_wu_s; break;
> case 2: op = rv_op_fcvt_l_s; break;
> @@ -3176,7 +3176,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 97:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_w_d; break;
> case 1: op = rv_op_fcvt_wu_d; break;
> case 2: op = rv_op_fcvt_l_d; break;
> @@ -3184,7 +3184,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 99:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_w_q; break;
> case 1: op = rv_op_fcvt_wu_q; break;
> case 2: op = rv_op_fcvt_l_q; break;
> @@ -3192,7 +3192,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 104:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_s_w; break;
> case 1: op = rv_op_fcvt_s_wu; break;
> case 2: op = rv_op_fcvt_s_l; break;
> @@ -3200,7 +3200,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 105:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_d_w; break;
> case 1: op = rv_op_fcvt_d_wu; break;
> case 2: op = rv_op_fcvt_d_l; break;
> @@ -3208,7 +3208,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 107:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: op = rv_op_fcvt_q_w; break;
> case 1: op = rv_op_fcvt_q_wu; break;
> case 2: op = rv_op_fcvt_q_l; break;
> @@ -3257,9 +3257,9 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 21:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vadd_vv; break;
> case 2: op = rv_op_vsub_vv; break;
> case 4: op = rv_op_vminu_vv; break;
> @@ -3314,7 +3314,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 1:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vfadd_vv; break;
> case 1: op = rv_op_vfredusum_vs; break;
> case 2: op = rv_op_vfsub_vv; break;
> @@ -3327,12 +3327,12 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 9: op = rv_op_vfsgnjn_vv; break;
> case 10: op = rv_op_vfsgnjx_vv; break;
> case 16:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: if ((inst >> 25) & 1) op = rv_op_vfmv_f_s; break;
> }
> break;
> case 18:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: op = rv_op_vfcvt_xu_f_v; break;
> case 1: op = rv_op_vfcvt_x_f_v; break;
> case 2: op = rv_op_vfcvt_f_xu_v; break;
> @@ -3357,7 +3357,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 19:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: op = rv_op_vfsqrt_v; break;
> case 4: op = rv_op_vfrsqrt7_v; break;
> case 5: op = rv_op_vfrec7_v; break;
> @@ -3392,7 +3392,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 2:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vredsum_vs; break;
> case 1: op = rv_op_vredand_vs; break;
> case 2: op = rv_op_vredor_vs; break;
> @@ -3406,14 +3406,14 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 10: op = rv_op_vasubu_vv; break;
> case 11: op = rv_op_vasub_vv; break;
> case 16:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: if ((inst >> 25) & 1) op = rv_op_vmv_x_s; break;
> case 16: op = rv_op_vcpop_m; break;
> case 17: op = rv_op_vfirst_m; break;
> }
> break;
> case 18:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 2: op = rv_op_vzext_vf8; break;
> case 3: op = rv_op_vsext_vf8; break;
> case 4: op = rv_op_vzext_vf4; break;
> @@ -3423,7 +3423,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 20:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 1: op = rv_op_vmsbf_m; break;
> case 2: op = rv_op_vmsof_m; break;
> case 3: op = rv_op_vmsif_m; break;
> @@ -3473,7 +3473,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 3:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vadd_vi; break;
> case 3: op = rv_op_vrsub_vi; break;
> case 9: op = rv_op_vand_vi; break;
> @@ -3504,7 +3504,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 33: op = rv_op_vsadd_vi; break;
> case 37: op = rv_op_vsll_vi; break;
> case 39:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: op = rv_op_vmv1r_v; break;
> case 1: op = rv_op_vmv2r_v; break;
> case 3: op = rv_op_vmv4r_v; break;
> @@ -3522,7 +3522,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 4:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vadd_vx; break;
> case 2: op = rv_op_vsub_vx; break;
> case 3: op = rv_op_vrsub_vx; break;
> @@ -3579,7 +3579,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 5:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_vfadd_vf; break;
> case 2: op = rv_op_vfsub_vf; break;
> case 4: op = rv_op_vfmin_vf; break;
> @@ -3590,7 +3590,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 14: op = rv_op_vfslide1up_vf; break;
> case 15: op = rv_op_vfslide1down_vf; break;
> case 16:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: if ((inst >> 25) & 1) op = rv_op_vfmv_s_f; break;
> }
> break;
> @@ -3630,7 +3630,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 6:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 8: op = rv_op_vaaddu_vx; break;
> case 9: op = rv_op_vaadd_vx; break;
> case 10: op = rv_op_vasubu_vx; break;
> @@ -3638,7 +3638,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> case 14: op = rv_op_vslide1up_vx; break;
> case 15: op = rv_op_vslide1down_vx; break;
> case 16:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 0: if ((inst >> 25) & 1) op = rv_op_vmv_s_x; break;
> }
> break;
> @@ -3683,15 +3683,15 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 22:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_addid; break;
> case 1:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_sllid; break;
> }
> break;
> case 5:
> - switch (((inst >> 26) & 0b111111)) {
> + switch ((inst >> 26) & 0b111111) {
> case 0: op = rv_op_srlid; break;
> case 16: op = rv_op_sraid; break;
> }
> @@ -3699,7 +3699,7 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 24:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_beq; break;
> case 1: op = rv_op_bne; break;
> case 4: op = rv_op_blt; break;
> @@ -3709,33 +3709,33 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> }
> break;
> case 25:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0: op = rv_op_jalr; break;
> }
> break;
> case 27: op = rv_op_jal; break;
> case 28:
> - switch (((inst >> 12) & 0b111)) {
> + switch ((inst >> 12) & 0b111) {
> case 0:
> switch (((inst >> 20) & 0b111111100000) |
> ((inst >> 7) & 0b000000011111)) {
> case 0:
> - switch (((inst >> 15) & 0b1111111111)) {
> + switch ((inst >> 15) & 0b1111111111) {
> case 0: op = rv_op_ecall; break;
> case 32: op = rv_op_ebreak; break;
> case 64: op = rv_op_uret; break;
> }
> break;
> case 256:
> - switch (((inst >> 20) & 0b11111)) {
> + switch ((inst >> 20) & 0b11111) {
> case 2:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: op = rv_op_sret; break;
> }
> break;
> case 4: op = rv_op_sfence_vm; break;
> case 5:
> - switch (((inst >> 15) & 0b11111)) {
> + switch ((inst >> 15) & 0b11111) {
> case 0: op = rv_op_wfi; break;
> }
> break;
> @@ -3743,17 +3743,17 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa
> isa)
> break;
> case 288: op = rv_op_sfence_vma; break;
> case 512:
> - switch (((inst >> 15) & 0b1111111111)) {
> + switch ((inst >> 15) & 0b1111111111) {
> case 64: op = rv_op_hret; break;
> }
> break;
> case 768:
> - switch (((inst >> 15) & 0b1111111111)) {
> + switch ((inst >> 15) & 0b1111111111) {
> case 64: op = rv_op_mret; break;
> }
> break;
> case 1952:
> - switch (((inst >> 15) & 0b1111111111)) {
> + switch ((inst >> 15) & 0b1111111111) {
> case 576: op = rv_op_dret; break;
> }
> break;
> @@ -4605,7 +4605,8 @@ static size_t inst_length(rv_inst inst)
> {
> /* NOTE: supports maximum instruction size of 64-bits */
>
> - /* instruction length coding
> + /*
> + * instruction length coding
> *
> * aa - 16 bit aa != 11
> * bbb11 - 32 bit bbb != 111
> --
> 2.25.1
>
>
- [PATCH v2 5/8] disas/riscv.c: Support disas for Z*inx extensions, (continued)
- [PATCH v2 5/8] disas/riscv.c: Support disas for Z*inx extensions, Weiwei Li, 2023/05/23
- [PATCH v2 2/8] target/riscv: Split RISCVCPUConfig declarations from cpu.h into cpu_cfg.h, Weiwei Li, 2023/05/23
- [PATCH v2 4/8] disas/riscv.c: Support disas for Zcm* extensions, Weiwei Li, 2023/05/23
- [PATCH v2 7/8] disas/riscv.c: Fix lines with over 80 characters, Weiwei Li, 2023/05/23
- [PATCH v2 8/8] disas/riscv.c: Remove redundant parentheses, Weiwei Li, 2023/05/23
- Re: [PATCH v2 8/8] disas/riscv.c: Remove redundant parentheses,
Alistair Francis <=
- [PATCH v2 6/8] disas/riscv.c: Remove unused decomp_rv32/64 value for vector instructions, Weiwei Li, 2023/05/23
- Re: [PATCH v2 0/8] Add support for extension specific disas, Alistair Francis, 2023/05/25