Changeset 7f043c0 in mainline

Timestamp:

2007-05-31T21:39:13Z (18 years ago)

Author:

Martin Decky <martin@…>

Branches:

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

Children:

7bb0c32

Parents:

d8431986

Message:

fix ICC compilation

Location:

kernel

Files:

• arch/amd64/include/debugger.h (modified) (1 diff)
• arch/amd64/src/debugger.c (modified) (9 diffs)
• arch/ia32/include/asm.h (modified) (1 diff)
• arch/ia32/include/context.h (modified) (1 diff)
• arch/ia32/include/mm/frame.h (modified) (1 diff)
• arch/ia32/include/smp/apic.h (modified) (1 diff)
• arch/ia32/src/ddi/ddi.c (modified) (1 diff)
• arch/ia32/src/mm/page.c (modified) (3 diffs)
• arch/ia32/src/proc/scheduler.c (modified) (1 diff)
• arch/ia32/src/smp/apic.c (modified) (12 diffs)
• arch/ia32/src/smp/mps.c (modified) (11 diffs)
• arch/ia32/src/smp/smp.c (modified) (6 diffs)
• genarch/src/acpi/acpi.c (modified) (6 diffs)
• generic/include/interrupt.h (modified) (1 diff)
• generic/src/printf/printf_core.c (modified) (2 diffs)

kernel/arch/amd64/include/debugger.h

@@ -49 +49 @@
 
 extern void debugger_init(void);
-extern int breakpoint_add(void * where, int flags, int curidx);
+extern int breakpoint_add(const void *where, const int flags, int curidx);
 extern void breakpoint_del(int slot);
 

kernel/arch/amd64/src/debugger.c

@@ -103 +103 @@
 
 /** Print table of active breakpoints */
-int cmd_print_breakpoints(cmd_arg_t *argv)
+int cmd_print_breakpoints(cmd_arg_t *argv __attribute__((unused)))
 {
         int i;
@@ -112 +112 @@
                 if (breakpoints[i].address) {
                         symbol = get_symtab_entry(breakpoints[i].address);
-                        printf("%d. %p in %s\n",i,
+                        printf("%d. %lx in %s\n", i,
                                breakpoints[i].address, symbol);
                         printf("     Count(%d) ", breakpoints[i].counter);
@@ -174 +174 @@
 /** Enable hardware breakpoint
  *
- *
  * @param where Address of HW breakpoint
  * @param flags Type of breakpoint (EXECUTE, WRITE)
  * @return Debug slot on success, -1 - no available HW breakpoint
  */
-int breakpoint_add(void * where, int flags, int curidx)
+int breakpoint_add(const void *where, const int flags, int curidx)
 {
         ipl_t ipl;
@@ -185 +184 @@
         bpinfo_t *cur;
 
-        ASSERT( flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
+        ASSERT(flags & (BKPOINT_INSTR | BKPOINT_WRITE | BKPOINT_READ_WRITE));
 
         ipl = interrupts_disable();
@@ -192 +191 @@
         if (curidx == -1) {
                 /* Find free space in slots */
-                for (i=0; i<BKPOINTS_MAX; i++)
+                for (i = 0; i < BKPOINTS_MAX; i++)
                         if (!breakpoints[i].address) {
                                 curidx = i;
@@ -224 +223 @@
 
 #ifdef amd64
-# define getip(x)  ((x)->rip)
+#       define getip(x) ((x)->rip)
 #else
-# define getip(x)  ((x)->eip)
+#       define getip(x) ((x)->eip)
 #endif
 
@@ -238 +237 @@
                         if (*((unative_t *) breakpoints[slot].address) != 0)
                                 return;
-                        printf("**** Found ZERO on address %p ****\n",
-                               slot, breakpoints[slot].address);
+                        printf("**** Found ZERO on address %lx (slot %d) ****\n",
+                                breakpoints[slot].address, slot);
                 } else {
-                        printf("Data watchpoint - new data: %p\n",
+                        printf("Data watchpoint - new data: %lx\n",
                                *((unative_t *) breakpoints[slot].address));
                 }
         }
-        printf("Reached breakpoint %d:%p(%s)\n", slot, getip(istate),
+        printf("Reached breakpoint %d:%lx(%s)\n", slot, getip(istate),
                get_symtab_entry(getip(istate)));
         printf("***Type 'exit' to exit kconsole.\n");
@@ -314 +313 @@
 #endif
 
-static void debug_exception(int n, istate_t *istate)
+static void debug_exception(int n __attribute__((unused)), istate_t *istate)
 {
         unative_t dr6;
@@ -338 +337 @@
 
 #ifdef CONFIG_SMP
-static void debug_ipi(int n, istate_t *istate)
+static void debug_ipi(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
         int i;
 
         spinlock_lock(&bkpoint_lock);
-        for (i=0; i < BKPOINTS_MAX; i++)
+        for (i = 0; i < BKPOINTS_MAX; i++)
                 setup_dr(i);
         spinlock_unlock(&bkpoint_lock);

kernel/arch/ia32/include/asm.h

@@ -258 +258 @@
         uintptr_t v;
         
-        asm volatile ("andl %%esp, %0\n" : "=r" (v) : "0" (~(STACK_SIZE-1)));
+        asm volatile (
+                "andl %%esp, %0\n"
+                : "=r" (v)
+                : "0" (~(STACK_SIZE - 1))
+        );
         
         return v;

kernel/arch/ia32/include/context.h

@@ -46 +46 @@
  * One item is put onto stack to support get_stack_base().
  */
-#define SP_DELTA        (8+STACK_ITEM_SIZE)
+#define SP_DELTA        (8 + STACK_ITEM_SIZE)
 
 /*

kernel/arch/ia32/include/mm/frame.h

@@ -37 +37 @@
 
 #define FRAME_WIDTH     12      /* 4K */
-#define FRAME_SIZE      (1<<FRAME_WIDTH)
+#define FRAME_SIZE      (1 << FRAME_WIDTH)
 
 #ifdef KERNEL

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

@@ -347 +347 @@
 extern uint32_t io_apic_read(uint8_t address);
 extern void io_apic_write(uint8_t address , uint32_t x);
-extern void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags);
+extern void io_apic_change_ioredtbl(uint8_t pin, uint8_t dest, uint8_t v, int flags);
 extern void io_apic_disable_irqs(uint16_t irqmask);
 extern void io_apic_enable_irqs(uint16_t irqmask);

kernel/arch/ia32/src/ddi/ddi.c

@@ -126 +126 @@
         if ((bits = TASK->arch.iomap.bits)) {
                 bitmap_t iomap;
+                task_t *task = TASK;
         
                 ASSERT(TASK->arch.iomap.map);
                 bitmap_initialize(&iomap, CPU->arch.tss->iomap, TSS_IOMAP_SIZE * 8);
-                bitmap_copy(&iomap, &TASK->arch.iomap, TASK->arch.iomap.bits);
+                bitmap_copy(&iomap, &task->arch.iomap, task->arch.iomap.bits);
                 /*
                  * It is safe to set the trailing eight bits because of the extra

kernel/arch/ia32/src/mm/page.c

@@ -84 +84 @@
         uintptr_t virtaddr = PA2KA(last_frame);
         pfn_t i;
-        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++)
-                page_mapping_insert(AS_KERNEL, virtaddr + PFN2ADDR(i), physaddr + PFN2ADDR(i), PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) {
+                uintptr_t addr = PFN2ADDR(i);
+                page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr, PAGE_NOT_CACHEABLE | PAGE_WRITE);
+        }
         
         last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE);
@@ -92 +94 @@
 }
 
-void page_fault(int n, istate_t *istate)
+void page_fault(int n __attribute__((unused)), istate_t *istate)
 {
         uintptr_t page;
@@ -111 +113 @@
                 
                 decode_istate(istate);
-                printf("page fault address: %#x\n", page);
+                printf("page fault address: %#lx\n", page);
                 panic("page fault\n");
         }

kernel/arch/ia32/src/proc/scheduler.c

@@ -67 +67 @@
 #ifdef CONFIG_DEBUG_AS_WATCHPOINT
         /* Set watchpoint on AS to ensure that nobody sets it to zero */
-        if (CPU->id < BKPOINTS_MAX)
-                breakpoint_add(&((the_t *) THREAD->kstack)->as, 
-                               BKPOINT_WRITE | BKPOINT_CHECK_ZERO,
-                               CPU->id);
+        if (CPU->id < BKPOINTS_MAX) {
+                the_t *the = THE;
+                breakpoint_add(&((the_t *) the->thread->kstack)->as, 
+                        BKPOINT_WRITE | BKPOINT_CHECK_ZERO, the->cpu->id);
+        }
 #endif
 }

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

@@ -126 +126 @@
  * @param istate Interrupted state.
  */
-static void apic_spurious(int n, istate_t *istate)
+static void apic_spurious(int n __attribute__((unused)), istate_t *istate __attribute__((unused)))
 {
 #ifdef CONFIG_DEBUG
-        printf("cpu%d: APIC spurious interrupt\n", CPU->id);
+        printf("cpu%u: APIC spurious interrupt\n", CPU->id);
 #endif
 }
@@ -138 +138 @@
 }
 
-static void l_apic_timer_irq_handler(irq_t *irq, void *arg, ...)
+static void l_apic_timer_irq_handler(irq_t *irq, void *arg __attribute__((unused)), ...)
 {
         /*
@@ -154 +154 @@
 {
         io_apic_id_t idreg;
-        unsigned int i;
-
+        
         exc_register(VECTOR_APIC_SPUR, "apic_spurious", (iroutine) apic_spurious);
 
@@ -177 +176 @@
         irq_register(&l_apic_timer_irq);
         
+        uint8_t i;
         for (i = 0; i < IRQ_COUNT; i++) {
                 int pin;
         
                 if ((pin = smp_irq_to_pin(i)) != -1)
-                        io_apic_change_ioredtbl(pin, DEST_ALL, IVT_IRQBASE + i, LOPRI);
+                        io_apic_change_ioredtbl((uint8_t) pin, DEST_ALL, (uint8_t) (IVT_IRQBASE + i), LOPRI);
         }
         
@@ -329 +329 @@
                 for (i = 0; i<2; i++) {
                         icr.lo = l_apic[ICRlo];
-                        icr.vector = ((uintptr_t) ap_boot) / 4096; /* calculate the reset vector */
+                        icr.vector = (uint8_t) (((uintptr_t) ap_boot) >> 12); /* calculate the reset vector */
                         icr.delmod = DELMOD_STARTUP;
                         icr.destmod = DESTMOD_PHYS;
@@ -426 +426 @@
         
         /* Program Logical Destination Register. */
+        ASSERT(CPU->id < 8)
         ldr.value = l_apic[LDR];
-        if (CPU->id < sizeof(CPU->id)*8)        /* size in bits */
-                ldr.id = (1<<CPU->id);
+        ldr.id = (uint8_t) (1 << CPU->id);
         l_apic[LDR] = ldr.value;
         
@@ -514 +514 @@
  * @param flags Flags.
  */
-void io_apic_change_ioredtbl(int pin, int dest, uint8_t v, int flags)
+void io_apic_change_ioredtbl(uint8_t pin, uint8_t dest, uint8_t v, int flags)
 {
         io_redirection_reg_t reg;
@@ -522 +522 @@
                 dlvr = DELMOD_LOWPRI;
 
-        reg.lo = io_apic_read(IOREDTBL + pin*2);
-        reg.hi = io_apic_read(IOREDTBL + pin*2 + 1);
+        reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
+        reg.hi = io_apic_read((uint8_t) (IOREDTBL + pin * 2 + 1));
         
         reg.dest = dest;
@@ -532 +532 @@
         reg.intvec = v;
 
-        io_apic_write(IOREDTBL + pin*2, reg.lo);
-        io_apic_write(IOREDTBL + pin*2 + 1, reg.hi);
+        io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
+        io_apic_write((uint8_t) (IOREDTBL + pin * 2 + 1), reg.hi);
 }
 
@@ -554 +554 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                                reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
                                 reg.masked = true;
-                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
+                                io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
                         }
                         
@@ -573 +573 @@
         io_redirection_reg_t reg;       
         
-        for (i = 0;i < 16; i++) {
+        for (i = 0; i < 16; i++) {
                 if (irqmask & (1 << i)) {
                         /*
@@ -581 +581 @@
                         pin = smp_irq_to_pin(i);
                         if (pin != -1) {
-                                reg.lo = io_apic_read(IOREDTBL + pin * 2);
+                                reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2));
                                 reg.masked = false;
-                                io_apic_write(IOREDTBL + pin * 2, reg.lo);
+                                io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo);
                         }
                         

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

@@ -55 +55 @@
 #define CT_SIGNATURE    0x504d4350
 
-int mps_fs_check(uint8_t *base);
-int mps_ct_check(void);
-
-int configure_via_ct(void);
-int configure_via_default(uint8_t n);
-
-int ct_processor_entry(struct __processor_entry *pr);
-void ct_bus_entry(struct __bus_entry *bus);
-void ct_io_apic_entry(struct __io_apic_entry *ioa);
-void ct_io_intr_entry(struct __io_intr_entry *iointr);
-void ct_l_intr_entry(struct __l_intr_entry *lintr);
-
-void ct_extended_entries(void);
+static int mps_fs_check(uint8_t *base);
+static int mps_ct_check(void);
+
+static int configure_via_ct(void);
+static int configure_via_default(uint8_t n);
+
+static int ct_processor_entry(struct __processor_entry *pr);
+static void ct_bus_entry(struct __bus_entry *bus);
+static void ct_io_apic_entry(struct __io_apic_entry *ioa);
+static void ct_io_intr_entry(struct __io_intr_entry *iointr);
+static void ct_l_intr_entry(struct __l_intr_entry *lintr);
+
+static void ct_extended_entries(void);
 
 static struct mps_fs *fs;
@@ -109 +109 @@
 {
         ASSERT(i < processor_entry_cnt);
-        return processor_entries[i].cpu_flags & 0x1;
+        return (bool) ((processor_entries[i].cpu_flags & 0x01) == 0x01);
 }
 
@@ -115 +115 @@
 {
         ASSERT(i < processor_entry_cnt);
-        return processor_entries[i].cpu_flags & 0x2;
+        return (bool) ((processor_entries[i].cpu_flags & 0x02) == 0x02);
 }
 
@@ -134 +134 @@
         
         for (i = 0, sum = 0; i < 16; i++)
-                sum += base[i];
+                sum = (uint8_t) (sum + base[i]);
         
         return !sum;
@@ -151 +151 @@
         /* count the checksum for the base table */
         for (i=0,sum=0; i < ct->base_table_length; i++)
-                sum += base[i];
+                sum = (uint8_t) (sum + base[i]);
                 
         if (sum)
@@ -158 +158 @@
         /* count the checksum for the extended table */
         for (i=0,sum=0; i < ct->ext_table_length; i++)
-                sum += ext[i];
+                sum = (uint8_t) (sum + ext[i]);
                 
         return sum == ct->ext_table_checksum;
@@ -287 +287 @@
 }
 
-int configure_via_default(uint8_t n)
+int configure_via_default(uint8_t n __attribute__((unused)))
 {
         /*
@@ -297 +297 @@
 
 
-int ct_processor_entry(struct __processor_entry *pr)
+int ct_processor_entry(struct __processor_entry *pr __attribute__((unused)))
 {
         /*
@@ -309 +309 @@
 }
 
-void ct_bus_entry(struct __bus_entry *bus)
+void ct_bus_entry(struct __bus_entry *bus __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE
@@ -338 +338 @@
 
 //#define MPSCT_VERBOSE
-void ct_io_intr_entry(struct __io_intr_entry *iointr)
+void ct_io_intr_entry(struct __io_intr_entry *iointr __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE
@@ -369 +369 @@
 }
 
-void ct_l_intr_entry(struct __l_intr_entry *lintr)
+void ct_l_intr_entry(struct __l_intr_entry *lintr __attribute__((unused)))
 {
 #ifdef MPSCT_VERBOSE

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

@@ -99 +99 @@
  * as an initialization stack for each AP.)
  */
-void kmp(void *arg)
+void kmp(void *arg __attribute__((unused)))
 {
         unsigned int i;
@@ -113 +113 @@
          * Set the warm-reset vector to the real-mode address of 4K-aligned ap_boot()
          */
-        *((uint16_t *) (PA2KA(0x467 + 0))) =  ((uintptr_t) ap_boot) >> 4;       /* segment */
-        *((uint16_t *) (PA2KA(0x467 + 2))) =  0;                                /* offset */
+        *((uint16_t *) (PA2KA(0x467 + 0))) = (uint16_t) (((uintptr_t) ap_boot) >> 4);   /* segment */
+        *((uint16_t *) (PA2KA(0x467 + 2))) = 0;                         /* offset */
         
         /*
@@ -125 +125 @@
         pic_disable_irqs(0xffff);
         apic_init();
+        
+        uint8_t apic = l_apic_id();
 
         for (i = 0; i < ops->cpu_count(); i++) {
@@ -141 +143 @@
                         continue;
 
-                if (ops->cpu_apic_id(i) == l_apic_id()) {
-                        printf("%s: bad processor entry #%d, will not send IPI to myself\n", __FUNCTION__, i);
+                if (ops->cpu_apic_id(i) == apic) {
+                        printf("%s: bad processor entry #%u, will not send IPI to myself\n", __FUNCTION__, i);
                         continue;
                 }
@@ -149 +151 @@
                  * Prepare new GDT for CPU in question.
                  */
-                if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS*sizeof(struct descriptor), FRAME_ATOMIC)))
+                if (!(gdt_new = (struct descriptor *) malloc(GDT_ITEMS * sizeof(struct descriptor), FRAME_ATOMIC)))
                         panic("couldn't allocate memory for GDT\n");
 
@@ -164 +166 @@
                          * supposed to wake us up.
                          */
-                        if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT)
-                                printf("%s: waiting for cpu%d (APIC ID = %d) timed out\n", __FUNCTION__, config.cpu_active > i ? config.cpu_active : i, ops->cpu_apic_id(i));
+                        if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE) == ESYNCH_TIMEOUT) {
+                                unsigned int cpu = (config.cpu_active > i) ? config.cpu_active : i;
+                                printf("%s: waiting for cpu%u (APIC ID = %d) timed out\n", __FUNCTION__, cpu, ops->cpu_apic_id(i));
+                        }
                 } else
                         printf("INIT IPI for l_apic%d failed\n", ops->cpu_apic_id(i));

kernel/genarch/src/acpi/acpi.c

@@ -60 +60 @@
         
         for (i = 0; i < 20; i++)
-                sum += rsdp[i];
+                sum = (uint8_t) (sum + rsdp[i]);
                 
         if (sum)        
@@ -69 +69 @@
                 
         for (; i < r->length; i++)
-                sum += rsdp[i];
+                sum = (uint8_t) (sum + rsdp[i]);
                 
         return !sum;
@@ -82 +82 @@
 
         for (i = 0; i < h->length; i++)
-                sum += sdt[i];
+                sum = (uint8_t) (sum + sdt[i]);
                 
         return !sum;
@@ -106 +106 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%#zx: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }
@@ -127 +127 @@
                                         goto next;
                                 *signature_map[j].sdt_ptr = h;
-                                printf("%#zx: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
+                                printf("%#zp: ACPI %s\n", *signature_map[j].sdt_ptr, signature_map[j].description);
                         }
                 }
@@ -161 +161 @@
 
 rsdp_found:
-        printf("%#zx: ACPI Root System Description Pointer\n", acpi_rsdp);
+        printf("%#zp: ACPI Root System Description Pointer\n", acpi_rsdp);
 
         acpi_rsdt = (struct acpi_rsdt *) (unative_t) acpi_rsdp->rsdt_address;

kernel/generic/include/interrupt.h

@@ -49 +49 @@
 { \
         if (istate_from_uspace(istate)) { \
-                klog_printf("Task %llu killed due to an exception at %p.", TASK->taskid, istate_get_pc(istate)); \
+                task_t *task = TASK; \
+                klog_printf("Task %llu killed due to an exception at %p.", task->taskid, istate_get_pc(istate)); \
                 klog_printf("  " cmd, ##__VA_ARGS__); \
-                task_kill(TASK->taskid); \
+                task_kill(task->taskid); \
                 thread_exit(); \
         } \

kernel/generic/src/printf/printf_core.c

@@ -419 +419 @@
  * TYPE:@n
  *      - "hh"  Signed or unsigned char.@n
- *      - "h"   Signed or usigned short.@n
- *      - ""    Signed or usigned int (default value).@n
- *      - "l"   Signed or usigned long int.@n
- *      - "ll"  Signed or usigned long long int.@n
+ *      - "h"   Signed or unsigned short.@n
+ *      - ""    Signed or unsigned int (default value).@n
+ *      - "l"   Signed or unsigned long int.@n
+ *      - "ll"  Signed or unsigned long long int.@n
  *      - "z"   unative_t (non-standard extension).@n
  * 
@@ -434 +434 @@
  * 
  *      - P, p  Print value of a pointer. Void * value is expected and it is printed in hexadecimal notation with prefix
- *      (as with \%#X or \%#x for 32bit or \%#X / \%#x for 64bit long pointers).
+ *      (as with \%#X / \%#x for 32bit or \%#X / \%#x for 64bit long pointers).
  *
  *      - b     Print value as unsigned binary number. Prefix is not printed by default. (Nonstandard extension.)