target/riscv: add traces for exceptions
cover target/riscv: add traces for exceptions
Hi,
Let's add trace capabilities in riscv_raise_exception() to allow users of qemu-riscv(32/64) to have a little more information when a SIGILL occurs. This is done in patch 2.
Patch 1 is a "look and feel" patch that I figured was worth doing.
Daniel Henrique Barboza (2):
target/riscv: use RISCVException enum in exception helpers target/riscv: add trace in riscv_raise_exception()
target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 9 ++++++++- target/riscv/trace-events | 3 +++ target/riscv/translate.c | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-)
Signature · 1 line
2.47.1
PATCH 1/2 target/riscv: use RISCVException enum in exception helpers
Do a cosmetic change in riscv_raise_exception() to change 'exception' type from uint32_t to RISCVException, making it a bit clear that the arg is directly correlated to the RISCVException enum.
As a side effect, change 'excp' type from int to RISCVException in generate_exception() to guarantee that all callers of riscv_raise_exception() will use the enum.
--- target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 3 ++- target/riscv/translate.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
target/riscv/cpu.h +2 -1
@@ -603,7 +603,8 @@ void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv, bool virt_en);void riscv_translate_init (void ); G_NORETURN void riscv_raise_exception(CPURISCVState *env, -uint32_t exception,uintptr_t pc); +RISCVException exception, +uintptr_t pc);target_ulong riscv_cpu_get_fflags (CPURISCVState *env);void riscv_cpu_set_fflags (CPURISCVState *env,target_ulong );
target/riscv/op_helper.c +2 -1
@@ -27,7 +27,8 @@/* Exceptions processing helpers */ G_NORETURN void riscv_raise_exception(CPURISCVState *env, -uint32_t exception,uintptr_t pc) +RISCVException exception, +uintptr_t pc) {CPUState *cs =env_cpu (env); cs->exception_index = exception;
target/riscv/translate.c +1 -1
@@ -244,7 +244,7 @@ static void gen_update_pc(DisasContext *ctx, target_long diff) ctx->pc_save = ctx->base.pc_next + diff; } -static void generate_exception (DisasContext *ctx,int excp) +static void generate_exception (DisasContext *ctx,RISCVException excp) {gen_update_pc (ctx,0 );gen_helper_raise_exception (tcg_env,tcg_constant_i32 (excp));
Signature · 1 line
2.47.1
Re: [PATCH 1/2] target/riscv: use RISCVException enum in exception helpers
Quoted 8 lines · Daniel Henrique Barboza
Do a cosmetic change in
riscv_raise_exception()to change 'exception' type fromuint32_tto RISCVException, making it a bit clear that the arg is directly correlated to the RISCVException enum.As a side effect, change 'excp' type from int to RISCVException in
generate_exception()to guarantee that all callers ofriscv_raise_exception()will use the enum.
Quoted 6 lines
Signed-off-by Daniel Henrique Barboza<[email protected]>--- target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 3 ++- target/riscv/translate.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
r~
Re: [PATCH 1/2] target/riscv: use RISCVException enum in exception helpers
In reply to Daniel Henrique BarbozaQuoted 10 lines · Daniel Henrique Barboza
Do a cosmetic change in
riscv_raise_exception()to change 'exception' type fromuint32_tto RISCVException, making it a bit clear that the arg is directly correlated to the RISCVException enum.As a side effect, change 'excp' type from int to RISCVException in
generate_exception()to guarantee that all callers ofriscv_raise_exception()will use the enum.Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 51 lines
--- target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 3 ++- target/riscv/translate.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)target/riscv/cpu.h +2
-1@@ -603,7 +603,8 @@ void riscv_cpu_set_mode(CPURISCVState *env, target_ulong newpriv, bool virt_en);void riscv_translate_init (void ); G_NORETURN void riscv_raise_exception(CPURISCVState *env, -uint32_t exception,uintptr_t pc); +RISCVException exception, +uintptr_t pc);target_ulong riscv_cpu_get_fflags (CPURISCVState *env);void riscv_cpu_set_fflags (CPURISCVState *env,target_ulong );target/riscv/op_helper.c +2
-1@@ -27,7 +27,8 @@/* Exceptions processing helpers */ G_NORETURN void riscv_raise_exception(CPURISCVState *env, -uint32_t exception,uintptr_t pc) +RISCVException exception, +uintptr_t pc) {CPUState *cs =env_cpu (env); cs->exception_index = exception;target/riscv/translate.c +1
-2@@ -244,7 +244,7 @@ static void gen_update_pc(DisasContext *ctx, target_long diff) ctx->pc_save = ctx->base.pc_next + diff; } -static void generate_exception (DisasContext *ctx,int excp) +static void generate_exception (DisasContext *ctx,RISCVException excp) {gen_update_pc (ctx,0 );gen_helper_raise_exception (tcg_env,tcg_constant_i32 (excp)); --2.47.1
Re: [PATCH 1/2] target/riscv: use RISCVException enum in exception helpers
In reply to Daniel Henrique BarbozaQuoted 8 lines · Daniel Henrique Barboza
Do a cosmetic change in
riscv_raise_exception()to change 'exception' type fromuint32_tto RISCVException, making it a bit clear that the arg is directly correlated to the RISCVException enum.As a side effect, change 'excp' type from int to RISCVException in
generate_exception()to guarantee that all callers ofriscv_raise_exception()will use the enum.
Quoted 6 lines
Signed-off-by Daniel Henrique Barboza <[email protected]>--- target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 3 ++- target/riscv/translate.c | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-)
PATCH 2/2 target/riscv: add trace in riscv_raise_exception()
In reply to Daniel Henrique BarbozaWhen using system mode we can get the CPU traps being taken via the 'riscv_trap' trace or the "-d int" qemu log. User mode does not a way of logging/showing exceptions to users.
Add a trace in riscv_raise_exception() to allow qemu-riscv(32/64) users to check all exceptions being thrown. This is particularly useful to help identifying insns that are throwing SIGILLs.
As it is today we need to debug their binaries to identify where the illegal insns are:
$ ~/work/qemu/build/qemu-riscv64 -cpu rv64 ./foo.out Illegal instruction (core dumped)
After this change users can capture the trace and use EPC to pinpoint the insn:
$ ~/work/qemu/build/qemu-riscv64 -cpu rv64 -trace riscv_exception ./foo.out riscv_exception 8 (user_ecall) on epc 0x17cd2 riscv_exception 8 (user_ecall) on epc 0x17cda riscv_exception 8 (user_ecall) on epc 0x17622 (...) riscv_exception 2 (illegal_instruction) on epc 0x1053a Illegal instruction (core dumped)
--- target/riscv/op_helper.c | 6 ++++++ target/riscv/trace-events | 3 +++ 2 files changed, 9 insertions(+)
target/riscv/op_helper.c +6 -0
@@ -24,6 +24,7 @@#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "trace.h" /* Exceptions processing helpers */ G_NORETURN void riscv_raise_exception(CPURISCVState *env,
@@ -31,6 +32,11 @@ G_NORETURN void riscv_raise_exception(CPURISCVState *env, uintptr_t pc) {CPUState *cs =env_cpu (env); + +trace_riscv_exception (exception, +riscv_cpu_get_trap_name (exception, false), + env->pc); + cs->exception_index = exception;cpu_loop_exit_restore (cs, pc); }
target/riscv/trace-events +3 -0
@@ -9,3 +9,6 @@ pmpaddr_csr_write(uint64_t mhartid, uint32_t addr_index, uint64_t val) "hart %" mseccfg_csr_read(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": read mseccfg, val: 0x%" PRIx64 mseccfg_csr_write(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": write mseccfg, val: 0x%" PRIx64 + +# op_helper.c +riscv_exception(uint32_t exception, const char *desc, uint64_t epc) "%u (%s) on epc 0x%"PRIx64""
Signature · 1 line
2.47.1
Re: [PATCH 2/2] target/riscv: add trace in riscv_raise_exception()
Quoted 26 lines · Daniel Henrique Barboza
When using system mode we can get the CPU traps being taken via the '
riscv_trap' trace or the "-d int" qemu log. User mode does not a way of logging/showing exceptions to users.Add a trace in
riscv_raise_exception()to allow qemu-riscv(32/64) users to check all exceptions being thrown. This is particularly useful to help identifying insns that are throwing SIGILLs.As it is today we need to debug their binaries to identify where the illegal insns are:
$ ~/work/qemu/build/qemu-riscv64 -cpu rv64 ./foo.out Illegal instruction (core dumped)After this change users can capture the trace and use EPC to pinpoint the insn:
$ ~/work/qemu/build/qemu-riscv64 -cpu rv64 -trace riscv_exception ./foo.out riscv_exception 8 (user_ecall) on epc 0x17cd2 riscv_exception 8 (user_ecall) on epc 0x17cda riscv_exception 8 (user_ecall) on epc 0x17622 (...) riscv_exception 2 (illegal_instruction) on epc 0x1053a Illegal instruction (core dumped)
Quoted 1 line
Signed-off-by Daniel Henrique Barboza <[email protected]>
Alistair
Quoted 44 lines
--- target/riscv/op_helper.c | 6 ++++++ target/riscv/trace-events | 3 +++ 2 files changed, 9 insertions(+)target/riscv/op_helper.c +6
-0@@ -24,6 +24,7 @@#include "exec/exec-all.h" #include "exec/cpu_ldst.h" #include "exec/helper-proto.h" +#include "trace.h" /* Exceptions processing helpers */ G_NORETURN void riscv_raise_exception(CPURISCVState *env,@@ -31,6 +32,11 @@ G_NORETURN void riscv_raise_exception(CPURISCVState *env, uintptr_t pc) {CPUState *cs =env_cpu (env); + +trace_riscv_exception (exception, +riscv_cpu_get_trap_name (exception, false), + env->pc); + cs->exception_index = exception;cpu_loop_exit_restore (cs, pc); }target/riscv/trace-events +3
-1@@ -9,3 +9,6 @@ pmpaddr_csr_write(uint64_t mhartid, uint32_t addr_index, uint64_t val) "hart %" mseccfg_csr_read(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": read mseccfg, val: 0x%" PRIx64 mseccfg_csr_write(uint64_t mhartid, uint64_t val) "hart %" PRIu64 ": write mseccfg, val: 0x%" PRIx64 + +# op_helper.c +riscv_exception(uint32_t exception, const char *desc, uint64_t epc) "%u (%s) on epc 0x%"PRIx64"" --2.47.1
Quoted 7 lines · Daniel Henrique Barboza
Hi,
Let's add trace capabilities in
riscv_raise_exception()to allow users of qemu-riscv(32/64) to have a little more information when a SIGILL occurs. This is done in patch 2.
Quoted 5 lines
Patch 1 is a "look and feel" patch that I figured was worth doing.
Daniel Henrique Barboza (2):
target/riscv: use RISCVException enum in exception helpers target/riscv: add trace inriscv_raise_exception()
Do you mind rebasing on
https://github.com/alistair23/qemu/tree/riscv-to-apply.next ?
Alistair
Quoted 11 lines
target/riscv/cpu.h | 3 ++- target/riscv/op_helper.c | 9 ++++++++- target/riscv/trace-events | 3 +++ target/riscv/translate.c | 2 +- 4 files changed, 14 insertions(+), 3 deletions(-)--
2.47.1