Changeset 623b49f1 in mainline for kernel/arch/ia32

Timestamp:

2007-01-29T19:22:04Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

1004b37

Parents:

7d07bf3

Message:

fix signed/unsigned comparison and integer overflow

Location:

kernel/arch/ia32

Files:

• include/smp/smp.h (modified) (1 diff)
• src/smp/apic.c (modified) (6 diffs)
• src/smp/mps.c (modified) (2 diffs)
• src/smp/smp.c (modified) (1 diff)

kernel/arch/ia32/include/smp/smp.h

@@ -44 +44 @@
         bool (*cpu_bootstrap)(index_t i);       /**< Check whether the processor of index i is BSP. */
         uint8_t (*cpu_apic_id)(index_t i);              /**< Return APIC ID of the processor of index i. */
-        int (*irq_to_pin)(int irq);             /**< Return mapping between irq and APIC pin. */
+        int (*irq_to_pin)(unsigned int irq);            /**< Return mapping between irq and APIC pin. */
 };
 
-extern int smp_irq_to_pin(int irq);
+extern int smp_irq_to_pin(unsigned int irq);
 
 #endif

kernel/arch/ia32/src/smp/apic.c

@@ -147 +147 @@
 {
         io_apic_id_t idreg;
-        int i;
+        unsigned int i;
 
         exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
@@ -173 +173 @@
         
                 if ((pin = smp_irq_to_pin(i)) != -1)
-                        io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE+i, LOPRI);
+                        io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE + i, LOPRI);
         }
         
@@ -535 +535 @@
 {
         io_redirection_reg_t reg;
-        int i, pin;
-        
-        for (i=0;i<16;i++) {
-                if (irqmask & (1<<i)) {
+        unsigned int i;
+        int pin;
+        
+        for (i = 0; i < 16; i++) {
+                if (irqmask & (1 << i)) {
                         /*
                          * Mask the signal input in IO APIC if there is a
@@ -545 +546 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin*2);
+                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
                                 reg.masked = true;
-                                io_apic_write(IOREDTBL + pin*2, reg.lo);
+                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
                         }
                         
@@ -560 +561 @@
 void io_apic_enable_irqs(uint16_t irqmask)
 {
-        int i, pin;
+        unsigned int i;
+        int pin;
         io_redirection_reg_t reg;       
         
-        for (i=0;i<16;i++) {
-                if (irqmask & (1<<i)) {
+        for (i = 0;i < 16; i++) {
+                if (irqmask & (1 << i)) {
                         /*
                          * Unmask the signal input in IO APIC if there is a
@@ -571 +573 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin*2);
+                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
                                 reg.masked = false;
-                                io_apic_write(IOREDTBL + pin*2, reg.lo);
+                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
                         }
                         

kernel/arch/ia32/src/smp/mps.c

@@ -91 +91 @@
 static bool is_bsp(index_t i);
 static uint8_t get_cpu_apic_id(index_t i);
-static int mps_irq_to_pin(int irq);
+static int mps_irq_to_pin(unsigned int irq);
 
 struct smp_config_operations mps_config_operations = {
@@ -414 +414 @@
 }
 
-int mps_irq_to_pin(int irq)
+int mps_irq_to_pin(unsigned int irq)
 {
         unsigned int i;
         
-        for(i = 0; i < io_intr_entry_cnt; i++) {
+        for (i = 0; i < io_intr_entry_cnt; i++) {
                 if (io_intr_entries[i].src_bus_irq == irq && io_intr_entries[i].intr_type == 0)
                         return io_intr_entries[i].dst_io_apic_pin;

kernel/arch/ia32/src/smp/smp.c

@@ -171 +171 @@
 }
 
-int smp_irq_to_pin(int irq)
+int smp_irq_to_pin(unsigned int irq)
 {
         ASSERT(ops != NULL);