Commit 27a7ea8a authored by Paolo Bonzini's avatar Paolo Bonzini
Browse files

arm: move arm_log_exception into .c file 



Avoid need for qemu/log.h inclusion, and make the function static too.

Reviewed-by: default avatarAlex Bennée <alex.bennee@linaro.org>
Signed-off-by: default avatarPaolo Bonzini <pbonzini@redhat.com>
parent 33c11879

target-arm/helper.c

+15 −0
Original line number Diff line number Diff line
@@ -5819,6 +5819,21 @@ static void do_v7m_exception_exit(CPUARMState *env) 
       pointer.  */

}



static void arm_log_exception(int idx)

{

    if (qemu_loglevel_mask(CPU_LOG_INT)) {

        const char *exc = NULL;



        if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {

            exc = excnames[idx];

        }

        if (!exc) {

            exc = "unknown";

        }

        qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);

    }

}



void arm_v7m_cpu_do_interrupt(CPUState *cs)

{

    ARMCPU *cpu = ARM_CPU(cs);

target-arm/internals.h

+0 −15
Original line number Diff line number Diff line
@@ -72,21 +72,6 @@ static const char * const excnames[] = { 
    [EXCP_SEMIHOST] = "Semihosting call",

};



static inline void arm_log_exception(int idx)

{

    if (qemu_loglevel_mask(CPU_LOG_INT)) {

        const char *exc = NULL;



        if (idx >= 0 && idx < ARRAY_SIZE(excnames)) {

            exc = excnames[idx];

        }

        if (!exc) {

            exc = "unknown";

        }

        qemu_log_mask(CPU_LOG_INT, "Taking exception %d [%s]\n", idx, exc);

    }

}



/* Scale factor for generic timers, ie number of ns per tick.

 * This gives a 62.5MHz timer.

 */