summaryrefslogtreecommitdiffstats
path: root/hw/intc/omap_intc.c
diff options
context:
space:
mode:
authorPaolo Bonzini2015-03-23 16:29:29 +0100
committerKevin Wolf2015-04-28 15:36:08 +0200
commit41074f3d3ff0e9a3c6f638627c12ebbf6d757cea (patch)
treeec3bc9485585d311b5a14e590719562967fb604b /hw/intc/omap_intc.c
parentsd: convert sd_normal_command() ffs(3) call to ctz32() (diff)
downloadqemu-41074f3d3ff0e9a3c6f638627c12ebbf6d757cea.tar.gz
qemu-41074f3d3ff0e9a3c6f638627c12ebbf6d757cea.tar.xz
qemu-41074f3d3ff0e9a3c6f638627c12ebbf6d757cea.zip
omap_intc: convert ffs(3) to ctz32() in omap_inth_sir_update()
Rewrite the loop using level &= level - 1 to clear the least significant bit after each iteration. This simplifies the loop and makes it easy to replace ffs(3) with ctz32(). Cc: Peter Maydell <peter.maydell@linaro.org> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com> Signed-off-by: Stefan Hajnoczi <stefanha@redhat.com> Message-id: 1427124571-28598-8-git-send-email-stefanha@redhat.com Signed-off-by: Kevin Wolf <kwolf@redhat.com>
Diffstat (limited to 'hw/intc/omap_intc.c')
-rw-r--r--hw/intc/omap_intc.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c
index ad3931c112..e9b38a3c63 100644
--- a/hw/intc/omap_intc.c
+++ b/hw/intc/omap_intc.c
@@ -60,7 +60,7 @@ struct omap_intr_handler_s {
static void omap_inth_sir_update(struct omap_intr_handler_s *s, int is_fiq)
{
- int i, j, sir_intr, p_intr, p, f;
+ int i, j, sir_intr, p_intr, p;
uint32_t level;
sir_intr = 0;
p_intr = 255;
@@ -72,14 +72,15 @@ static void omap_inth_sir_update(struct omap_intr_handler_s *s, int is_fiq)
for (j = 0; j < s->nbanks; ++j) {
level = s->bank[j].irqs & ~s->bank[j].mask &
(is_fiq ? s->bank[j].fiq : ~s->bank[j].fiq);
- for (f = ffs(level), i = f - 1, level >>= f - 1; f; i += f,
- level >>= f) {
+
+ while (level != 0) {
+ i = ctz32(level);
p = s->bank[j].priority[i];
if (p <= p_intr) {
p_intr = p;
sir_intr = 32 * j + i;
}
- f = ffs(level >> 1);
+ level &= level - 1;
}
}
s->sir_intr[is_fiq] = sir_intr;