Miscellaneous patches from the RISC-V fork
cover Miscellaneous patches from the RISC-V fork
This should be the last series bringing the patches from the RISC-V fork into mainline QEMU.
Dayeol Lee (1):
target/riscv: Fix PMP range boundary address bug
Michael Clark (3):
disas/riscv: Disassemble reserved compressed encodings as illegal disas/riscv: Fix rdinstreth constraint
target/riscv: Implement riscv_cpu_unassigned_access
disas/riscv.c | 53 ++++++++++++++++++++++++++------------- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 16 ++++++++++++ target/riscv/pmp.c | 2 +- 5 files changed, 55 insertions(+), 19 deletions(-)
Signature · 1 line
2.21.0
PATCH 1/4 target/riscv: Fix PMP range boundary address bug
From: Dayeol Lee <[email protected]>
A wrong address is passed to pmp_is_in_range while checking if a memory access is within a PMP range.
Since the ending address of the pmp range (i.e., pmp_state.addr[i].ea) is set to the last address in the range (i.e., pmp base + pmp size - 1), memory accesses containg the last address in the range will always fail.
For example, assume that a PMP range is 4KB from 0x87654000 such that the last address within the range is 0x87654fff.
1-byte access to 0x87654fff should be considered to be fully inside the PMP range.
However the access now fails and complains partial inclusion because pmp_is_in_range(env, i, addr + size) returns 0 whereas pmp_is_in_range(env, i, addr) returns 1.
--- target/riscv/pmp.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
target/riscv/pmp.c +1 -1
@@ -246,7 +246,7 @@ bool pmp_hart_has_privs(CPURISCVState *env, target_ulong addr,from low to high */ for (i =0 ; i <MAX_RISCV_PMPS ; i++) { s =pmp_is_in_range (env, i, addr); - e =pmp_is_in_range (env, i, addr + size); + e =pmp_is_in_range (env, i, addr + size -1 );/* partially inside */ if ((s + e) ==1 ) {
Signature · 1 line
2.21.0
PATCH 2/4 disas/riscv: Disassemble reserved compressed encodings as illegal
In reply to Alistair FrancisFrom: Michael Clark <[email protected]>
Due to the design of the disassembler, the immediate is not known during decoding of the opcode; so to handle compressed encodings with reserved immediate values (non-zero), we need to add an additional check during decompression to match reserved encodings with zero immediates and translate them into the illegal instruction.
The following compressed opcodes have reserved encodings with zero immediates: c.addi4spn, c.addi, c.lui, c.addi16sp, c.srli, c.srai, c.andi and c.slli
--- disas/riscv.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-)
disas/riscv.c +34 -17
@@ -504,14 +504,19 @@ typedef struct {const rvc_constraint *constraints; } rv_comp_data; +enum { + rvcd_imm_nz =0x1 +}; +typedef struct {const char *const name;const rv_codec codec;const char *const format;const rv_comp_data *pseudo; -const int decomp_rv32; -const int decomp_rv64; -const int decomp_rv128; +const short decomp_rv32; +const short decomp_rv64; +const short decomp_rv128; +const short decomp_data; }rv_opcode_data ;/* register names */
@@ -1011,7 +1016,7 @@ const rv_opcode_data opcode_data[] = { { "fcvt.q.lu", rv_codec_r_m, rv_fmt_rm_frd_rs1, NULL, 0, 0, 0 }, { "fmv.x.q", rv_codec_r, rv_fmt_rd_frs1, NULL, 0, 0, 0 }, { "fmv.q.x", rv_codec_r, rv_fmt_frd_rs1, NULL, 0, 0, 0 }, - { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.fld", rv_codec_cl_ld, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, 0 }, { "c.lw", rv_codec_cl_lw, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flw", rv_codec_cl_lw, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },
@@ -1019,14 +1024,14 @@ const rv_opcode_data opcode_data[] = { { "c.sw", rv_codec_cs_sw, rv_fmt_rs2_offset_rs1, NULL, rv_op_sw, rv_op_sw, rv_op_sw }, { "c.fsw", rv_codec_cs_sw, rv_fmt_frs2_offset_rs1, NULL, rv_op_fsw, 0, 0 }, { "c.nop", rv_codec_ci_none, rv_fmt_none, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.jal", rv_codec_cj_jal, rv_fmt_rd_offset, NULL, rv_op_jal, 0, 0 }, { "c.li", rv_codec_ci_li, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui }, - { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli }, - { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai }, - { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi }, + { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, + { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui, rvcd_imm_nz }, + { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli, rvcd_imm_nz }, + { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai, rvcd_imm_nz }, + { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi, rvcd_imm_nz }, { "c.sub", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_sub, rv_op_sub, rv_op_sub }, { "c.xor", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_xor, rv_op_xor, rv_op_xor }, { "c.or", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_or, rv_op_or, rv_op_or },
@@ -1036,7 +1041,7 @@ const rv_opcode_data opcode_data[] = { { "c.j", rv_codec_cj, rv_fmt_rd_offset, NULL, rv_op_jal, rv_op_jal, rv_op_jal }, { "c.beqz", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_beq, rv_op_beq, rv_op_beq }, { "c.bnez", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_bne, rv_op_bne, rv_op_bne }, - { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli }, + { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli, rvcd_imm_nz }, { "c.fldsp", rv_codec_ci_ldsp, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, rv_op_fld }, { "c.lwsp", rv_codec_ci_lwsp, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flwsp", rv_codec_ci_lwsp, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },
@@ -2795,8 +2800,12 @@ static void decode_inst_decompress_rv32(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv32;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }
@@ -2804,8 +2813,12 @@ static void decode_inst_decompress_rv64(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv64;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }
@@ -2813,8 +2826,12 @@ static void decode_inst_decompress_rv128(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv128;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v1 2/4] disas/riscv: Disassemble reserved compressed encodings as illegal
Quoted 63 lines · Alistair Francis
From: Michael Clark <[email protected]>
Due to the design of the disassembler, the immediate is not known during decoding of the opcode; so to handle compressed encodings with reserved immediate values (non-zero), we need to add an additional check during decompression to match reserved encodings with zero immediates and translate them into the illegal instruction.
The following compressed opcodes have reserved encodings with zero immediates: c.addi4spn, c.addi, c.lui, c.addi16sp, c.srli, c.srai, c.andi and c.slli
Signed-off-by Michael Clark <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- disas/riscv.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-)disas/riscv.c +10
-5@@ -504,14 +504,19 @@ typedef struct {const rvc_constraint *constraints; } rv_comp_data; +enum { + rvcd_imm_nz =0x1 +}; +typedef struct {const char *const name;const rv_codec codec;const char *const format;const rv_comp_data *pseudo; -const int decomp_rv32; -const int decomp_rv64; -const int decomp_rv128; +const short decomp_rv32; +const short decomp_rv64; +const short decomp_rv128; +const short decomp_data; }rv_opcode_data ;/* register names */ @@ -1011,7 +1016,7 @@ const rv_opcode_data opcode_data[] = { { "fcvt.q.lu", rv_codec_r_m, rv_fmt_rm_frd_rs1, NULL, 0, 0, 0 }, { "fmv.x.q", rv_codec_r, rv_fmt_rd_frs1, NULL, 0, 0, 0 }, { "fmv.q.x", rv_codec_r, rv_fmt_frd_rs1, NULL, 0, 0, 0 }, - { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.fld", rv_codec_cl_ld, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, 0 }, { "c.lw", rv_codec_cl_lw, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flw", rv_codec_cl_lw, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },@@ -1019,14 +1024,14 @@ const rv_opcode_data opcode_data[] = { { "c.sw", rv_codec_cs_sw, rv_fmt_rs2_offset_rs1, NULL, rv_op_sw, rv_op_sw, rv_op_sw }, { "c.fsw", rv_codec_cs_sw, rv_fmt_frs2_offset_rs1, NULL, rv_op_fsw, 0, 0 }, { "c.nop", rv_codec_ci_none, rv_fmt_none, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.jal", rv_codec_cj_jal, rv_fmt_rd_offset, NULL, rv_op_jal, 0, 0 }, { "c.li", rv_codec_ci_li, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi },
disas/riscv.c const rv_opcode_data opcode_data[] = { · line 1034
Quoted 10 lines
disas/riscv.c +5
-5- { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui }, - { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli }, - { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai }, - { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi }, + { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, + { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui, rvcd_imm_nz }, + { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli, rvcd_imm_nz }, + { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai, rvcd_imm_nz }, + { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi, rvcd_imm_nz },
Unless I'm missing something, c.andi can have a zero immediate.
Quoted 56 lines
disas/riscv.c +19
-7{ "c.sub", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_sub, rv_op_sub, rv_op_sub }, { "c.xor", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_xor, rv_op_xor, rv_op_xor }, { "c.or", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_or, rv_op_or, rv_op_or },@@ -1036,7 +1041,7 @@ const rv_opcode_data opcode_data[] = { { "c.j", rv_codec_cj, rv_fmt_rd_offset, NULL, rv_op_jal, rv_op_jal, rv_op_jal }, { "c.beqz", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_beq, rv_op_beq, rv_op_beq }, { "c.bnez", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_bne, rv_op_bne, rv_op_bne }, - { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli }, + { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli, rvcd_imm_nz }, { "c.fldsp", rv_codec_ci_ldsp, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, rv_op_fld }, { "c.lwsp", rv_codec_ci_lwsp, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flwsp", rv_codec_ci_lwsp, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },@@ -2795,8 +2800,12 @@ static void decode_inst_decompress_rv32(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv32;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }@@ -2804,8 +2813,12 @@ static void decode_inst_decompress_rv64(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv64;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }@@ -2813,8 +2826,12 @@ static void decode_inst_decompress_rv128(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv128;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }
Re: [Qemu-devel] [PATCH v1 2/4] disas/riscv: Disassemble reserved compressed encodings as illegal
Quoted 69 lines · Palmer Dabbelt
Quoted 67 lines · Alistair Francis
From: Michael Clark <[email protected]>
Due to the design of the disassembler, the immediate is not known during decoding of the opcode; so to handle compressed encodings with reserved immediate values (non-zero), we need to add an additional check during decompression to match reserved encodings with zero immediates and translate them into the illegal instruction.
The following compressed opcodes have reserved encodings with zero immediates: c.addi4spn, c.addi, c.lui, c.addi16sp, c.srli, c.srai, c.andi and c.slli
Signed-off-by Michael Clark <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- disas/riscv.c | 51 ++++++++++++++++++++++++++++++++++----------------- 1 file changed, 34 insertions(+), 17 deletions(-)disas/riscv.c +10
-9@@ -504,14 +504,19 @@ typedef struct {const rvc_constraint *constraints; } rv_comp_data; +enum { + rvcd_imm_nz =0x1 +}; +typedef struct {const char *const name;const rv_codec codec;const char *const format;const rv_comp_data *pseudo; -const int decomp_rv32; -const int decomp_rv64; -const int decomp_rv128; +const short decomp_rv32; +const short decomp_rv64; +const short decomp_rv128; +const short decomp_data; }rv_opcode_data ;/* register names */ @@ -1011,7 +1016,7 @@ const rv_opcode_data opcode_data[] = { { "fcvt.q.lu", rv_codec_r_m, rv_fmt_rm_frd_rs1, NULL, 0, 0, 0 }, { "fmv.x.q", rv_codec_r, rv_fmt_rd_frs1, NULL, 0, 0, 0 }, { "fmv.q.x", rv_codec_r, rv_fmt_frd_rs1, NULL, 0, 0, 0 }, - { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi4spn", rv_codec_ciw_4spn, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.fld", rv_codec_cl_ld, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, 0 }, { "c.lw", rv_codec_cl_lw, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flw", rv_codec_cl_lw, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },@@ -1019,14 +1024,14 @@ const rv_opcode_data opcode_data[] = { { "c.sw", rv_codec_cs_sw, rv_fmt_rs2_offset_rs1, NULL, rv_op_sw, rv_op_sw, rv_op_sw }, { "c.fsw", rv_codec_cs_sw, rv_fmt_frs2_offset_rs1, NULL, rv_op_fsw, 0, 0 }, { "c.nop", rv_codec_ci_none, rv_fmt_none, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, + { "c.addi", rv_codec_ci, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, { "c.jal", rv_codec_cj_jal, rv_fmt_rd_offset, NULL, rv_op_jal, 0, 0 }, { "c.li", rv_codec_ci_li, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi }, - { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui }, - { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli }, - { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai },
Quoted 8 lines
disas/riscv.c const rv_opcode_data opcode_data[] = { · line 1034
Quoted 6 lines
disas/riscv.c +5
-1- { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi }, + { "c.addi16sp", rv_codec_ci_16sp, rv_fmt_rd_rs1_imm, NULL, rv_op_addi, rv_op_addi, rv_op_addi, rvcd_imm_nz }, + { "c.lui", rv_codec_ci_lui, rv_fmt_rd_imm, NULL, rv_op_lui, rv_op_lui, rv_op_lui, rvcd_imm_nz }, + { "c.srli", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srli, rv_op_srli, rv_op_srli, rvcd_imm_nz }, + { "c.srai", rv_codec_cb_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_srai, rv_op_srai, rv_op_srai, rvcd_imm_nz }, + { "c.andi", rv_codec_cb_imm, rv_fmt_rd_rs1_imm, NULL, rv_op_andi, rv_op_andi, rv_op_andi, rvcd_imm_nz },Unless I'm missing something, c.andi can have a zero immediate.
Yeah, I'll remove that.
Alistair
Quoted 57 lines
Quoted 57 lines
disas/riscv.c +19
-7{ "c.sub", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_sub, rv_op_sub, rv_op_sub }, { "c.xor", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_xor, rv_op_xor, rv_op_xor }, { "c.or", rv_codec_cs, rv_fmt_rd_rs1_rs2, NULL, rv_op_or, rv_op_or, rv_op_or },@@ -1036,7 +1041,7 @@ const rv_opcode_data opcode_data[] = { { "c.j", rv_codec_cj, rv_fmt_rd_offset, NULL, rv_op_jal, rv_op_jal, rv_op_jal }, { "c.beqz", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_beq, rv_op_beq, rv_op_beq }, { "c.bnez", rv_codec_cb, rv_fmt_rs1_rs2_offset, NULL, rv_op_bne, rv_op_bne, rv_op_bne }, - { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli }, + { "c.slli", rv_codec_ci_sh6, rv_fmt_rd_rs1_imm, NULL, rv_op_slli, rv_op_slli, rv_op_slli, rvcd_imm_nz }, { "c.fldsp", rv_codec_ci_ldsp, rv_fmt_frd_offset_rs1, NULL, rv_op_fld, rv_op_fld, rv_op_fld }, { "c.lwsp", rv_codec_ci_lwsp, rv_fmt_rd_offset_rs1, NULL, rv_op_lw, rv_op_lw, rv_op_lw }, { "c.flwsp", rv_codec_ci_lwsp, rv_fmt_frd_offset_rs1, NULL, rv_op_flw, 0, 0 },@@ -2795,8 +2800,12 @@ static void decode_inst_decompress_rv32(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv32;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }@@ -2804,8 +2813,12 @@ static void decode_inst_decompress_rv64(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv64;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }@@ -2813,8 +2826,12 @@ static void decode_inst_decompress_rv128(rv_decode *dec) {int decomp_op = opcode_data[dec->op].decomp_rv128;if (decomp_op != rv_op_illegal) { - dec->op = decomp_op; - dec->codec = opcode_data[decomp_op].codec; +if ((opcode_data[dec->op].decomp_data & rvcd_imm_nz) && dec->imm ==0 ) { + dec->op = rv_op_illegal; + }else { + dec->op = decomp_op; + dec->codec = opcode_data[decomp_op].codec; + } } }
PATCH 3/4 disas/riscv: Fix `rdinstreth` constraint
In reply to Alistair FrancisFrom: Michael Clark <[email protected]>
The constraint for rdinstreth was comparing the csr number to 0xc80, which is cycleh instead. Fix this.
Author: Wladimir J. van der Laan <[email protected]>
--- disas/riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
disas/riscv.c +1 -1
@@ -614,7 +614,7 @@ static const rvc_constraint rvcc_rdtime[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc01, rstatic const rvc_constraint rvcc_rdinstret[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc02, rvc_end };static const rvc_constraint rvcc_rdcycleh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end };static const rvc_constraint rvcc_rdtimeh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc81, rvc_end }; -static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end }; +static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc82, rvc_end };static const rvc_constraint rvcc_frcsr[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x003, rvc_end };static const rvc_constraint rvcc_frrm[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x002, rvc_end };static const rvc_constraint rvcc_frflags[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x001, rvc_end };
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v1 3/4] disas/riscv: Fix `rdinstreth` constraint
Quoted 6 lines · Alistair Francis
From: Michael Clark <[email protected]>
The constraint for
rdinstrethwas comparing the csr number to0xc80, which iscyclehinstead. Fix this.Author: Wladimir J. van der Laan <[email protected]>
I'm not sure what this tag is supposed to mean. If this is the actual author of the patch, then shouldn't it also have a SOB?
Quoted 19 lines
Signed-off-by Michael Clark <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- disas/riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)disas/riscv.c +1
-1@@ -614,7 +614,7 @@ static const rvc_constraint rvcc_rdtime[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc01, rstatic const rvc_constraint rvcc_rdinstret[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc02, rvc_end };static const rvc_constraint rvcc_rdcycleh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end };static const rvc_constraint rvcc_rdtimeh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc81, rvc_end }; -static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end }; +static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc82, rvc_end };static const rvc_constraint rvcc_frcsr[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x003, rvc_end };static const rvc_constraint rvcc_frrm[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x002, rvc_end };static const rvc_constraint rvcc_frflags[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x001, rvc_end };
Re: [Qemu-devel] [PATCH v1 3/4] disas/riscv: Fix `rdinstreth` constraint
Quoted 11 lines · Palmer Dabbelt
Quoted 6 lines · Alistair Francis
From: Michael Clark <[email protected]>
The constraint for
rdinstrethwas comparing the csr number to0xc80, which iscyclehinstead. Fix this.Author: Wladimir J. van der Laan <[email protected]>
I'm not sure what this tag is supposed to mean. If this is the actual author of the patch, then shouldn't it also have a SOB?
I'm not sure either, that is the line that the patch had and I didn't want to change it. I'm not sure what usually happens in cases like this.
Alistair
Quoted 20 lines
Quoted 20 lines
Signed-off-by Michael Clark <[email protected]>Signed-off-by Alistair Francis <[email protected]>--- disas/riscv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)disas/riscv.c +1
-1@@ -614,7 +614,7 @@ static const rvc_constraint rvcc_rdtime[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc01, rstatic const rvc_constraint rvcc_rdinstret[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc02, rvc_end };static const rvc_constraint rvcc_rdcycleh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end };static const rvc_constraint rvcc_rdtimeh[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc81, rvc_end }; -static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc80, rvc_end }; +static const rvc_constraint rvcc_rdinstreth[] = { rvc_rs1_eq_x0, rvc_csr_eq_0xc82, rvc_end };static const rvc_constraint rvcc_frcsr[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x003, rvc_end };static const rvc_constraint rvcc_frrm[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x002, rvc_end };static const rvc_constraint rvcc_frflags[] = { rvc_rs1_eq_x0, rvc_csr_eq_0x001, rvc_end };
PATCH 4/4 target/riscv: Implement riscv_cpu_unassigned_access
In reply to Alistair FrancisFrom: Michael Clark <[email protected]>
This patch adds support for the riscv_cpu_unassigned_access call and will raise a load or store access fault.
[Changes by AF:
- Squash two patches and rewrite commit message
- Set baddr to the access address
]
--- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+)
target/riscv/cpu.c +1 -0
@@ -356,6 +356,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_stop_before_watchpoint = true; cc->disas_set_info = riscv_cpu_disas_set_info;#ifndef CONFIG_USER_ONLY + cc->do_unassigned_access = riscv_cpu_unassigned_access; cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug;#endif
target/riscv/cpu.h +2 -0
@@ -264,6 +264,8 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,bool riscv_cpu_tlb_fill (CPUState *cs,vaddr address,int size,MMUAccessType access_type,int mmu_idx,bool probe,uintptr_t retaddr); +void riscv_cpu_unassigned_access (CPUState *cpu,hwaddr addr,bool is_write, +bool is_exec,int unused,unsigned size);char *riscv_isa_string (RISCVCPU *cpu);void riscv_cpu_list (void );
target/riscv/cpu_helper.c +16 -0
@@ -356,6 +356,22 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)return phys_addr; } +void riscv_cpu_unassigned_access (CPUState *cs,hwaddr addr,bool is_write, +bool is_exec,int unused,unsigned size) +{ +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; + +if (is_write) { + cs->exception_index =RISCV_EXCP_STORE_AMO_ACCESS_FAULT ; + }else { + cs->exception_index =RISCV_EXCP_LOAD_ACCESS_FAULT ; + } + + env->badaddr = addr; +riscv_raise_exception (&cpu->env, cs->exception_index,GETPC ()); +} +void riscv_cpu_do_unaligned_access (CPUState *cs,vaddr addr,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr)
Signature · 1 line
2.21.0
Re: [Qemu-devel] [PATCH v1 4/4] target/riscv: Implement riscv_cpu_unassigned_access
Quoted 59 lines · Alistair Francis
From: Michael Clark <[email protected]>
This patch adds support for the
riscv_cpu_unassigned_accesscall and will raise a load or store access fault.Signed-off-by Michael Clark <[email protected]>[Changes by AF:
- Squash two patches and rewrite commit message
- Set baddr to the access address
]Signed-off-by Alistair Francis <[email protected]>--- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 16 ++++++++++++++++ 3 files changed, 19 insertions(+)target/riscv/cpu.c +1
-0@@ -356,6 +356,7 @@ static void riscv_cpu_class_init(ObjectClass *c, void *data) cc->gdb_stop_before_watchpoint = true; cc->disas_set_info = riscv_cpu_disas_set_info;#ifndef CONFIG_USER_ONLY + cc->do_unassigned_access = riscv_cpu_unassigned_access; cc->do_unaligned_access = riscv_cpu_do_unaligned_access; cc->get_phys_page_debug = riscv_cpu_get_phys_page_debug;#endif target/riscv/cpu.h +2
-0@@ -264,6 +264,8 @@ void riscv_cpu_do_unaligned_access(CPUState *cs, vaddr addr,bool riscv_cpu_tlb_fill (CPUState *cs,vaddr address,int size,MMUAccessType access_type,int mmu_idx,bool probe,uintptr_t retaddr); +void riscv_cpu_unassigned_access (CPUState *cpu,hwaddr addr,bool is_write, +bool is_exec,int unused,unsigned size);char *riscv_isa_string (RISCVCPU *cpu);void riscv_cpu_list (void );target/riscv/cpu_helper.c +9
-0@@ -356,6 +356,22 @@ hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vaddr addr)return phys_addr; } +void riscv_cpu_unassigned_access (CPUState *cs,hwaddr addr,bool is_write, +bool is_exec,int unused,unsigned size) +{ +RISCVCPU *cpu =RISCV_CPU (cs); +CPURISCVState *env = &cpu->env; + +if (is_write) { + cs->exception_index =RISCV_EXCP_STORE_AMO_ACCESS_FAULT ; + }else {
target/riscv/cpu_helper.c hwaddr riscv_cpu_get_phys_page_debug(CPUState *cs, vaddr addr) · line 377
Quoted 10 lines
target/riscv/cpu_helper.c +7
-0+ cs->exception_index =RISCV_EXCP_LOAD_ACCESS_FAULT ; + } + + env->badaddr = addr; +riscv_raise_exception (&cpu->env, cs->exception_index,GETPC ()); +} +void riscv_cpu_do_unaligned_access (CPUState *cs,vaddr addr,MMUAccessType access_type,int mmu_idx,uintptr_t retaddr)
Quoted 11 lines · Alistair Francis
This should be the last series bringing the patches from the RISC-V fork into mainline QEMU.
Dayeol Lee (1):
target/riscv: Fix PMP range boundary address bugMichael Clark (3):
disas/riscv: Disassemble reserved compressed encodings as illegal disas/riscv: Fixrdinstrethconstraint
target/riscv: Implementriscv_cpu_unassigned_access
Ping!
Alistair
Quoted 11 lines
disas/riscv.c | 53 ++++++++++++++++++++++++++------------- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 16 ++++++++++++ target/riscv/pmp.c | 2 +- 5 files changed, 55 insertions(+), 19 deletions(-)--
2.21.0
Quoted 11 lines · Alistair Francis
This should be the last series bringing the patches from the RISC-V fork into mainline QEMU.
Dayeol Lee (1):
target/riscv: Fix PMP range boundary address bugMichael Clark (3):
disas/riscv: Disassemble reserved compressed encodings as illegal disas/riscv: Fixrdinstrethconstraint
target/riscv: Implementriscv_cpu_unassigned_access
Quoted 6 lines
disas/riscv.c | 53 ++++++++++++++++++++++++++------------- target/riscv/cpu.c | 1 + target/riscv/cpu.h | 2 ++ target/riscv/cpu_helper.c | 16 ++++++++++++ target/riscv/pmp.c | 2 +- 5 files changed, 55 insertions(+), 19 deletions(-)
There's some minor issues with two of these, but since they're all independent I'm going to take the other two right now.
Thanks!