diff options
| author | Marcelo Tosatti <mtosatti@redhat.com> | 2010-02-17 04:26:53 -0200 |
|---|---|---|
| committer | Marcelo Tosatti <mtosatti@redhat.com> | 2010-02-17 04:26:53 -0200 |
| commit | 282ab3a578b442a157b9cb4d2c19492d2aad1e55 (patch) | |
| tree | b78b987f00a226a43dca60d184ef0e91168bf317 /cpu-exec.c | |
| parent | f74843ae19d16e9797130095755dab95691d7abb (diff) | |
| parent | bf76bafa5ade434ef2747ceeeeaa95510ecb7946 (diff) | |
Merge commit 'bf76bafa5ade434ef2747ceeeeaa95510ecb7946' into upstream-merge
* commit 'bf76bafa5ade434ef2747ceeeeaa95510ecb7946':
crisv10: Prettify.
sparc32 fix spurious dma interrupts v2
Revert "Sparc32: improve DMA controller IRQ debugging"
cris: Add support for CRISv10 translation.
cris: Use tcg_gen_movi_tl.
cris: Add v10 style interrupts.
crisv10: Always clear the V and C flags on btst.
cris: Prepare for CRISv10.
dec: use PCI accessors
sparc64: use PCI accessors for APB/PBM
Signed-off-by: Marcelo Tosatti <mtosatti@redhat.com>
Diffstat (limited to 'cpu-exec.c')
| -rw-r--r-- | cpu-exec.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cpu-exec.c b/cpu-exec.c index fa878c567..cb1b63da7 100644 --- a/cpu-exec.c +++ b/cpu-exec.c @@ -504,7 +504,8 @@ int cpu_exec(CPUState *env1) } #elif defined(TARGET_CRIS) if (interrupt_request & CPU_INTERRUPT_HARD - && (env->pregs[PR_CCS] & I_FLAG)) { + && (env->pregs[PR_CCS] & I_FLAG) + && !env->locked_irq) { env->exception_index = EXCP_IRQ; do_interrupt(env); next_tb = 0; |