diff mbox

[43/49] arm: move arm_log_exception into .c file

Message ID 1458125219-131698-44-git-send-email-pbonzini@redhat.com (mailing list archive)
State New, archived
Headers show

Commit Message

Paolo Bonzini March 16, 2016, 10:46 a.m. UTC
Avoid need for qemu/log.h inclusion.

Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
 target-arm/helper.c    | 14 ++++++++++++++
 target-arm/internals.h | 15 +--------------
 2 files changed, 15 insertions(+), 14 deletions(-)

Comments

Peter Maydell March 16, 2016, 11:18 a.m. UTC | #1
On 16 March 2016 at 10:46, Paolo Bonzini <pbonzini@redhat.com> wrote:
> Avoid need for qemu/log.h inclusion.
>
> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
> ---
>  target-arm/helper.c    | 14 ++++++++++++++
>  target-arm/internals.h | 15 +--------------
>  2 files changed, 15 insertions(+), 14 deletions(-)
>
> diff --git a/target-arm/helper.c b/target-arm/helper.c
> index eaded41..f71a78f 100644
> --- a/target-arm/helper.c
> +++ b/target-arm/helper.c
> @@ -5810,6 +5810,20 @@ static void do_v7m_exception_exit(CPUARMState *env)
>         pointer.  */
>  }
>
> +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)
>  {

Missing blank line after '}'.

Also, arm_log_exception() is now only used in helper.c so you could just
make it static in this file.

thanks
-- PMM
diff mbox

Patch

diff --git a/target-arm/helper.c b/target-arm/helper.c
index eaded41..f71a78f 100644
--- a/target-arm/helper.c
+++ b/target-arm/helper.c
@@ -5810,6 +5810,20 @@  static void do_v7m_exception_exit(CPUARMState *env)
        pointer.  */
 }
 
+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..5c7d146 100644
--- a/target-arm/internals.h
+++ b/target-arm/internals.h
@@ -72,20 +72,7 @@  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);
-    }
-}
+void arm_log_exception(int idx);
 
 /* Scale factor for generic timers, ie number of ns per tick.
  * This gives a 62.5MHz timer.