From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:54045) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya4Ib-0001fI-US for qemu-devel@nongnu.org; Mon, 23 Mar 2015 11:29:54 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1Ya4IX-00088C-58 for qemu-devel@nongnu.org; Mon, 23 Mar 2015 11:29:53 -0400 Received: from mx1.redhat.com ([209.132.183.28]:34649) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1Ya4IX-000873-0z for qemu-devel@nongnu.org; Mon, 23 Mar 2015 11:29:49 -0400 From: Stefan Hajnoczi Date: Mon, 23 Mar 2015 15:29:29 +0000 Message-Id: <1427124571-28598-8-git-send-email-stefanha@redhat.com> In-Reply-To: <1427124571-28598-1-git-send-email-stefanha@redhat.com> References: <1427124571-28598-1-git-send-email-stefanha@redhat.com> Subject: [Qemu-devel] [PATCH v3 7/9] omap_intc: convert ffs(3) to ctz32() in omap_inth_sir_update() List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Paolo Bonzini , Markus Armbruster , Stefan Hajnoczi , Peter Maydell From: Paolo Bonzini The loop previously terminated on ffs(0) == 0, now it terminates on ctz32(0) + 1 == 33. Other than this change, ffs() is simply replaced with ctz32() + 1. Cc: Peter Maydell Signed-off-by: Paolo Bonzini Signed-off-by: Stefan Hajnoczi --- hw/intc/omap_intc.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/hw/intc/omap_intc.c b/hw/intc/omap_intc.c index ad3931c..e9b38a3 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; -- 2.1.0