disas/riscv: enable `mnret` disassembly
PATCH 1/1 disas/riscv: enable `mnret` disassembly
The translator has supported mnret since commit 3157a553ec6b9a ("target/riscv: Add Smrnmi mnret instruction"), but the disassembler still renders it as illegal. Add it unguarded, since the encoding does not overlap any other extension.
--- disas/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+)
disas/riscv.c +7 -0
@@ -985,6 +985,7 @@ typedef enum { rv_op_ssamoswap_d =953 , rv_op_c_sspush =954 , rv_op_c_sspopchk =955 , + rv_op_mnret =956 , } rv_op;/* register names */
@@ -2255,6 +2256,7 @@ const rv_opcode_data rvi_opcode_data[] = { rv_op_sspush, 0 }, {"c.sspopchk" , rv_codec_cmop_ss, rv_fmt_rs1,NULL , rv_op_sspopchk, rv_op_sspopchk, 0 }, + { "mnret", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, };/* CSR names */
@@ -4050,6 +4052,11 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa)case 64 : op = rv_op_mret;break ; }break ; +case 1792 : +switch ((inst >>15 ) &0b1111111111 ) { +case 64 : op = rv_op_mnret;break ; + } +break ;case 1952 :switch ((inst >>15 ) &0b1111111111 ) {case 576 : op = rv_op_dret;break ;
Signature · 1 line
2.43.0
Quoted 7 lines · imaginos
The translator has supported mnret since commit
3157a553ec6b9a("target/riscv: Add Smrnmi mnret instruction"), but the disassembler still renders it as illegal. Add it unguarded, since the encoding does not overlap any other extension.Signed-off-by imaginos <[email protected]>
Alistair
Quoted 40 lines
--- disas/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+)disas/riscv.c +7
-1@@ -985,6 +985,7 @@ typedef enum { rv_op_ssamoswap_d =953 , rv_op_c_sspush =954 , rv_op_c_sspopchk =955 , + rv_op_mnret =956 , } rv_op;/* register names */ @@ -2255,6 +2256,7 @@ const rv_opcode_data rvi_opcode_data[] = { rv_op_sspush, 0 }, {"c.sspopchk" , rv_codec_cmop_ss, rv_fmt_rs1,NULL , rv_op_sspopchk, rv_op_sspopchk, 0 }, + { "mnret", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, };/* CSR names */ @@ -4050,6 +4052,11 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa)case 64 : op = rv_op_mret;break ; }break ; +case 1792 : +switch ((inst >>15 ) &0b1111111111 ) { +case 64 : op = rv_op_mnret;break ; + } +break ;case 1952 :switch ((inst >>15 ) &0b1111111111 ) {case 576 : op = rv_op_dret;break ; --2.43.0
Quoted 7 lines · imaginos
The translator has supported mnret since commit
3157a553ec6b9a("target/riscv: Add Smrnmi mnret instruction"), but the disassembler still renders it as illegal. Add it unguarded, since the encoding does not overlap any other extension.Signed-off-by imaginos <[email protected]>
Do you mind rebasing this on
https://github.com/alistair23/qemu/tree/riscv-to-apply.next and sending a v2
Alistair
Quoted 40 lines
--- disas/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+)disas/riscv.c +7
-1@@ -985,6 +985,7 @@ typedef enum { rv_op_ssamoswap_d =953 , rv_op_c_sspush =954 , rv_op_c_sspopchk =955 , + rv_op_mnret =956 , } rv_op;/* register names */ @@ -2255,6 +2256,7 @@ const rv_opcode_data rvi_opcode_data[] = { rv_op_sspush, 0 }, {"c.sspopchk" , rv_codec_cmop_ss, rv_fmt_rs1,NULL , rv_op_sspopchk, rv_op_sspopchk, 0 }, + { "mnret", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, };/* CSR names */ @@ -4050,6 +4052,11 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa)case 64 : op = rv_op_mret;break ; }break ; +case 1792 : +switch ((inst >>15 ) &0b1111111111 ) { +case 64 : op = rv_op_mnret;break ; + } +break ;case 1952 :switch ((inst >>15 ) &0b1111111111 ) {case 576 : op = rv_op_dret;break ; --2.43.0
PATCH v2 1/1 disas/riscv: enable `mnret` disassembly
In reply to imaginosThe translator has supported mnret since commit 3157a553ec6b9a ("target/riscv: Add Smrnmi mnret instruction"), but the disassembler still renders it as illegal. Add it unguarded, since the encoding does not overlap any other extension.
---
v2: rebase on riscv-to-apply.next
disas/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+)
disas/riscv.c +7 -0
@@ -989,6 +989,7 @@ typedef enum { rv_op_cbo_clean =957 , rv_op_cbo_flush =958 , rv_op_cbo_zero =959 , + rv_op_mnret =960 , } rv_op;/* register names */
@@ -2263,6 +2264,7 @@ const rv_opcode_data rvi_opcode_data[] = { { "cbo.clean", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, { "cbo.flush", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, { "cbo.zero", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, + { "mnret", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, };/* CSR names */
@@ -4077,6 +4079,11 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa)case 64 : op = rv_op_mret;break ; }break ; +case 1792 : +switch ((inst >>15 ) &0b1111111111 ) { +case 64 : op = rv_op_mnret;break ; + } +break ;case 1952 :switch ((inst >>15 ) &0b1111111111 ) {case 576 : op = rv_op_dret;break ;
Signature · 1 line
2.43.0
Alistair Francis
AppliedQuoted 7 lines · imaginos
The translator has supported mnret since commit
3157a553ec6b9a("target/riscv: Add Smrnmi mnret instruction"), but the disassembler still renders it as illegal. Add it unguarded, since the encoding does not overlap any other extension.Signed-off-by imaginos <[email protected]>
Thanks!
Applied to riscv-to-apply.next
Alistair
Quoted 42 lines
---
v2: rebase on riscv-to-apply.nextdisas/riscv.c | 7 +++++++ 1 file changed, 7 insertions(+)disas/riscv.c +7
-1@@ -989,6 +989,7 @@ typedef enum { rv_op_cbo_clean =957 , rv_op_cbo_flush =958 , rv_op_cbo_zero =959 , + rv_op_mnret =960 , } rv_op;/* register names */ @@ -2263,6 +2264,7 @@ const rv_opcode_data rvi_opcode_data[] = { { "cbo.clean", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, { "cbo.flush", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, { "cbo.zero", rv_codec_r, rv_fmt_rs1, NULL, 0, 0, 0 }, + { "mnret", rv_codec_none, rv_fmt_none, NULL, 0, 0, 0 }, };/* CSR names */ @@ -4077,6 +4079,11 @@ static void decode_inst_opcode(rv_decode *dec, rv_isa isa)case 64 : op = rv_op_mret;break ; }break ; +case 1792 : +switch ((inst >>15 ) &0b1111111111 ) { +case 64 : op = rv_op_mnret;break ; + } +break ;case 1952 :switch ((inst >>15 ) &0b1111111111 ) {case 576 : op = rv_op_dret;break ; --2.43.0