| Message ID | 1524699938-6764-35-git-send-email-mjc@sifive.com |
|---|---|
| State | New |
| Headers | show |
| Series | QEMU 2.13 Privileged ISA emulation updates | expand |
On Wed, Apr 25, 2018 at 5:05 PM Michael Clark <mjc@sifive.com> wrote: > Add carriage return that was erroneously removed > when converting to qemu_log. Change hard coded > core number to the actual hartid. > Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> > Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> > Cc: Palmer Dabbelt <palmer@sifive.com> > Cc: Alistair Francis <Alistair.Francis@wdc.com> > Signed-off-by: Michael Clark <mjc@sifive.com> Reviewed-by: Alistair Francis <alistair.francis@wdc.com> Alistair > --- > target/riscv/cpu_helper.c | 18 ++++++++++-------- > 1 file changed, 10 insertions(+), 8 deletions(-) > diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c > index 5d33f7b..a45885f 100644 > --- a/target/riscv/cpu_helper.c > +++ b/target/riscv/cpu_helper.c > @@ -445,11 +445,13 @@ void riscv_cpu_do_interrupt(CPUState *cs) > if (RISCV_DEBUG_INTERRUPT) { > int log_cause = cs->exception_index & RISCV_EXCP_INT_MASK; > if (cs->exception_index & RISCV_EXCP_INT_FLAG) { > - qemu_log_mask(LOG_TRACE, "core 0: trap %s, epc 0x" TARGET_FMT_lx, > - riscv_intr_names[log_cause], env->pc); > + qemu_log_mask(LOG_TRACE, "core " > + TARGET_FMT_ld ": trap %s, epc 0x" TARGET_FMT_lx "\n", > + env->mhartid, riscv_intr_names[log_cause], env->pc); > } else { > - qemu_log_mask(LOG_TRACE, "core 0: intr %s, epc 0x" TARGET_FMT_lx, > - riscv_excp_names[log_cause], env->pc); > + qemu_log_mask(LOG_TRACE, "core " > + TARGET_FMT_ld ": intr %s, epc 0x" TARGET_FMT_lx "\n", > + env->mhartid, riscv_excp_names[log_cause], env->pc); > } > } > @@ -511,8 +513,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) > if (hasbadaddr) { > if (RISCV_DEBUG_INTERRUPT) { > - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld > - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); > + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" > + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); > } > env->sbadaddr = env->badaddr; > } else { > @@ -536,8 +538,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) > if (hasbadaddr) { > if (RISCV_DEBUG_INTERRUPT) { > - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld > - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); > + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" > + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); > } > env->mbadaddr = env->badaddr; > } else { > -- > 2.7.0
diff --git a/target/riscv/cpu_helper.c b/target/riscv/cpu_helper.c index 5d33f7b..a45885f 100644 --- a/target/riscv/cpu_helper.c +++ b/target/riscv/cpu_helper.c @@ -445,11 +445,13 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (RISCV_DEBUG_INTERRUPT) { int log_cause = cs->exception_index & RISCV_EXCP_INT_MASK; if (cs->exception_index & RISCV_EXCP_INT_FLAG) { - qemu_log_mask(LOG_TRACE, "core 0: trap %s, epc 0x" TARGET_FMT_lx, - riscv_intr_names[log_cause], env->pc); + qemu_log_mask(LOG_TRACE, "core " + TARGET_FMT_ld ": trap %s, epc 0x" TARGET_FMT_lx "\n", + env->mhartid, riscv_intr_names[log_cause], env->pc); } else { - qemu_log_mask(LOG_TRACE, "core 0: intr %s, epc 0x" TARGET_FMT_lx, - riscv_excp_names[log_cause], env->pc); + qemu_log_mask(LOG_TRACE, "core " + TARGET_FMT_ld ": intr %s, epc 0x" TARGET_FMT_lx "\n", + env->mhartid, riscv_excp_names[log_cause], env->pc); } } @@ -511,8 +513,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (hasbadaddr) { if (RISCV_DEBUG_INTERRUPT) { - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); } env->sbadaddr = env->badaddr; } else { @@ -536,8 +538,8 @@ void riscv_cpu_do_interrupt(CPUState *cs) if (hasbadaddr) { if (RISCV_DEBUG_INTERRUPT) { - qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld - ": badaddr 0x" TARGET_FMT_lx, env->mhartid, env->badaddr); + qemu_log_mask(LOG_TRACE, "core " TARGET_FMT_ld ": badaddr 0x" + TARGET_FMT_lx "\n", env->mhartid, env->badaddr); } env->mbadaddr = env->badaddr; } else {
Add carriage return that was erroneously removed when converting to qemu_log. Change hard coded core number to the actual hartid. Cc: Sagar Karandikar <sagark@eecs.berkeley.edu> Cc: Bastian Koppelmann <kbastian@mail.uni-paderborn.de> Cc: Palmer Dabbelt <palmer@sifive.com> Cc: Alistair Francis <Alistair.Francis@wdc.com> Signed-off-by: Michael Clark <mjc@sifive.com> --- target/riscv/cpu_helper.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-)