Re: [Qemu-devel] [PATCH 44/50] arm: move arm_log_exception into .c file

[Alex Bennée]

Paolo Bonzini <address@hidden> writes:

> Avoid need for qemu/log.h inclusion, and make the function static too.
>
> Signed-off-by: Paolo Bonzini <address@hidden>

Reviewed-by: Alex Bennée <address@hidden>

> ---
>  target-arm/helper.c    | 15 +++++++++++++++
>  target-arm/internals.h | 15 ---------------
>  2 files changed, 15 insertions(+), 15 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index 09638b2..41abdff 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -5815,6 +5815,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);
> diff --git a/target-arm/internals.h b/target-arm/internals.h
> index 2e70272..c484700 100644
> --- a/target-arm/internals.h
> +++ b/target-arm/internals.h
> @@ -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.
>   */


--
Alex Bennée