[v2,07/13] armv7m: Remove unused armv7m_nvic_acknowledge_irq() return value

Message ID 1487262963-11519-8-git-send-email-peter.maydell@linaro.org
State Superseded
Headers show
Series
  • Rewrite NVIC to not depend on the GIC
Related show

Commit Message

Peter Maydell Feb. 16, 2017, 4:35 p.m.
Having armv7m_nvic_acknowledge_irq() return the new value of
env->v7m.exception and its one caller assign the return value
back to env->v7m.exception is pointless. Just make the return
type void instead.

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

Reviewed-by: Alex Bennée <alex.bennee@linaro.org>

---
 target/arm/cpu.h      | 2 +-
 hw/intc/armv7m_nvic.c | 4 +---
 target/arm/helper.c   | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

-- 
2.7.4

Comments

Philippe Mathieu-Daudé April 17, 2017, 3:42 a.m. | #1
On 02/16/2017 01:35 PM, Peter Maydell wrote:
> Having armv7m_nvic_acknowledge_irq() return the new value of

> env->v7m.exception and its one caller assign the return value

> back to env->v7m.exception is pointless. Just make the return

> type void instead.

>

> Signed-off-by: Peter Maydell <peter.maydell@linaro.org>

> Reviewed-by: Alex Bennée <alex.bennee@linaro.org>


Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>


> ---

>  target/arm/cpu.h      | 2 +-

>  hw/intc/armv7m_nvic.c | 4 +---

>  target/arm/helper.c   | 2 +-

>  3 files changed, 3 insertions(+), 5 deletions(-)

>

> diff --git a/target/arm/cpu.h b/target/arm/cpu.h

> index 53299fa..ab46c0c 100644

> --- a/target/arm/cpu.h

> +++ b/target/arm/cpu.h

> @@ -1351,7 +1351,7 @@ static inline bool armv7m_nvic_can_take_pending_exception(void *opaque)

>  }

>  #endif

>  void armv7m_nvic_set_pending(void *opaque, int irq);

> -int armv7m_nvic_acknowledge_irq(void *opaque);

> +void armv7m_nvic_acknowledge_irq(void *opaque);

>  void armv7m_nvic_complete_irq(void *opaque, int irq);

>

>  /* Interface for defining coprocessor registers.

> diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c

> index d9b9a43..010bf92 100644

> --- a/hw/intc/armv7m_nvic.c

> +++ b/hw/intc/armv7m_nvic.c

> @@ -412,7 +412,7 @@ void armv7m_nvic_set_pending(void *opaque, int irq)

>  }

>

>  /* Make pending IRQ active.  */

> -int armv7m_nvic_acknowledge_irq(void *opaque)

> +void armv7m_nvic_acknowledge_irq(void *opaque)

>  {

>      NVICState *s = (NVICState *)opaque;

>      CPUARMState *env = &s->cpu->env;

> @@ -439,8 +439,6 @@ int armv7m_nvic_acknowledge_irq(void *opaque)

>      env->v7m.exception = s->vectpending;

>

>      nvic_irq_update(s);

> -

> -    return env->v7m.exception;

>  }

>

>  void armv7m_nvic_complete_irq(void *opaque, int irq)

> diff --git a/target/arm/helper.c b/target/arm/helper.c

> index bac1718..050d8df 100644

> --- a/target/arm/helper.c

> +++ b/target/arm/helper.c

> @@ -6141,7 +6141,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)

>          armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG);

>          return;

>      case EXCP_IRQ:

> -        env->v7m.exception = armv7m_nvic_acknowledge_irq(env->nvic);

> +        armv7m_nvic_acknowledge_irq(env->nvic);

>          break;

>      case EXCP_EXCEPTION_EXIT:

>          do_v7m_exception_exit(env);

>

Patch

diff --git a/target/arm/cpu.h b/target/arm/cpu.h
index 53299fa..ab46c0c 100644
--- a/target/arm/cpu.h
+++ b/target/arm/cpu.h
@@ -1351,7 +1351,7 @@  static inline bool armv7m_nvic_can_take_pending_exception(void *opaque)
 }
 #endif
 void armv7m_nvic_set_pending(void *opaque, int irq);
-int armv7m_nvic_acknowledge_irq(void *opaque);
+void armv7m_nvic_acknowledge_irq(void *opaque);
 void armv7m_nvic_complete_irq(void *opaque, int irq);
 
 /* Interface for defining coprocessor registers.
diff --git a/hw/intc/armv7m_nvic.c b/hw/intc/armv7m_nvic.c
index d9b9a43..010bf92 100644
--- a/hw/intc/armv7m_nvic.c
+++ b/hw/intc/armv7m_nvic.c
@@ -412,7 +412,7 @@  void armv7m_nvic_set_pending(void *opaque, int irq)
 }
 
 /* Make pending IRQ active.  */
-int armv7m_nvic_acknowledge_irq(void *opaque)
+void armv7m_nvic_acknowledge_irq(void *opaque)
 {
     NVICState *s = (NVICState *)opaque;
     CPUARMState *env = &s->cpu->env;
@@ -439,8 +439,6 @@  int armv7m_nvic_acknowledge_irq(void *opaque)
     env->v7m.exception = s->vectpending;
 
     nvic_irq_update(s);
-
-    return env->v7m.exception;
 }
 
 void armv7m_nvic_complete_irq(void *opaque, int irq)
diff --git a/target/arm/helper.c b/target/arm/helper.c
index bac1718..050d8df 100644
--- a/target/arm/helper.c
+++ b/target/arm/helper.c
@@ -6141,7 +6141,7 @@  void arm_v7m_cpu_do_interrupt(CPUState *cs)
         armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG);
         return;
     case EXCP_IRQ:
-        env->v7m.exception = armv7m_nvic_acknowledge_irq(env->nvic);
+        armv7m_nvic_acknowledge_irq(env->nvic);
         break;
     case EXCP_EXCEPTION_EXIT:
         do_v7m_exception_exit(env);