hw/openrisc: Fix masking in openrisc_pic_cpu_handler()
Consider the masking of PICSR and PICMR: ((cpu->env.picsr && (1 << i)) && (cpu->env.picmr && (1 << i))) To correctly mask bits, we should use the bitwise AND "&" rather than the logical AND "&&". Also, the loop is not necessary for masking. Simply use (cpu->env.picsr & cpu->env.picmr). Signed-off-by: Xi Wang <xi.wang@gmail.com> Acked-by: Jia Liu <proljc@gmail.com>
This commit is contained in:
parent
b6d9766ddf
commit
ed396e2b2d
|
@ -26,7 +26,6 @@ static void openrisc_pic_cpu_handler(void *opaque, int irq, int level)
|
||||||
{
|
{
|
||||||
OpenRISCCPU *cpu = (OpenRISCCPU *)opaque;
|
OpenRISCCPU *cpu = (OpenRISCCPU *)opaque;
|
||||||
CPUState *cs = CPU(cpu);
|
CPUState *cs = CPU(cpu);
|
||||||
int i;
|
|
||||||
uint32_t irq_bit = 1 << irq;
|
uint32_t irq_bit = 1 << irq;
|
||||||
|
|
||||||
if (irq > 31 || irq < 0) {
|
if (irq > 31 || irq < 0) {
|
||||||
|
@ -39,13 +38,11 @@ static void openrisc_pic_cpu_handler(void *opaque, int irq, int level)
|
||||||
cpu->env.picsr &= ~irq_bit;
|
cpu->env.picsr &= ~irq_bit;
|
||||||
}
|
}
|
||||||
|
|
||||||
for (i = 0; i < 32; i++) {
|
if (cpu->env.picsr & cpu->env.picmr) {
|
||||||
if ((cpu->env.picsr && (1 << i)) && (cpu->env.picmr && (1 << i))) {
|
cpu_interrupt(cs, CPU_INTERRUPT_HARD);
|
||||||
cpu_interrupt(cs, CPU_INTERRUPT_HARD);
|
} else {
|
||||||
} else {
|
cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
|
||||||
cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
|
cpu->env.picsr = 0;
|
||||||
cpu->env.picsr &= ~(1 << i);
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue