Index: kernel/arch/amd64/include/arch/asm.h =================================================================== --- kernel/arch/amd64/include/arch/asm.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/amd64/include/arch/asm.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -55,7 +55,7 @@ asm volatile ( - "andq %%rsp, %[v]\n" - : [v] "=r" (v) - : "0" (~((uint64_t) STACK_SIZE - 1)) + "andq %%rsp, %[v]\n" + : [v] "=r" (v) + : "0" (~((uint64_t) STACK_SIZE - 1)) ); @@ -66,5 +66,5 @@ { asm volatile ( - "hlt\n" + "hlt\n" ); } @@ -74,5 +74,5 @@ while (true) { asm volatile ( - "hlt\n" + "hlt\n" ); } @@ -93,7 +93,7 @@ asm volatile ( - "inb %w[port], %b[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -117,7 +117,7 @@ asm volatile ( - "inw %w[port], %w[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -141,7 +141,7 @@ asm volatile ( - "inl %w[port], %[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -163,6 +163,6 @@ if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outb %b[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -182,6 +182,6 @@ if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outw %w[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -201,6 +201,6 @@ if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outl %[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -213,7 +213,7 @@ asm volatile ( - "pushfq\n" - "popq %[v]\n" - : [v] "=r" (rflags) + "pushfq\n" + "popq %[v]\n" + : [v] "=r" (rflags) ); @@ -224,7 +224,7 @@ { asm volatile ( - "pushq %[v]\n" - "popfq\n" - :: [v] "r" (rflags) + "pushq %[v]\n" + "popfq\n" + :: [v] "r" (rflags) ); } @@ -300,8 +300,8 @@ { asm volatile ( - "wrmsr\n" - :: "c" (msr), - "a" ((uint32_t) (value)), - "d" ((uint32_t) (value >> 32)) + "wrmsr\n" + :: "c" (msr), + "a" ((uint32_t) (value)), + "d" ((uint32_t) (value >> 32)) ); } @@ -312,7 +312,7 @@ asm volatile ( - "rdmsr\n" - : "=a" (ax), "=d" (dx) - : "c" (msr) + "rdmsr\n" + : "=a" (ax), "=d" (dx) + : "c" (msr) ); @@ -328,6 +328,6 @@ { asm volatile ( - "invlpg %[addr]\n" - :: [addr] "m" (*((sysarg_t *) addr)) + "invlpg %[addr]\n" + :: [addr] "m" (*((sysarg_t *) addr)) ); } @@ -341,6 +341,6 @@ { asm volatile ( - "lgdtq %[gdtr_reg]\n" - :: [gdtr_reg] "m" (*gdtr_reg) + "lgdtq %[gdtr_reg]\n" + :: [gdtr_reg] "m" (*gdtr_reg) ); } @@ -354,6 +354,6 @@ { asm volatile ( - "sgdtq %[gdtr_reg]\n" - :: [gdtr_reg] "m" (*gdtr_reg) + "sgdtq %[gdtr_reg]\n" + :: [gdtr_reg] "m" (*gdtr_reg) ); } @@ -367,6 +367,6 @@ { asm volatile ( - "lidtq %[idtr_reg]\n" - :: [idtr_reg] "m" (*idtr_reg)); + "lidtq %[idtr_reg]\n" + :: [idtr_reg] "m" (*idtr_reg)); } @@ -379,6 +379,6 @@ { asm volatile ( - "ltr %[sel]" - :: [sel] "r" (sel) + "ltr %[sel]" + :: [sel] "r" (sel) ); } Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/amd64/src/amd64.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -215,6 +215,6 @@ outdev_t **ns16550_out_ptr = NULL; #endif - ns16550_instance_t *ns16550_instance - = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL, + ns16550_instance_t *ns16550_instance = + ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL, ns16550_out_ptr); if (ns16550_instance) { Index: kernel/arch/arm32/include/arch/asm.h =================================================================== --- kernel/arch/arm32/include/arch/asm.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/arm32/include/arch/asm.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,5 +59,5 @@ { #ifdef PROCESSOR_ARCH_armv7_a - asm volatile ( "wfe" ); + asm volatile ("wfe"); #elif defined(PROCESSOR_ARCH_armv6) | defined(PROCESSOR_arm926ej_s) | defined(PROCESSOR_arm920t) WFI_write(0); @@ -107,7 +107,7 @@ asm volatile ( - "and %[v], sp, %[size]\n" - : [v] "=r" (v) - : [size] "r" (~(STACK_SIZE - 1)) + "and %[v], sp, %[size]\n" + : [v] "=r" (v) + : [size] "r" (~(STACK_SIZE - 1)) ); Index: kernel/arch/arm32/include/arch/security_ext.h =================================================================== --- kernel/arch/arm32/include/arch/security_ext.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/arm32/include/arch/security_ext.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -77,6 +77,6 @@ static inline bool sec_ext_is_secure(void) { - return sec_ext_is_implemented() - && (sec_ext_is_monitor_mode() || !(SCR_read() & SCR_NS_FLAG)); + return sec_ext_is_implemented() && + (sec_ext_is_monitor_mode() || !(SCR_read() & SCR_NS_FLAG)); } Index: kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c =================================================================== --- kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/arm32/src/mach/raspberrypi/raspberrypi.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -103,5 +103,5 @@ /* Initialize interrupt controller */ raspi.irc = (void *) km_map(BCM2835_IRC_ADDR, sizeof(bcm2835_irc_t), - PAGE_NOT_CACHEABLE); + PAGE_NOT_CACHEABLE); assert(raspi.irc); bcm2835_irc_init(raspi.irc); @@ -109,6 +109,6 @@ /* Initialize system timer */ raspi.timer = (void *) km_map(BCM2835_TIMER_ADDR, - sizeof(bcm2835_timer_t), - PAGE_NOT_CACHEABLE); + sizeof(bcm2835_timer_t), + PAGE_NOT_CACHEABLE); } @@ -129,5 +129,6 @@ static void raspberrypi_cpu_halt(void) { - while (true) ; + while (true) + ; } @@ -184,5 +185,5 @@ #ifdef CONFIG_PL011_UART if (pl011_uart_init(&raspi.uart, BCM2835_UART_IRQ, - BCM2835_UART0_BASE_ADDRESS)) + BCM2835_UART0_BASE_ADDRESS)) stdout_wire(&raspi.uart.outdev); #endif Index: kernel/arch/arm32/src/mm/page.c =================================================================== --- kernel/arch/arm32/src/mm/page.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/arm32/src/mm/page.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -63,5 +63,5 @@ for (uintptr_t cur = PHYSMEM_START_ADDR; cur < min(KA2PA(config.identity_base) + - config.identity_size, config.physmem_end); + config.identity_size, config.physmem_end); cur += FRAME_SIZE) page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags); Index: kernel/arch/ia32/include/arch/asm.h =================================================================== --- kernel/arch/ia32/include/arch/asm.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia32/include/arch/asm.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -52,5 +52,5 @@ while (true) { asm volatile ( - "hlt\n" + "hlt\n" ); } @@ -60,5 +60,5 @@ { asm volatile ( - "hlt\n" + "hlt\n" ); } @@ -117,6 +117,6 @@ if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outb %b[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outb %b[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -136,6 +136,6 @@ if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outw %w[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outw %w[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -155,6 +155,6 @@ if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { asm volatile ( - "outl %[val], %w[port]\n" - :: [val] "a" (val), [port] "d" (port) + "outl %[val], %w[port]\n" + :: [val] "a" (val), [port] "d" (port) ); } else @@ -176,7 +176,7 @@ asm volatile ( - "inb %w[port], %b[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inb %w[port], %b[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -200,7 +200,7 @@ asm volatile ( - "inw %w[port], %w[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inw %w[port], %w[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -224,7 +224,7 @@ asm volatile ( - "inl %w[port], %[val]\n" - : [val] "=a" (val) - : [port] "d" (port) + "inl %w[port], %[val]\n" + : [val] "=a" (val) + : [port] "d" (port) ); @@ -239,7 +239,7 @@ asm volatile ( - "pushf\n" - "popl %[v]\n" - : [v] "=r" (eflags) + "pushf\n" + "popl %[v]\n" + : [v] "=r" (eflags) ); @@ -250,7 +250,7 @@ { asm volatile ( - "pushl %[v]\n" - "popf\n" - :: [v] "r" (eflags) + "pushl %[v]\n" + "popf\n" + :: [v] "r" (eflags) ); } @@ -326,8 +326,8 @@ { asm volatile ( - "wrmsr" - :: "c" (msr), - "a" ((uint32_t) (value)), - "d" ((uint32_t) (value >> 32)) + "wrmsr" + :: "c" (msr), + "a" ((uint32_t) (value)), + "d" ((uint32_t) (value >> 32)) ); } @@ -338,8 +338,8 @@ asm volatile ( - "rdmsr" - : "=a" (ax), - "=d" (dx) - : "c" (msr) + "rdmsr" + : "=a" (ax), + "=d" (dx) + : "c" (msr) ); @@ -362,7 +362,7 @@ asm volatile ( - "andl %%esp, %[v]\n" - : [v] "=r" (v) - : "0" (~(STACK_SIZE - 1)) + "andl %%esp, %[v]\n" + : [v] "=r" (v) + : "0" (~(STACK_SIZE - 1)) ); @@ -378,6 +378,6 @@ { asm volatile ( - "invlpg %[addr]\n" - :: [addr] "m" (*(sysarg_t *) addr) + "invlpg %[addr]\n" + :: [addr] "m" (*(sysarg_t *) addr) ); } @@ -391,6 +391,6 @@ { asm volatile ( - "lgdtl %[gdtr_reg]\n" - :: [gdtr_reg] "m" (*gdtr_reg) + "lgdtl %[gdtr_reg]\n" + :: [gdtr_reg] "m" (*gdtr_reg) ); } @@ -404,6 +404,6 @@ { asm volatile ( - "sgdtl %[gdtr_reg]\n" - : [gdtr_reg] "=m" (*gdtr_reg) + "sgdtl %[gdtr_reg]\n" + : [gdtr_reg] "=m" (*gdtr_reg) ); } @@ -417,6 +417,6 @@ { asm volatile ( - "lidtl %[idtr_reg]\n" - :: [idtr_reg] "m" (*idtr_reg) + "lidtl %[idtr_reg]\n" + :: [idtr_reg] "m" (*idtr_reg) ); } @@ -430,6 +430,6 @@ { asm volatile ( - "ltr %[sel]" - :: [sel] "r" (sel) + "ltr %[sel]" + :: [sel] "r" (sel) ); } @@ -443,6 +443,6 @@ { asm volatile ( - "mov %[sel], %%gs" - :: [sel] "r" (sel) + "mov %[sel], %%gs" + :: [sel] "r" (sel) ); } Index: kernel/arch/ia32/src/cpu/cpu.c =================================================================== --- kernel/arch/ia32/src/cpu/cpu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia32/src/cpu/cpu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -101,9 +101,9 @@ if (CPU->arch.fi.bits.sse) { asm volatile ( - "mov %%cr4, %[help]\n" - "or %[mask], %[help]\n" - "mov %[help], %%cr4\n" - : [help] "+r" (help) - : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT) + "mov %%cr4, %[help]\n" + "or %[mask], %[help]\n" + "mov %[help], %%cr4\n" + : [help] "+r" (help) + : [mask] "i" (CR4_OSFXSR | CR4_OSXMMEXCPT) ); } @@ -128,7 +128,7 @@ * Check for AMD processor. */ - if ((info.cpuid_ebx == AMD_CPUID_EBX) - && (info.cpuid_ecx == AMD_CPUID_ECX) - && (info.cpuid_edx == AMD_CPUID_EDX)) + if ((info.cpuid_ebx == AMD_CPUID_EBX) && + (info.cpuid_ecx == AMD_CPUID_ECX) && + (info.cpuid_edx == AMD_CPUID_EDX)) CPU->arch.vendor = VendorAMD; @@ -136,7 +136,7 @@ * Check for Intel processor. */ - if ((info.cpuid_ebx == INTEL_CPUID_EBX) - && (info.cpuid_ecx == INTEL_CPUID_ECX) - && (info.cpuid_edx == INTEL_CPUID_EDX)) + if ((info.cpuid_ebx == INTEL_CPUID_EBX) && + (info.cpuid_ecx == INTEL_CPUID_ECX) && + (info.cpuid_edx == INTEL_CPUID_EDX)) CPU->arch.vendor = VendorIntel; @@ -148,9 +148,9 @@ } -void cpu_print_report(cpu_t* cpu) +void cpu_print_report(cpu_t *cpu) { printf("cpu%u: (%s family=%u model=%u stepping=%u apicid=%u) %" PRIu16 - " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family, - cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz); + " MHz\n", cpu->id, vendor_str[cpu->arch.vendor], cpu->arch.family, + cpu->arch.model, cpu->arch.stepping, cpu->arch.id, cpu->frequency_mhz); } Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia32/src/ia32.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -200,6 +200,6 @@ outdev_t **ns16550_out_ptr = NULL; #endif - ns16550_instance_t *ns16550_instance - = ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL, + ns16550_instance_t *ns16550_instance = + ns16550_init(NS16550_BASE, 0, IRQ_NS16550, NULL, NULL, ns16550_out_ptr); if (ns16550_instance) { Index: kernel/arch/ia64/src/drivers/ski.c =================================================================== --- kernel/arch/ia64/src/drivers/ski.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia64/src/drivers/ski.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -84,11 +84,11 @@ asm volatile ( - "mov r15 = %1\n" - "break 0x80000;;\n" /* modifies r8 */ - "mov %0 = r8;;\n" - - : "=r" (ch) - : "i" (SKI_GETCHAR) - : "r15", "r8" + "mov r15 = %1\n" + "break 0x80000;;\n" /* modifies r8 */ + "mov %0 = r8;;\n" + + : "=r" (ch) + : "i" (SKI_GETCHAR) + : "r15", "r8" ); @@ -143,9 +143,9 @@ asm volatile ( - "mov r15 = %0\n" - "break 0x80000\n" - : - : "i" (SKI_INIT_CONSOLE) - : "r15", "r8" + "mov r15 = %0\n" + "break 0x80000\n" + : + : "i" (SKI_INIT_CONSOLE) + : "r15", "r8" ); @@ -169,10 +169,10 @@ { asm volatile ( - "mov r15 = %[cmd]\n" - "mov r32 = %[ch]\n" /* r32 is in0 */ - "break 0x80000\n" /* modifies r8 */ - : - : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch) - : "r15", "in0", "r8" + "mov r15 = %[cmd]\n" + "mov r32 = %[ch]\n" /* r32 is in0 */ + "break 0x80000\n" /* modifies r8 */ + : + : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch) + : "r15", "in0", "r8" ); } Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia64/src/ia64.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -181,6 +181,6 @@ #ifdef CONFIG_NS16550 - ns16550_instance_t *ns16550_instance - = ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL, + ns16550_instance_t *ns16550_instance = + ns16550_init(NS16550_BASE, 0, NS16550_IRQ, NULL, NULL, NULL); if (ns16550_instance) { @@ -253,5 +253,6 @@ (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value); - while (true); + while (true) + ; } @@ -259,5 +260,6 @@ { pio_write_8((ioport8_t *)0x64, 0xfe); - while (true); + while (true) + ; } Index: kernel/arch/ia64/src/interrupt.c =================================================================== --- kernel/arch/ia64/src/interrupt.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ia64/src/interrupt.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -229,5 +229,5 @@ { asm volatile ( - "mov cr.eoi = r0 ;;" + "mov cr.eoi = r0 ;;" ); } @@ -245,5 +245,5 @@ case INTERRUPT_SPURIOUS: #ifdef CONFIG_DEBUG - printf("cpu%d: spurious interrupt\n", CPU->id); + printf("cpu%d: spurious interrupt\n", CPU->id); #endif break; Index: kernel/arch/mips32/include/arch/asm.h =================================================================== --- kernel/arch/mips32/include/arch/asm.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/mips32/include/arch/asm.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -57,7 +57,7 @@ asm volatile ( - "and %[base], $29, %[mask]\n" - : [base] "=r" (base) - : [mask] "r" (~(STACK_SIZE - 1)) + "and %[base], $29, %[mask]\n" + : [base] "=r" (base) + : [mask] "r" (~(STACK_SIZE - 1)) ); Index: kernel/arch/mips32/include/arch/mm/tlb.h =================================================================== --- kernel/arch/mips32/include/arch/mm/tlb.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/mips32/include/arch/mm/tlb.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -82,5 +82,5 @@ unsigned : 2; /* zero */ #endif - } __attribute__ ((packed)); + } __attribute__((packed)); uint32_t value; } entry_lo_t; @@ -97,5 +97,5 @@ unsigned vpn2 : 19; #endif - } __attribute__ ((packed)); + } __attribute__((packed)); uint32_t value; } entry_hi_t; @@ -112,5 +112,5 @@ unsigned : 7; #endif - } __attribute__ ((packed)); + } __attribute__((packed)); uint32_t value; } page_mask_t; @@ -127,5 +127,5 @@ unsigned p : 1; #endif - } __attribute__ ((packed)); + } __attribute__((packed)); uint32_t value; } tlb_index_t; Index: kernel/arch/mips32/src/debugger.c =================================================================== --- kernel/arch/mips32/src/debugger.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/mips32/src/debugger.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -102,28 +102,28 @@ uint32_t value; } jmpinstr[] = { - {0xf3ff0000, 0x41000000}, /* BCzF */ - {0xf3ff0000, 0x41020000}, /* BCzFL */ - {0xf3ff0000, 0x41010000}, /* BCzT */ - {0xf3ff0000, 0x41030000}, /* BCzTL */ - {0xfc000000, 0x10000000}, /* BEQ */ - {0xfc000000, 0x50000000}, /* BEQL */ - {0xfc1f0000, 0x04010000}, /* BEQL */ - {0xfc1f0000, 0x04110000}, /* BGEZAL */ - {0xfc1f0000, 0x04130000}, /* BGEZALL */ - {0xfc1f0000, 0x04030000}, /* BGEZL */ - {0xfc1f0000, 0x1c000000}, /* BGTZ */ - {0xfc1f0000, 0x5c000000}, /* BGTZL */ - {0xfc1f0000, 0x18000000}, /* BLEZ */ - {0xfc1f0000, 0x58000000}, /* BLEZL */ - {0xfc1f0000, 0x04000000}, /* BLTZ */ - {0xfc1f0000, 0x04100000}, /* BLTZAL */ - {0xfc1f0000, 0x04120000}, /* BLTZALL */ - {0xfc1f0000, 0x04020000}, /* BLTZL */ - {0xfc000000, 0x14000000}, /* BNE */ - {0xfc000000, 0x54000000}, /* BNEL */ - {0xfc000000, 0x08000000}, /* J */ - {0xfc000000, 0x0c000000}, /* JAL */ - {0xfc1f07ff, 0x00000009}, /* JALR */ - {0, 0} /* end of table */ + { 0xf3ff0000, 0x41000000 }, /* BCzF */ + { 0xf3ff0000, 0x41020000 }, /* BCzFL */ + { 0xf3ff0000, 0x41010000 }, /* BCzT */ + { 0xf3ff0000, 0x41030000 }, /* BCzTL */ + { 0xfc000000, 0x10000000 }, /* BEQ */ + { 0xfc000000, 0x50000000 }, /* BEQL */ + { 0xfc1f0000, 0x04010000 }, /* BEQL */ + { 0xfc1f0000, 0x04110000 }, /* BGEZAL */ + { 0xfc1f0000, 0x04130000 }, /* BGEZALL */ + { 0xfc1f0000, 0x04030000 }, /* BGEZL */ + { 0xfc1f0000, 0x1c000000 }, /* BGTZ */ + { 0xfc1f0000, 0x5c000000 }, /* BGTZL */ + { 0xfc1f0000, 0x18000000 }, /* BLEZ */ + { 0xfc1f0000, 0x58000000 }, /* BLEZL */ + { 0xfc1f0000, 0x04000000 }, /* BLTZ */ + { 0xfc1f0000, 0x04100000 }, /* BLTZAL */ + { 0xfc1f0000, 0x04120000 }, /* BLTZALL */ + { 0xfc1f0000, 0x04020000 }, /* BLTZL */ + { 0xfc000000, 0x14000000 }, /* BNE */ + { 0xfc000000, 0x54000000 }, /* BNEL */ + { 0xfc000000, 0x08000000 }, /* J */ + { 0xfc000000, 0x0c000000 }, /* JAL */ + { 0xfc1f07ff, 0x00000009 }, /* JALR */ + { 0, 0 } /* end of table */ }; @@ -273,6 +273,6 @@ breakpoints[i].counter, (void *) breakpoints[i].address, ((breakpoints[i].flags & BKPOINT_INPROG) ? "true" : - "false"), ((breakpoints[i].flags & BKPOINT_ONESHOT) - ? "true" : "false"), ((breakpoints[i].flags & + "false"), ((breakpoints[i].flags & BKPOINT_ONESHOT) ? + "true" : "false"), ((breakpoints[i].flags & BKPOINT_FUNCCALL) ? "true" : "false"), symbol); } @@ -382,5 +382,5 @@ smc_coherence(cur->address); - if (! (cur->flags & BKPOINT_ONESHOT)) { + if (!(cur->flags & BKPOINT_ONESHOT)) { /* Set Breakpoint on next instruction */ ((uint32_t *)cur->address)[1] = 0x0d; @@ -422,6 +422,6 @@ } - if ((cur) && (cur->address == fireaddr) - && ((cur->flags & BKPOINT_INPROG))) { + if ((cur) && (cur->address == fireaddr) && + ((cur->flags & BKPOINT_INPROG))) { /* Remove one-shot breakpoint */ if ((cur->flags & BKPOINT_ONESHOT)) Index: kernel/arch/mips32/src/mach/msim/msim.c =================================================================== --- kernel/arch/mips32/src/mach/msim/msim.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/mips32/src/mach/msim/msim.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -94,6 +94,6 @@ * interrupts. */ - dsrlnin_instance_t *dsrlnin_instance - = dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_KBD_IRQ); + dsrlnin_instance_t *dsrlnin_instance = + dsrlnin_init((dsrlnin_t *) MSIM_KBD_ADDRESS, MSIM_KBD_IRQ); if (dsrlnin_instance) { srln_instance_t *srln_instance = srln_init(); Index: kernel/arch/mips32/src/mm/km.c =================================================================== --- kernel/arch/mips32/src/mm/km.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/mips32/src/mm/km.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -51,6 +51,6 @@ bool km_is_non_identity_arch(uintptr_t addr) { - return iswithin(KM_MIPS32_KSSEG_START, KM_MIPS32_KSSEG_SIZE, addr, 1) - || iswithin(KM_MIPS32_KSEG3_START, KM_MIPS32_KSEG3_SIZE, addr, 1); + return iswithin(KM_MIPS32_KSSEG_START, KM_MIPS32_KSSEG_SIZE, addr, 1) || + iswithin(KM_MIPS32_KSEG3_START, KM_MIPS32_KSEG3_SIZE, addr, 1); } Index: kernel/arch/ppc32/src/mm/pht.c =================================================================== --- kernel/arch/ppc32/src/mm/pht.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ppc32/src/mm/pht.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -109,8 +109,8 @@ /* Find colliding PTE in PTEG */ for (i = 0; i < 8; i++) { - if ((phte[base + i].v) - && (phte[base + i].vsid == vsid) - && (phte[base + i].api == api) - && (phte[base + i].h == 0)) { + if ((phte[base + i].v) && + (phte[base + i].vsid == vsid) && + (phte[base + i].api == api) && + (phte[base + i].h == 0)) { found = true; break; @@ -134,8 +134,8 @@ /* Find colliding PTE in PTEG */ for (i = 0; i < 8; i++) { - if ((phte[base2 + i].v) - && (phte[base2 + i].vsid == vsid) - && (phte[base2 + i].api == api) - && (phte[base2 + i].h == 1)) { + if ((phte[base2 + i].v) && + (phte[base2 + i].vsid == vsid) && + (phte[base2 + i].api == api) && + (phte[base2 + i].h == 1)) { found = true; base = base2; Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/ppc32/src/ppc32.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -185,6 +185,6 @@ fb_scanline = *((uint32_t *) prop->value); - if ((fb_addr) && (fb_width > 0) && (fb_height > 0) - && (fb_scanline > 0) && (visual != VISUAL_UNKNOWN)) { + if ((fb_addr) && (fb_width > 0) && (fb_height > 0) && + (fb_scanline > 0) && (visual != VISUAL_UNKNOWN)) { fb_properties_t fb_prop = { .addr = fb_addr, @@ -301,5 +301,6 @@ /* Unreachable */ - while (true); + while (true) + ; } @@ -321,5 +322,6 @@ { // TODO - while (true); + while (true) + ; } Index: kernel/arch/sparc64/include/arch/asm.h =================================================================== --- kernel/arch/sparc64/include/arch/asm.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/sparc64/include/arch/asm.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -93,6 +93,6 @@ asm volatile ( - "rdpr %%pstate, %[v]\n" - : [v] "=r" (v) + "rdpr %%pstate, %[v]\n" + : [v] "=r" (v) ); @@ -108,7 +108,7 @@ { asm volatile ( - "wrpr %[v], %[zero], %%pstate\n" - :: [v] "r" (v), - [zero] "i" (0) + "wrpr %[v], %[zero], %%pstate\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -124,6 +124,6 @@ asm volatile ( - "rd %%tick_cmpr, %[v]\n" - : [v] "=r" (v) + "rd %%tick_cmpr, %[v]\n" + : [v] "=r" (v) ); @@ -139,7 +139,7 @@ { asm volatile ( - "wr %[v], %[zero], %%tick_cmpr\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%tick_cmpr\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -155,6 +155,6 @@ asm volatile ( - "rd %%asr25, %[v]\n" - : [v] "=r" (v) + "rd %%asr25, %[v]\n" + : [v] "=r" (v) ); @@ -170,7 +170,7 @@ { asm volatile ( - "wr %[v], %[zero], %%asr25\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%asr25\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -186,6 +186,6 @@ asm volatile ( - "rdpr %%tick, %[v]\n" - : [v] "=r" (v) + "rdpr %%tick, %[v]\n" + : [v] "=r" (v) ); @@ -201,7 +201,7 @@ { asm volatile ( - "wrpr %[v], %[zero], %%tick\n" - :: [v] "r" (v), - [zero] "i" (0) + "wrpr %[v], %[zero], %%tick\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -217,6 +217,6 @@ asm volatile ( - "rd %%fprs, %[v]\n" - : [v] "=r" (v) + "rd %%fprs, %[v]\n" + : [v] "=r" (v) ); @@ -232,7 +232,7 @@ { asm volatile ( - "wr %[v], %[zero], %%fprs\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%fprs\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -248,6 +248,6 @@ asm volatile ( - "rd %%softint, %[v]\n" - : [v] "=r" (v) + "rd %%softint, %[v]\n" + : [v] "=r" (v) ); @@ -263,7 +263,7 @@ { asm volatile ( - "wr %[v], %[zero], %%softint\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%softint\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -279,7 +279,7 @@ { asm volatile ( - "wr %[v], %[zero], %%clear_softint\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%clear_softint\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -295,7 +295,7 @@ { asm volatile ( - "wr %[v], %[zero], %%set_softint\n" - :: [v] "r" (v), - [zero] "i" (0) + "wr %[v], %[zero], %%set_softint\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -309,5 +309,6 @@ * */ -NO_TRACE static inline ipl_t interrupts_enable(void) { +NO_TRACE static inline ipl_t interrupts_enable(void) +{ pstate_reg_t pstate; uint64_t value = pstate_read(); @@ -328,5 +329,6 @@ * */ -NO_TRACE static inline ipl_t interrupts_disable(void) { +NO_TRACE static inline ipl_t interrupts_disable(void) +{ pstate_reg_t pstate; uint64_t value = pstate_read(); @@ -346,5 +348,6 @@ * */ -NO_TRACE static inline void interrupts_restore(ipl_t ipl) { +NO_TRACE static inline void interrupts_restore(ipl_t ipl) +{ pstate_reg_t pstate; @@ -361,5 +364,6 @@ * */ -NO_TRACE static inline ipl_t interrupts_read(void) { +NO_TRACE static inline ipl_t interrupts_read(void) +{ return (ipl_t) pstate_read(); } @@ -390,7 +394,7 @@ asm volatile ( - "add %%sp, %[stack_bias], %[unbiased_sp]\n" - : [unbiased_sp] "=r" (unbiased_sp) - : [stack_bias] "i" (STACK_BIAS) + "add %%sp, %[stack_bias], %[unbiased_sp]\n" + : [unbiased_sp] "=r" (unbiased_sp) + : [stack_bias] "i" (STACK_BIAS) ); @@ -408,6 +412,6 @@ asm volatile ( - "rdpr %%ver, %[v]\n" - : [v] "=r" (v) + "rdpr %%ver, %[v]\n" + : [v] "=r" (v) ); @@ -425,6 +429,6 @@ asm volatile ( - "rdpr %%tpc, %[v]\n" - : [v] "=r" (v) + "rdpr %%tpc, %[v]\n" + : [v] "=r" (v) ); @@ -442,6 +446,6 @@ asm volatile ( - "rdpr %%tl, %[v]\n" - : [v] "=r" (v) + "rdpr %%tl, %[v]\n" + : [v] "=r" (v) ); @@ -459,6 +463,6 @@ asm volatile ( - "rdpr %%tba, %[v]\n" - : [v] "=r" (v) + "rdpr %%tba, %[v]\n" + : [v] "=r" (v) ); @@ -474,7 +478,7 @@ { asm volatile ( - "wrpr %[v], %[zero], %%tba\n" - :: [v] "r" (v), - [zero] "i" (0) + "wrpr %[v], %[zero], %%tba\n" + :: [v] "r" (v), + [zero] "i" (0) ); } @@ -494,8 +498,8 @@ asm volatile ( - "ldxa [%[va]] %[asi], %[v]\n" - : [v] "=r" (v) - : [va] "r" (va), - [asi] "i" ((unsigned int) asi) + "ldxa [%[va]] %[asi], %[v]\n" + : [v] "=r" (v) + : [va] "r" (va), + [asi] "i" ((unsigned int) asi) ); @@ -513,9 +517,9 @@ { asm volatile ( - "stxa %[v], [%[va]] %[asi]\n" - :: [v] "r" (v), - [va] "r" (va), - [asi] "i" ((unsigned int) asi) - : "memory" + "stxa %[v], [%[va]] %[asi]\n" + :: [v] "r" (v), + [va] "r" (va), + [asi] "i" ((unsigned int) asi) + : "memory" ); } Index: kernel/arch/sparc64/src/fpu_context.c =================================================================== --- kernel/arch/sparc64/src/fpu_context.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/sparc64/src/fpu_context.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -41,24 +41,24 @@ { asm volatile ( - "std %%f0, %0\n" - "std %%f2, %1\n" - "std %%f4, %2\n" - "std %%f6, %3\n" - "std %%f8, %4\n" - "std %%f10, %5\n" - "std %%f12, %6\n" - "std %%f14, %7\n" - "std %%f16, %8\n" - "std %%f18, %9\n" - "std %%f20, %10\n" - "std %%f22, %11\n" - "std %%f24, %12\n" - "std %%f26, %13\n" - "std %%f28, %14\n" - "std %%f30, %15\n" - : "=m" (fctx->d[0]), "=m" (fctx->d[1]), "=m" (fctx->d[2]), "=m" (fctx->d[3]), - "=m" (fctx->d[4]), "=m" (fctx->d[5]), "=m" (fctx->d[6]), "=m" (fctx->d[7]), - "=m" (fctx->d[8]), "=m" (fctx->d[9]), "=m" (fctx->d[10]), "=m" (fctx->d[11]), - "=m" (fctx->d[12]), "=m" (fctx->d[13]), "=m" (fctx->d[14]), "=m" (fctx->d[15]) + "std %%f0, %0\n" + "std %%f2, %1\n" + "std %%f4, %2\n" + "std %%f6, %3\n" + "std %%f8, %4\n" + "std %%f10, %5\n" + "std %%f12, %6\n" + "std %%f14, %7\n" + "std %%f16, %8\n" + "std %%f18, %9\n" + "std %%f20, %10\n" + "std %%f22, %11\n" + "std %%f24, %12\n" + "std %%f26, %13\n" + "std %%f28, %14\n" + "std %%f30, %15\n" + : "=m" (fctx->d[0]), "=m" (fctx->d[1]), "=m" (fctx->d[2]), "=m" (fctx->d[3]), + "=m" (fctx->d[4]), "=m" (fctx->d[5]), "=m" (fctx->d[6]), "=m" (fctx->d[7]), + "=m" (fctx->d[8]), "=m" (fctx->d[9]), "=m" (fctx->d[10]), "=m" (fctx->d[11]), + "=m" (fctx->d[12]), "=m" (fctx->d[13]), "=m" (fctx->d[14]), "=m" (fctx->d[15]) ); @@ -69,24 +69,24 @@ asm volatile ( - "std %%f32, %0\n" - "std %%f34, %1\n" - "std %%f36, %2\n" - "std %%f38, %3\n" - "std %%f40, %4\n" - "std %%f42, %5\n" - "std %%f44, %6\n" - "std %%f46, %7\n" - "std %%f48, %8\n" - "std %%f50, %9\n" - "std %%f52, %10\n" - "std %%f54, %11\n" - "std %%f56, %12\n" - "std %%f58, %13\n" - "std %%f60, %14\n" - "std %%f62, %15\n" - : "=m" (fctx->d[16]), "=m" (fctx->d[17]), "=m" (fctx->d[18]), "=m" (fctx->d[19]), - "=m" (fctx->d[20]), "=m" (fctx->d[21]), "=m" (fctx->d[22]), "=m" (fctx->d[23]), - "=m" (fctx->d[24]), "=m" (fctx->d[25]), "=m" (fctx->d[26]), "=m" (fctx->d[27]), - "=m" (fctx->d[28]), "=m" (fctx->d[29]), "=m" (fctx->d[30]), "=m" (fctx->d[31]) + "std %%f32, %0\n" + "std %%f34, %1\n" + "std %%f36, %2\n" + "std %%f38, %3\n" + "std %%f40, %4\n" + "std %%f42, %5\n" + "std %%f44, %6\n" + "std %%f46, %7\n" + "std %%f48, %8\n" + "std %%f50, %9\n" + "std %%f52, %10\n" + "std %%f54, %11\n" + "std %%f56, %12\n" + "std %%f58, %13\n" + "std %%f60, %14\n" + "std %%f62, %15\n" + : "=m" (fctx->d[16]), "=m" (fctx->d[17]), "=m" (fctx->d[18]), "=m" (fctx->d[19]), + "=m" (fctx->d[20]), "=m" (fctx->d[21]), "=m" (fctx->d[22]), "=m" (fctx->d[23]), + "=m" (fctx->d[24]), "=m" (fctx->d[25]), "=m" (fctx->d[26]), "=m" (fctx->d[27]), + "=m" (fctx->d[28]), "=m" (fctx->d[29]), "=m" (fctx->d[30]), "=m" (fctx->d[31]) ); @@ -97,25 +97,25 @@ { asm volatile ( - "ldd %0, %%f0\n" - "ldd %1, %%f2\n" - "ldd %2, %%f4\n" - "ldd %3, %%f6\n" - "ldd %4, %%f8\n" - "ldd %5, %%f10\n" - "ldd %6, %%f12\n" - "ldd %7, %%f14\n" - "ldd %8, %%f16\n" - "ldd %9, %%f18\n" - "ldd %10, %%f20\n" - "ldd %11, %%f22\n" - "ldd %12, %%f24\n" - "ldd %13, %%f26\n" - "ldd %14, %%f28\n" - "ldd %15, %%f30\n" - : - : "m" (fctx->d[0]), "m" (fctx->d[1]), "m" (fctx->d[2]), "m" (fctx->d[3]), - "m" (fctx->d[4]), "m" (fctx->d[5]), "m" (fctx->d[6]), "m" (fctx->d[7]), - "m" (fctx->d[8]), "m" (fctx->d[9]), "m" (fctx->d[10]), "m" (fctx->d[11]), - "m" (fctx->d[12]), "m" (fctx->d[13]), "m" (fctx->d[14]), "m" (fctx->d[15]) + "ldd %0, %%f0\n" + "ldd %1, %%f2\n" + "ldd %2, %%f4\n" + "ldd %3, %%f6\n" + "ldd %4, %%f8\n" + "ldd %5, %%f10\n" + "ldd %6, %%f12\n" + "ldd %7, %%f14\n" + "ldd %8, %%f16\n" + "ldd %9, %%f18\n" + "ldd %10, %%f20\n" + "ldd %11, %%f22\n" + "ldd %12, %%f24\n" + "ldd %13, %%f26\n" + "ldd %14, %%f28\n" + "ldd %15, %%f30\n" + : + : "m" (fctx->d[0]), "m" (fctx->d[1]), "m" (fctx->d[2]), "m" (fctx->d[3]), + "m" (fctx->d[4]), "m" (fctx->d[5]), "m" (fctx->d[6]), "m" (fctx->d[7]), + "m" (fctx->d[8]), "m" (fctx->d[9]), "m" (fctx->d[10]), "m" (fctx->d[11]), + "m" (fctx->d[12]), "m" (fctx->d[13]), "m" (fctx->d[14]), "m" (fctx->d[15]) ); @@ -126,25 +126,25 @@ asm volatile ( - "ldd %0, %%f32\n" - "ldd %1, %%f34\n" - "ldd %2, %%f36\n" - "ldd %3, %%f38\n" - "ldd %4, %%f40\n" - "ldd %5, %%f42\n" - "ldd %6, %%f44\n" - "ldd %7, %%f46\n" - "ldd %8, %%f48\n" - "ldd %9, %%f50\n" - "ldd %10, %%f52\n" - "ldd %11, %%f54\n" - "ldd %12, %%f56\n" - "ldd %13, %%f58\n" - "ldd %14, %%f60\n" - "ldd %15, %%f62\n" - : - : "m" (fctx->d[16]), "m" (fctx->d[17]), "m" (fctx->d[18]), "m" (fctx->d[19]), - "m" (fctx->d[20]), "m" (fctx->d[21]), "m" (fctx->d[22]), "m" (fctx->d[23]), - "m" (fctx->d[24]), "m" (fctx->d[25]), "m" (fctx->d[26]), "m" (fctx->d[27]), - "m" (fctx->d[28]), "m" (fctx->d[29]), "m" (fctx->d[30]), "m" (fctx->d[31]) + "ldd %0, %%f32\n" + "ldd %1, %%f34\n" + "ldd %2, %%f36\n" + "ldd %3, %%f38\n" + "ldd %4, %%f40\n" + "ldd %5, %%f42\n" + "ldd %6, %%f44\n" + "ldd %7, %%f46\n" + "ldd %8, %%f48\n" + "ldd %9, %%f50\n" + "ldd %10, %%f52\n" + "ldd %11, %%f54\n" + "ldd %12, %%f56\n" + "ldd %13, %%f58\n" + "ldd %14, %%f60\n" + "ldd %15, %%f62\n" + : + : "m" (fctx->d[16]), "m" (fctx->d[17]), "m" (fctx->d[18]), "m" (fctx->d[19]), + "m" (fctx->d[20]), "m" (fctx->d[21]), "m" (fctx->d[22]), "m" (fctx->d[23]), + "m" (fctx->d[24]), "m" (fctx->d[25]), "m" (fctx->d[26]), "m" (fctx->d[27]), + "m" (fctx->d[28]), "m" (fctx->d[29]), "m" (fctx->d[30]), "m" (fctx->d[31]) ); Index: kernel/arch/sparc64/src/sun4v/md.c =================================================================== --- kernel/arch/sparc64/src/sun4v/md.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/arch/sparc64/src/sun4v/md.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -62,5 +62,5 @@ uint32_t name_blk_sz; /**< Size in bytes of name block */ uint32_t data_blk_sz; /**< Size in bytes of data block */ -} __attribute__ ((packed)) md_header_t; +} __attribute__((packed)) md_header_t; /** machine description element (in the node block) */ @@ -91,5 +91,5 @@ uint64_t val; } d; -} __attribute__ ((packed)) md_element_t; +} __attribute__((packed)) md_element_t; /** index of the element within the node block */ @@ -98,5 +98,5 @@ /** buffer to which the machine description will be saved */ static uint8_t mach_desc[MD_MAX_SIZE] - __attribute__ ((aligned (16))); + __attribute__((aligned(16))); @@ -129,5 +129,5 @@ */ bool md_get_integer_property(md_node_t node, const char *key, - uint64_t *result) + uint64_t *result) { element_idx_t idx = node; @@ -152,5 +152,5 @@ */ bool md_get_string_property(md_node_t node, const char *key, - const char **result) + const char **result) { md_header_t *md_header = (md_header_t *) mach_desc; Index: kernel/genarch/src/acpi/acpi.c =================================================================== --- kernel/genarch/src/acpi/acpi.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/acpi/acpi.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -65,5 +65,6 @@ }; -static int rsdp_check(uint8_t *_rsdp) { +static int rsdp_check(uint8_t *_rsdp) +{ struct acpi_rsdp *rsdp = (struct acpi_rsdp *) _rsdp; uint8_t sum = 0; @@ -119,10 +120,10 @@ size_t i; size_t j; - size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) - / sizeof(uint32_t); + size_t cnt = (acpi_rsdt->header.length - sizeof(struct acpi_sdt_header)) / + sizeof(uint32_t); for (i = 0; i < cnt; i++) { - for (j = 0; j < sizeof(signature_map) - / sizeof(struct acpi_signature_map); j++) { + for (j = 0; j < sizeof(signature_map) / + sizeof(struct acpi_signature_map); j++) { struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i]; @@ -145,10 +146,10 @@ size_t i; size_t j; - size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) - / sizeof(uint64_t); + size_t cnt = (acpi_xsdt->header.length - sizeof(struct acpi_sdt_header)) / + sizeof(uint64_t); for (i = 0; i < cnt; i++) { - for (j = 0; j < sizeof(signature_map) - / sizeof(struct acpi_signature_map); j++) { + for (j = 0; j < sizeof(signature_map) / + sizeof(struct acpi_signature_map); j++) { struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); @@ -184,6 +185,6 @@ for (i = (ebda ? 0 : 1); i < 2; i++) { for (j = 0; j < length[i]; j += 16) { - if ((*((uint64_t *) &addr[i][j]) == *sig) - && (rsdp_check(&addr[i][j]))) { + if ((*((uint64_t *) &addr[i][j]) == *sig) && + (rsdp_check(&addr[i][j]))) { acpi_rsdp = (struct acpi_rsdp *) &addr[i][j]; goto rsdp_found; Index: kernel/genarch/src/acpi/madt.c =================================================================== --- kernel/genarch/src/acpi/madt.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/acpi/madt.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -225,5 +225,5 @@ case MADT_IO_APIC: madt_io_apic_entry((struct madt_io_apic *) hdr, i); - break; + break; case MADT_INTR_SRC_OVRD: madt_intr_src_ovrd_entry((struct madt_intr_src_ovrd *) hdr, i); @@ -240,6 +240,6 @@ break; default: - if ((hdr->type >= MADT_RESERVED_SKIP_BEGIN) - && (hdr->type <= MADT_RESERVED_SKIP_END)) + if ((hdr->type >= MADT_RESERVED_SKIP_BEGIN) && + (hdr->type <= MADT_RESERVED_SKIP_END)) log(LF_ARCH, LVL_NOTE, "MADT: Skipping reserved entry (type=%" PRIu8 ")", Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -56,6 +56,6 @@ dsrlnin_instance_t *dsrlnin_init(dsrlnin_t *dev, inr_t inr) { - dsrlnin_instance_t *instance - = malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC); + dsrlnin_instance_t *instance = + malloc(sizeof(dsrlnin_instance_t), FRAME_ATOMIC); if (instance) { instance->dsrlnin = dev; Index: kernel/genarch/src/drivers/ega/ega.c =================================================================== --- kernel/genarch/src/drivers/ega/ega.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/drivers/ega/ega.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -547,10 +547,10 @@ switch (ch) { case '\n': - instance->cursor = (instance->cursor + EGA_COLS) - - instance->cursor % EGA_COLS; + instance->cursor = (instance->cursor + EGA_COLS) - + instance->cursor % EGA_COLS; break; case '\t': - instance->cursor = (instance->cursor + 8) - - instance->cursor % 8; + instance->cursor = (instance->cursor + 8) - + instance->cursor % 8; break; case '\b': Index: kernel/genarch/src/drivers/ns16550/ns16550.c =================================================================== --- kernel/genarch/src/drivers/ns16550/ns16550.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/drivers/ns16550/ns16550.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -128,6 +128,6 @@ cir_t cir, void *cir_arg, outdev_t **output) { - ns16550_instance_t *instance - = malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC); + ns16550_instance_t *instance = + malloc(sizeof(ns16550_instance_t), FRAME_ATOMIC); if (instance) { instance->ns16550 = dev; Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -90,6 +90,6 @@ cuda_instance_t *cuda_init(cuda_t *dev, inr_t inr, cir_t cir, void *cir_arg) { - cuda_instance_t *instance - = malloc(sizeof(cuda_instance_t), FRAME_ATOMIC); + cuda_instance_t *instance = + malloc(sizeof(cuda_instance_t), FRAME_ATOMIC); if (instance) { instance->cuda = dev; @@ -168,10 +168,20 @@ switch (instance->xstate) { - case cx_listen: cuda_irq_listen(irq); break; - case cx_receive: cuda_irq_receive(irq); break; - case cx_rcv_end: cuda_irq_rcv_end(irq, rbuf, &len); - handle = true; break; - case cx_send_start: cuda_irq_send_start(irq); break; - case cx_send: cuda_irq_send(irq); break; + case cx_listen: + cuda_irq_listen(irq); + break; + case cx_receive: + cuda_irq_receive(irq); + break; + case cx_rcv_end: + cuda_irq_rcv_end(irq, rbuf, &len); + handle = true; + break; + case cx_send_start: + cuda_irq_send_start(irq); + break; + case cx_send: + cuda_irq_send(irq); + break; } @@ -314,6 +324,6 @@ static void cuda_packet_handle(cuda_instance_t *instance, uint8_t *data, size_t len) { - if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c - && data[2] != 0x8c)) + if (data[0] != 0x00 || data[1] != 0x40 || (data[2] != 0x2c && + data[2] != 0x8c)) return; Index: kernel/genarch/src/fb/fb.c =================================================================== --- kernel/genarch/src/fb/fb.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/fb/fb.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -80,5 +80,5 @@ ((glyph) * (instance)->glyphbytes + (y) * (instance)->glyphscanline) -typedef void (* rgb_conv_t)(void *, uint32_t); +typedef void (*rgb_conv_t)(void *, uint32_t); typedef struct { @@ -224,6 +224,6 @@ static void bgr_323(void *dst, uint32_t rgb) { - *((uint8_t *) dst) - = ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3)); + *((uint8_t *) dst) = + ~((RED(rgb, 3) << 5) | (GREEN(rgb, 2) << 3) | BLUE(rgb, 3)); } Index: kernel/genarch/src/kbrd/kbrd.c =================================================================== --- kernel/genarch/src/kbrd/kbrd.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/kbrd/kbrd.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -171,6 +171,6 @@ kbrd_instance_t *kbrd_init(void) { - kbrd_instance_t *instance - = malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC); + kbrd_instance_t *instance = + malloc(sizeof(kbrd_instance_t), FRAME_ATOMIC); if (instance) { instance->thread = thread_create(kkbrd, (void *) instance, Index: kernel/genarch/src/ofw/ofw_tree.c =================================================================== --- kernel/genarch/src/ofw/ofw_tree.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/ofw/ofw_tree.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -106,5 +106,5 @@ * Try to find the disambigued name. */ - for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) { if (str_cmp(cur->da_name, name) == 0) return cur; @@ -118,5 +118,5 @@ * are not always fully-qualified. */ - for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) { if (str_cmp(ofw_tree_node_name(cur), name) == 0) return cur; @@ -138,5 +138,5 @@ const char *dtype) { - for (ofw_tree_node_t *cur = node->child; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node->child; cur; cur = cur->peer) { ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); @@ -167,5 +167,5 @@ phandle handle) { - for (ofw_tree_node_t *cur = root; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = root; cur; cur = cur->peer) { if (cur->node_handle == handle) return cur; @@ -194,5 +194,5 @@ const char *dtype) { - for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node->peer; cur; cur = cur->peer) { ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); @@ -220,5 +220,5 @@ const char *name) { - for (ofw_tree_node_t *cur = node->peer; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node->peer; cur; cur = cur->peer) { ofw_tree_property_t *prop = ofw_tree_getprop(cur, "name"); @@ -284,5 +284,5 @@ const char *dtype, ofw_tree_walker_t walker, void *arg) { - for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node; cur; cur = cur->peer) { ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); @@ -388,5 +388,5 @@ char *cur_path = (char *) malloc(PATH_MAX_LEN, 0); - for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) { + for (ofw_tree_node_t * cur = node; cur; cur = cur->peer) { if ((cur->parent) && (path)) snprintf(cur_path, PATH_MAX_LEN, "%s.%s", path, cur->da_name); Index: kernel/genarch/src/softint/division.c =================================================================== --- kernel/genarch/src/softint/division.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/softint/division.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -59,5 +59,5 @@ for (; steps > 0; steps--) { /* shift one bit to remainder */ - *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1); + *remainder = ((*remainder) << 1) | ((a >> 31) & 0x1); result <<= 1; Index: kernel/genarch/src/srln/srln.c =================================================================== --- kernel/genarch/src/srln/srln.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/genarch/src/srln/srln.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -129,6 +129,6 @@ srln_instance_t *srln_init(void) { - srln_instance_t *instance - = malloc(sizeof(srln_instance_t), FRAME_ATOMIC); + srln_instance_t *instance = + malloc(sizeof(srln_instance_t), FRAME_ATOMIC); if (instance) { instance->thread = thread_create(ksrln, (void *) instance, Index: kernel/generic/include/adt/hash.h =================================================================== --- kernel/generic/include/adt/hash.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/include/adt/hash.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -105,6 +105,6 @@ * http://burtleburtle.net/bob/c/lookup3.c */ - seed ^= hash + 0x9e3779b9 - + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5))); + seed ^= hash + 0x9e3779b9 + + ((seed << 5) | (seed >> (sizeof(size_t) * 8 - 5))); return seed; } Index: kernel/generic/src/adt/avl.c =================================================================== --- kernel/generic/src/adt/avl.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/adt/avl.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -186,5 +186,5 @@ } gpa = par; - dpc = par->key > key ? &par->lft: &par->rgt; + dpc = par->key > key ? &par->lft : &par->rgt; } @@ -308,5 +308,5 @@ */ static int -repair(avltree_t *t, avltree_node_t *u, avltree_node_t *v, avltree_node_t *w, + repair(avltree_t *t, avltree_node_t *u, avltree_node_t *v, avltree_node_t *w, int *dir, int ro) { @@ -404,5 +404,5 @@ gpa = node->par; cur = NULL; - dir = (gpa->lft == node) ? LEFT: RIGHT; + dir = (gpa->lft == node) ? LEFT : RIGHT; } } else { Index: kernel/generic/src/adt/cht.c =================================================================== --- kernel/generic/src/adt/cht.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/adt/cht.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -407,31 +407,31 @@ static size_t size_to_order(size_t bucket_cnt, size_t min_order); static cht_buckets_t *alloc_buckets(size_t order, bool set_invalid, - bool can_block); + bool can_block); static inline cht_link_t *find_lazy(cht_t *h, void *key); static cht_link_t *search_bucket(cht_t *h, marked_ptr_t head, void *key, - size_t search_hash); + size_t search_hash); static cht_link_t *find_resizing(cht_t *h, void *key, size_t hash, - marked_ptr_t old_head, size_t old_idx); + marked_ptr_t old_head, size_t old_idx); static bool insert_impl(cht_t *h, cht_link_t *item, cht_link_t **dup_item); static bool insert_at(cht_link_t *item, const wnd_t *wnd, walk_mode_t walk_mode, - bool *resizing); + bool *resizing); static bool has_duplicate(cht_t *h, const cht_link_t *item, size_t hash, - cht_link_t *cur, cht_link_t **dup_item); + cht_link_t *cur, cht_link_t **dup_item); static cht_link_t *find_duplicate(cht_t *h, const cht_link_t *item, size_t hash, - cht_link_t *start); + cht_link_t *start); static bool remove_pred(cht_t *h, size_t hash, equal_pred_t pred, void *pred_arg); static bool delete_at(cht_t *h, wnd_t *wnd, walk_mode_t walk_mode, - bool *deleted_but_gc, bool *resizing); + bool *deleted_but_gc, bool *resizing); static bool mark_deleted(cht_link_t *cur, walk_mode_t walk_mode, bool *resizing); static bool unlink_from_pred(wnd_t *wnd, walk_mode_t walk_mode, bool *resizing); static bool find_wnd_and_gc_pred(cht_t *h, size_t hash, walk_mode_t walk_mode, - equal_pred_t pred, void *pred_arg, wnd_t *wnd, bool *resizing); + equal_pred_t pred, void *pred_arg, wnd_t *wnd, bool *resizing); static bool find_wnd_and_gc(cht_t *h, size_t hash, walk_mode_t walk_mode, - wnd_t *wnd, bool *resizing); + wnd_t *wnd, bool *resizing); static bool gc_deleted_node(cht_t *h, walk_mode_t walk_mode, wnd_t *wnd, - bool *resizing); + bool *resizing); static bool join_completed(cht_t *h, const wnd_t *wnd); static void upd_resizing_head(cht_t *h, size_t hash, marked_ptr_t **phead, - bool *join_finishing, walk_mode_t *walk_mode); + bool *join_finishing, walk_mode_t *walk_mode); static void item_removed(cht_t *h); static void item_inserted(cht_t *h); @@ -442,12 +442,12 @@ static void complete_head_move(marked_ptr_t *psrc_head, marked_ptr_t *pdest_head); static void split_bucket(cht_t *h, marked_ptr_t *psrc_head, - marked_ptr_t *pdest_head, size_t split_hash); + marked_ptr_t *pdest_head, size_t split_hash); static void mark_join_follows(cht_t *h, marked_ptr_t *psrc_head, - size_t split_hash, wnd_t *wnd); + size_t split_hash, wnd_t *wnd); static void mark_join_node(cht_link_t *join_node); static void join_buckets(cht_t *h, marked_ptr_t *psrc_head, - marked_ptr_t *pdest_head, size_t split_hash); + marked_ptr_t *pdest_head, size_t split_hash); static void link_to_join_node(cht_t *h, marked_ptr_t *pdest_head, - cht_link_t *join_node, size_t split_hash); + cht_link_t *join_node, size_t split_hash); static void resize_table(work_t *arg); static void grow_table(cht_t *h); @@ -455,8 +455,8 @@ static void cleanup_join_node(cht_t *h, marked_ptr_t *new_head); static void clear_join_and_gc(cht_t *h, cht_link_t *join_node, - marked_ptr_t *new_head); + marked_ptr_t *new_head); static void cleanup_join_follows(cht_t *h, marked_ptr_t *new_head); static marked_ptr_t make_link(const cht_link_t *next, mark_t mark); -static cht_link_t * get_next(marked_ptr_t link); +static cht_link_t *get_next(marked_ptr_t link); static mark_t get_mark(marked_ptr_t link); static void next_wnd(wnd_t *wnd); @@ -472,7 +472,7 @@ static size_t shrink_idx(size_t idx); static marked_ptr_t cas_link(marked_ptr_t *link, const cht_link_t *cur_next, - mark_t cur_mark, const cht_link_t *new_next, mark_t new_mark); + mark_t cur_mark, const cht_link_t *new_next, mark_t new_mark); static marked_ptr_t _cas_link(marked_ptr_t *link, marked_ptr_t cur, - marked_ptr_t new); + marked_ptr_t new); static void cas_order_barrier(void); @@ -513,5 +513,5 @@ */ bool cht_create(cht_t *h, size_t init_size, size_t min_size, size_t max_load, - bool can_block, cht_ops_t *op) + bool can_block, cht_ops_t *op) { assert(h); @@ -572,5 +572,5 @@ size_t bucket_cnt = (1 << order); size_t bytes = - sizeof(cht_buckets_t) + (bucket_cnt - 1) * sizeof(marked_ptr_t); + sizeof(cht_buckets_t) + (bucket_cnt - 1) * sizeof(marked_ptr_t); cht_buckets_t *b = malloc(bytes, can_block ? 0 : FRAME_ATOMIC); @@ -580,7 +580,7 @@ b->order = order; - marked_ptr_t head_link = set_invalid - ? make_link(&sentinel, N_INVALID) - : make_link(&sentinel, N_NORMAL); + marked_ptr_t head_link = set_invalid ? + make_link(&sentinel, N_INVALID) : + make_link(&sentinel, N_NORMAL); for (size_t i = 0; i < bucket_cnt; ++i) { @@ -733,5 +733,5 @@ /** Searches the bucket at head for key using search_hash. */ static inline cht_link_t *search_bucket(cht_t *h, marked_ptr_t head, void *key, - size_t search_hash) + size_t search_hash) { /* @@ -781,5 +781,5 @@ /** Searches for the key while the table is undergoing a resize. */ static cht_link_t *find_resizing(cht_t *h, void *key, size_t hash, - marked_ptr_t old_head, size_t old_idx) + marked_ptr_t old_head, size_t old_idx) { assert(N_INVALID == get_mark(old_head)); @@ -1022,5 +1022,5 @@ */ inline static bool insert_at(cht_link_t *item, const wnd_t *wnd, - walk_mode_t walk_mode, bool *resizing) + walk_mode_t walk_mode, bool *resizing) { marked_ptr_t ret; @@ -1078,9 +1078,9 @@ */ static inline bool has_duplicate(cht_t *h, const cht_link_t *item, size_t hash, - cht_link_t *cur, cht_link_t **dup_item) + cht_link_t *cur, cht_link_t **dup_item) { assert(cur); - assert(cur == &sentinel || hash <= node_hash(h, cur) - || node_hash(h, cur) == h->invalid_hash); + assert(cur == &sentinel || hash <= node_hash(h, cur) || + node_hash(h, cur) == h->invalid_hash); /* hash < node_hash(h, cur) */ @@ -1101,5 +1101,5 @@ /** Returns an item that is equal to \a item starting in a chain at \a start. */ static cht_link_t *find_duplicate(cht_t *h, const cht_link_t *item, size_t hash, - cht_link_t *start) + cht_link_t *start) { assert(hash <= node_hash(h, start) || h->invalid_hash == node_hash(h, start)); @@ -1201,5 +1201,5 @@ if (!find_wnd_and_gc_pred( - h, hash, walk_mode, pred, pred_arg, &wnd, &resizing)) { + h, hash, walk_mode, pred, pred_arg, &wnd, &resizing)) { /* Could not GC a node; or detected an unexpected resize. */ continue; @@ -1253,5 +1253,5 @@ */ static inline bool delete_at(cht_t *h, wnd_t *wnd, walk_mode_t walk_mode, - bool *deleted_but_gc, bool *resizing) + bool *deleted_but_gc, bool *resizing) { assert(wnd->cur && wnd->cur != &sentinel); @@ -1283,5 +1283,5 @@ /** Marks cur logically deleted. Returns false to request a retry. */ static inline bool mark_deleted(cht_link_t *cur, walk_mode_t walk_mode, - bool *resizing) + bool *resizing) { assert(cur && cur != &sentinel); @@ -1309,5 +1309,5 @@ marked_ptr_t ret = - cas_link(&cur->link, next, cur_mark, next, cur_mark | N_DELETED); + cas_link(&cur->link, next, cur_mark, next, cur_mark | N_DELETED); if (ret != make_link(next, cur_mark)) @@ -1320,5 +1320,5 @@ /** Unlinks wnd.cur from wnd.ppred. Returns false if it should be retried. */ static inline bool unlink_from_pred(wnd_t *wnd, walk_mode_t walk_mode, - bool *resizing) + bool *resizing) { assert(wnd->cur != &sentinel); @@ -1354,6 +1354,6 @@ if (pred_link != ret) { /* If we're not resizing the table there are no JF/JN nodes. */ - *resizing = (walk_mode == WM_NORMAL) - && (N_JOIN_FOLLOWS & get_mark(ret)); + *resizing = (walk_mode == WM_NORMAL) && + (N_JOIN_FOLLOWS & get_mark(ret)); return false; } @@ -1389,5 +1389,5 @@ */ static bool find_wnd_and_gc_pred(cht_t *h, size_t hash, walk_mode_t walk_mode, - equal_pred_t pred, void *pred_arg, wnd_t *wnd, bool *resizing) + equal_pred_t pred, void *pred_arg, wnd_t *wnd, bool *resizing) { assert(wnd->cur); @@ -1459,5 +1459,5 @@ */ static bool find_wnd_and_gc(cht_t *h, size_t hash, walk_mode_t walk_mode, - wnd_t *wnd, bool *resizing) + wnd_t *wnd, bool *resizing) { try_again: @@ -1489,5 +1489,5 @@ /** Garbage collects the N_DELETED node at \a wnd skipping join nodes. */ static bool gc_deleted_node(cht_t *h, walk_mode_t walk_mode, wnd_t *wnd, - bool *resizing) + bool *resizing) { assert(N_DELETED & get_mark(wnd->cur->link)); @@ -1498,6 +1498,6 @@ } else { /* Ordinary deleted node or a deleted JOIN_FOLLOWS. */ - assert(walk_mode != WM_LEAVE_JOIN - || !((N_JOIN | N_JOIN_FOLLOWS) & get_mark(wnd->cur->link))); + assert(walk_mode != WM_LEAVE_JOIN || + !((N_JOIN | N_JOIN_FOLLOWS) & get_mark(wnd->cur->link))); /* Unlink an ordinary deleted node, move JOIN_FOLLOWS mark. */ @@ -1591,5 +1591,5 @@ */ static void upd_resizing_head(cht_t *h, size_t hash, marked_ptr_t **phead, - bool *join_finishing, walk_mode_t *walk_mode) + bool *join_finishing, walk_mode_t *walk_mode) { cht_buckets_t *b = rcu_access(h->b); @@ -1641,5 +1641,5 @@ *walk_mode = WM_LEAVE_JOIN; } - } else if (h->new_b->order < b->order ) { + } else if (h->new_b->order < b->order) { /* Shrinking the table. */ @@ -1702,5 +1702,5 @@ */ static inline void help_head_move(marked_ptr_t *psrc_head, - marked_ptr_t *pdest_head) + marked_ptr_t *pdest_head) { /* Head move has to in progress already when calling this func. */ @@ -1743,5 +1743,5 @@ /* Mark the normal/clean src link immutable/const. */ ret = cas_link(psrc_head, next, N_NORMAL, next, N_CONST); - } while(ret != src_link && !(N_CONST & get_mark(ret))); + } while (ret != src_link && !(N_CONST & get_mark(ret))); } @@ -1783,5 +1783,5 @@ */ static void split_bucket(cht_t *h, marked_ptr_t *psrc_head, - marked_ptr_t *pdest_head, size_t split_hash) + marked_ptr_t *pdest_head, size_t split_hash) { /* Already split. */ @@ -1884,5 +1884,5 @@ */ static void mark_join_follows(cht_t *h, marked_ptr_t *psrc_head, - size_t split_hash, wnd_t *wnd) + size_t split_hash, wnd_t *wnd) { /* See comment in split_bucket(). */ @@ -1909,6 +1909,6 @@ * that a join node follows. It must be clean/normal. */ - marked_ptr_t ret - = cas_link(wnd->ppred, wnd->cur, N_NORMAL, wnd->cur, N_JOIN_FOLLOWS); + marked_ptr_t ret = + cas_link(wnd->ppred, wnd->cur, N_NORMAL, wnd->cur, N_JOIN_FOLLOWS); /* @@ -1916,6 +1916,6 @@ * if also marked deleted - unlinking the node will move the JF mark). */ - done = (ret == make_link(wnd->cur, N_NORMAL)) - || (N_JOIN_FOLLOWS & get_mark(ret)); + done = (ret == make_link(wnd->cur, N_NORMAL)) || + (N_JOIN_FOLLOWS & get_mark(ret)); } while (!done); } @@ -1935,11 +1935,11 @@ * because its predecessor is marked with JOIN_FOLLOWS or CONST. */ - marked_ptr_t ret - = cas_link(&join_node->link, next, mark, next, mark | N_JOIN); + marked_ptr_t ret = + cas_link(&join_node->link, next, mark, next, mark | N_JOIN); /* Successfully marked or already marked as a join node. */ - done = (ret == make_link(next, mark)) - || (N_JOIN & get_mark(ret)); - } while(!done); + done = (ret == make_link(next, mark)) || + (N_JOIN & get_mark(ret)); + } while (!done); } @@ -1952,5 +1952,5 @@ */ static void join_buckets(cht_t *h, marked_ptr_t *psrc_head, - marked_ptr_t *pdest_head, size_t split_hash) + marked_ptr_t *pdest_head, size_t split_hash) { /* Buckets already joined. */ @@ -2059,5 +2059,5 @@ */ static void link_to_join_node(cht_t *h, marked_ptr_t *pdest_head, - cht_link_t *join_node, size_t split_hash) + cht_link_t *join_node, size_t split_hash) { bool done = false; @@ -2078,6 +2078,6 @@ if (wnd.cur != &sentinel) { /* Must be from the new appended bucket. */ - assert(split_hash <= node_hash(h, wnd.cur) - || h->invalid_hash == node_hash(h, wnd.cur)); + assert(split_hash <= node_hash(h, wnd.cur) || + h->invalid_hash == node_hash(h, wnd.cur)); return; } @@ -2085,5 +2085,5 @@ /* Reached the tail of pdest_head - link it to the join node. */ marked_ptr_t ret = - cas_link(wnd.ppred, &sentinel, N_NORMAL, join_node, N_NORMAL); + cas_link(wnd.ppred, &sentinel, N_NORMAL, join_node, N_NORMAL); done = (ret == make_link(&sentinel, N_NORMAL)); @@ -2320,5 +2320,5 @@ size_t split_hash = calc_split_hash(old_idx, h->b->order); join_buckets(h, &h->b->head[old_idx], &h->new_b->head[new_idx], - split_hash); + split_hash); } } @@ -2391,5 +2391,5 @@ /** Clears the join_node's N_JOIN mark frees it if marked N_DELETED as well. */ static void clear_join_and_gc(cht_t *h, cht_link_t *join_node, - marked_ptr_t *new_head) + marked_ptr_t *new_head) { assert(join_node != &sentinel); @@ -2406,5 +2406,5 @@ marked_ptr_t ret = - _cas_link(&join_node->link, jn_link, make_link(next, cleared_mark)); + _cas_link(&join_node->link, jn_link, make_link(next, cleared_mark)); /* Done if the mark was cleared. Retry if a new node was inserted. */ @@ -2431,5 +2431,5 @@ done = find_wnd_and_gc_pred(h, jn_hash, WM_NORMAL, same_node_pred, - join_node, &wnd, &resizing); + join_node, &wnd, &resizing); assert(!resizing); @@ -2483,8 +2483,8 @@ cht_link_t *next = get_next(*cur_link); marked_ptr_t ret = - cas_link(cur_link, next, N_JOIN_FOLLOWS, &sentinel, N_NORMAL); - - assert(next == &sentinel - || ((N_JOIN | N_JOIN_FOLLOWS) & get_mark(ret))); + cas_link(cur_link, next, N_JOIN_FOLLOWS, &sentinel, N_NORMAL); + + assert(next == &sentinel || + ((N_JOIN | N_JOIN_FOLLOWS) & get_mark(ret))); /* Successfully cleared the JF mark of a non-deleted node. */ @@ -2559,7 +2559,7 @@ static inline size_t node_hash(cht_t *h, const cht_link_t *item) { - assert(item->hash == h->invalid_hash - || item->hash == sentinel.hash - || item->hash == calc_node_hash(h, item)); + assert(item->hash == h->invalid_hash || + item->hash == sentinel.hash || + item->hash == calc_node_hash(h, item)); return item->hash; @@ -2595,7 +2595,7 @@ /** Strips any marks from the next item link and returns the next item's address.*/ -static inline cht_link_t * get_next(marked_ptr_t link) -{ - return (cht_link_t*)(link & ~N_MARK_MASK); +static inline cht_link_t *get_next(marked_ptr_t link) +{ + return (cht_link_t *)(link & ~N_MARK_MASK); } @@ -2620,5 +2620,5 @@ static bool same_node_pred(void *node, const cht_link_t *item2) { - const cht_link_t *item1 = (const cht_link_t*) node; + const cht_link_t *item1 = (const cht_link_t *) node; return item1 == item2; } @@ -2626,13 +2626,13 @@ /** Compare-and-swaps a next item link. */ static inline marked_ptr_t cas_link(marked_ptr_t *link, const cht_link_t *cur_next, - mark_t cur_mark, const cht_link_t *new_next, mark_t new_mark) + mark_t cur_mark, const cht_link_t *new_next, mark_t new_mark) { return _cas_link(link, make_link(cur_next, cur_mark), - make_link(new_next, new_mark)); + make_link(new_next, new_mark)); } /** Compare-and-swaps a next item link. */ static inline marked_ptr_t _cas_link(marked_ptr_t *link, marked_ptr_t cur, - marked_ptr_t new) + marked_ptr_t new) { assert(link != &sentinel.link); @@ -2690,5 +2690,5 @@ * is already visible to cpu3. * */ - void *expected = (void*)cur; + void *expected = (void *)cur; /* @@ -2697,6 +2697,6 @@ * of explicit memory barriers. */ - __atomic_compare_exchange_n((void**)link, &expected, (void *)new, false, - __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE); + __atomic_compare_exchange_n((void **)link, &expected, (void *)new, false, + __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE); return (marked_ptr_t) expected; Index: kernel/generic/src/console/cmd.c =================================================================== --- kernel/generic/src/console/cmd.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/console/cmd.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -923,5 +923,5 @@ printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n", - sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); + sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); return 1; @@ -1088,5 +1088,5 @@ (void *) cmd_call2); printf("Calling f(%#" PRIxn ", %#" PRIxn "): %p: %s\n", - arg1, arg2, (void *) symaddr, symbol); + arg1, arg2, (void *) symaddr, symbol); printf("Result: %#" PRIxn "\n", fnc(arg1, arg2)); interrupts_restore(ipl); @@ -1125,5 +1125,5 @@ (void *) cmd_call3); printf("Calling f(%#" PRIxn ",%#" PRIxn ", %#" PRIxn "): %p: %s\n", - arg1, arg2, arg3, (void *) symaddr, symbol); + arg1, arg2, arg3, (void *) symaddr, symbol); printf("Result: %#" PRIxn "\n", fnc(arg1, arg2, arg3)); interrupts_restore(ipl); @@ -1188,5 +1188,5 @@ pointer = true; } else if (((char *) argv->buffer)[0] >= '0' && - ((char *) argv->buffer)[0] <= '9') { + ((char *) argv->buffer)[0] <= '9') { uint64_t value; rc = str_uint64_t((char *) argv->buffer, NULL, 0, true, &value); @@ -1206,5 +1206,5 @@ if (pointer) addr = *(uintptr_t *) addr; - printf("Writing %#" PRIx32" -> %p\n", arg1, (void *) addr); + printf("Writing %#" PRIx32 " -> %p\n", arg1, (void *) addr); *(uint32_t *) addr = arg1; } else Index: kernel/generic/src/console/kconsole.c =================================================================== --- kernel/generic/src/console/kconsole.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/console/kconsole.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -86,5 +86,5 @@ LIST_INITIALIZE(cmd_list); /**< Command list. */ -static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = {}; +static wchar_t history[KCONSOLE_HISTORY][MAX_CMDLINE] = { }; static size_t history_pos = 0; @@ -166,5 +166,5 @@ const char *cmdtab_enum(const char *name, const char **h, void **ctx) { - link_t **startpos = (link_t**) ctx; + link_t **startpos = (link_t **) ctx; size_t namelen = str_length(name); @@ -376,5 +376,5 @@ beg = position - 1; while ((beg > 0) && (!isspace(current[beg]))) - beg--; + beg--; if (isspace(current[beg])) Index: kernel/generic/src/cpu/cpu.c =================================================================== --- kernel/generic/src/cpu/cpu.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/cpu/cpu.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -65,5 +65,5 @@ #endif /* CONFIG_SMP */ - cpus = (cpu_t *) malloc(sizeof(cpu_t) *config.cpu_count, + cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count, FRAME_ATOMIC); if (!cpus) @@ -71,5 +71,5 @@ /* Initialize everything */ - memsetb(cpus, sizeof(cpu_t) *config.cpu_count, 0); + memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0); size_t i; Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/main/main.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -121,5 +121,5 @@ /** Boot arguments. */ -char bargs[CONFIG_BOOT_ARGUMENTS_BUFLEN] = {}; +char bargs[CONFIG_BOOT_ARGUMENTS_BUFLEN] = { }; /** Initial user-space tasks */ Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/mm/as.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -1006,5 +1006,5 @@ pte_t pte; bool found = page_mapping_find(as, - ptr + P2SZ(size), false, &pte); + ptr + P2SZ(size), false, &pte); assert(found); @@ -2196,5 +2196,5 @@ backend = &user_backend; if (copy_from_uspace(&backend_data.pager_info, pager_info, - sizeof(as_area_pager_info_t)) != EOK) { + sizeof(as_area_pager_info_t)) != EOK) { return (sysarg_t) AS_MAP_FAILED; } Index: kernel/generic/src/mm/backend_user.c =================================================================== --- kernel/generic/src/mm/backend_user.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/mm/backend_user.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -118,5 +118,5 @@ as_area_pager_info_t *pager_info = &area->backend_data.pager_info; - ipc_data_t data = {}; + ipc_data_t data = { }; IPC_SET_IMETHOD(data, IPC_M_PAGE_IN); IPC_SET_ARG1(data, upage - area->base); Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/mm/frame.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -198,6 +198,6 @@ size_t i = hint; do { - if ((zones.info[i].base <= frame) - && (zones.info[i].base + zones.info[i].count >= frame + count)) + if ((zones.info[i].base <= frame) && + (zones.info[i].base + zones.info[i].count >= frame + count)) return i; @@ -551,6 +551,6 @@ pfn_t cframes = SIZE2FRAMES(zone_conf_size( - zones.info[z2].base - zones.info[z1].base - + zones.info[z2].count)); + zones.info[z2].base - zones.info[z1].base + + zones.info[z2].count)); /* Allocate merged zone data inside one of the zones */ @@ -704,5 +704,5 @@ * the assert */ - assert(confframe != ADDR2PFN((uintptr_t ) NULL)); + assert(confframe != ADDR2PFN((uintptr_t) NULL)); /* Update the known end of physical memory. */ @@ -1206,5 +1206,5 @@ size_t free_highprio = 0; - for (size_t i = 0;; i++) { + for (size_t i = 0; ; i++) { irq_spinlock_lock(&zones.lock, true); Index: kernel/generic/src/printf/vsnprintf.c =================================================================== --- kernel/generic/src/printf/vsnprintf.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/printf/vsnprintf.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -170,6 +170,6 @@ }; printf_spec_t ps = { - (int(*) (const char *, size_t, void *)) vsnprintf_str_write, - (int(*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write, + (int (*) (const char *, size_t, void *)) vsnprintf_str_write, + (int (*) (const wchar_t *, size_t, void *)) vsnprintf_wstr_write, &data }; Index: kernel/generic/src/proc/task.c =================================================================== --- kernel/generic/src/proc/task.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/proc/task.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -112,5 +112,5 @@ #ifdef CONFIG_DEBUG - printf("[%"PRIu64"] ", task->taskid); + printf("[%" PRIu64 "] ", task->taskid); #endif Index: kernel/generic/src/proc/thread.c =================================================================== --- kernel/generic/src/proc/thread.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/proc/thread.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -338,5 +338,5 @@ * */ -thread_t *thread_create(void (* func)(void *), void *arg, task_t *task, +thread_t *thread_create(void (*func)(void *), void *arg, task_t *task, thread_flags_t flags, const char *name) { @@ -524,5 +524,5 @@ ipc_cleanup(); futex_task_cleanup(); - LOG("Cleanup of task %" PRIu64" completed.", TASK->taskid); + LOG("Cleanup of task %" PRIu64 " completed.", TASK->taskid); } } @@ -542,5 +542,6 @@ /* Not reached */ - while (true); + while (true) + ; } @@ -978,5 +979,5 @@ return (sys_errno_t) rc; - } + } } Index: kernel/generic/src/synch/futex.c =================================================================== --- kernel/generic/src/synch/futex.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/synch/futex.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -171,5 +171,5 @@ /* Invoke the blocking cht_destroy in the background. */ workq_global_enqueue_noblock(&task->futexes->destroy_work, - destroy_task_cache); + destroy_task_cache); } else { /* We can block. Invoke cht_destroy in this thread. */ @@ -182,5 +182,5 @@ { struct futex_cache *cache = - member_to_inst(work, struct futex_cache, destroy_work); + member_to_inst(work, struct futex_cache, destroy_work); /* @@ -319,6 +319,6 @@ if (futex_ptr_link) { - futex_ptr_t *futex_ptr - = member_to_inst(futex_ptr_link, futex_ptr_t, cht_link); + futex_ptr_t *futex_ptr = + member_to_inst(futex_ptr_link, futex_ptr_t, cht_link); futex = futex_ptr->futex; @@ -485,5 +485,5 @@ static size_t task_fut_ht_key_hash(void *key) { - return *(uintptr_t*)key; + return *(uintptr_t *)key; } @@ -499,5 +499,5 @@ { const futex_ptr_t *fut_ptr = member_to_inst(item, futex_ptr_t, cht_link); - uintptr_t uaddr = *(uintptr_t*)key; + uintptr_t uaddr = *(uintptr_t *)key; return fut_ptr->uaddr == uaddr; Index: kernel/generic/src/synch/workqueue.c =================================================================== --- kernel/generic/src/synch/workqueue.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/synch/workqueue.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -133,5 +133,5 @@ static void wait_for_workers(struct work_queue *workq); static int _workq_enqueue(struct work_queue *workq, work_t *work_item, - work_func_t func, bool can_block); + work_func_t func, bool can_block); static void init_work_item(work_t *work_item, work_func_t func); static signal_op_t signal_worker_logic(struct work_queue *workq, bool can_block); @@ -185,5 +185,5 @@ /** Creates and initializes a work queue. Returns NULL upon failure. */ -struct work_queue * workq_create(const char *name) +struct work_queue *workq_create(const char *name) { struct work_queue *workq = malloc(sizeof(struct work_queue), 0); @@ -269,5 +269,5 @@ thread_t *thread = thread_create(worker_thread, workq, TASK, - THREAD_FLAG_NONE, workq->name); + THREAD_FLAG_NONE, workq->name); if (!thread) { @@ -428,5 +428,5 @@ */ bool workq_enqueue_noblock(struct work_queue *workq, work_t *work_item, - work_func_t func) + work_func_t func) { return _workq_enqueue(workq, work_item, func, false); @@ -473,5 +473,5 @@ */ static int _workq_enqueue(struct work_queue *workq, work_t *work_item, - work_func_t func, bool can_block) + work_func_t func, bool can_block) { assert(!workq_corrupted(workq)); @@ -614,5 +614,5 @@ size_t remaining_idle = - workq->idle_worker_cnt - workq->activate_pending; + workq->idle_worker_cnt - workq->activate_pending; /* Idle workers still exist - activate one. */ @@ -628,6 +628,6 @@ } else { /* No idle workers remain. Request that a new one be created. */ - bool need_worker = (active < max_concurrent_workers) - && (workq->cur_worker_cnt < max_worker_cnt); + bool need_worker = (active < max_concurrent_workers) && + (workq->cur_worker_cnt < max_worker_cnt); if (need_worker && can_block) { @@ -780,5 +780,5 @@ _condvar_wait_timeout_irq_spinlock(&workq->activate_worker, - &workq->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); + &workq->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); assert(!workq_corrupted(workq)); @@ -855,28 +855,27 @@ bool worker_surplus = worker_unnecessary(workq); const char *load_str = worker_surplus ? "decreasing" : - (0 < workq->activate_pending) ? "increasing" : "stable"; + (0 < workq->activate_pending) ? "increasing" : "stable"; irq_spinlock_unlock(&workq->lock, true); printf( - "Configuration: max_worker_cnt=%zu, min_worker_cnt=%zu,\n" - " max_concurrent_workers=%zu, max_items_per_worker=%zu\n" - "Workers: %zu\n" - "Active: %zu (workers currently processing work)\n" - "Blocked: %zu (work functions sleeping/blocked)\n" - "Idle: %zu (idle workers waiting for more work)\n" - "Items: %zu (queued not yet dispatched work)\n" - "Stopping: %d\n" - "Load: %s\n", - max_worker_cnt, min_worker_cnt, - max_concurrent_workers, max_items_per_worker, - total, - active, - blocked, - idle, - items, - stopping, - load_str - ); + "Configuration: max_worker_cnt=%zu, min_worker_cnt=%zu,\n" + " max_concurrent_workers=%zu, max_items_per_worker=%zu\n" + "Workers: %zu\n" + "Active: %zu (workers currently processing work)\n" + "Blocked: %zu (work functions sleeping/blocked)\n" + "Idle: %zu (idle workers waiting for more work)\n" + "Items: %zu (queued not yet dispatched work)\n" + "Stopping: %d\n" + "Load: %s\n", + max_worker_cnt, min_worker_cnt, + max_concurrent_workers, max_items_per_worker, + total, + active, + blocked, + idle, + items, + stopping, + load_str); } @@ -896,5 +895,5 @@ while (list_empty(&info->work_queues) && !stop) { errno_t ret = _condvar_wait_timeout_irq_spinlock(&info->req_cv, - &info->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE); + &info->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE); stop = (ret == EINTR); @@ -903,5 +902,5 @@ if (!stop) { *pworkq = list_get_instance(list_first(&info->work_queues), - struct work_queue, nb_link); + struct work_queue, nb_link); assert(!workq_corrupted(*pworkq)); @@ -933,5 +932,5 @@ nonblock_adder.thread = thread_create(thr_nonblock_add_worker, - &nonblock_adder, TASK, THREAD_FLAG_NONE, "kworkq-nb"); + &nonblock_adder, TASK, THREAD_FLAG_NONE, "kworkq-nb"); if (nonblock_adder.thread) { Index: kernel/generic/src/sysinfo/stats.c =================================================================== --- kernel/generic/src/sysinfo/stats.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/sysinfo/stats.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -74,8 +74,8 @@ * */ -static load_t load_exp[LOAD_STEPS] = {1884, 2014, 2037}; +static load_t load_exp[LOAD_STEPS] = { 1884, 2014, 2037 }; /** Running average of the number of ready threads */ -static load_t avenrdy[LOAD_STEPS] = {0, 0, 0}; +static load_t avenrdy[LOAD_STEPS] = { 0, 0, 0 }; /** Load calculation lock */ Index: kernel/generic/src/udebug/udebug.c =================================================================== --- kernel/generic/src/udebug/udebug.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/generic/src/udebug/udebug.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -170,5 +170,5 @@ mutex_unlock(&THREAD->udebug.lock); - mutex_unlock(&TASK->udebug.lock); + mutex_unlock(&TASK->udebug.lock); } Index: kernel/test/cht/cht1.c =================================================================== --- kernel/test/cht/cht1.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/test/cht/cht1.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -95,13 +95,13 @@ -static const char * do_sanity_test(cht_t *h) -{ - if (cht_find_lazy(h, (void*)0)) +static const char *do_sanity_test(cht_t *h) +{ + if (cht_find_lazy(h, (void *)0)) return "Found lazy in empty table."; - if (cht_find(h, (void*)0)) + if (cht_find(h, (void *)0)) return "Found in empty table."; - if (cht_remove_key(h, (void*)0)) + if (cht_remove_key(h, (void *)0)) return "Removed from empty table."; @@ -149,8 +149,8 @@ return "Refused unique ins 4, 5."; - if (cht_find(h, (void*)0)) + if (cht_find(h, (void *)0)) return "Phantom find."; - cht_link_t *item = cht_find(h, (void*)v[5]->unique_id); + cht_link_t *item = cht_find(h, (void *)v[5]->unique_id); if (!item || item != &v[5]->link) return "Missing 5."; @@ -160,5 +160,5 @@ return "Found nonexisting duplicate 5"; - item = cht_find(h, (void*)v[3]->unique_id); + item = cht_find(h, (void *)v[3]->unique_id); if (!item || item != &v[3]->link) return "Missing 3."; @@ -168,6 +168,6 @@ return "Found nonexisting duplicate 3, same hash as others."; - item = cht_find(h, (void*)v[0]->unique_id); - ((val_t*)item)->mark = true; + item = cht_find(h, (void *)v[0]->unique_id); + ((val_t *)item)->mark = true; for (int k = 1; k < 3; ++k) { @@ -176,5 +176,5 @@ return "Did not find an inserted duplicate"; - val_t *val = ((val_t*)item); + val_t *val = ((val_t *)item); if (val->unique_id != v[0]->unique_id) @@ -195,16 +195,16 @@ return "Found non-existing duplicate."; - item = cht_find_next(h, cht_find(h, (void*)key[0])); - - ((val_t*)item)->mark = true; + item = cht_find_next(h, cht_find(h, (void *)key[0])); + + ((val_t *)item)->mark = true; if (!cht_remove_item(h, item)) return "Failed to remove inserted item"; - item = cht_find(h, (void*)key[0]); - if (!item || ((val_t*)item)->mark) + item = cht_find(h, (void *)key[0]); + if (!item || ((val_t *)item)->mark) return "Did not find proper item."; item = cht_find_next(h, item); - if (!item || ((val_t*)item)->mark) + if (!item || ((val_t *)item)->mark) return "Did not find proper duplicate."; @@ -213,19 +213,19 @@ return "Found removed duplicate"; - if (2 != cht_remove_key(h, (void*)key[0])) + if (2 != cht_remove_key(h, (void *)key[0])) return "Failed to remove all duplicates"; - if (cht_find(h, (void*)key[0])) + if (cht_find(h, (void *)key[0])) return "Found removed key"; - if (!cht_find(h, (void*)key[3])) + if (!cht_find(h, (void *)key[3])) return "Removed incorrect key"; for (size_t k = 0; k < sizeof(v) / sizeof(v[0]); ++k) { - cht_remove_key(h, (void*)key[k]); + cht_remove_key(h, (void *)key[k]); } for (size_t k = 0; k < sizeof(v) / sizeof(v[0]); ++k) { - if (cht_find(h, (void*)key[k])) + if (cht_find(h, (void *)key[k])) return "Found a key in a cleared table"; } @@ -234,5 +234,5 @@ } -static const char * sanity_test(void) +static const char *sanity_test(void) { cht_t h; @@ -279,5 +279,5 @@ static size_t stress_hash(const cht_link_t *item) { - return ((stress_t*)item)->key >> 8; + return ((stress_t *)item)->key >> 8; } static size_t stress_key_hash(void *key) @@ -287,16 +287,16 @@ static bool stress_equal(const cht_link_t *item1, const cht_link_t *item2) { - return ((stress_t*)item1)->key == ((stress_t*)item2)->key; + return ((stress_t *)item1)->key == ((stress_t *)item2)->key; } static bool stress_key_equal(void *key, const cht_link_t *item) { - return ((size_t)key) == ((stress_t*)item)->key; + return ((size_t)key) == ((stress_t *)item)->key; } static void stress_rm_callback(cht_link_t *item) { - if (((stress_t*)item)->free) + if (((stress_t *)item)->free) free(item); else - ((stress_t*)item)->deleted = true; + ((stress_t *)item)->deleted = true; } @@ -335,5 +335,5 @@ size_t key = (i << 8) + work->id; - if (1 != cht_remove_key(work->h, (void*)key)) { + if (1 != cht_remove_key(work->h, (void *)key)) { TPRINTF("Err: Failed to remove inserted item\n"); goto failed; @@ -357,5 +357,5 @@ for (size_t i = 0; i < work->wave_elems; ++i) { size_t key = (i << 8) + work->id; - cht_remove_key(work->h, (void*)key); + cht_remove_key(work->h, (void *)key); } } @@ -392,5 +392,5 @@ rcu_read_unlock(); } else { - void *key = (void*)work->elem[elem_idx].key; + void *key = (void *)work->elem[elem_idx].key; if (1 != cht_remove_key(work->h, key)) { TPRINTF("Err: did not rm the key\n"); @@ -406,5 +406,5 @@ cht_link_t *dup; if (!cht_insert_unique(work->h, &work->elem[elem_idx].link, - &dup)) { + &dup)) { TPRINTF("Err: already inserted\n"); work->failed = true; @@ -420,5 +420,5 @@ rcu_read_lock(); cht_link_t *item = - cht_find(work->h, (void*)work->elem[elem_idx].key); + cht_find(work->h, (void *)work->elem[elem_idx].key); rcu_read_unlock(); @@ -444,5 +444,5 @@ /* Remove anything we may have inserted. */ for (size_t i = 0; i < work->elem_cnt; ++i) { - void *key = (void*) work->elem[i].key; + void *key = (void *) work->elem[i].key; cht_remove_key(work->h, key); } @@ -469,6 +469,6 @@ /* Alloc hash table items. */ - size_t size = item_cnt * sizeof(stress_t) + work_cnt * sizeof(stress_work_t) - + sizeof(int); + size_t size = item_cnt * sizeof(stress_t) + work_cnt * sizeof(stress_work_t) + + sizeof(int); TPRINTF("Alloc and init table items. \n"); @@ -482,5 +482,5 @@ stress_t *pitem = p + work_cnt * sizeof(stress_work_t); stress_work_t *pwork = p; - int *pstop = (int*)(pitem + item_cnt); + int *pstop = (int *)(pitem + item_cnt); *pstop = 0; @@ -517,5 +517,5 @@ TPRINTF("Running %zu ins/del/find stress threads + %zu resizers.\n", - op_thread_cnt, resize_thread_cnt); + op_thread_cnt, resize_thread_cnt); /* Create and run threads. */ Index: kernel/test/synch/rcu1.c =================================================================== --- kernel/test/synch/rcu1.c (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/test/synch/rcu1.c (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -78,12 +78,12 @@ } -static void run_thread(size_t k, void (*func)(void*), void *arg) +static void run_thread(size_t k, void (*func)(void *), void *arg) { assert(thread[k] == NULL); thread[k] = thread_create(func, arg, TASK, THREAD_FLAG_NONE, - "test-rcu-thread"); - - if(thread[k]) { + "test-rcu-thread"); + + if (thread[k]) { /* Distribute evenly. */ thread_wire(thread[k], &cpus[k % config.cpu_active]); @@ -92,5 +92,5 @@ } -static void run_all(void (*func)(void*)) +static void run_all(void (*func)(void *)) { size_t thread_cnt = get_thread_cnt(); @@ -127,5 +127,5 @@ } -static void run_one(void (*func)(void*), void *arg) +static void run_one(void (*func)(void *), void *arg) { assert(one_idx < MAX_THREADS); @@ -179,5 +179,5 @@ static bool do_nop_readers(void) { - size_t seq[MAX_THREADS] = {0}; + size_t seq[MAX_THREADS] = { 0 }; get_seq(100, 100000, get_thread_cnt(), seq); @@ -185,5 +185,5 @@ for (size_t k = 0; k < get_thread_cnt(); ++k) - run_one(nop_reader, (void*)seq[k]); + run_one(nop_reader, (void *)seq[k]); TPRINTF("\nJoining %zu no-op readers\n", get_thread_cnt()); @@ -220,12 +220,12 @@ static bool do_long_readers(void) { - size_t seq[MAX_THREADS] = {0}; + size_t seq[MAX_THREADS] = { 0 }; get_seq(10, 1000 * 1000, get_thread_cnt(), seq); TPRINTF("\nRun %zu thr: repeat long reader sections, will preempt, no cbs.\n", - get_thread_cnt()); + get_thread_cnt()); for (size_t k = 0; k < get_thread_cnt(); ++k) - run_one(long_reader, (void*)seq[k]); + run_one(long_reader, (void *)seq[k]); TPRINTF("\nJoining %zu readers with long reader sections.\n", get_thread_cnt()); @@ -238,5 +238,5 @@ -static atomic_t nop_callbacks_cnt = {0}; +static atomic_t nop_callbacks_cnt = { 0 }; /* Must be even. */ static const int nop_updater_iters = 10000; @@ -250,5 +250,5 @@ static void nop_updater(void *arg) { - for (int i = 0; i < nop_updater_iters; i += 2){ + for (int i = 0; i < nop_updater_iters; i += 2) { rcu_item_t *a = malloc(sizeof(rcu_item_t), FRAME_ATOMIC); rcu_item_t *b = malloc(sizeof(rcu_item_t), FRAME_ATOMIC); @@ -274,5 +274,5 @@ TPRINTF("\nRun %zu thr: post %zu no-op callbacks (%zu B used), no readers.\n", - get_thread_cnt(), exp_cnt, max_used_mem); + get_thread_cnt(), exp_cnt, max_used_mem); run_all(nop_updater); @@ -303,5 +303,5 @@ static void one_cb_done(rcu_item_t *item) { - assert( ((item_w_cookie_t *)item)->cookie == magic_cookie); + assert(((item_w_cookie_t *)item)->cookie == magic_cookie); one_cb_is_done = 1; TPRINTF("Callback()\n"); @@ -367,6 +367,6 @@ static errno_t seq_test_result = EOK; -static atomic_t cur_time = {1}; -static atomic_count_t max_upd_done_time = {0}; +static atomic_t cur_time = { 1 }; +static atomic_count_t max_upd_done_time = { 0 }; static void seq_cb(rcu_item_t *rcu_item) @@ -392,5 +392,5 @@ */ #ifndef KARCH_riscv64 - seq_work_t *work = (seq_work_t*)arg; + seq_work_t *work = (seq_work_t *)arg; /* Alternate between reader and updater roles. */ @@ -401,5 +401,5 @@ atomic_count_t start_time = atomic_postinc(&cur_time); - for (volatile size_t d = 0; d < 10 * i; ++d ){ + for (volatile size_t d = 0; d < 10 * i; ++d) { /* no-op */ } @@ -452,5 +452,5 @@ const size_t iters = 100; const size_t total_cnt = 1000; - size_t read_cnt[MAX_THREADS] = {0}; + size_t read_cnt[MAX_THREADS] = { 0 }; seq_work_t item[MAX_THREADS]; @@ -476,6 +476,6 @@ TPRINTF("\nRun %zu th: check callback completion time in readers. " - "%zu callbacks total (max %" PRIu64 " %s used). Be patient.\n", - get_thread_cnt(), total_cbs, mem_units, mem_suffix); + "%zu callbacks total (max %" PRIu64 " %s used). Be patient.\n", + get_thread_cnt(), total_cbs, mem_units, mem_suffix); for (size_t i = 0; i < get_thread_cnt(); ++i) { @@ -500,5 +500,5 @@ static void reader_unlocked(rcu_item_t *item) { - exited_t *p = (exited_t*)item; + exited_t *p = (exited_t *)item; p->exited = true; } @@ -511,5 +511,5 @@ rcu_read_unlock(); - rcu_call((rcu_item_t*)arg, reader_unlocked); + rcu_call((rcu_item_t *)arg, reader_unlocked); rcu_read_lock(); @@ -566,5 +566,5 @@ static void preempted_reader_prev(void *arg) { - preempt_t *p = (preempt_t*)arg; + preempt_t *p = (preempt_t *)arg; assert(!p->e.exited); @@ -586,5 +586,5 @@ static void preempted_reader_inside_cur(void *arg) { - preempt_t *p = (preempt_t*)arg; + preempt_t *p = (preempt_t *)arg; assert(!p->e.exited); @@ -611,5 +611,5 @@ static void preempted_reader_cur(void *arg) { - preempt_t *p = (preempt_t*)arg; + preempt_t *p = (preempt_t *)arg; assert(!p->e.exited); @@ -633,5 +633,5 @@ static void preempted_reader_next1(void *arg) { - preempt_t *p = (preempt_t*)arg; + preempt_t *p = (preempt_t *)arg; assert(!p->e.exited); @@ -655,5 +655,5 @@ static void preempted_reader_next2(void *arg) { - preempt_t *p = (preempt_t*)arg; + preempt_t *p = (preempt_t *)arg; assert(!p->e.exited); @@ -684,5 +684,5 @@ -static bool do_one_reader_preempt(void (*f)(void*), const char *err) +static bool do_one_reader_preempt(void (*f)(void *), const char *err) { preempt_t *p = malloc(sizeof(preempt_t), FRAME_ATOMIC); @@ -719,21 +719,21 @@ ok = do_one_reader_preempt(preempted_reader_prev, - "Err: preempted_reader_prev()\n"); + "Err: preempted_reader_prev()\n"); success = success && ok; ok = do_one_reader_preempt(preempted_reader_inside_cur, - "Err: preempted_reader_inside_cur()\n"); + "Err: preempted_reader_inside_cur()\n"); success = success && ok; ok = do_one_reader_preempt(preempted_reader_cur, - "Err: preempted_reader_cur()\n"); + "Err: preempted_reader_cur()\n"); success = success && ok; ok = do_one_reader_preempt(preempted_reader_next1, - "Err: preempted_reader_next1()\n"); + "Err: preempted_reader_next1()\n"); success = success && ok; ok = do_one_reader_preempt(preempted_reader_next2, - "Err: preempted_reader_next2()\n"); + "Err: preempted_reader_next2()\n"); success = success && ok; @@ -860,5 +860,5 @@ static void stress_reader(void *arg) { - bool *done = (bool*) arg; + bool *done = (bool *) arg; while (!*done) { @@ -896,5 +896,5 @@ /* Print a dot if we make a progress of 1% */ - if (s->master && 0 == (i % (s->iters/100))) + if (s->master && 0 == (i % (s->iters / 100))) TPRINTF("."); } @@ -921,6 +921,6 @@ TPRINTF("\nStress: Run %zu nop-readers and %zu updaters. %zu callbacks" - " total (max %" PRIu64 " %s used). Be very patient.\n", - reader_cnt, updater_cnt, exp_upd_calls, mem_units, mem_suffix); + " total (max %" PRIu64 " %s used). Be very patient.\n", + reader_cnt, updater_cnt, exp_upd_calls, mem_units, mem_suffix); for (size_t k = 0; k < reader_cnt; ++k) { @@ -961,5 +961,5 @@ --e->count_down; - if (0 == (e->count_down % (e->total_cnt/100))) { + if (0 == (e->count_down % (e->total_cnt / 100))) { TPRINTF("*"); } @@ -1046,5 +1046,5 @@ if (ok) { TPRINTF("\nSubtest %s() ok (GPs: %" PRIu64 ").\n", - test_func[i].desc, delta_gps); + test_func[i].desc, delta_gps); } else { TPRINTF("\nFailed: %s(). Pausing for 5 secs.\n", test_func[i].desc); Index: kernel/test/synch/workq-test-core.h =================================================================== --- kernel/test/synch/workq-test-core.h (revision 76d0981d8dda2b7d698201a93e0c555e99215ba5) +++ kernel/test/synch/workq-test-core.h (revision 3bacee1839e6f355100ab4ea86bb211e9ecf19ed) @@ -67,8 +67,8 @@ { unsigned n = (unsigned)num; - return (n != 0) && 0 == (n & (n-1)); -} - -static test_work_t * create_child(test_work_t *work) + return (n != 0) && 0 == (n & (n - 1)); +} + +static test_work_t *create_child(test_work_t *work) { test_work_t *child = malloc(sizeof(test_work_t), 0); @@ -168,5 +168,5 @@ TPRINTF("waves: %d, count_down: %d, total expected calls: %zu\n", - WAVES, COUNT, exp_call_cnt * WAVES); + WAVES, COUNT, exp_call_cnt * WAVES); @@ -179,6 +179,6 @@ for (int i = 0; i < WAVES; ++i) { - while (atomic_get(&call_cnt[i]) < exp_call_cnt - && sleep_cnt < max_sleep_cnt) { + while (atomic_get(&call_cnt[i]) < exp_call_cnt && + sleep_cnt < max_sleep_cnt) { TPRINTF("."); thread_usleep(MAIN_POLL_SLEEP_MS * 1000); @@ -192,9 +192,9 @@ if (atomic_get(&call_cnt[i]) == exp_call_cnt) { TPRINTF("Ok: %" PRIua " calls in wave %d, as expected.\n", - atomic_get(&call_cnt[i]), i); + atomic_get(&call_cnt[i]), i); } else { success = false; TPRINTF("Error: %" PRIua " calls in wave %d, but %zu expected.\n", - atomic_get(&call_cnt[i]), i, exp_call_cnt); + atomic_get(&call_cnt[i]), i, exp_call_cnt); } }