Hi Michael,
On 05/22/2018 09:15 PM, Michael Clark wrote:
> Add carriage return that was erroneously removed
> when converting to qemu_log. Change hard coded
> core number to the actual hartid.
I think it makes more sens to move this patch before your 6/30 "Move
non-ops from op_helper to cpu_helper".
>
> Cc: Sagar Karandikar <sag...@eecs.berkeley.edu>
> Cc: Bastian Koppelmann <kbast...@mail.uni-paderborn.de>
> Cc: Palmer Dabbelt <pal...@sifive.com>
> Cc: Alistair Francis <alistair.fran...@wdc.com>
> Signed-off-by: Michael Clark <m...@sifive.com>
Reviewed-by: Philippe Mathieu-Daudé <f4...@amsat.org>
> ---
> 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 bc15e19022cc..69592c037042 100644
> --- a/target/riscv/cpu_helper.c
> +++ b/target/riscv/cpu_helper.c
> @@ -446,11 +446,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);
> }
> }
>
> @@ -512,8 +514,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 {
> @@ -537,8 +539,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 {
>
