Revert "hw/apic.c: use fls() from host-utils"

This reverts commit 5876.

Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5890 c046a42c-6fe2-441c-8c8c-71466251a162
This commit is contained in:
aurel32 2008-12-06 10:46:35 +00:00
parent bf9298b90e
commit 3b63c04e1b

View File

@ -105,6 +105,12 @@ static void apic_init_ipi(APICState *s);
static void apic_set_irq(APICState *s, int vector_num, int trigger_mode); static void apic_set_irq(APICState *s, int vector_num, int trigger_mode);
static void apic_update_irq(APICState *s); static void apic_update_irq(APICState *s);
/* Find first bit starting from msb */
static int fls_bit(uint32_t value)
{
return 31 - clz32(value);
}
/* Find first bit starting from lsb */ /* Find first bit starting from lsb */
static int ffs_bit(uint32_t value) static int ffs_bit(uint32_t value)
{ {
@ -300,7 +306,7 @@ static int get_highest_priority_int(uint32_t *tab)
int i; int i;
for(i = 7; i >= 0; i--) { for(i = 7; i >= 0; i--) {
if (tab[i] != 0) { if (tab[i] != 0) {
return i * 32 + fls(tab[i]); return i * 32 + fls_bit(tab[i]);
} }
} }
return -1; return -1;