gwj / at91sam9263 · Commits

Commit 3b63c04e1bcf626ca24d3fa92b5872c73f1ba8d5

Authored by aurel32
1 parent bf9298b9

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
Inline Side-by-side
Showing 1 changed file with 7 additions and 1 deletions
hw/apic.c
  View file @3b63c04
@@ -105,6 +105,12 @@ static void apic_init_ipi(APICState *s); @@ -105,6 +105,12 @@ static void apic_init_ipi(APICState *s);
105 static void apic_set_irq(APICState *s, int vector_num, int trigger_mode); 105 static void apic_set_irq(APICState *s, int vector_num, int trigger_mode);
106 static void apic_update_irq(APICState *s); 106 static void apic_update_irq(APICState *s);
107 107
  108 +/* Find first bit starting from msb */
  109 +static int fls_bit(uint32_t value)
  110 +{
  111 + return 31 - clz32(value);
  112 +}
  113 +
108 /* Find first bit starting from lsb */ 114 /* Find first bit starting from lsb */
109 static int ffs_bit(uint32_t value) 115 static int ffs_bit(uint32_t value)
110 { 116 {
@@ -300,7 +306,7 @@ static int get_highest_priority_int(uint32_t *tab) @@ -300,7 +306,7 @@ static int get_highest_priority_int(uint32_t *tab)
300 int i; 306 int i;
301 for(i = 7; i >= 0; i--) { 307 for(i = 7; i >= 0; i--) {
302 if (tab[i] != 0) { 308 if (tab[i] != 0) {
303 - return i * 32 + fls(tab[i]); 309 + return i * 32 + fls_bit(tab[i]);
304 } 310 }
305 } 311 }
306 return -1; 312 return -1;