Proxmox-Port/qemu
1
0
Fork 0
mirror of https://github.com/qemu/qemu.git synced 2025-08-09 01:50:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

armv7m: Remove unused armv7m_nvic_acknowledge_irq() return value

Browse Source 
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>
This commit is contained in:
Peter Maydell 2017-02-28 12:08:18 +00:00
parent a73c98e159
commit a5d8235545
3 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hw/intc/armv7m_nvic.c
View File

@ -412,7 +412,7 @@ void armv7m_nvic_set_pending(void *opaque, int irq)
} }
/* Make pending IRQ active. */ /* Make pending IRQ active. */
int armv7m_nvic_acknowledge_irq(void *opaque) void armv7m_nvic_acknowledge_irq(void *opaque)
{ {
NVICState *s = (NVICState *)opaque; NVICState *s = (NVICState *)opaque;
CPUARMState *env = &s->cpu->env; CPUARMState *env = &s->cpu->env;
@ -439,8 +439,6 @@ int armv7m_nvic_acknowledge_irq(void *opaque)
env->v7m.exception = s->vectpending; env->v7m.exception = s->vectpending;
nvic_irq_update(s); nvic_irq_update(s);
return env->v7m.exception;
} }
void armv7m_nvic_complete_irq(void *opaque, int irq) void armv7m_nvic_complete_irq(void *opaque, int irq)

2
target/arm/cpu.h
View File

@ -1365,7 +1365,7 @@ static inline bool armv7m_nvic_can_take_pending_exception(void *opaque)
} }
#endif #endif
void armv7m_nvic_set_pending(void *opaque, int irq); 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); void armv7m_nvic_complete_irq(void *opaque, int irq);
/* Interface for defining coprocessor registers. /* Interface for defining coprocessor registers.

2
target/arm/helper.c
View File

@ -6142,7 +6142,7 @@ void arm_v7m_cpu_do_interrupt(CPUState *cs)
armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG); armv7m_nvic_set_pending(env->nvic, ARMV7M_EXCP_DEBUG);
return; return;
case EXCP_IRQ: case EXCP_IRQ:
env->v7m.exception = armv7m_nvic_acknowledge_irq(env->nvic); armv7m_nvic_acknowledge_irq(env->nvic);
break; break;
case EXCP_EXCEPTION_EXIT: case EXCP_EXCEPTION_EXIT:
do_v7m_exception_exit(env); do_v7m_exception_exit(env);