diff options
| author | Edgar E. Iglesias <edgar.iglesias@xilinx.com> | 2014-09-29 18:48:49 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-09-29 18:48:49 +0100 |
| commit | 043b7f8d12dc922172cf7d570dc2854dbf81dcb3 (patch) | |
| tree | 1565f450a12dd17d0a097a3bb6760c8c180e4c3b /target-arm/cpu.c | |
| parent | 9e729b57ac2a3adebee2746a2106a70eb8230a72 (diff) | |
| download | qemu-043b7f8d12dc922172cf7d570dc2854dbf81dcb3.zip qemu-043b7f8d12dc922172cf7d570dc2854dbf81dcb3.tar.gz qemu-043b7f8d12dc922172cf7d570dc2854dbf81dcb3.tar.bz2 | |
target-arm: Break out exception masking to a separate func
Reviewed-by: Greg Bellows <greg.bellows@linaro.org>
Signed-off-by: Edgar E. Iglesias <edgar.iglesias@xilinx.com>
Message-id: 1411718914-6608-5-git-send-email-edgar.iglesias@gmail.com
[PMM: updated to account for recent cpu-exec refactoring]
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'target-arm/cpu.c')
| -rw-r--r-- | target-arm/cpu.c | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/target-arm/cpu.c b/target-arm/cpu.c index 248778d..b7cdcd7 100644 --- a/target-arm/cpu.c +++ b/target-arm/cpu.c @@ -187,12 +187,10 @@ static void arm_cpu_reset(CPUState *s) bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request) { CPUClass *cc = CPU_GET_CLASS(cs); - ARMCPU *cpu = ARM_CPU(cs); - CPUARMState *env = &cpu->env; bool ret = false; if (interrupt_request & CPU_INTERRUPT_FIQ - && !(env->daif & PSTATE_F)) { + && arm_excp_unmasked(cs, EXCP_FIQ)) { cs->exception_index = EXCP_FIQ; cc->do_interrupt(cs); ret = true; @@ -207,8 +205,7 @@ bool arm_cpu_exec_interrupt(CPUState *cs, int interrupt_request) We avoid this by disabling interrupts when pc contains a magic address. */ if (interrupt_request & CPU_INTERRUPT_HARD - && !(env->daif & PSTATE_I) - && (!IS_M(env) || env->regs[15] < 0xfffffff0)) { + && arm_excp_unmasked(cs, EXCP_IRQ)) { cs->exception_index = EXCP_IRQ; cc->do_interrupt(cs); ret = true; |