aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAnthony Liguori <anthony@codemonkey.ws>2013-08-22 09:29:13 -0500
committerAnthony Liguori <anthony@codemonkey.ws>2013-08-22 09:29:13 -0500
commit9fe480695ad8c9126ac8f318a0241e10aad7a25b (patch)
tree60e36a0433148bd8d37cceafb3d19e4690b66b5b
parentecfe10c9a6f9bc77d0e4b7eb5d0f5d61e8fbaed8 (diff)
parent7717f248eebdcfe6de400404d0cf65dcb3633308 (diff)
Merge remote-tracking branch 'jliu/or32' into staging
# By Jia Liu # Via Jia Liu * jliu/or32: hw/openrisc: Avoid undefined shift in openrisc_pic_cpu_handler() hw/openrisc: Fix masking in openrisc_pic_cpu_handler() hw/openrisc: Avoid using uninitialised variable 'entry' Message-id: 1377050811-11116-1-git-send-email-proljc@gmail.com Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
-rw-r--r--hw/openrisc/openrisc_sim.c3
-rw-r--r--hw/openrisc/pic_cpu.c17
2 files changed, 9 insertions, 11 deletions
diff --git a/hw/openrisc/openrisc_sim.c b/hw/openrisc/openrisc_sim.c
index a08f27ce2e..28fa41d64e 100644
--- a/hw/openrisc/openrisc_sim.c
+++ b/hw/openrisc/openrisc_sim.c
@@ -86,9 +86,8 @@ static void cpu_openrisc_load_kernel(ram_addr_t ram_size,
kernel_filename);
exit(1);
}
+ cpu->env.pc = entry;
}
-
- cpu->env.pc = entry;
}
static void openrisc_sim_init(QEMUMachineInitArgs *args)
diff --git a/hw/openrisc/pic_cpu.c b/hw/openrisc/pic_cpu.c
index ca0b7c11bd..2af1d6013a 100644
--- a/hw/openrisc/pic_cpu.c
+++ b/hw/openrisc/pic_cpu.c
@@ -26,26 +26,25 @@ static void openrisc_pic_cpu_handler(void *opaque, int irq, int level)
{
OpenRISCCPU *cpu = (OpenRISCCPU *)opaque;
CPUState *cs = CPU(cpu);
- int i;
- uint32_t irq_bit = 1 << irq;
+ uint32_t irq_bit;
if (irq > 31 || irq < 0) {
return;
}
+ irq_bit = 1U << irq;
+
if (level) {
cpu->env.picsr |= irq_bit;
} else {
cpu->env.picsr &= ~irq_bit;
}
- for (i = 0; i < 32; i++) {
- if ((cpu->env.picsr && (1 << i)) && (cpu->env.picmr && (1 << i))) {
- cpu_interrupt(cs, CPU_INTERRUPT_HARD);
- } else {
- cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
- cpu->env.picsr &= ~(1 << i);
- }
+ if (cpu->env.picsr & cpu->env.picmr) {
+ cpu_interrupt(cs, CPU_INTERRUPT_HARD);
+ } else {
+ cpu_reset_interrupt(cs, CPU_INTERRUPT_HARD);
+ cpu->env.picsr = 0;
}
}