Index: abi/include/abi/ddi/irq.h =================================================================== --- abi/include/abi/ddi/irq.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/ddi/irq.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ */ CMD_PIO_READ_8 = 1, - + /** Read 2 bytes from the I/O space. * @@ -55,5 +55,5 @@ */ CMD_PIO_READ_16, - + /** Read 4 bytes from the I/O space. * @@ -61,5 +61,5 @@ */ CMD_PIO_READ_32, - + /** Write 1 byte to the I/O space. * @@ -67,5 +67,5 @@ */ CMD_PIO_WRITE_8, - + /** Write 2 bytes to the I/O space. * @@ -73,5 +73,5 @@ */ CMD_PIO_WRITE_16, - + /** Write 4 bytes to the I/O space. * @@ -79,5 +79,5 @@ */ CMD_PIO_WRITE_32, - + /** Write 1 byte to the I/O space. * @@ -85,5 +85,5 @@ */ CMD_PIO_WRITE_A_8, - + /** Write 2 bytes to the I/O space. * @@ -91,5 +91,5 @@ */ CMD_PIO_WRITE_A_16, - + /** Write 4 bytes to the I/O space. * @@ -97,5 +97,5 @@ */ CMD_PIO_WRITE_A_32, - + /** Load value. * @@ -103,5 +103,5 @@ */ CMD_LOAD, - + /** Perform bitwise conjunction. * @@ -109,5 +109,5 @@ */ CMD_AND, - + /** Predicate the execution of the following commands. * @@ -116,8 +116,8 @@ */ CMD_PREDICATE, - + /** Accept the interrupt. */ CMD_ACCEPT, - + /** Decline the interrupt. */ CMD_DECLINE, Index: abi/include/abi/ipc/interfaces.h =================================================================== --- abi/include/abi/ipc/interfaces.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/ipc/interfaces.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,5 +53,5 @@ */ IFACE_EXCHANGE_ATOMIC = 0x00, - + /** Exchange management via mutual exclusion * @@ -61,5 +61,5 @@ */ IFACE_EXCHANGE_SERIALIZE = 0x01, - + /** Exchange management via connection cloning * Index: abi/include/abi/log.h =================================================================== --- abi/include/abi/log.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/log.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -52,5 +52,5 @@ /** More detailed debugging message. */ LVL_DEBUG2, - + /** For checking range of values */ LVL_LIMIT Index: abi/include/abi/mm/as.h =================================================================== --- abi/include/abi/mm/as.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/mm/as.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,8 +53,8 @@ /** Starting address */ uintptr_t start_addr; - + /** Area size */ size_t size; - + /** Area flags */ unsigned int flags; Index: abi/include/abi/proc/uarg.h =================================================================== --- abi/include/abi/proc/uarg.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/proc/uarg.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,8 +43,8 @@ void *uspace_stack; size_t uspace_stack_size; - + void (*uspace_thread_function)(void *); void *uspace_thread_arg; - + struct uspace_arg *uspace_uarg; } uspace_arg_t; Index: abi/include/abi/syscall.h =================================================================== --- abi/include/abi/syscall.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/syscall.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,5 +38,5 @@ typedef enum { SYS_KIO = 0, - + SYS_THREAD_CREATE, SYS_THREAD_EXIT, @@ -44,5 +44,5 @@ SYS_THREAD_USLEEP, SYS_THREAD_UDELAY, - + SYS_TASK_GET_ID, SYS_TASK_SET_NAME, @@ -50,17 +50,17 @@ SYS_TASK_EXIT, SYS_PROGRAM_SPAWN_LOADER, - + SYS_FUTEX_SLEEP, SYS_FUTEX_WAKEUP, SYS_SMC_COHERENCE, SYS_SMP_MEMORY_BARRIER, - + SYS_AS_AREA_CREATE, SYS_AS_AREA_RESIZE, SYS_AS_AREA_CHANGE_FLAGS, SYS_AS_AREA_DESTROY, - + SYS_PAGE_FIND_MAPPING, - + SYS_IPC_CALL_ASYNC_FAST, SYS_IPC_CALL_ASYNC_SLOW, @@ -73,12 +73,12 @@ SYS_IPC_HANGUP, SYS_IPC_CONNECT_KBOX, - + SYS_IPC_EVENT_SUBSCRIBE, SYS_IPC_EVENT_UNSUBSCRIBE, SYS_IPC_EVENT_UNMASK, - + SYS_PERM_GRANT, SYS_PERM_REVOKE, - + SYS_PHYSMEM_MAP, SYS_PHYSMEM_UNMAP, @@ -87,8 +87,8 @@ SYS_IOSPACE_ENABLE, SYS_IOSPACE_DISABLE, - + SYS_IPC_IRQ_SUBSCRIBE, SYS_IPC_IRQ_UNSUBSCRIBE, - + SYS_SYSINFO_GET_KEYS_SIZE, SYS_SYSINFO_GET_KEYS, @@ -97,9 +97,9 @@ SYS_SYSINFO_GET_DATA_SIZE, SYS_SYSINFO_GET_DATA, - + SYS_DEBUG_CONSOLE, - + SYS_KLOG, - + SYSCALL_END } syscall_t; Index: abi/include/abi/udebug.h =================================================================== --- abi/include/abi/udebug.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ abi/include/abi/udebug.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -39,5 +39,5 @@ typedef enum { /* udebug_method_t */ - + /** Start debugging the recipient. * @@ -47,5 +47,5 @@ */ UDEBUG_M_BEGIN = 1, - + /** Finish debugging the recipient. * @@ -54,8 +54,8 @@ */ UDEBUG_M_END, - + /** Set which events should be captured. */ UDEBUG_M_SET_EVMASK, - + /** Make sure the debugged task is still there. * @@ -65,5 +65,5 @@ */ UDEBUG_M_GUARD, - + /** Run a thread until a debugging event occurs. * @@ -75,5 +75,5 @@ */ UDEBUG_M_GO, - + /** Stop a thread being debugged. * @@ -83,5 +83,5 @@ */ UDEBUG_M_STOP, - + /** Read arguments of a syscall. * @@ -91,5 +91,5 @@ */ UDEBUG_M_ARGS_READ, - + /** Read thread's userspace register state (istate_t). * @@ -102,5 +102,5 @@ */ UDEBUG_M_REGS_READ, - + /** Read the list of the debugged tasks's threads. * @@ -116,5 +116,5 @@ */ UDEBUG_M_THREAD_READ, - + /** Read the name of the debugged task. * @@ -129,5 +129,5 @@ */ UDEBUG_M_NAME_READ, - + /** Read the list of the debugged task's address space areas. * @@ -143,5 +143,5 @@ */ UDEBUG_M_AREAS_READ, - + /** Read the debugged tasks's memory. * Index: boot/arch/arm32/src/asm.S =================================================================== --- boot/arch/arm32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/arm32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,5 +67,5 @@ #ifndef PROCESSOR_ARCH_armv7_a mrc p15, 0, r4, c1, c0, 0 - + # Disable D-cache before the kernel is started. bic r4, r4, #(1 << CP15_C1_DC) @@ -76,8 +76,8 @@ bic r4, r4, #(1 << CP15_C1_BP) #endif - + mcr p15, 0, r4, c1, c0, 0 #endif - + # Wait for the operations to complete #ifdef PROCESSOR_ARCH_armv7_a @@ -88,5 +88,5 @@ mcr p15, 0, r4, c7, c10, 4 #endif - + # Clean ICache and BPredictors, r4 ignored (SBZ) mov r4, #0 Index: boot/arch/arm32/src/main.c =================================================================== --- boot/arch/arm32/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/arm32/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -89,5 +89,5 @@ mmu_start(); version_print(); - + printf("Boot data: %p -> %p\n", &bdata_start, &bdata_end); printf("\nMemory statistics\n"); @@ -97,5 +97,5 @@ printf(" %p|%p: kernel entry point\n", (void *) PA2KA(BOOT_OFFSET), (void *) BOOT_OFFSET); - + for (size_t i = 0; i < COMPONENTS; i++) { printf(" %p|%p: %s image (%u/%u bytes)\n", components[i].addr, @@ -103,5 +103,5 @@ components[i].size); } - + void *dest[COMPONENTS]; size_t top = 0; @@ -110,22 +110,22 @@ for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.tasks[bootinfo.cnt].addr = TOP2ADDR(top); bootinfo.tasks[bootinfo.cnt].size = components[i].inflated; - + str_cpy(bootinfo.tasks[bootinfo.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.cnt++; } - + dest[i] = TOP2ADDR(top); top += components[i].inflated; cnt++; } - + printf("\nInflating components ... "); - + for (size_t i = cnt; i > 0; i--) { void *tail = components[i - 1].addr + components[i - 1].size; @@ -135,7 +135,7 @@ halt(); } - + printf("%s ", components[i - 1].name); - + int err = inflate(components[i - 1].addr, components[i - 1].size, dest[i - 1], components[i - 1].inflated); @@ -147,10 +147,10 @@ clean_dcache_poc(dest[i - 1], components[i - 1].inflated); } - + printf(".\n"); /* Flush PT too. We need this if we disable caches later */ clean_dcache_poc(boot_pt, PTL0_ENTRIES * PTL0_ENTRY_SIZE); - + printf("Booting the kernel...\n"); jump_to_kernel((void *) PA2KA(BOOT_OFFSET), &bootinfo); Index: boot/arch/arm32/src/mm.c =================================================================== --- boot/arch/arm32/src/mm.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/arm32/src/mm.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -209,5 +209,5 @@ /* Current settings */ "mrc p15, 0, r0, c1, c0, 0\n" - + /* Enable ICache, DCache, BPredictors and MMU, * we disable caches before jumping to kernel @@ -221,5 +221,5 @@ "ldr r1, =0x00001805\n" #endif - + "orr r0, r0, r1\n" @@ -228,5 +228,5 @@ */ "mcr p15, 0, r0, c8, c7, 0\n" - + /* Store settings, enable the MMU */ "mcr p15, 0, r0, c1, c0, 0\n" Index: boot/arch/ia64/src/main.c =================================================================== --- boot/arch/ia64/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,5 +67,5 @@ memmap_item_t *memmap = bootinfo.memmap; size_t items = 0; - + if (!bootpar) { /* Fake-up a memory map for simulators. */ @@ -83,5 +83,5 @@ size_t mm_size = bootpar->efi_memmap_sz; size_t md_size = bootpar->efi_memdesc_sz; - + /* * Walk the EFI memory map using the V1 memory descriptor @@ -109,5 +109,5 @@ continue; } - + memmap[items].base = md->phys_start; memmap[items].size = md->pages * EFI_PAGE_SIZE; @@ -115,5 +115,5 @@ } } - + bootinfo.memmap_items = items; } @@ -134,10 +134,10 @@ efi_guid_t sal_guid = SAL_SYSTEM_TABLE_GUID; sal_system_table_header_t *sal_st; - + sal_st = efi_vendor_table_find( (efi_system_table_t *) bootpar->efi_system_table, sal_guid); sal_system_table_parse(sal_st); - + bootinfo.sys_freq = sal_base_clock_frequency(); } else { @@ -150,5 +150,5 @@ { version_print(); - + printf(" %p|%p: boot info structure\n", &bootinfo, &bootinfo); printf(" %p|%p: kernel entry point\n", @@ -156,5 +156,5 @@ printf(" %p|%p: loader entry point\n", (void *) LOADER_ADDRESS, (void *) LOADER_ADDRESS); - + size_t i; for (i = 0; i < COMPONENTS; i++) @@ -162,5 +162,5 @@ components[i].addr, components[i].name, components[i].inflated, components[i].size); - + void *dest[COMPONENTS]; size_t top = KERNEL_ADDRESS; @@ -169,5 +169,5 @@ for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr = @@ -175,18 +175,18 @@ bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size = components[i].inflated; - + str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.taskmap.cnt++; } - + dest[i] = (void *) top; top += components[i].inflated; cnt++; } - + printf("\nInflating components ... "); - + /* * We will use the next available address for a copy of each component to @@ -197,5 +197,5 @@ for (i = cnt; i > 0; i--) { printf("%s ", components[i - 1].name); - + /* * Copy the component to a location which is guaranteed not to @@ -203,8 +203,8 @@ */ memmove((void *) top, components[i - 1].addr, components[i - 1].size); - + int err = inflate((void *) top, components[i - 1].size, dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -213,5 +213,5 @@ } } - + printf(".\n"); @@ -219,5 +219,5 @@ read_sal_configuration(); read_pal_configuration(); - + printf("Booting the kernel ...\n"); jump_to_kernel(&bootinfo); Index: boot/arch/ia64/src/pal.c =================================================================== --- boot/arch/ia64/src/pal.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/pal.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -35,7 +35,7 @@ { uint64_t proc_ratio; - + pal_static_call_0_1(PAL_FREQ_RATIOS, &proc_ratio); - + return proc_ratio; } Index: boot/arch/ia64/src/pal_asm.S =================================================================== --- boot/arch/ia64/src/pal_asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/pal_asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,8 +38,8 @@ srlz.i srlz.d - + mov loc2 = gp mov loc3 = rp - + addl loc4 = @gprel(pal_proc), gp @@ -48,5 +48,5 @@ mov r30 = in2 mov r31 = in3 ;; - + ld8 loc4 = [loc4] movl loc5 = 0f ;; @@ -64,12 +64,12 @@ cmp.ne p8,p0 = 0, in5 cmp.ne p9,p0 = 0, in6 ;; - + (p7) st8 [in4] = r9 (p8) st8 [in5] = r10 (p9) st8 [in6] = r11 - + mov gp = loc2 mov rp = loc3 ;; - + mov ar.pfs = loc0 br.ret.sptk.many rp Index: boot/arch/ia64/src/sal.c =================================================================== --- boot/arch/ia64/src/sal.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/sal.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,7 +75,7 @@ { uint64_t freq; - + sal_call_1_1(SAL_FREQ_BASE, 0, &freq); - + return freq; } Index: boot/arch/ia64/src/sal_asm.S =================================================================== --- boot/arch/ia64/src/sal_asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/sal_asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,13 +45,13 @@ FUNCTION_BEGIN(sal_call) alloc loc0 = ar.pfs, 8, 8, 8, 0 - + adds sp = -STACK_SCRATCH_AREA, sp mov loc1 = gp mov loc2 = rp - + addl loc3 = @gprel(sal_proc), gp addl loc4 = @gprel(sal_proc_gp), gp - + mov out0 = in0 mov out1 = in1 @@ -62,5 +62,5 @@ mov out6 = in6 mov out7 = in7 ;; - + ld8 loc3 = [loc3] ld8 gp = [loc4] @@ -73,21 +73,21 @@ ld8 loc6 = [r15] ld8 loc7 = [r16] - + mov b6 = loc3 ;; br.call.sptk.many rp = b6 - + cmp.ne p7,p0 = 0, loc5 cmp.ne p8,p0 = 0, loc6 cmp.ne p9,p0 = 0, loc7 ;; - + (p7) st8 [loc5] = r9 (p8) st8 [loc6] = r10 (p9) st8 [loc7] = r11 - + mov gp = loc1 mov rp = loc2 adds sp = STACK_SCRATCH_AREA, sp ;; - + mov ar.pfs = loc0 br.ret.sptk.many rp Index: boot/arch/ia64/src/ski.c =================================================================== --- boot/arch/ia64/src/ski.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ia64/src/ski.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -37,5 +37,5 @@ { static bool initialized = false; - + if (initialized) return; @@ -48,5 +48,5 @@ : "r15", "r8" ); - + initialized = true; } Index: boot/arch/mips32/src/asm.S =================================================================== --- boot/arch/mips32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/mips32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ sw $a3, 0($a0) #endif - + /* * Setup CPU map (on msim this code @@ -62,53 +62,53 @@ */ la $a0, PA2KA(CPUMAP_OFFSET) - + sw $zero, 0($a0) sw $zero, 4($a0) sw $zero, 8($a0) sw $zero, 12($a0) - + sw $zero, 16($a0) sw $zero, 20($a0) sw $zero, 24($a0) sw $zero, 28($a0) - + sw $zero, 32($a0) sw $zero, 36($a0) sw $zero, 40($a0) sw $zero, 44($a0) - + sw $zero, 48($a0) sw $zero, 52($a0) sw $zero, 56($a0) sw $zero, 60($a0) - + sw $zero, 64($a0) sw $zero, 68($a0) sw $zero, 72($a0) sw $zero, 76($a0) - + sw $zero, 80($a0) sw $zero, 84($a0) sw $zero, 88($a0) sw $zero, 92($a0) - + sw $zero, 96($a0) sw $zero, 100($a0) sw $zero, 104($a0) sw $zero, 108($a0) - + sw $zero, 112($a0) sw $zero, 116($a0) sw $zero, 120($a0) sw $zero, 124($a0) - + lui $a1, 1 - + #ifdef MACHINE_msim - + /* Read dorder value */ la $k0, MSIM_DORDER_ADDRESS lw $k1, ($k0) - + /* * If we are not running on BSP @@ -117,23 +117,23 @@ beq $k1, $zero, bsp nop - + /* Record CPU presence */ sll $a2, $k1, 2 addu $a2, $a2, $a0 sw $a1, ($a2) - + loop: j loop nop - + #endif - + bsp: /* Record CPU presence */ sw $a1, ($a0) - + /* Setup initial stack */ la $sp, PA2KA(STACK_OFFSET) - + j bootstrap nop Index: boot/arch/mips32/src/boot.S =================================================================== --- boot/arch/mips32/src/boot.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/mips32/src/boot.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,81 +38,81 @@ .global start start: - + /* Setup CPU map (on msim this code is executed in parallel on all CPUs, but it not an issue) */ la $a0, CPUMAP - + sw $zero, 0($a0) sw $zero, 4($a0) sw $zero, 8($a0) sw $zero, 12($a0) - + sw $zero, 16($a0) sw $zero, 20($a0) sw $zero, 24($a0) sw $zero, 28($a0) - + sw $zero, 32($a0) sw $zero, 36($a0) sw $zero, 40($a0) sw $zero, 44($a0) - + sw $zero, 48($a0) sw $zero, 52($a0) sw $zero, 56($a0) sw $zero, 60($a0) - + sw $zero, 64($a0) sw $zero, 68($a0) sw $zero, 72($a0) sw $zero, 76($a0) - + sw $zero, 80($a0) sw $zero, 84($a0) sw $zero, 88($a0) sw $zero, 92($a0) - + sw $zero, 96($a0) sw $zero, 100($a0) sw $zero, 104($a0) sw $zero, 108($a0) - + sw $zero, 112($a0) sw $zero, 116($a0) sw $zero, 120($a0) sw $zero, 124($a0) - + lui $a1, 1 - + #ifdef MACHINE_msim - + /* Read dorder value */ la $k0, MSIM_DORDER_ADDRESS lw $k1, ($k0) - + /* If we are not running on BSP then end in an infinite loop */ beq $k1, $zero, bsp nop - + /* Record CPU presence */ sll $a2, $k1, 2 addu $a2, $a2, $a0 sw $a1, ($a2) - + loop: j loop nop - + #endif - + bsp: /* Record CPU presence */ sw $a1, ($a0) - + /* Setup initial stack */ la $sp, INITIAL_STACK - + j bootstrap nop Index: boot/arch/mips32/src/main.c =================================================================== --- boot/arch/mips32/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/mips32/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ { version_print(); - + printf("\nMemory statistics\n"); printf(" %p|%p: CPU map\n", (void *) PA2KA(CPUMAP_OFFSET), @@ -61,5 +61,5 @@ printf(" %p|%p: bootloader entry point\n", (void *) PA2KA(LOADER_OFFSET), (void *) LOADER_OFFSET); - + size_t i; for (i = 0; i < COMPONENTS; i++) @@ -70,5 +70,5 @@ components[i].name, components[i].inflated, components[i].size); - + void *dest[COMPONENTS]; size_t top = 0; @@ -77,22 +77,22 @@ for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo->tasks[bootinfo->cnt].addr = TOP2ADDR(top); bootinfo->tasks[bootinfo->cnt].size = components[i].inflated; - + str_cpy(bootinfo->tasks[bootinfo->cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo->cnt++; } - + dest[i] = TOP2ADDR(top); top += components[i].inflated; cnt++; } - + printf("\nInflating components ... "); - + for (i = cnt; i > 0; i--) { #ifdef MACHINE_msim @@ -104,10 +104,10 @@ } #endif - + printf("%s ", components[i - 1].name); - + int err = inflate(components[i - 1].addr, components[i - 1].size, dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -116,9 +116,9 @@ } } - + printf(".\n"); - + printf("Copying CPU map ... \n"); - + bootinfo->cpumap = 0; for (i = 0; i < CPUMAP_MAX_RECORDS; i++) { @@ -126,5 +126,5 @@ bootinfo->cpumap |= (1 << i); } - + printf("Booting the kernel ... \n"); jump_to_kernel((void *) PA2KA(BOOT_OFFSET), bootinfo); Index: boot/arch/ppc32/src/asm.S =================================================================== --- boot/arch/ppc32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ppc32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,10 +48,10 @@ li \reg, 0 sync - + .rept 64 tlbie \reg addi \reg, \reg, 0x1000 .endr - + eieio tlbsync @@ -61,44 +61,44 @@ .macro BAT_COMPUTE base size mask lower upper # less than 128 KB -> no BAT - + lis \upper, 0x0002 cmpw \size, \upper blt no_bat - + # mask = total >> 18 - + li \upper, 18 srw \mask, \size, \upper - + # create Block Length mask by replicating # the leading logical one 14 times - + li \upper, 14 mtctr \mask li \upper, 1 - + 0: # mask = (mask >> 1) | mask - + srw \lower, \mask, \upper or \mask, \mask, \lower - + bdnz 0b - + # mask = mask & 0x07ff # (BAT can map up to 256 MB) - + andi. \mask, \mask, 0x07ff - + # mask = (mask << 2) | 0x0002 # (priviledged access only) - + li \upper, 2 slw \mask, \mask, \upper ori \mask, \mask, 0x0002 - + lis \upper, (0x8000 + \base) or \upper, \upper, \mask - + lis \lower, \base ori \lower, \lower, 0x0002 @@ -111,5 +111,5 @@ addi r4, r4, ofw_cif@l stw r5, 0(r4) - + bl ofw_init b bootstrap @@ -127,17 +127,17 @@ # r5 = pages to translate # r6 = real mode meeting point (physical address) - + # disable interrupts - + mfmsr r31 rlwinm r31, r31, 0, 17, 15 mtmsr r31 - + # set real mode meeting point physical address - + mtspr srr0, r6 - + # jump to real_mode - + mfmsr r31 lis r30, ~0@h @@ -145,5 +145,5 @@ and r31, r31, r30 mtspr srr1, r31 - + sync isync @@ -155,246 +155,246 @@ .align PAGE_WIDTH SYMBOL(real_mode) - + # arguments: # r3 = bootinfo (physical address) # r4 = translate table (physical address) # r5 = pages to translate - + # move the images of components to the proper # location using the translate table - + li r31, PAGE_SIZE >> 2 li r30, 0 - + page_copy: - + cmpwi r5, 0 beq copy_end - + mtctr r31 lwz r29, 0(r4) - + copy_loop: - + lwz r28, 0(r29) stw r28, 0(r30) - + SMC_COHERENCY r30 - + addi r29, r29, 4 addi r30, r30, 4 - + bdnz copy_loop - + addi r4, r4, 4 subi r5, r5, 1 b page_copy - + copy_end: - + # initially fill segment registers - + li r31, 0 - + li r29, 8 mtctr r29 li r30, 0 # ASID 0 (VSIDs 0 .. 7) - + seg_fill_uspace: - + mtsrin r30, r31 addi r30, r30, 1 addis r31, r31, 0x1000 # move to next SR - + bdnz seg_fill_uspace - + li r29, 8 mtctr r29 lis r30, 0x4000 # priviledged access only ori r30, r30, 8 # ASID 0 (VSIDs 8 .. 15) - + seg_fill_kernel: - + mtsrin r30, r31 addi r30, r30, 1 addis r31, r31, 0x1000 # move to next SR - + bdnz seg_fill_kernel - + # invalidate block address translation registers - + li r30, 0 - + mtspr ibat0u, r30 mtspr ibat0l, r30 - + mtspr ibat1u, r30 mtspr ibat1l, r30 - + mtspr ibat2u, r30 mtspr ibat2l, r30 - + mtspr ibat3u, r30 mtspr ibat3l, r30 - + mtspr dbat0u, r30 mtspr dbat0l, r30 - + mtspr dbat1u, r30 mtspr dbat1l, r30 - + mtspr dbat2u, r30 mtspr dbat2l, r30 - + mtspr dbat3u, r30 mtspr dbat3l, r30 - + # create empty Page Hash Table # on top of memory, size 64 KB - + lwz r31, 4(r3) # r31 = memory size - + lis r30, 65536@h ori r30, r30, 65536@l # r30 = 65536 - + subi r29, r30, 1 # r29 = 65535 - + sub r31, r31, r30 andc r31, r31, r29 # pht = ALIGN_DOWN(memory_size - 65536, 65536) - + mtsdr1 r31 - + li r29, 2 srw r30, r30, r29 # r30 = 16384 li r29, 0 - + pht_clear: - + # write zeroes - + stw r29, 0(r31) FLUSH_DCACHE r31 - + addi r31, r31, 4 subi r30, r30, 4 - + cmpwi r30, 0 beq clear_end - + bdnz pht_clear - + clear_end: - + # create BAT identity mapping - + lwz r31, 4(r3) # r31 = memory size - + lis r30, 268435456@h ori r30, r30, 268435456@l # r30 = 256 MB - + # BAT0 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat0_r31 - + mr r29, r30 b bat0_r30 - + bat0_r31: - + mr r29, r31 - + bat0_r30: - + BAT_COMPUTE 0x0000 r29 r28 r27 r26 mtspr ibat0u, r26 mtspr ibat0l, r27 - + mtspr dbat0u, r26 mtspr dbat0l, r27 - + # BAT1 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat1_r31 - + mr r29, r30 b bat1_r30 - + bat1_r31: - + mr r29, r31 - + bat1_r30: - + BAT_COMPUTE 0x1000 r29 r28 r27 r26 mtspr ibat1u, r26 mtspr ibat1l, r27 - + mtspr dbat1u, r26 mtspr dbat1l, r27 - + # BAT2 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat2_r31 - + mr r29, r30 b bat2_r30 - + bat2_r31: - + mr r29, r31 - + bat2_r30: - + BAT_COMPUTE 0x2000 r29 r28 r27 r26 mtspr ibat2u, r26 mtspr ibat2l, r27 - + mtspr dbat2u, r26 mtspr dbat2l, r27 - + # BAT3 - + sub r31, r31, r29 # r31 = r31 - r29 - + # r29 = min(r31, r30) - + cmpw r31, r30 blt bat3_r31 - + mr r29, r30 b bat3_r30 - + bat3_r31: - + mr r29, r31 - + bat3_r30: - + BAT_COMPUTE 0x3000 r29 r28 r27 r26 mtspr ibat3u, r26 mtspr ibat3l, r27 - + mtspr dbat3u, r26 mtspr dbat3l, r27 - + no_bat: - + # flush TLB - + TLB_FLUSH r31 - + # start the kernel # @@ -404,25 +404,25 @@ # sprg3 = physical memory size # sp = 0 (enforces the usage of sprg0 as exception stack) - + lis r31, PA2KA(BOOT_OFFSET)@ha addi r31, r31, PA2KA(BOOT_OFFSET)@l mtspr srr0, r31 - + lis r31, BOOT_OFFSET@ha addi r31, r31, BOOT_OFFSET@l mtsprg0 r31 - + # bootinfo starts with a 64 bit integer containing # the physical memory size, get the lower 4 bytes - + lwz r31, 4(r3) mtsprg3 r31 - + li sp, 0 - + mfmsr r31 ori r31, r31, (msr_ir | msr_dr)@l mtspr srr1, r31 - + sync isync Index: boot/arch/ppc32/src/main.c =================================================================== --- boot/arch/ppc32/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ppc32/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -60,9 +60,9 @@ version_print(); ofw_memmap(&bootinfo.memmap); - + void *bootinfo_pa = ofw_translate(&bootinfo); void *real_mode_pa = ofw_translate(&real_mode); void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS); - + printf("\nMemory statistics (total %llu MB)\n", bootinfo.memmap.total >> 20); printf(" %p|%p: real mode trampoline\n", &real_mode, real_mode_pa); @@ -72,5 +72,5 @@ printf(" %p|%p: loader entry point\n", (void *) LOADER_ADDRESS, loader_address_pa); - + size_t i; for (i = 0; i < COMPONENTS; i++) @@ -78,5 +78,5 @@ ofw_translate(components[i].addr), components[i].name, components[i].inflated, components[i].size); - + size_t dest[COMPONENTS]; size_t top = 0; @@ -85,5 +85,5 @@ for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr = @@ -91,16 +91,16 @@ bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size = components[i].inflated; - + str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.taskmap.cnt++; } - + dest[i] = top; top += components[i].inflated; cnt++; } - + if (top >= (size_t) loader_address_pa) { printf("Inflated components overlap loader area.\n"); @@ -108,5 +108,5 @@ halt(); } - + void *balloc_base; void *balloc_base_pa; @@ -114,5 +114,5 @@ BALLOC_MAX_SIZE, loader_address_pa); printf(" %p|%p: boot allocator area\n", balloc_base, balloc_base_pa); - + void *inflate_base; void *inflate_base_pa; @@ -120,5 +120,5 @@ loader_address_pa); printf(" %p|%p: inflate area\n", inflate_base, inflate_base_pa); - + uintptr_t balloc_start = ALIGN_UP(top, PAGE_SIZE); size_t pages = (balloc_start + ALIGN_UP(BALLOC_MAX_SIZE, PAGE_SIZE)) @@ -129,17 +129,17 @@ pages * sizeof(void *), loader_address_pa); printf(" %p|%p: translate table\n", transtable, transtable_pa); - + check_overlap("boot allocator area", balloc_base_pa, pages); check_overlap("inflate area", inflate_base_pa, pages); check_overlap("translate table", transtable_pa, pages); - + printf("\nInflating components ... "); - + for (i = cnt; i > 0; i--) { printf("%s ", components[i - 1].name); - + int err = inflate(components[i - 1].addr, components[i - 1].size, inflate_base + dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -148,30 +148,30 @@ } } - + printf(".\n"); - + printf("Setting up boot allocator ...\n"); balloc_init(&bootinfo.ballocs, balloc_base, PA2KA(balloc_start), BALLOC_MAX_SIZE); - + printf("Setting up screens ...\n"); ofw_setup_screens(); - + printf("Canonizing OpenFirmware device tree ...\n"); bootinfo.ofw_root = ofw_tree_build(); - + printf("Setting up translate table ...\n"); for (i = 0; i < pages; i++) { uintptr_t off = i << PAGE_WIDTH; void *phys; - + if (off < balloc_start) phys = ofw_translate(inflate_base + off); else phys = ofw_translate(balloc_base + off - balloc_start); - + ((void **) transtable)[i] = phys; } - + printf("Booting the kernel...\n"); jump_to_kernel(bootinfo_pa, transtable_pa, pages, real_mode_pa); Index: boot/arch/ppc32/src/ofw.c =================================================================== --- boot/arch/ppc32/src/ofw.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/ppc32/src/ofw.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,5 +43,5 @@ if (ch == '\n') ofw_putchar('\r'); - + if (ascii_check(ch)) ofw_putchar(ch); Index: boot/arch/riscv64/src/asm.S =================================================================== --- boot/arch/riscv64/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/riscv64/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -85,9 +85,9 @@ li x30, 0 li x31, 0 - + /* Set up stack, create stack frame */ la sp, boot_stack + BOOT_STACK_SIZE addi sp, sp, -16 - + j bootstrap @@ -97,23 +97,23 @@ /* Enable performance counters access in supervisor mode */ csrsi mcounteren, MCOUNTEREN_CY_MASK | MCOUNTEREN_TM_MASK | MCOUNTEREN_IR_MASK - + /* Setup SV48 paging for supervisor mode */ la t0, ptl_0 srli t0, t0, 12 - + li t1, SATP_PFN_MASK and t0, t0, t1 - + li t1, SATP_MODE_SV48 or t0, t0, t1 - + csrw sptbr, t0 - + /* Jump to supervisor mode */ csrr t0, mstatus - + li t1, ~MSTATUS_MPP_MASK and t0, t0, t1 - + /* * TODO: Enable running with Supervisor User Mode @@ -122,10 +122,10 @@ li t1, MSTATUS_MPP_SUPERVISOR | MSTATUS_SUM_MASK or t0, t0, t1 - + csrw mstatus, t0 - + li ra, PA2KA(BOOT_OFFSET) csrw mepc, ra - + mret FUNCTION_END(jump_to_kernel) Index: boot/arch/riscv64/src/main.c =================================================================== --- boot/arch/riscv64/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/riscv64/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,13 +48,13 @@ { version_print(); - + bootinfo.htif_frame = ((uintptr_t) &htif_page) >> PAGE_WIDTH; bootinfo.pt_frame = ((uintptr_t) &pt_page) >> PAGE_WIDTH; - + bootinfo.ucbinfo.tohost = (volatile uint64_t *) PA2KA((uintptr_t) &tohost); bootinfo.ucbinfo.fromhost = (volatile uint64_t *) PA2KA((uintptr_t) &fromhost); - + // FIXME TODO: read from device tree bootinfo.physmem_start = PHYSMEM_START; @@ -63,16 +63,16 @@ bootinfo.memmap.zones[0].start = (void *) PHYSMEM_START; bootinfo.memmap.zones[0].size = PHYSMEM_SIZE; - + printf("\nMemory statistics (total %lu MB, starting at %p)\n\n", bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start); printf(" %p: boot info structure\n", &bootinfo); - + uintptr_t top = BOOT_OFFSET; - + for (size_t i = 0; i < COMPONENTS; i++) { printf(" %p: %s image (%zu/%zu bytes)\n", components[i].addr, components[i].name, components[i].inflated, components[i].size); - + uintptr_t tail = (uintptr_t) components[i].addr + components[i].size; @@ -83,15 +83,15 @@ } } - + printf(" %p: inflate area\n", (void *) top); - + void *kernel_entry = NULL; void *dest[COMPONENTS]; size_t cnt = 0; bootinfo.taskmap.cnt = 0; - + for (size_t i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr = @@ -99,19 +99,19 @@ bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size = components[i].inflated; - + str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.taskmap.cnt++; } else kernel_entry = (void *) PA2KA(top); - + dest[i] = (void *) top; top += components[i].inflated; cnt++; } - + printf(" %p: kernel entry point\n", kernel_entry); - + if (top >= bootinfo.physmem_start + bootinfo.memmap.total) { printf("Not enough physical memory available.\n"); @@ -119,13 +119,13 @@ halt(); } - + printf("\nInflating components ... "); - + for (size_t i = cnt; i > 0; i--) { printf("%s ", components[i - 1].name); - + int err = inflate(components[i - 1].addr, components[i - 1].size, dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -134,7 +134,7 @@ } } - + printf(".\n"); - + printf("Booting the kernel...\n"); jump_to_kernel(PA2KA(&bootinfo)); Index: boot/arch/riscv64/src/ucb.c =================================================================== --- boot/arch/riscv64/src/ucb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/riscv64/src/ucb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -39,5 +39,5 @@ if (!val) return; - + fromhost = 0; } @@ -48,8 +48,8 @@ (((uint64_t) cmd) << 48) | (payload & UINT64_C(0xffffffffffff)); - + while (tohost) poll_fromhost(); - + tohost = val; } Index: boot/arch/sparc64/src/asm.S =================================================================== --- boot/arch/sparc64/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/sparc64/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,22 +65,22 @@ 1: ! Disable interrupts and disable address masking. - + wrpr %g0, PSTATE_PRIV_BIT, %pstate - + wrpr %g0, NWINDOWS - 2, %cansave ! Set maximum saveable windows wrpr %g0, 0, %canrestore ! Get rid of windows we will never need again wrpr %g0, 0, %otherwin ! Make sure the window state is consistent wrpr %g0, NWINDOWS - 1, %cleanwin ! Prevent needless clean_window traps for kernel - + set initial_stack, %sp add %sp, -STACK_BIAS, %sp - + set ofw_cif, %l0 - + ! Initialize OpenFirmware - + call ofw_init stx %o4, [%l0] - + ba %xcc, bootstrap nop @@ -105,5 +105,5 @@ * 3. Flush instruction pipeline. */ - + /* * US3 processors have a write-invalidate cache, so explicitly @@ -115,17 +115,17 @@ be %xcc, 1f nop - + 0: call icache_flush nop - + 1: membar #StoreStore - + /* * Flush the instruction pipeline. */ flush %i7 - + ! Jump to kernel jmp %o3 @@ -138,16 +138,16 @@ set ((ICACHE_SIZE - ICACHE_LINE_SIZE) | ICACHE_SET_BIT), %g1 stxa %g0, [%g1] ASI_ICACHE_TAG - + 0: membar #Sync subcc %g1, ICACHE_LINE_SIZE, %g1 bnz,pt %xcc, 0b - + stxa %g0, [%g1] ASI_ICACHE_TAG membar #Sync retl - + ! SF Erratum #51 - + nop #else @@ -161,14 +161,14 @@ set ofw_cif, %l0 ldx [%l0], %l0 - + rdpr %pstate, %l1 and %l1, ~PSTATE_AM_BIT, %l2 wrpr %l2, 0, %pstate - + jmpl %l0, %o7 mov %i0, %o0 - + wrpr %l1, 0, %pstate - + ret restore %o0, 0, %o0 Index: boot/arch/sparc64/src/main.c =================================================================== --- boot/arch/sparc64/src/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/sparc64/src/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -86,5 +86,5 @@ phandle root = ofw_find_device("/"); char compatible[OFW_TREE_PROPERTY_MAX_VALUELEN]; - + if (ofw_get_property(root, "compatible", compatible, OFW_TREE_PROPERTY_MAX_VALUELEN) <= 0) { @@ -93,5 +93,5 @@ return; } - + if (str_cmp(compatible, "sun4v") != 0) { /* @@ -122,15 +122,15 @@ : [ver] "=r" (ver) ); - + ver = (ver << 16) >> 48; - + if ((ver >= FIRST_US3_CPU) && (ver <= LAST_US3_CPU)) { subarch = SUBARCH_US3; - + if (ver == US_IIIi_CODE) mid_mask = (1 << 5) - 1; else mid_mask = (1 << 10) - 1; - + } else if (ver < FIRST_US3_CPU) { subarch = SUBARCH_US; @@ -193,5 +193,5 @@ { version_print(); - + arch_detect(); if (arch == ARCH_SUN4U) @@ -199,5 +199,5 @@ else subarch = SUBARCH_UNKNOWN; - + bootinfo.physmem_start = ofw_get_physmem_start(); ofw_memmap(&bootinfo.memmap); @@ -205,9 +205,9 @@ if (arch == ARCH_SUN4V) sun4v_fixups(); - + void *bootinfo_pa = ofw_translate(&bootinfo); void *kernel_address_pa = ofw_translate((void *) KERNEL_ADDRESS); void *loader_address_pa = ofw_translate((void *) LOADER_ADDRESS); - + printf("\nMemory statistics (total %" PRIu64 " MB, starting at %p)\n", bootinfo.memmap.total >> 20, (void *) bootinfo.physmem_start); @@ -217,5 +217,5 @@ printf(" %p|%p: loader entry point\n", (void *) LOADER_ADDRESS, (void *) loader_address_pa); - + size_t i; for (i = 0; i < COMPONENTS; i++) @@ -223,5 +223,5 @@ ofw_translate(components[i].addr), components[i].name, components[i].inflated, components[i].size); - + void *dest[COMPONENTS]; size_t top = KERNEL_ADDRESS; @@ -230,5 +230,5 @@ for (i = 0; i < min(COMPONENTS, TASKMAP_MAX_RECORDS); i++) { top = ALIGN_UP(top, PAGE_SIZE); - + if (i > 0) { bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].addr = @@ -236,21 +236,21 @@ bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].size = components[i].inflated; - + str_cpy(bootinfo.taskmap.tasks[bootinfo.taskmap.cnt].name, BOOTINFO_TASK_NAME_BUFLEN, components[i].name); - + bootinfo.taskmap.cnt++; } - + dest[i] = (void *) top; top += components[i].inflated; cnt++; } - + printf("\nInflating components ... "); - + for (i = cnt; i > 0; i--) { printf("%s ", components[i - 1].name); - + /* * At this point, we claim and map the physical memory that we @@ -263,11 +263,11 @@ ofw_claim_phys(bootinfo.physmem_start + dest[i - 1], ALIGN_UP(components[i - 1].inflated, PAGE_SIZE)); - + ofw_map(bootinfo.physmem_start + dest[i - 1], dest[i - 1], ALIGN_UP(components[i - 1].inflated, PAGE_SIZE), -1); - + int err = inflate(components[i - 1].addr, components[i - 1].size, dest[i - 1], components[i - 1].inflated); - + if (err != EOK) { printf("\n%s: Inflating error %d, halting.\n", @@ -276,7 +276,7 @@ } } - + printf(".\n"); - + /* * Claim and map the physical memory for the boot allocator. @@ -290,14 +290,14 @@ balloc_init(&bootinfo.ballocs, balloc_base, (uintptr_t) balloc_base, BALLOC_MAX_SIZE); - + printf("Setting up screens ...\n"); ofw_setup_screens(); - + printf("Canonizing OpenFirmware device tree ...\n"); bootinfo.ofw_root = ofw_tree_build(); - + if (arch == ARCH_SUN4U) sun4u_smp(); - + printf("Booting the kernel ...\n"); jump_to_kernel(bootinfo.physmem_start | BSP_PROCESSOR, &bootinfo, subarch, Index: boot/arch/sparc64/src/ofw.c =================================================================== --- boot/arch/sparc64/src/ofw.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/arch/sparc64/src/ofw.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,5 +47,5 @@ if (ch == '\n') ofw_putchar('\r'); - + if (ascii_check(ch)) ofw_putchar(ch); @@ -72,16 +72,16 @@ { size_t cpus; - + for (cpus = 0; (child != 0) && (child != (phandle) -1); child = ofw_get_peer_node(child), cpus++) { char type_name[OFW_TREE_PROPERTY_MAX_VALUELEN]; - + if (ofw_get_property(child, "device_type", type_name, OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) { type_name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0; - + if (str_cmp(type_name, "cpu") == 0) { uint32_t mid; - + /* * "upa-portid" for US, "portid" for US-III, @@ -92,5 +92,5 @@ && (ofw_get_property(child, "cpuid", &mid, sizeof(mid)) <= 0)) continue; - + if (current_mid != mid) { /* @@ -104,5 +104,5 @@ } } - + return cpus; } @@ -115,5 +115,5 @@ /* Get the current CPU MID */ uint64_t current_mid; - + asm volatile ( "ldxa [%[zero]] %[asi], %[current_mid]\n" @@ -122,24 +122,24 @@ [asi] "i" (ASI_ICBUS_CONFIG) ); - + current_mid >>= ICBUS_CONFIG_MID_SHIFT; current_mid &= mid_mask; - + /* Wake up the CPUs */ - + phandle cpus_parent = ofw_find_device("/ssm@0,0"); if ((cpus_parent == 0) || (cpus_parent == (phandle) -1)) cpus_parent = ofw_find_device("/"); - + phandle node = ofw_get_child_node(cpus_parent); size_t cpus = wake_cpus_in_node(node, current_mid, physmem_start); - + while ((node != 0) && (node != (phandle) -1)) { char name[OFW_TREE_PROPERTY_MAX_VALUELEN]; - + if (ofw_get_property(node, "name", name, OFW_TREE_PROPERTY_MAX_VALUELEN) > 0) { name[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = 0; - + if (str_cmp(name, "cmp") == 0) { phandle subnode = ofw_get_child_node(node); @@ -148,8 +148,8 @@ } } - + node = ofw_get_peer_node(node); } - + if (cpus == 0) printf("Warning: Unable to get CPU properties.\n"); @@ -169,5 +169,5 @@ halt(); } - + return ((((uintptr_t) memreg[0]) << 32) | memreg[1]); } Index: boot/genarch/include/genarch/ofw_tree.h =================================================================== --- boot/genarch/include/genarch/ofw_tree.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/genarch/include/genarch/ofw_tree.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,12 +45,12 @@ struct ofw_tree_node *peer; struct ofw_tree_node *child; - + phandle node_handle; /**< Old OpenFirmware node handle. */ - + char *da_name; /**< Disambigued name. */ - + size_t properties; /**< Number of properties. */ ofw_tree_property_t *property; - + void *device; /**< Member used solely by the kernel. */ } ofw_tree_node_t; Index: boot/genarch/src/division.c =================================================================== --- boot/genarch/src/division.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/genarch/src/division.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,23 +40,23 @@ unsigned int result; int steps = sizeof(unsigned int) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -65,5 +65,5 @@ a <<= 1; } - + return result; } @@ -74,23 +74,23 @@ unsigned long long result; int steps = sizeof(unsigned long long) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -99,5 +99,5 @@ a <<= 1; } - + return result; } @@ -108,8 +108,8 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -120,8 +120,8 @@ unsigned long long rem; long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -146,9 +146,9 @@ unsigned int rem; divandmod32(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((int) rem); - + return (int) rem; } @@ -159,9 +159,9 @@ unsigned long long rem; divandmod64(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((long long) rem); - + return (long long) rem; } @@ -187,10 +187,10 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; @@ -207,10 +207,10 @@ unsigned long long rem; long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; Index: boot/genarch/src/multiplication.c =================================================================== --- boot/genarch/src/multiplication.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/genarch/src/multiplication.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,12 +50,12 @@ unsigned int b1 = b >> 16; unsigned int b2 = b & UINT16_MAX; - + unsigned long long t1 = a1 * b1; unsigned long long t2 = a1 * b2; t2 += a2 * b1; unsigned long long t3 = a2 * b2; - + t3 = (((t1 << 16) + t2) << 16) + t3; - + return t3; } @@ -67,40 +67,40 @@ { char neg = 0; - + if (a < 0) { neg = !neg; a = -a; } - + if (b < 0) { neg = !neg; b = -b; } - + unsigned long long a1 = a >> 32; unsigned long long b1 = b >> 32; - + unsigned long long a2 = a & (UINT32_MAX); unsigned long long b2 = b & (UINT32_MAX); - + if (SOFTINT_CHECK_OF && (a1 != 0) && (b1 != 0)) { /* Error (overflow) */ return (neg ? INT64_MIN : INT64_MAX); } - + /* (if OF checked) a1 or b1 is zero => result fits in 64 bits, * no need to another overflow check */ unsigned long long t1 = mul(a1, b2) + mul(b1, a2); - + if ((SOFTINT_CHECK_OF) && (t1 > UINT32_MAX)) { /* Error (overflow) */ return (neg ? INT64_MIN : INT64_MAX); } - + t1 = t1 << 32; unsigned long long t2 = mul(a2, b2); t2 += t1; - + /* t2 & (1ull << 63) - if this bit is set in unsigned long long, * result does not fit in signed one @@ -110,9 +110,9 @@ return (neg ? INT64_MIN : INT64_MAX); } - + long long result = t2; if (neg) result = -result; - + return result; } Index: boot/genarch/src/ofw.c =================================================================== --- boot/genarch/src/ofw.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/genarch/src/ofw.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,9 +62,9 @@ if (ofw_chosen == (phandle) -1) halt(); - + if ((ofw_ret_t) ofw_get_property(ofw_chosen, "stdout", &ofw_stdout, sizeof(ofw_stdout)) <= 0) ofw_stdout = 0; - + ofw_root = ofw_find_device("/"); if (ofw_root == (phandle) -1) { @@ -72,5 +72,5 @@ halt(); } - + if ((ofw_ret_t) ofw_get_property(ofw_chosen, "mmu", &ofw_mmu, sizeof(ofw_mmu)) <= 0) { @@ -83,5 +83,5 @@ halt(); } - + ofw_memory = ofw_find_device("/memory"); if (ofw_memory == (phandle) -1) { @@ -110,22 +110,22 @@ args.nargs = nargs; args.nret = nret; - + va_list list; va_start(list, rets); - + size_t i; for (i = 0; i < nargs; i++) args.args[i] = va_arg(list, ofw_arg_t); - + va_end(list); - + for (i = 0; i < nret; i++) args.args[i + nargs] = 0; - + (void) ofw(&args); - + for (i = 1; i < nret; i++) rets[i - 1] = args.args[i + nargs]; - + return args.args[nargs]; } @@ -161,5 +161,5 @@ { ofw_prop_t ret = 1; - + if ((ofw_ret_t) ofw_get_property(device, "#address-cells", &ret, sizeof(ret)) <= 0) @@ -167,5 +167,5 @@ sizeof(ret)) <= 0) ret = OFW_ADDRESS_CELLS; - + return (size_t) ret; } @@ -174,5 +174,5 @@ { ofw_prop_t ret = 1; - + if ((ofw_ret_t) ofw_get_property(device, "#size-cells", &ret, sizeof(ret)) <= 0) @@ -180,5 +180,5 @@ sizeof(ret)) <= 0) ret = OFW_SIZE_CELLS; - + return (size_t) ret; } @@ -198,5 +198,5 @@ if (ofw_stdout == 0) return; - + ofw_call("write", 3, 1, NULL, ofw_stdout, &ch, 1); } @@ -210,5 +210,5 @@ halt(); } - + if (result[0] == false) { printf("Error: Unable to translate virtual address %p, halting.\n", @@ -216,9 +216,9 @@ halt(); } - + #ifdef __32_BITS__ return (void *) result[2]; #endif - + #ifdef __64_BITS__ return (void *) ((result[2] << 32) | result[3]); @@ -235,5 +235,5 @@ halt(); } - + return (void *) addr; } @@ -252,5 +252,5 @@ { void *addr = ofw_claim_virt_internal(NULL, len, alignment); - + if (addr == NULL) { printf("Error: Unable to claim %zu bytes in virtual memory, halting.\n", @@ -258,5 +258,5 @@ halt(); } - + return addr; } @@ -276,5 +276,5 @@ * purposes. */ - + #ifdef __32_BITS__ ofw_arg_t retaddr[1]; @@ -284,8 +284,8 @@ halt(); } - + return (void *) retaddr[0]; #endif - + #ifdef __64_BITS__ ofw_arg_t retaddr[2]; @@ -296,5 +296,5 @@ halt(); } - + return (void *) ((retaddr[0] << 32) | retaddr[1]); #endif @@ -319,5 +319,5 @@ halt(); } - + return addr; } @@ -328,18 +328,18 @@ ofw_arg_t phys_hi; ofw_arg_t phys_lo; - + #ifdef __32_BITS__ phys_hi = (ofw_arg_t) phys; phys_lo = 0; #endif - + #ifdef __64_BITS__ phys_hi = (ofw_arg_t) phys >> 32; phys_lo = (ofw_arg_t) phys & 0xffffffff; #endif - + ofw_arg_t ret = ofw_call("call-method", 7, 1, NULL, "map", ofw_mmu, mode, ALIGN_UP(size, PAGE_SIZE), virt, phys_hi, phys_lo); - + if (ret != 0) { printf("Error: Unable to map %p to %p (size %zu), halting.\n", @@ -360,7 +360,7 @@ size_t sc = ofw_get_size_cells(ofw_memory) / (sizeof(uintptr_t) / sizeof(uint32_t)); - + uintptr_t buf[((ac + sc) * MEMMAP_MAX_RECORDS)]; - + /* The number of bytes read */ ofw_ret_t ret = (ofw_ret_t) ofw_get_property(ofw_memory, "reg", buf, @@ -370,5 +370,5 @@ halt(); } - + size_t pos; map->total = 0; @@ -378,5 +378,5 @@ void *start = (void *) (buf[pos + ac - 1]); uintptr_t size = buf[pos + ac + sc - 1]; - + /* * This is a hot fix of the issue which occurs on machines @@ -389,5 +389,5 @@ map->zones[map->cnt - 1].size < start)) break; - + if (size > 0) { map->zones[map->cnt].start = start; @@ -397,5 +397,5 @@ } } - + if (map->total == 0) { printf("Error: No physical memory detected, halting.\n"); @@ -421,5 +421,5 @@ *base_pa = ofw_claim_phys_any(size, PAGE_SIZE); } while (*base_pa <= min_pa); - + *base = ofw_claim_virt_any(size, PAGE_SIZE); ofw_map(*base_pa, *base, ALIGN_UP(size, PAGE_SIZE), (ofw_arg_t) -1); @@ -433,9 +433,9 @@ OFW_TREE_PROPERTY_MAX_VALUELEN) <= 0) return; - + device_type[OFW_TREE_PROPERTY_MAX_VALUELEN - 1] = '\0'; if (str_cmp(device_type, "display") != 0) return; - + /* Check for 8 bit depth */ ofw_prop_t depth; @@ -443,17 +443,17 @@ sizeof(depth)) <= 0) depth = 0; - + /* Get device path */ ofw_arg_t len = ofw_package_to_path(handle, path, OFW_TREE_PATH_MAX_LEN); if (len == (ofw_arg_t) -1) return; - + path[len] = '\0'; - + /* Open the display to initialize it */ ihandle screen = ofw_open(path); if (screen == (ihandle) -1) return; - + if (depth == 8) { /* Setup the palette so that the (inverted) 3:2:3 scheme is usable */ @@ -470,5 +470,5 @@ while ((current != 0) && (current != (phandle) -1)) { ofw_setup_screen(current); - + /* * Recursively process the potential child node. @@ -477,5 +477,5 @@ if ((child != 0) && (child != (phandle) -1)) ofw_setup_screens_internal(child); - + /* * Iteratively process the next peer node. @@ -493,5 +493,5 @@ continue; } - + /* * No more peers on this level. Index: boot/genarch/src/ofw_tree.c =================================================================== --- boot/genarch/src/ofw_tree.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/genarch/src/ofw_tree.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ if (addr) addr[size] = '\0'; - + return addr; } @@ -98,5 +98,5 @@ current_node->property = NULL; current_node->device = NULL; - + /* * Get the disambigued name. @@ -105,23 +105,23 @@ if (len == (size_t) -1) return; - + path[len] = '\0'; - + /* Find last slash */ size_t i; for (i = len; (i > 0) && (path[i - 1] != '/'); i--); - + /* Do not include the slash */ len -= i; - + /* Add space for trailing '\0' */ char *da_name = ofw_tree_space_alloc(len + 1); if (!da_name) return; - + memcpy(da_name, &path[i], len); da_name[len] = '\0'; current_node->da_name = (char *) balloc_rebase(da_name); - + /* * Recursively process the potential child node. @@ -137,5 +137,5 @@ } } - + /* * Count properties. @@ -146,8 +146,8 @@ memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN); } - + if (!current_node->properties) return; - + /* * Copy properties. @@ -157,17 +157,17 @@ if (!property) return; - + name[0] = '\0'; for (i = 0; ofw_next_property(current, name, name2) == 1; i++) { if (i == current_node->properties) break; - + memcpy(name, name2, OFW_TREE_PROPERTY_MAX_NAMELEN); memcpy(property[i].name, name, OFW_TREE_PROPERTY_MAX_NAMELEN); property[i].name[OFW_TREE_PROPERTY_MAX_NAMELEN - 1] = '\0'; - + size_t size = ofw_get_proplen(current, name); property[i].size = size; - + if (size) { void *buf = ofw_tree_space_alloc(size); @@ -182,9 +182,9 @@ property[i].value = NULL; } - + /* Just in case we ran out of memory. */ current_node->properties = i; current_node->property = (ofw_tree_property_t *) balloc_rebase(property); - + /* * Iteratively process the next peer node. @@ -207,5 +207,5 @@ } } - + /* * No more peers on this level. @@ -225,5 +225,5 @@ if (root) ofw_tree_node_process(root, NULL, ofw_root); - + /* * The firmware client interface does not automatically include the @@ -241,5 +241,5 @@ } } - + return (ofw_tree_node_t *) balloc_rebase(root); } Index: boot/generic/include/printf_core.h =================================================================== --- boot/generic/include/printf_core.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/include/printf_core.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,5 +40,5 @@ /* String output function, returns number of printed characters or EOF */ int (*str_write)(const char *, size_t, void *); - + /* User data - output stream specification, state, locks, etc. */ void *data; Index: boot/generic/src/balloc.c =================================================================== --- boot/generic/src/balloc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/balloc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,15 +49,15 @@ if (alignment == 0) return NULL; - + /* Enforce minimal alignment. */ alignment = ALIGN_UP(alignment, 4); - + uintptr_t addr = phys_base + ALIGN_UP(ballocs->size, alignment); - + if (ALIGN_UP(ballocs->size, alignment) + size >= max_size) return NULL; - + ballocs->size = ALIGN_UP(ballocs->size, alignment) + size; - + return (void *) addr; } Index: boot/generic/src/inflate.c =================================================================== --- boot/generic/src/inflate.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/inflate.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -103,12 +103,12 @@ size_t destlen; /**< Output buffer size */ size_t destcnt; /**< Position in the output buffer */ - + uint8_t *src; /**< Input buffer */ size_t srclen; /**< Input buffer size */ size_t srccnt; /**< Position in the input buffer */ - + uint16_t bitbuf; /**< Bit buffer */ size_t bitlen; /**< Number of bits in the bit buffer */ - + bool overrun; /**< Overrun condition */ } inflate_state_t; @@ -240,5 +240,5 @@ /* Bit accumulator for at least 20 bits */ uint32_t val = state->bitbuf; - + while (state->bitlen < cnt) { if (state->srccnt == state->srclen) { @@ -246,5 +246,5 @@ return 0; } - + /* Load 8 more bits */ val |= ((uint32_t) state->src[state->srccnt]) << state->bitlen; @@ -252,9 +252,9 @@ state->bitlen += 8; } - + /* Update bits in the buffer */ state->bitbuf = (uint16_t) (val >> cnt); state->bitlen -= cnt; - + return ((uint16_t) (val & ((1 << cnt) - 1))); } @@ -275,32 +275,32 @@ state->bitbuf = 0; state->bitlen = 0; - + if (state->srccnt + 4 > state->srclen) return ELIMIT; - + uint16_t len = state->src[state->srccnt] | (state->src[state->srccnt + 1] << 8); uint16_t len_compl = state->src[state->srccnt + 2] | (state->src[state->srccnt + 3] << 8); - + /* Check block length and its complement */ if (((int16_t) len) != ~((int16_t) len_compl)) return EINVAL; - + state->srccnt += 4; - + /* Check input buffer size */ if (state->srccnt + len > state->srclen) return ELIMIT; - + /* Check output buffer size */ if (state->destcnt + len > state->destlen) return ENOMEM; - + /* Copy data */ memcpy(state->dest + state->destcnt, state->src + state->srccnt, len); state->srccnt += len; state->destcnt += len; - + return EOK; } @@ -323,5 +323,5 @@ size_t index = 0; /* Index of the first code of the given length in the symbol table */ - + size_t len; /* Current number of bits in the code */ for (len = 1; len <= MAX_HUFFMAN_BIT; len++) { @@ -329,5 +329,5 @@ code |= get_bits(state, 1); CHECK_OVERRUN(*state); - + uint16_t count = huffman->count[len]; if (code < first + count) { @@ -336,5 +336,5 @@ return EOK; } - + /* Update for next length */ index += count; @@ -343,5 +343,5 @@ code <<= 1; } - + return EINVAL; } @@ -364,15 +364,15 @@ for (len = 0; len <= MAX_HUFFMAN_BIT; len++) huffman->count[len] = 0; - + /* We assume that the lengths are within bounds */ size_t symbol; for (symbol = 0; symbol < n; symbol++) huffman->count[length[symbol]]++; - + if (huffman->count[0] == n) { /* The code is complete, but decoding will fail */ return 0; } - + /* Check for an over-subscribed or incomplete set of lengths */ int16_t left = 1; @@ -385,12 +385,12 @@ } } - + /* Generate offsets into symbol table */ uint16_t offs[MAX_HUFFMAN_BIT + 1]; - + offs[1] = 0; for (len = 1; len < MAX_HUFFMAN_BIT; len++) offs[len + 1] = offs[len] + huffman->count[len]; - + for (symbol = 0; symbol < n; symbol++) { if (length[symbol] != 0) { @@ -399,5 +399,5 @@ } } - + return left; } @@ -422,5 +422,5 @@ { uint16_t symbol; - + do { int err = huffman_decode(state, len_code, &symbol); @@ -429,10 +429,10 @@ return err; } - + if (symbol < 256) { /* Write out literal */ if (state->destcnt == state->destlen) return ENOMEM; - + state->dest[state->destcnt] = (uint8_t) symbol; state->destcnt++; @@ -442,20 +442,20 @@ if (symbol >= 29) return EINVAL; - + size_t len = lens[symbol] + get_bits(state, lens_ext[symbol]); CHECK_OVERRUN(*state); - + /* Get distance */ err = huffman_decode(state, dist_code, &symbol); if (err != EOK) return err; - + size_t dist = dists[symbol] + get_bits(state, dists_ext[symbol]); if (dist > state->destcnt) return ENOENT; - + if (state->destcnt + len > state->destlen) return ENOMEM; - + while (len > 0) { /* Copy len bytes from distance bytes back */ @@ -467,5 +467,5 @@ } } while (symbol != 256); - + return EOK; } @@ -510,25 +510,25 @@ huffman_t dyn_len_code; huffman_t dyn_dist_code; - + dyn_len_code.count = dyn_len_count; dyn_len_code.symbol = dyn_len_symbol; - + dyn_dist_code.count = dyn_dist_count; dyn_dist_code.symbol = dyn_dist_symbol; - + /* Get number of bits in each table */ uint16_t nlen = get_bits(state, 5) + 257; CHECK_OVERRUN(*state); - + uint16_t ndist = get_bits(state, 5) + 1; CHECK_OVERRUN(*state); - + uint16_t ncode = get_bits(state, 4) + 4; CHECK_OVERRUN(*state); - + if ((nlen > MAX_LITLEN) || (ndist > MAX_DIST) || (ncode > MAX_ORDER)) return EINVAL; - + /* Read code length code lengths */ uint16_t index; @@ -537,14 +537,14 @@ CHECK_OVERRUN(*state); } - + /* Set missing lengths to zero */ for (index = ncode; index < MAX_ORDER; index++) length[order[index]] = 0; - + /* Build Huffman code */ int16_t rc = huffman_construct(&dyn_len_code, length, MAX_ORDER); if (rc != 0) return EINVAL; - + /* Read length/literal and distance code length tables */ index = 0; @@ -554,5 +554,5 @@ if (err != EOK) return EOK; - + if (symbol < 16) { length[index] = symbol; @@ -560,9 +560,9 @@ } else { uint16_t len = 0; - + if (symbol == 16) { if (index == 0) return EINVAL; - + len = length[index - 1]; symbol = get_bits(state, 2) + 3; @@ -575,8 +575,8 @@ CHECK_OVERRUN(*state); } - + if (index + symbol > nlen + ndist) return EINVAL; - + while (symbol > 0) { length[index] = len; @@ -586,19 +586,19 @@ } } - + /* Check for end-of-block code */ if (length[256] == 0) return EINVAL; - + /* Build Huffman tables for literal/length codes */ rc = huffman_construct(&dyn_len_code, length, nlen); if ((rc < 0) || ((rc > 0) && (dyn_len_code.count[0] + 1 != nlen))) return EINVAL; - + /* Build Huffman tables for distance codes */ rc = huffman_construct(&dyn_dist_code, length + nlen, ndist); if ((rc < 0) || ((rc > 0) && (dyn_dist_code.count[0] + 1 != ndist))) return EINVAL; - + return inflate_codes(state, &dyn_len_code, &dyn_dist_code); } @@ -622,30 +622,30 @@ /* Initialize the state */ inflate_state_t state; - + state.dest = (uint8_t *) dest; state.destlen = destlen; state.destcnt = 0; - + state.src = (uint8_t *) src; state.srclen = srclen; state.srccnt = 0; - + state.bitbuf = 0; state.bitlen = 0; - + state.overrun = false; - + uint16_t last; int ret = 0; - + do { /* Last block is indicated by a non-zero bit */ last = get_bits(&state, 1); CHECK_OVERRUN(state); - + /* Block type */ uint16_t type = get_bits(&state, 2); CHECK_OVERRUN(state); - + switch (type) { case 0: @@ -662,5 +662,5 @@ } } while ((!last) && (ret == 0)); - + return ret; } Index: boot/generic/src/memstr.c =================================================================== --- boot/generic/src/memstr.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/memstr.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,8 +46,8 @@ uint8_t *dp = (uint8_t *) dst; const uint8_t *sp = (uint8_t *) src; - + while (cnt-- != 0) *dp++ = *sp++; - + return dst; } @@ -67,8 +67,8 @@ { uint8_t *dp = (uint8_t *) dst; - + while (cnt-- != 0) *dp++ = val; - + return dst; } @@ -91,12 +91,12 @@ if (src == dst) return dst; - + /* Non-overlapping? */ if ((dst >= src + cnt) || (src >= dst + cnt)) return memcpy(dst, src, cnt); - + uint8_t *dp; const uint8_t *sp; - + /* Which direction? */ if (src > dst) { @@ -104,5 +104,5 @@ dp = dst; sp = src; - + while (cnt-- != 0) *dp++ = *sp++; @@ -111,9 +111,9 @@ dp = dst + (cnt - 1); sp = src + (cnt - 1); - + while (cnt-- != 0) *dp-- = *sp--; } - + return dst; } Index: boot/generic/src/printf.c =================================================================== --- boot/generic/src/printf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/printf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -37,11 +37,11 @@ int ret; va_list args; - + va_start(args, fmt); - + ret = vprintf(fmt, args); - + va_end(args); - + return ret; } Index: boot/generic/src/printf_core.c =================================================================== --- boot/generic/src/printf_core.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/printf_core.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -138,5 +138,5 @@ if (str == NULL) return printf_putnchars(nullstr, str_size(nullstr), ps); - + return ps->str_write((void *) str, str_size(str), ps->data); } @@ -154,5 +154,5 @@ if (!ascii_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->str_write(&ch, 1, ps->data); } @@ -180,8 +180,8 @@ } } - + if (printf_putchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -192,5 +192,5 @@ counter++; } - + return (int) (counter); } @@ -210,10 +210,10 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + /* Print leading spaces. */ size_t strw = str_length(str); if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -225,5 +225,5 @@ } } - + /* Part of @a str fitting into the alloted space. */ int retval; @@ -231,7 +231,7 @@ if ((retval = printf_putnchars(str, size, ps)) < 0) return -counter; - + counter += retval; - + /* Right padding */ while (width-- > 0) { @@ -264,14 +264,14 @@ else digits = digits_small; - + char data[PRINT_NUMBER_BUFFER_SIZE]; char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1]; - + /* Size of number with all prefixes and signs */ int size = 0; - + /* Put zero at end of string */ *ptr-- = 0; - + if (num == 0) { *ptr-- = '0'; @@ -283,8 +283,8 @@ } while (num /= base); } - + /* Size of plain number */ int number_size = size; - + /* * Collect the sum of all prefixes/signs/etc. to calculate padding and @@ -305,5 +305,5 @@ } } - + char sgn = 0; if (flags & __PRINTF_FLAG_SIGNED) { @@ -319,8 +319,8 @@ } } - + if (flags & __PRINTF_FLAG_LEFTALIGNED) flags &= ~__PRINTF_FLAG_ZEROPADDED; - + /* * If the number is left-aligned or precision is specified then @@ -331,5 +331,5 @@ precision = width - size + number_size; } - + /* Print leading spaces */ if (number_size > precision) { @@ -337,8 +337,8 @@ precision = number_size; } - + width -= precision + size - number_size; size_t counter = 0; - + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { while (width-- > 0) { @@ -347,5 +347,5 @@ } } - + /* Print sign */ if (sgn) { @@ -353,5 +353,5 @@ counter++; } - + /* Print prefix */ if (flags & __PRINTF_FLAG_PREFIX) { @@ -386,5 +386,5 @@ } } - + /* Print leading zeroes */ precision -= number_size; @@ -393,17 +393,17 @@ counter++; } - + /* Print the number itself */ int retval; if ((retval = printf_putstr(++ptr, ps)) > 0) counter += retval; - + /* Print trailing spaces */ - + while (width-- > 0) { if (printf_putchar(' ', ps) == 1) counter++; } - + return ((int) counter); } @@ -497,15 +497,15 @@ size_t nxt = 0; /* Index of the next character from fmt */ size_t j = 0; /* Index to the first not printed nonformating character */ - + size_t counter = 0; /* Number of characters printed */ int retval; /* Return values from nested functions */ - + while (true) { i = nxt; wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT); - + if (uc == 0) break; - + /* Control character */ if (uc == '%') { @@ -519,11 +519,11 @@ counter += retval; } - + j = i; - + /* Parse modifiers */ uint32_t flags = 0; bool end = false; - + do { i = nxt; @@ -549,5 +549,5 @@ }; } while (!end); - + /* Width & '*' operator */ int width = 0; @@ -556,5 +556,5 @@ width *= 10; width += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -575,5 +575,5 @@ } } - + /* Precision and '*' operator */ int precision = 0; @@ -585,5 +585,5 @@ precision *= 10; precision += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -604,7 +604,7 @@ } } - + qualifier_t qualifier; - + switch (uc) { case 't': @@ -653,7 +653,7 @@ qualifier = PrintfQualifierInt; } - + unsigned int base = 10; - + switch (uc) { /* @@ -662,10 +662,10 @@ case 's': retval = print_str(va_arg(ap, char *), width, precision, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; @@ -673,14 +673,14 @@ case 'c': retval = print_char(va_arg(ap, unsigned int), width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; }; - + counter += retval; j = nxt; goto next_char; - + /* * Integer values @@ -714,10 +714,10 @@ base = 16; break; - + /* Percentile itself */ case '%': j = i; goto next_char; - + /* * Bad formatting. @@ -730,9 +730,9 @@ goto next_char; } - + /* Print integers */ size_t size; uint64_t number; - + switch (qualifier) { case PrintfQualifierByte: @@ -774,5 +774,5 @@ goto out; } - + if ((retval = print_number(number, width, precision, base, flags, ps)) < 0) { @@ -780,5 +780,5 @@ goto out; } - + counter += retval; j = nxt; @@ -787,5 +787,5 @@ ; } - + if (i > j) { if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { @@ -796,5 +796,5 @@ counter += retval; } - + out: return ((int) counter); Index: boot/generic/src/str.c =================================================================== --- boot/generic/src/str.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/str.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -141,13 +141,13 @@ if (*offset + 1 > size) return 0; - + /* First byte read from string */ uint8_t b0 = (uint8_t) str[(*offset)++]; - + /* Determine code length */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((b0 & 0x80) == 0) { /* 0xxxxxxx (Plain ASCII) */ @@ -170,23 +170,23 @@ return U_SPECIAL; } - + if (*offset + cbytes > size) return U_SPECIAL; - + wchar_t ch = b0 & LO_MASK_8(b0_bits); - + /* Decode continuation bytes */ while (cbytes > 0) { uint8_t b = (uint8_t) str[(*offset)++]; - + /* Must be 10xxxxxx */ if ((b & 0xc0) != 0x80) return U_SPECIAL; - + /* Shift data bits to ch */ ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS)); cbytes--; } - + return ch; } @@ -211,17 +211,17 @@ if (*offset >= size) return EOVERFLOW; - + if (!chr_check(ch)) return EINVAL; - + /* Unsigned version of ch (bit operations should only be done on unsigned types). */ uint32_t cc = (uint32_t) ch; - + /* Determine how many continuation bytes are needed */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((cc & ~LO_MASK_32(7)) == 0) { b0_bits = 7; @@ -240,9 +240,9 @@ return EINVAL; } - + /* Check for available space in buffer */ if (*offset + cbytes >= size) return EOVERFLOW; - + /* Encode continuation bytes */ unsigned int i; @@ -251,11 +251,11 @@ cc = cc >> CONT_BITS; } - + /* Encode first byte */ str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1); - + /* Advance offset */ *offset += cbytes + 1; - + return EOK; } @@ -274,8 +274,8 @@ { size_t size = 0; - + while (*str++ != 0) size++; - + return size; } @@ -298,12 +298,12 @@ size_t len = 0; size_t offset = 0; - + while (len < max_len) { if (str_decode(str, &offset, STR_NO_LIMIT) == 0) break; - + len++; } - + return offset; } @@ -320,8 +320,8 @@ size_t len = 0; size_t offset = 0; - + while (str_decode(str, &offset, STR_NO_LIMIT) != 0) len++; - + return len; } @@ -336,5 +336,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127)) return true; - + return false; } @@ -349,5 +349,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111)) return true; - + return false; } @@ -375,22 +375,22 @@ wchar_t c1 = 0; wchar_t c2 = 0; - + size_t off1 = 0; size_t off2 = 0; - + while (true) { c1 = str_decode(s1, &off1, STR_NO_LIMIT); c2 = str_decode(s2, &off2, STR_NO_LIMIT); - + if (c1 < c2) return -1; - + if (c1 > c2) return 1; - + if ((c1 == 0) || (c2 == 0)) break; } - + return 0; } @@ -412,5 +412,5 @@ size_t src_off = 0; size_t dest_off = 0; - + wchar_t ch; while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) { @@ -418,5 +418,5 @@ break; } - + dest[dest_off] = '\0'; } Index: boot/generic/src/vprintf.c =================================================================== --- boot/generic/src/vprintf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ boot/generic/src/vprintf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,10 +40,10 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { putchar(str_decode(str, &offset, size)); chars++; } - + return chars; } @@ -54,10 +54,10 @@ size_t chars = 0; wchar_t uc; - + while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) { putchar(uc); chars++; } - + return chars; } @@ -69,7 +69,7 @@ NULL }; - + int ret = printf_core(fmt, &ps, ap); - + return ret; } Index: contrib/arch/hadlbppp.py =================================================================== --- contrib/arch/hadlbppp.py (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ contrib/arch/hadlbppp.py (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -41,5 +41,5 @@ def usage(prname): "Print usage syntax" - + print("%s <--bp|--ebp|--adl|--dot|--nop>+ " % prname) print() @@ -53,29 +53,29 @@ def tabs(cnt): "Return given number of tabs" - + return ("\t" * cnt) def cond_append(tokens, token, trim): "Conditionally append token to tokens with trim" - + if (trim): token = token.strip(" \t") - + if (token != ""): tokens.append(token) - + return tokens def split_tokens(string, delimiters, trim = False, separate = False): "Split string to tokens by delimiters, keep the delimiters" - + tokens = [] last = 0 i = 0 - + while (i < len(string)): for delim in delimiters: if (len(delim) > 0): - + if (string[i:(i + len(delim))] == delim): if (separate): @@ -86,20 +86,20 @@ tokens = cond_append(tokens, string[last:i], trim) last = i - + i += len(delim) - 1 break - + i += 1 - + tokens = cond_append(tokens, string[last:len(string)], trim) - + return tokens def identifier(token): "Check whether the token is an identifier" - + if (len(token) == 0): return False - + for i, char in enumerate(token): if (i == 0): @@ -109,34 +109,34 @@ if ((not char.isalnum()) and (char != "_")): return False - + return True def descriptor(token): "Check whether the token is an interface descriptor" - + parts = token.split(":") if (len(parts) != 2): return False - + return (identifier(parts[0]) and identifier(parts[1])) def word(token): "Check whether the token is a word" - + if (len(token) == 0): return False - + for i, char in enumerate(token): if ((not char.isalnum()) and (char != "_") and (char != ".")): return False - + return True def tentative_bp(name, tokens): "Preprocess tentative statements in Behavior Protocol" - + result = [] i = 0 - + while (i < len(tokens)): if (tokens[i] == "tentative"): @@ -145,5 +145,5 @@ start = i level = 1 - + while ((i < len(tokens)) and (level > 0)): if (tokens[i] == "{"): @@ -151,7 +151,7 @@ elif (tokens[i] == "}"): level -= 1 - + i += 1 - + if (level == 0): result.append("(") @@ -168,15 +168,15 @@ else: result.append(tokens[i]) - + i += 1 - + return result def alternative_bp(name, tokens): "Preprocess alternative statements in Behavior Protocol" - + result = [] i = 0 - + while (i < len(tokens)): if (tokens[i] == "alternative"): @@ -184,5 +184,5 @@ i += 2 reps = [] - + while ((i < len(tokens)) and (tokens[i] != ")")): reps.append(tokens[i]) @@ -191,12 +191,12 @@ else: i += 1 - + if (len(reps) >= 2): if ((i + 1 < len(tokens)) and (tokens[i + 1] == "{")): i += 2 - + start = i level = 1 - + while ((i < len(tokens)) and (level > 0)): if (tokens[i] == "{"): @@ -204,10 +204,10 @@ elif (tokens[i] == "}"): level -= 1 - + i += 1 - + if (level == 0): first = True - + for rep in reps[1:]: retokens = [] @@ -218,14 +218,14 @@ else: retokens.append(token) - + if (first): first = False else: result.append("+") - + result.append("(") result.extend(alternative_bp(name, retokens)) result.append(")") - + if (i < len(tokens)): result.append(tokens[i]) @@ -240,28 +240,28 @@ else: result.append(tokens[i]) - + i += 1 - + return result def split_bp(protocol): "Convert Behavior Protocol to tokens" - + return split_tokens(protocol, ["\n", " ", "\t", "(", ")", "{", "}", "*", ";", "+", "||", "|", "!", "?"], True, True) def extend_bp(name, tokens, iface): "Convert interface Behavior Protocol to generic protocol" - + result = [] i = 0 - + while (i < len(tokens)): result.append(tokens[i]) - + if (tokens[i] == "?"): if (i + 1 < len(tokens)): i += 1 parts = tokens[i].split(".") - + if (len(parts) == 1): result.append("%s.%s" % (iface, tokens[i])) @@ -270,17 +270,17 @@ else: print("%s: Unexpected end of protocol" % name) - + i += 1 - + return result def merge_bp(initialization, finalization, protocols): "Merge several Behavior Protocols" - + indep = [] - + if (len(protocols) > 1): first = True - + for protocol in protocols: if (first): @@ -288,5 +288,5 @@ else: indep.append("|") - + indep.append("(") indep.extend(protocol) @@ -294,7 +294,7 @@ elif (len(protocols) == 1): indep = protocols[0] - + inited = [] - + if (initialization != None): if (len(indep) > 0): @@ -310,7 +310,7 @@ else: inited = indep - + finited = [] - + if (finalization != None): if (len(inited) > 0): @@ -326,20 +326,20 @@ else: finited = inited - + return finited def parse_bp(name, tokens, base_indent): "Parse Behavior Protocol" - + tokens = tentative_bp(name, tokens) tokens = alternative_bp(name, tokens) - + indent = base_indent output = "" - + for token in tokens: if (token == "\n"): continue - + if ((token == ";") or (token == "+") or (token == "||") or (token == "|")): output += " %s" % token @@ -350,5 +350,5 @@ if (indent < base_indent): print("%s: Too many parentheses" % name) - + indent -= 1 output += "\n%s%s" % (tabs(indent), token) @@ -359,5 +359,5 @@ if (indent < base_indent): print("%s: Too many parentheses" % name) - + indent -= 1 output += "\n%s%s" % (tabs(indent), token) @@ -368,34 +368,34 @@ else: output += "%s" % token - + if (indent > base_indent): print("%s: Missing parentheses" % name) - + output = output.strip() if (output == ""): return "NULL" - + return output def parse_ebp(component, name, tokens, base_indent): "Parse Behavior Protocol and generate Extended Behavior Protocol output" - + return "component %s {\n\tbehavior {\n\t\t%s\n\t}\n}" % (component, parse_bp(name, tokens, base_indent + 2)) def get_iface(name): "Get interface by name" - + global iface_properties - + if (name in iface_properties): return iface_properties[name] - + return None def inherited_protocols(iface): "Get protocols inherited by an interface" - + result = [] - + if ('extends' in iface): supiface = get_iface(iface['extends']) @@ -406,37 +406,37 @@ else: print("%s: Extends unknown interface '%s'" % (iface['name'], iface['extends'])) - + return result def dump_frame(directed_binds, frame, outdir, var, archf): "Dump Behavior Protocol of a given frame" - + global opt_bp global opt_ebp - + if (opt_ebp): fname = "%s.ebp" % frame['name'] else: fname = "%s.bp" % frame['name'] - + if (archf != None): archf.write("instantiate %s from \"%s\"\n" % (var, fname)) - + outname = os.path.join(outdir, fname) - + protocols = [] if ('protocol' in frame): protocols.append(frame['protocol']) - + if ('initialization' in frame): initialization = frame['initialization'] else: initialization = None - + if ('finalization' in frame): finalization = frame['finalization'] else: finalization = None - + if ('provides' in frame): for provides in frame['provides']: @@ -448,10 +448,10 @@ else: cnt = 1 - + if ('protocol' in iface): proto = extend_bp(outname, iface['protocol'], iface['name']) for _ in range(0, cnt): protocols.append(proto) - + for protocol in inherited_protocols(iface): proto = extend_bp(outname, protocol, iface['name']) @@ -460,10 +460,10 @@ else: print("%s: Provided interface '%s' is undefined" % (frame['name'], provides['iface'])) - + if (opt_bp): outf = open(outname, "w") outf.write(parse_bp(outname, merge_bp(initialization, finalization, protocols), 0)) outf.close() - + if (opt_ebp): outf = open(outname, "w") @@ -473,49 +473,49 @@ def get_system_arch(): "Get system architecture" - + global arch_properties - + for arch, properties in arch_properties.items(): if ('system' in properties): return properties - + return None def get_arch(name): "Get architecture by name" - + global arch_properties - + if (name in arch_properties): return arch_properties[name] - + return None def get_frame(name): "Get frame by name" - + global frame_properties - + if (name in frame_properties): return frame_properties[name] - + return None def create_null_bp(fname, outdir, archf): "Create null frame protocol" - + global opt_bp global opt_ebp - + if (archf != None): archf.write("frame \"%s\"\n" % fname) - + outname = os.path.join(outdir, fname) - + if (opt_bp): outf = open(outname, "w") outf.write("NULL") outf.close() - + if (opt_ebp): outf = open(outname, "w") @@ -525,26 +525,26 @@ def flatten_binds(binds, delegates, subsumes): "Remove bindings which are replaced by delegation or subsumption" - + result = [] stable = True - + for bind in binds: keep = True - + for delegate in delegates: if (bind['to'] == delegate['to']): keep = False result.append({'from': bind['from'], 'to': delegate['rep']}) - + for subsume in subsumes: if (bind['from'] == subsume['from']): keep = False result.append({'from': subsume['rep'], 'to': bind['to']}) - + if (keep): result.append(bind) else: stable = False - + if (stable): return result @@ -554,23 +554,23 @@ def direct_binds(binds): "Convert bindings matrix to set of sources by destination" - + result = {} - + for bind in binds: if (not bind['to'] in result): result[bind['to']] = set() - + result[bind['to']].add(bind['from']) - + return result def merge_arch(prefix, arch, outdir): "Merge subarchitecture into architecture" - + insts = [] binds = [] delegates = [] subsumes = [] - + if ('inst' in arch): for inst in arch['inst']: @@ -588,36 +588,36 @@ else: print("%s: '%s' is neither an architecture nor a frame" % (arch['name'], inst['type'])) - + if ('bind' in arch): for bind in arch['bind']: binds.append({'from': "%s_%s.%s" % (prefix, bind['from'][0], bind['from'][1]), 'to': "%s_%s.%s" % (prefix, bind['to'][0], bind['to'][1])}) - + if ('delegate' in arch): for delegate in arch['delegate']: delegates.append({'to': "%s.%s" % (prefix, delegate['from']), 'rep': "%s_%s.%s" % (prefix, delegate['to'][0], delegate['to'][1])}) - + if ('subsume' in arch): for subsume in arch['subsume']: subsumes.append({'from': "%s.%s" % (prefix, subsume['to']), 'rep': "%s_%s.%s" % (prefix, subsume['from'][0], subsume['from'][1])}) - + return (insts, binds, delegates, subsumes) def dump_archbp(outdir): "Dump system architecture Behavior Protocol" - + global opt_bp global opt_ebp - + arch = get_system_arch() - + if (arch is None): print("Unable to find system architecture") return - + insts = [] binds = [] delegates = [] subsumes = [] - + if ('inst' in arch): for inst in arch['inst']: @@ -635,21 +635,21 @@ else: print("%s: '%s' is neither an architecture nor a frame" % (arch['name'], inst['type'])) - + if ('bind' in arch): for bind in arch['bind']: binds.append({'from': "%s.%s" % (bind['from'][0], bind['from'][1]), 'to': "%s.%s" % (bind['to'][0], bind['to'][1])}) - + if ('delegate' in arch): for delegate in arch['delegate']: print("Unable to delegate interface in system architecture") break - + if ('subsume' in arch): for subsume in arch['subsume']: print("Unable to subsume interface in system architecture") break - + directed_binds = direct_binds(flatten_binds(binds, delegates, subsumes)) - + outname = os.path.join(outdir, "%s.archbp" % arch['name']) if ((opt_bp) or (opt_ebp)): @@ -657,14 +657,14 @@ else: outf = None - + create_null_bp("null.bp", outdir, outf) - + for inst in insts: dump_frame(directed_binds, inst['frame'], outdir, inst['var'], outf) - + for dst, src in directed_binds.items(): if (outf != None): outf.write("bind %s to %s\n" % (", ".join(src), dst)) - + if (outf != None): outf.close() @@ -672,10 +672,10 @@ def preproc_adl(raw, inarg): "Preprocess %% statements in ADL" - + return raw.replace("%%", inarg) def parse_adl(base, root, inname, nested, indent): "Parse Architecture Description Language" - + global output global context @@ -686,19 +686,19 @@ global initialization global finalization - + global iface_properties global frame_properties global arch_properties - + global arg0 - + if (nested): parts = inname.split("%") - + if (len(parts) > 1): inarg = parts[1] else: inarg = "%%" - + if (parts[0][0:1] == "/"): path = os.path.join(base, ".%s" % parts[0]) @@ -707,5 +707,5 @@ path = os.path.join(root, parts[0]) nested_root = root - + if (not os.path.isfile(path)): print("%s: Unable to include file %s" % (inname, path)) @@ -715,14 +715,14 @@ path = inname nested_root = root - + inf = open(path, "r") - + raw = preproc_adl(inf.read(), inarg) tokens = split_tokens(raw, ["\n", " ", "\t", "(", ")", "{", "}", "[", "]", "/*", "*/", "#", ";"], True, True) - + for token in tokens: - + # Includes - + if (INC in context): context.remove(INC) @@ -730,45 +730,45 @@ context.add(POST_INC) continue - + if (POST_INC in context): if (token != "]"): print("%s: Expected ]" % inname) - + context.remove(POST_INC) continue - + # Comments and newlines - + if (BLOCK_COMMENT in context): if (token == "*/"): context.remove(BLOCK_COMMENT) - + continue - + if (LINE_COMMENT in context): if (token == "\n"): context.remove(LINE_COMMENT) - + continue - + # Any context - + if (token == "/*"): context.add(BLOCK_COMMENT) continue - + if (token == "#"): context.add(LINE_COMMENT) continue - + if (token == "["): context.add(INC) continue - + if (token == "\n"): continue - + # "frame" - + if (FRAME in context): if (NULL in context): @@ -777,10 +777,10 @@ else: output += "%s\n" % token - + context.remove(NULL) context.remove(FRAME) frame = None continue - + if (BODY in context): if (FINALIZATION in context): @@ -789,20 +789,20 @@ elif (token == "}"): indent -= 1 - + if (((token[-1] == ":") and (indent == 0)) or (indent == -1)): bp = split_bp(finalization) finalization = None - + if (not frame in frame_properties): frame_properties[frame] = {} - + if ('finalization' in frame_properties[frame]): print("%s: Finalization protocol for frame '%s' already defined" % (inname, frame)) else: frame_properties[frame]['finalization'] = bp - + output += "\n%s" % tabs(2) output += parse_bp(inname, bp, 2) - + context.remove(FINALIZATION) if (indent == -1): @@ -817,5 +817,5 @@ finalization += token continue - + if (INITIALIZATION in context): if (token == "{"): @@ -823,20 +823,20 @@ elif (token == "}"): indent -= 1 - + if (((token[-1] == ":") and (indent == 0)) or (indent == -1)): bp = split_bp(initialization) initialization = None - + if (not frame in frame_properties): frame_properties[frame] = {} - + if ('initialization' in frame_properties[frame]): print("%s: Initialization protocol for frame '%s' already defined" % (inname, frame)) else: frame_properties[frame]['initialization'] = bp - + output += "\n%s" % tabs(2) output += parse_bp(inname, bp, 2) - + context.remove(INITIALIZATION) if (indent == -1): @@ -851,5 +851,5 @@ initialization += token continue - + if (PROTOCOL in context): if (token == "{"): @@ -857,20 +857,20 @@ elif (token == "}"): indent -= 1 - + if (((token[-1] == ":") and (indent == 0)) or (indent == -1)): bp = split_bp(protocol) protocol = None - + if (not frame in frame_properties): frame_properties[frame] = {} - + if ('protocol' in frame_properties[frame]): print("%s: Protocol for frame '%s' already defined" % (inname, frame)) else: frame_properties[frame]['protocol'] = bp - + output += "\n%s" % tabs(2) output += parse_bp(inname, bp, 2) - + context.remove(PROTOCOL) if (indent == -1): @@ -885,5 +885,5 @@ protocol += token continue - + if (REQUIRES in context): if (FIN in context): @@ -892,8 +892,8 @@ else: output += "%s" % token - + context.remove(FIN) continue - + if (VAR in context): if (not identifier(token)): @@ -902,17 +902,17 @@ if (not frame in frame_properties): frame_properties[frame] = {} - + if (not 'requires' in frame_properties[frame]): frame_properties[frame]['requires'] = [] - + frame_properties[frame]['requires'].append({'iface': arg0, 'var': token}) arg0 = None - + output += "%s" % token - + context.remove(VAR) context.add(FIN) continue - + if ((token == "}") or (token[-1] == ":")): context.remove(REQUIRES) @@ -923,8 +923,8 @@ arg0 = token output += "\n%s%s " % (tabs(indent), token) - + context.add(VAR) continue - + if (PROVIDES in context): if (FIN in context): @@ -933,8 +933,8 @@ else: output += "%s" % token - + context.remove(FIN) continue - + if (VAR in context): if (not identifier(token)): @@ -943,17 +943,17 @@ if (not frame in frame_properties): frame_properties[frame] = {} - + if (not 'provides' in frame_properties[frame]): frame_properties[frame]['provides'] = [] - + frame_properties[frame]['provides'].append({'iface': arg0, 'var': token}) arg0 = None - + output += "%s" % token - + context.remove(VAR) context.add(FIN) continue - + if ((token == "}") or (token[-1] == ":")): context.remove(PROVIDES) @@ -964,8 +964,8 @@ arg0 = token output += "\n%s%s " % (tabs(indent), token) - + context.add(VAR) continue - + if (token == "}"): if (indent != 2): @@ -974,19 +974,19 @@ indent = 0 output += "\n%s" % token - + context.remove(BODY) context.add(NULL) continue - + if (token == "provides:"): output += "\n%s%s" % (tabs(indent - 1), token) context.add(PROVIDES) continue - + if (token == "requires:"): output += "\n%s%s" % (tabs(indent - 1), token) context.add(REQUIRES) continue - + if (token == "initialization:"): output += "\n%s%s" % (tabs(indent - 1), token) @@ -995,5 +995,5 @@ initialization = "" continue - + if (token == "finalization:"): output += "\n%s%s" % (tabs(indent - 1), token) @@ -1002,5 +1002,5 @@ finalization = "" continue - + if (token == "protocol:"): output += "\n%s%s" % (tabs(indent - 1), token) @@ -1009,8 +1009,8 @@ protocol = "" continue - + print("%s: Unknown token '%s' in frame '%s'" % (inname, token, frame)) continue - + if (HEAD in context): if (token == "{"): @@ -1020,5 +1020,5 @@ context.add(BODY) continue - + if (token == ";"): output += "%s\n" % token @@ -1026,9 +1026,9 @@ context.remove(FRAME) continue - + print("%s: Unknown token '%s' in frame head '%s'" % (inname, token, frame)) - + continue - + if (not identifier(token)): print("%s: Expected frame name" % inname) @@ -1036,15 +1036,15 @@ frame = token output += "%s " % token - + if (not frame in frame_properties): frame_properties[frame] = {} - + frame_properties[frame]['name'] = frame - + context.add(HEAD) continue - + # "interface" - + if (IFACE in context): if (NULL in context): @@ -1053,10 +1053,10 @@ else: output += "%s\n" % token - + context.remove(NULL) context.remove(IFACE) interface = None continue - + if (BODY in context): if (PROTOCOL in context): @@ -1065,22 +1065,22 @@ elif (token == "}"): indent -= 1 - + if (indent == -1): bp = split_bp(protocol) protocol = None - + if (not interface in iface_properties): iface_properties[interface] = {} - + if ('protocol' in iface_properties[interface]): print("%s: Protocol for interface '%s' already defined" % (inname, interface)) else: iface_properties[interface]['protocol'] = bp - + output += "\n%s" % tabs(2) output += parse_bp(inname, bp, 2) output += "\n%s" % token indent = 0 - + context.remove(PROTOCOL) context.remove(BODY) @@ -1088,7 +1088,7 @@ else: protocol += token - - continue - + + continue + if (PROTOTYPE in context): if (FIN in context): @@ -1097,9 +1097,9 @@ else: output += "%s" % token - + context.remove(FIN) context.remove(PROTOTYPE) continue - + if (PAR_RIGHT in context): if (token == ")"): @@ -1109,7 +1109,7 @@ else: output += " %s" % token - - continue - + + continue + if (SIGNATURE in context): output += "%s" % token @@ -1117,9 +1117,9 @@ context.remove(SIGNATURE) context.add(FIN) - + context.remove(SIGNATURE) context.add(PAR_RIGHT) continue - + if (PAR_LEFT in context): if (token != "("): @@ -1127,17 +1127,17 @@ else: output += "%s" % token - + context.remove(PAR_LEFT) context.add(SIGNATURE) continue - + if (not identifier(token)): print("%s: Method identifier expected in interface '%s'" % (inname, interface)) else: output += "%s" % token - + context.add(PAR_LEFT) continue - + if (token == "}"): if (indent != 2): @@ -1146,14 +1146,14 @@ indent = 0 output += "\n%s" % token - + context.remove(BODY) context.add(NULL) continue - + if (token == "sysarg_t"): output += "\n%s%s " % (tabs(indent), token) context.add(PROTOTYPE) continue - + if (token == "protocol:"): output += "\n%s%s" % (tabs(indent - 1), token) @@ -1162,8 +1162,8 @@ protocol = "" continue - + print("%s: Unknown token '%s' in interface '%s'" % (inname, token, interface)) continue - + if (HEAD in context): if (PRE_BODY in context): @@ -1175,5 +1175,5 @@ context.add(BODY) continue - + if (token == ";"): output += "%s\n" % token @@ -1182,8 +1182,8 @@ context.remove(IFACE) continue - + print("%s: Expected '{' or ';' in interface head '%s'" % (inname, interface)) continue - + if (EXTENDS in context): if (not identifier(token)): @@ -1193,16 +1193,16 @@ if (not interface in iface_properties): iface_properties[interface] = {} - + iface_properties[interface]['extends'] = token - + context.remove(EXTENDS) context.add(PRE_BODY) continue - + if (token == "extends"): output += "%s " % token context.add(EXTENDS) continue - + if (token == "{"): output += "%s" % token @@ -1211,5 +1211,5 @@ context.add(BODY) continue - + if (token == ";"): output += "%s\n" % token @@ -1217,8 +1217,8 @@ context.remove(IFACE) continue - + print("%s: Expected 'extends', '{' or ';' in interface head '%s'" % (inname, interface)) continue - + if (not identifier(token)): print("%s: Expected interface name" % inname) @@ -1226,15 +1226,15 @@ interface = token output += "%s " % token - + if (not interface in iface_properties): iface_properties[interface] = {} - + iface_properties[interface]['name'] = interface - + context.add(HEAD) continue - + # "architecture" - + if (ARCH in context): if (NULL in context): @@ -1243,5 +1243,5 @@ else: output += "%s\n" % token - + context.remove(NULL) context.remove(ARCH) @@ -1249,5 +1249,5 @@ architecture = None continue - + if (BODY in context): if (DELEGATE in context): @@ -1257,9 +1257,9 @@ else: output += "%s" % token - + context.remove(FIN) context.remove(DELEGATE) continue - + if (VAR in context): if (not descriptor(token)): @@ -1268,17 +1268,17 @@ if (not architecture in arch_properties): arch_properties[architecture] = {} - + if (not 'delegate' in arch_properties[architecture]): arch_properties[architecture]['delegate'] = [] - + arch_properties[architecture]['delegate'].append({'from': arg0, 'to': token.split(":")}) arg0 = None - + output += "%s" % token - + context.add(FIN) context.remove(VAR) continue - + if (TO in context): if (token != "to"): @@ -1286,9 +1286,9 @@ else: output += "%s " % token - + context.add(VAR) context.remove(TO) continue - + if (not identifier(token)): print("%s: Expected interface name in architecture '%s'" % (inname, architecture)) @@ -1296,8 +1296,8 @@ output += "%s " % token arg0 = token - + context.add(TO) continue - + if (SUBSUME in context): if (FIN in context): @@ -1306,9 +1306,9 @@ else: output += "%s" % token - + context.remove(FIN) context.remove(SUBSUME) continue - + if (VAR in context): if (not identifier(token)): @@ -1317,17 +1317,17 @@ if (not architecture in arch_properties): arch_properties[architecture] = {} - + if (not 'subsume' in arch_properties[architecture]): arch_properties[architecture]['subsume'] = [] - + arch_properties[architecture]['subsume'].append({'from': arg0.split(":"), 'to': token}) arg0 = None - + output += "%s" % token - + context.add(FIN) context.remove(VAR) continue - + if (TO in context): if (token != "to"): @@ -1335,9 +1335,9 @@ else: output += "%s " % token - + context.add(VAR) context.remove(TO) continue - + if (not descriptor(token)): print("%s: Expected interface descriptor in architecture '%s'" % (inname, architecture)) @@ -1345,8 +1345,8 @@ output += "%s " % token arg0 = token - + context.add(TO) continue - + if (BIND in context): if (FIN in context): @@ -1355,9 +1355,9 @@ else: output += "%s" % token - + context.remove(FIN) context.remove(BIND) continue - + if (VAR in context): if (not descriptor(token)): @@ -1366,17 +1366,17 @@ if (not architecture in arch_properties): arch_properties[architecture] = {} - + if (not 'bind' in arch_properties[architecture]): arch_properties[architecture]['bind'] = [] - + arch_properties[architecture]['bind'].append({'from': arg0.split(":"), 'to': token.split(":")}) arg0 = None - + output += "%s" % token - + context.add(FIN) context.remove(VAR) continue - + if (TO in context): if (token != "to"): @@ -1384,9 +1384,9 @@ else: output += "%s " % token - + context.add(VAR) context.remove(TO) continue - + if (not descriptor(token)): print("%s: Expected interface descriptor in architecture '%s'" % (inname, architecture)) @@ -1394,8 +1394,8 @@ output += "%s " % token arg0 = token - + context.add(TO) continue - + if (INST in context): if (FIN in context): @@ -1404,9 +1404,9 @@ else: output += "%s" % token - + context.remove(FIN) context.remove(INST) continue - + if (VAR in context): if (not identifier(token)): @@ -1415,17 +1415,17 @@ if (not architecture in arch_properties): arch_properties[architecture] = {} - + if (not 'inst' in arch_properties[architecture]): arch_properties[architecture]['inst'] = [] - + arch_properties[architecture]['inst'].append({'type': arg0, 'var': token}) arg0 = None - + output += "%s" % token - + context.add(FIN) context.remove(VAR) continue - + if (not identifier(token)): print("%s: Expected frame/architecture type in architecture '%s'" % (inname, architecture)) @@ -1433,8 +1433,8 @@ output += "%s " % token arg0 = token - + context.add(VAR) continue - + if (token == "}"): if (indent != 1): @@ -1443,32 +1443,32 @@ indent -= 1 output += "\n%s" % token - + context.remove(BODY) context.add(NULL) continue - + if (token == "inst"): output += "\n%s%s " % (tabs(indent), token) context.add(INST) continue - + if (token == "bind"): output += "\n%s%s " % (tabs(indent), token) context.add(BIND) continue - + if (token == "subsume"): output += "\n%s%s " % (tabs(indent), token) context.add(SUBSUME) continue - + if (token == "delegate"): output += "\n%s%s " % (tabs(indent), token) context.add(DELEGATE) continue - + print("%s: Unknown token '%s' in architecture '%s'" % (inname, token, architecture)) continue - + if (HEAD in context): if (token == "{"): @@ -1478,5 +1478,5 @@ context.add(BODY) continue - + if (token == ";"): output += "%s\n" % token @@ -1485,12 +1485,12 @@ context.discard(SYSTEM) continue - + if (not word(token)): print("%s: Expected word in architecture head '%s'" % (inname, architecture)) else: output += "%s " % token - + continue - + if (not identifier(token)): print("%s: Expected architecture name" % inname) @@ -1498,18 +1498,18 @@ architecture = token output += "%s " % token - + if (not architecture in arch_properties): arch_properties[architecture] = {} - + arch_properties[architecture]['name'] = architecture - + if (SYSTEM in context): arch_properties[architecture]['system'] = True - + context.add(HEAD) continue - + # "system architecture" - + if (SYSTEM in context): if (token != "architecture"): @@ -1517,35 +1517,35 @@ else: output += "%s " % token - + context.add(ARCH) continue - + if (token == "frame"): output += "\n%s " % token context.add(FRAME) continue - + if (token == "interface"): output += "\n%s " % token context.add(IFACE) continue - + if (token == "system"): output += "\n%s " % token context.add(SYSTEM) continue - + if (token == "architecture"): output += "\n%s " % token context.add(ARCH) continue - + print("%s: Unknown token '%s'" % (inname, token)) - + inf.close() def open_adl(base, root, inname, outdir, outname): "Open Architecture Description file" - + global output global context @@ -1556,9 +1556,9 @@ global initialization global finalization - + global arg0 - + global opt_adl - + output = "" context = set() @@ -1570,8 +1570,8 @@ finalization = None arg0 = None - + parse_adl(base, root, inname, False, 0) output = output.strip() - + if ((output != "") and (opt_adl)): outf = open(outname, "w") @@ -1581,16 +1581,16 @@ def recursion(base, root, output, level): "Recursive directory walk" - + for name in os.listdir(root): canon = os.path.join(root, name) - + if (os.path.isfile(canon)): fcomp = split_tokens(canon, ["."]) cname = canon.split("/") - + if (fcomp[-1] == ".adl"): output_path = os.path.join(output, cname[-1]) open_adl(base, root, canon, output, output_path) - + if (os.path.isdir(canon)): recursion(base, canon, output, level + 1) @@ -1598,5 +1598,5 @@ def merge_dot_frame(prefix, name, frame, outf, indent): "Dump Dot frame" - + outf.write("%ssubgraph cluster_%s {\n" % (tabs(indent), prefix)) outf.write("%s\tlabel=\"%s\";\n" % (tabs(indent), name)) @@ -1605,11 +1605,11 @@ outf.write("%s\tfillcolor=yellow;\n" % tabs(indent)) outf.write("%s\t\n" % tabs(indent)) - + if ('provides' in frame): outf.write("%s\t%s__provides [label=\"\", shape=doublecircle, style=filled, color=green, fillcolor=yellow];\n" % (tabs(indent), prefix)) - + if ('requires' in frame): outf.write("%s\t%s__requires [label=\"\", shape=circle, style=filled, color=red, fillcolor=yellow];\n" % (tabs(indent), prefix)) - + outf.write("%s}\n" % tabs(indent)) outf.write("%s\n" % tabs(indent)) @@ -1617,10 +1617,10 @@ def merge_dot_arch(prefix, name, arch, outf, indent): "Dump Dot subarchitecture" - + outf.write("%ssubgraph cluster_%s {\n" % (tabs(indent), prefix)) outf.write("%s\tlabel=\"%s\";\n" % (tabs(indent), name)) outf.write("%s\tcolor=red;\n" % tabs(indent)) outf.write("%s\t\n" % tabs(indent)) - + if ('inst' in arch): for inst in arch['inst']: @@ -1634,5 +1634,5 @@ else: print("%s: '%s' is neither an architecture nor a frame" % (arch['name'], inst['type'])) - + if ('bind' in arch): labels = {} @@ -1642,28 +1642,28 @@ else: label = bind['from'][1] - + if (not (bind['from'][0], bind['to'][0]) in labels): labels[(bind['from'][0], bind['to'][0])] = [] - + labels[(bind['from'][0], bind['to'][0])].append(label) - + for bind in arch['bind']: if (not (bind['from'][0], bind['to'][0]) in labels): continue - + attrs = [] - + if (bind['from'][0] != bind['to'][0]): attrs.append("ltail=cluster_%s_%s" % (prefix, bind['from'][0])) attrs.append("lhead=cluster_%s_%s" % (prefix, bind['to'][0])) - + attrs.append("label=\"%s\"" % "\\n".join(labels[(bind['from'][0], bind['to'][0])])) del labels[(bind['from'][0], bind['to'][0])] - + outf.write("%s\t%s_%s__requires -> %s_%s__provides [%s];\n" % (tabs(indent), prefix, bind['from'][0], prefix, bind['to'][0], ", ".join(attrs))) - + if ('delegate' in arch): outf.write("%s\t%s__provides [label=\"\", shape=doublecircle, color=green];\n" % (tabs(indent), prefix)) - + labels = {} for delegate in arch['delegate']: @@ -1672,14 +1672,14 @@ else: label = delegate['from'] - + if (not delegate['to'][0] in labels): labels[delegate['to'][0]] = [] - + labels[delegate['to'][0]].append(label) - + for delegate in arch['delegate']: if (not delegate['to'][0] in labels): continue - + attrs = [] attrs.append("color=gray") @@ -1687,10 +1687,10 @@ attrs.append("label=\"%s\"" % "\\n".join(labels[delegate['to'][0]])) del labels[delegate['to'][0]] - + outf.write("%s\t%s__provides -> %s_%s__provides [%s];\n" % (tabs(indent), prefix, prefix, delegate['to'][0], ", ".join(attrs))) - + if ('subsume' in arch): outf.write("%s\t%s__requires [label=\"\", shape=circle, color=red];\n" % (tabs(indent), prefix)) - + labels = {} for subsume in arch['subsume']: @@ -1699,14 +1699,14 @@ else: label = subsume['to'] - + if (not subsume['from'][0] in labels): labels[subsume['from'][0]] = [] - + labels[subsume['from'][0]].append(label) - + for subsume in arch['subsume']: if (not subsume['from'][0] in labels): continue - + attrs = [] attrs.append("color=gray") @@ -1714,7 +1714,7 @@ attrs.append("label=\"%s\"" % "\\n".join(labels[subsume['from'][0]])) del labels[subsume['from'][0]] - + outf.write("%s\t%s_%s__requires -> %s__requires [%s];\n" % (tabs(indent), prefix, subsume['from'][0], prefix, ", ".join(attrs))) - + outf.write("%s}\n" % tabs(indent)) outf.write("%s\n" % tabs(indent)) @@ -1722,17 +1722,17 @@ def dump_dot(outdir): "Dump Dot architecture" - + global opt_dot - + arch = get_system_arch() - + if (arch is None): print("Unable to find system architecture") return - + if (opt_dot): outname = os.path.join(outdir, "%s.dot" % arch['name']) outf = open(outname, "w") - + outf.write("digraph {\n") outf.write("\tlabel=\"%s\";\n" % arch['name']) @@ -1741,5 +1741,5 @@ outf.write("\tedge [fontsize=8];\n") outf.write("\t\n") - + if ('inst' in arch): for inst in arch['inst']: @@ -1753,5 +1753,5 @@ else: print("%s: '%s' is neither an architecture nor a frame" % (arch['name'], inst['type'])) - + if ('bind' in arch): labels = {} @@ -1761,37 +1761,37 @@ else: label = bind['from'][1] - + if (not (bind['from'][0], bind['to'][0]) in labels): labels[(bind['from'][0], bind['to'][0])] = [] - + labels[(bind['from'][0], bind['to'][0])].append(label) - + for bind in arch['bind']: if (not (bind['from'][0], bind['to'][0]) in labels): continue - + attrs = [] - + if (bind['from'][0] != bind['to'][0]): attrs.append("ltail=cluster_%s" % bind['from'][0]) attrs.append("lhead=cluster_%s" % bind['to'][0]) - + attrs.append("label=\"%s\"" % "\\n".join(labels[(bind['from'][0], bind['to'][0])])) del labels[(bind['from'][0], bind['to'][0])] - + outf.write("\t%s__requires -> %s__provides [%s];\n" % (bind['from'][0], bind['to'][0], ", ".join(attrs))) - + if ('delegate' in arch): for delegate in arch['delegate']: print("Unable to delegate interface in system architecture") break - + if ('subsume' in arch): for subsume in arch['subsume']: print("Unable to subsume interface in system architecture") break - + outf.write("}\n") - + outf.close() @@ -1804,14 +1804,14 @@ global opt_adl global opt_dot - + if (len(sys.argv) < 3): usage(sys.argv[0]) return - + opt_bp = False opt_ebp = False opt_adl = False opt_dot = False - + for arg in sys.argv[1:(len(sys.argv) - 1)]: if (arg == "--bp"): @@ -1828,18 +1828,18 @@ print("Error: Unknown command line option '%s'" % arg) return - + if ((opt_bp) and (opt_ebp)): print("Error: Cannot dump both original Behavior Protocols and Extended Behavior Protocols") return - + path = os.path.abspath(sys.argv[-1]) if (not os.path.isdir(path)): print("Error: is not a directory") return - + iface_properties = {} frame_properties = {} arch_properties = {} - + recursion(".", ".", path, 0) dump_archbp(path) Index: contrib/qemu/build-from-scratch.sh =================================================================== --- contrib/qemu/build-from-scratch.sh (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ contrib/qemu/build-from-scratch.sh (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -90,10 +90,10 @@ wget ${URL} fi - + if [ "`md5sum ${TARBALL} | cut -f 1 -d " "`" != ${MD5} ]; then echo Wrong MD5 checksum exit fi - + tar xvfj ${TARBALL} cd ${SOURCEDIR} Index: contrib/tools/gen_vga323.c =================================================================== --- contrib/tools/gen_vga323.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ contrib/tools/gen_vga323.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -36,8 +36,8 @@ { unsigned int i; - + for (i = 0; i < 256; i++) printf("\t.byte 0x%02x, 0x%02x, 0x%02x, 0x00\n", BLUE(i) * 9, GREEN(i) * 21, RED(i) * 9); - + return 0; } Index: contrib/tools/random_check.sh =================================================================== --- contrib/tools/random_check.sh (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ contrib/tools/random_check.sh (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -88,10 +88,10 @@ COUNTER=$(( $COUNTER + 1 )) echo "Try #$COUNTER ($FAILED failed):" >&2 - + ( echo " Cleaning after previous build." >&2 make distclean -j$JOBS 2>&1 || exit 1 - - + + echo " Preparing random configuration." >&2 # It would be nicer to allow set the constraints directly to @@ -105,9 +105,9 @@ exit 2 fi - + make random-config 2>&1 || exit 1 - + tr -d ' ' "${FILENAME_PREFIX}config.trimmed" - + THIS_CONFIG_OKAY=true while read pattern; do @@ -117,13 +117,13 @@ fi done <"$PRUNE_CONFIG_FILE" - + rm -f "${FILENAME_PREFIX}config.trimmed" - + if $THIS_CONFIG_OKAY; then break fi done - - + + # Report basic info about the configuration and build it BASIC_CONFIG=`sed -n \ @@ -134,5 +134,5 @@ | paste '-sd,' | sed 's#,#, #g'` echo -n " Building ($BASIC_CONFIG)... " >&2 - + make -j$JOBS 2>&1 if [ $? -eq 0 ]; then @@ -143,13 +143,13 @@ exit 1 fi - + ) >random_run_$COUNTER.log RC=$? - + if [ $RC -ne 0 ]; then tail -n 10 random_run_$COUNTER.log | sed 's#.*# | &#' FAILED=$(( $FAILED + 1 )) fi - + if [ -e Makefile.config ]; then cp Makefile.config "$FILENAME_PREFIX$COUNTER.Makefile.config" Index: contrib/tools/toolchain_check.sh =================================================================== --- contrib/tools/toolchain_check.sh (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ contrib/tools/toolchain_check.sh (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,13 +38,13 @@ objcopy_path=`echo "$arch_path"/bin/*-objcopy` gdb_path=`echo "$arch_path"/bin/*-gdb` - + print_version "$ld_path" "Linker not found!" || continue - + print_version "$objcopy_path" "objcopy not found!" || continue - + print_version "$gcc_path" "GCC not found!" || continue check_define "$gcc_path" "__helenos__" 1 || continue check_define "$gcc_path" "helenos_uarch" "$arch" || continue - + print_version "$gdb_path" "GDB not found!" || continue done Index: kernel/arch/abs32le/include/arch/asm.h =================================================================== --- kernel/arch/abs32le/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,5 +50,5 @@ low-power mode) without any possibility of exitting this function. */ - + while (true); } @@ -137,5 +137,5 @@ * The return value stores the previous interrupt level. */ - + return 0; } @@ -151,5 +151,5 @@ * The return value stores the previous interrupt level. */ - + return 0; } @@ -169,5 +169,5 @@ * level. */ - + return 0; } @@ -179,5 +179,5 @@ * disabled. */ - + return false; } @@ -192,5 +192,5 @@ * address space. */ - + return 0; } Index: kernel/arch/abs32le/include/arch/atomic.h =================================================================== --- kernel/arch/abs32le/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ /* On real hardware the increment has to be done as an atomic action. */ - + val->count++; } @@ -60,5 +60,5 @@ /* On real hardware the decrement has to be done as an atomic action. */ - + val->count--; } @@ -72,7 +72,7 @@ value and the increment have to be done as a single atomic action. */ - + atomic_count_t prev = val->count; - + val->count++; return prev; @@ -87,7 +87,7 @@ value and the decrement have to be done as a single atomic action. */ - + atomic_count_t prev = val->count; - + val->count--; return prev; @@ -104,5 +104,5 @@ value and storing 1 have to be done as a single atomic action. */ - + atomic_count_t prev = val->count; val->count = 1; Index: kernel/arch/abs32le/include/arch/istate.h =================================================================== --- kernel/arch/abs32le/include/arch/istate.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/include/arch/istate.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,5 +67,5 @@ /* On real hardware this checks whether the interrupted context originated from user space. */ - + return !(istate->ip & UINT32_C(0x80000000)); } @@ -76,5 +76,5 @@ { /* On real hardware this sets the instruction pointer. */ - + istate->ip = retaddr; } @@ -84,5 +84,5 @@ { /* On real hardware this returns the instruction pointer. */ - + return istate->ip; } @@ -92,5 +92,5 @@ { /* On real hardware this returns the frame pointer. */ - + return istate->fp; } Index: kernel/arch/abs32le/include/arch/mm/page.h =================================================================== --- kernel/arch/abs32le/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -140,5 +140,5 @@ unsigned int pat : 1; unsigned int global : 1; - + /** Valid content even if the present bit is not set. */ unsigned int soft_valid : 1; @@ -151,5 +151,5 @@ { pte_t *p = &pt[i]; - + return ( ((unsigned int) (!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT) | @@ -168,5 +168,5 @@ { pte_t *p = &pt[i]; - + p->page_cache_disable = !(flags & PAGE_CACHEABLE); p->present = !(flags & PAGE_NOT_PRESENT); @@ -174,5 +174,5 @@ p->writeable = (flags & PAGE_WRITE) != 0; p->global = (flags & PAGE_GLOBAL) != 0; - + /* * Ensure that there is at least one bit set even if the present bit is Index: kernel/arch/abs32le/src/abs32le.c =================================================================== --- kernel/arch/abs32le/src/abs32le.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/src/abs32le.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ /* Initialize IRQ routing */ irq_init(0, 0); - + /* Merge all memory zones to 1 big zone */ zone_merge_all(); Index: kernel/arch/abs32le/src/userspace.c =================================================================== --- kernel/arch/abs32le/src/userspace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/abs32le/src/userspace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,5 +43,5 @@ /* On real hardware this switches the CPU to user space mode and jumps to kernel_uarg->uspace_entry. */ - + while (true); } Index: kernel/arch/amd64/include/arch/asm.h =================================================================== --- kernel/arch/amd64/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,5 +53,5 @@ { uintptr_t v; - + asm volatile ( "andq %%rsp, %[v]\n" @@ -59,5 +59,5 @@ : "0" (~((uint64_t) STACK_SIZE - 1)) ); - + return v; } @@ -91,5 +91,5 @@ if (port < (ioport8_t *) IO_SPACE_BOUNDARY) { uint8_t val; - + asm volatile ( "inb %w[port], %b[val]\n" @@ -97,5 +97,5 @@ : [port] "d" (port) ); - + return val; } else @@ -115,5 +115,5 @@ if (port < (ioport16_t *) IO_SPACE_BOUNDARY) { uint16_t val; - + asm volatile ( "inw %w[port], %w[val]\n" @@ -121,5 +121,5 @@ : [port] "d" (port) ); - + return val; } else @@ -139,5 +139,5 @@ if (port < (ioport32_t *) IO_SPACE_BOUNDARY) { uint32_t val; - + asm volatile ( "inl %w[port], %[val]\n" @@ -145,5 +145,5 @@ : [port] "d" (port) ); - + return val; } else @@ -252,7 +252,7 @@ { ipl_t ipl = interrupts_read(); - + asm volatile ("sti\n"); - + return ipl; } @@ -268,7 +268,7 @@ { ipl_t ipl = interrupts_read(); - + asm volatile ("cli\n"); - + return ipl; } @@ -310,5 +310,5 @@ { uint32_t ax, dx; - + asm volatile ( "rdmsr\n" @@ -316,5 +316,5 @@ : "c" (msr) ); - + return ((uint64_t) dx << 32) | ax; } Index: kernel/arch/amd64/include/arch/atomic.h =================================================================== --- kernel/arch/amd64/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -74,5 +74,5 @@ { atomic_count_t r = 1; - + asm volatile ( "lock xaddq %[r], %[count]\n" @@ -80,5 +80,5 @@ [r] "+r" (r) ); - + return r; } @@ -87,5 +87,5 @@ { atomic_count_t r = -1; - + asm volatile ( "lock xaddq %[r], %[count]\n" @@ -93,5 +93,5 @@ [r] "+r" (r) ); - + return r; } @@ -103,5 +103,5 @@ { atomic_count_t v = 1; - + asm volatile ( "xchgq %[v], %[count]\n" @@ -109,5 +109,5 @@ [count] "+m" (val->count) ); - + return v; } @@ -117,5 +117,5 @@ { atomic_count_t tmp; - + preemption_disable(); asm volatile ( @@ -125,5 +125,5 @@ " testq %[tmp], %[tmp]\n" " jnz 0b\n" /* lightweight looping on locked spinlock */ - + " incq %[tmp]\n" /* now use the atomic operation */ " xchgq %[count], %[tmp]\n" @@ -133,5 +133,5 @@ [tmp] "=&r" (tmp) ); - + /* * Prevent critical section code from bleeding out this way up. Index: kernel/arch/amd64/include/arch/cpu.h =================================================================== --- kernel/arch/amd64/include/arch/cpu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/include/arch/cpu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -89,7 +89,7 @@ int stepping; tss_t *tss; - + unsigned int id; /** CPU's local, ie physical, APIC ID. */ - + size_t iomapver_copy; /** Copy of TASK's I/O Permission bitmap generation count. */ } cpu_arch_t; Index: kernel/arch/amd64/include/arch/cycle.h =================================================================== --- kernel/arch/amd64/include/arch/cycle.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/include/arch/cycle.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -42,5 +42,5 @@ uint32_t lower; uint32_t upper; - + asm volatile ( "rdtsc\n" @@ -48,5 +48,5 @@ "=d" (upper) ); - + return ((uint64_t) lower) | (((uint64_t) upper) << 32); } Index: kernel/arch/amd64/include/arch/mm/page.h =================================================================== --- kernel/arch/amd64/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -210,5 +210,5 @@ { pte_t *p = &pt[i]; - + return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT | (!p->present) << PAGE_PRESENT_SHIFT | @@ -223,5 +223,5 @@ { pte_t *p = &pt[i]; - + p->addr_12_31 = (a >> 12) & UINT32_C(0xfffff); p->addr_32_51 = a >> 32; @@ -231,5 +231,5 @@ { pte_t *p = &pt[i]; - + p->page_cache_disable = !(flags & PAGE_CACHEABLE); p->present = !(flags & PAGE_NOT_PRESENT); @@ -238,5 +238,5 @@ p->no_execute = (flags & PAGE_EXEC) == 0; p->global = (flags & PAGE_GLOBAL) != 0; - + /* * Ensure that there is at least one bit set even if the present bit is cleared. Index: kernel/arch/amd64/src/amd64.c =================================================================== --- kernel/arch/amd64/src/amd64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/amd64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -92,5 +92,5 @@ multiboot_info_parse(signature, (multiboot_info_t *) info); multiboot2_info_parse(signature, (multiboot2_info_t *) info); - + #ifdef CONFIG_SMP /* Copy AP bootstrap routines below 1 MB. */ @@ -106,17 +106,17 @@ /* Enable FPU */ cpu_setup_fpu(); - + /* Initialize segmentation */ pm_init(); - + /* Disable I/O on nonprivileged levels, clear the nested-thread flag */ write_rflags(read_rflags() & ~(RFLAGS_IOPL | RFLAGS_NT)); /* Disable alignment check */ write_cr0(read_cr0() & ~CR0_AM); - + if (config.cpu_active == 1) { interrupt_init(); bios_init(); - + /* PIC */ i8259_init(); @@ -132,16 +132,16 @@ /* Initialize IRQ routing */ irq_init(IRQ_COUNT, IRQ_COUNT); - + /* hard clock */ i8254_init(); - + #if (defined(CONFIG_FB) || defined(CONFIG_EGA)) bool bfb = false; #endif - + #ifdef CONFIG_FB bfb = bfb_init(); #endif - + #ifdef CONFIG_EGA if (!bfb) { @@ -151,9 +151,9 @@ } #endif - + /* Merge all memory zones to 1 big zone */ zone_merge_all(); } - + /* Setup fast SYSCALL/SYSRET */ syscall_setup_cpu(); @@ -235,5 +235,5 @@ } #endif - + if (irqs_info != NULL) sysinfo_set_item_val(irqs_info, NULL, true); Index: kernel/arch/amd64/src/asm.S =================================================================== --- kernel/arch/amd64/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -60,16 +60,16 @@ FUNCTION_BEGIN(memcpy_to_uspace) movq MEMCPY_DST, %rax - + movq MEMCPY_SIZE, %rcx shrq $3, %rcx /* size / 8 */ - + rep movsq /* copy as much as possible word by word */ - + movq MEMCPY_SIZE, %rcx andq $7, %rcx /* size % 8 */ jz 0f - + rep movsb /* copy the rest byte by byte */ - + 0: ret /* return MEMCPY_SRC, success */ @@ -92,18 +92,18 @@ popq %rax movq %rax, %rdx - + /* Flip the ID bit */ xorl $RFLAGS_ID, %edx - + /* Store RFLAGS */ pushq %rdx popfq pushfq - + /* Get the ID bit again */ popq %rdx andl $RFLAGS_ID, %eax andl $RFLAGS_ID, %edx - + /* 0 if not supported, 1 if supported */ xorl %edx, %eax @@ -114,8 +114,8 @@ /* Preserve %rbx across function calls */ movq %rbx, %r10 - + /* Load the command into %eax */ movl %edi, %eax - + cpuid movl %eax, 0(%rsi) @@ -123,5 +123,5 @@ movl %ecx, 8(%rsi) movl %edx, 12(%rsi) - + movq %r10, %rbx ret @@ -161,5 +161,5 @@ * code. */ - + .iflt \i-32 .if (1 << \i) & ERROR_WORD_INTERRUPT_LIST @@ -180,5 +180,5 @@ subq $(ISTATE_SOFT_SIZE + 8), %rsp .endif - + /* * Save the general purpose registers. @@ -230,5 +230,5 @@ movq $(\i), %rdi /* pass intnum in the first argument */ movq %rsp, %rsi /* pass istate address in the second argument */ - + cld @@ -250,5 +250,5 @@ movq ISTATE_OFFSET_R10(%rsp), %r10 movq ISTATE_OFFSET_R11(%rsp), %r11 - + /* $8 = Skip error word */ addq $(ISTATE_SOFT_SIZE + 8), %rsp @@ -288,5 +288,5 @@ /* Switch to hidden %gs */ swapgs - + movq %rsp, %gs:KSEG_OFFSET_USTACK_RSP /* save this thread's user RSP */ movq %gs:KSEG_OFFSET_KSTACK_RSP, %rsp /* set this thread's kernel RSP */ @@ -346,5 +346,5 @@ swapgs sti - + /* Copy the 4th argument where it is expected */ movq %r10, %rcx @@ -364,5 +364,5 @@ cli - + /* * Restore registers needed for return via the SYSRET instruction and @@ -394,5 +394,5 @@ callq fault_from_uspace /* not reached */ - + bad_rip_msg: .asciz "Invalid instruction pointer." @@ -414,89 +414,89 @@ FUNCTION_BEGIN(early_putchar) #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) - + /* Prologue, save preserved registers */ pushq %rbp movq %rsp, %rbp pushq %rbx - + movq %rdi, %rsi movq $(PA2KA(0xb8000)), %rdi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb early_putchar_cursor_ok - + movw $1998, %ax - + early_putchar_cursor_ok: - + movw %ax, %bx shl $1, %rax addq %rax, %rdi - + movq %rsi, %rax - + cmp $0x0a, %al jne early_putchar_backspace - + /* Interpret newline */ - + movw %bx, %ax /* %bx -> %dx:%ax */ xorw %dx, %dx - + movw $80, %cx idivw %cx, %ax /* %dx = %bx % 80 */ - + /* %bx <- %bx + 80 - (%bx % 80) */ addw %cx, %bx subw %dx, %bx - + jmp early_putchar_skip - + early_putchar_backspace: - + cmp $0x08, %al jne early_putchar_print - + /* Interpret backspace */ - + cmp $0x0000, %bx je early_putchar_skip - + dec %bx jmp early_putchar_skip - + early_putchar_print: - + /* Print character */ - + movb $0x0e, %ah /* black background, yellow foreground */ stosw inc %bx - + early_putchar_skip: - + /* Sanity check for the cursor on the last line */ cmp $2000, %bx jb early_putchar_no_scroll - + /* Scroll the screen (24 rows) */ movq $(PA2KA(0xb80a0)), %rsi @@ -504,39 +504,39 @@ movl $480, %ecx rep movsq - + /* Clear the 24th row */ xorl %eax, %eax movl $20, %ecx rep stosq - + /* Go to row 24 */ movw $1920, %bx - + early_putchar_no_scroll: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + /* Epilogue, restore preserved registers */ popq %rbx leave - + #endif - + ret FUNCTION_END(early_putchar) Index: kernel/arch/amd64/src/boot/multiboot.S =================================================================== --- kernel/arch/amd64/src/boot/multiboot.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/boot/multiboot.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -78,8 +78,8 @@ cli cld - + /* Initialize stack pointer */ movl $START_STACK, %esp - + /* * Initialize Global Descriptor Table and @@ -88,5 +88,5 @@ lgdtl bootstrap_gdtr lidtl bootstrap_idtr - + /* Kernel data + stack */ movw $GDT_SELECTOR(KDATA_DES), %cx @@ -94,5 +94,5 @@ movw %cx, %ds movw %cx, %ss - + /* * Simics seems to remove hidden part of GS on entering user mode @@ -102,77 +102,77 @@ movw %cx, %fs movw %cx, %gs - + jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot_meeting_point multiboot_meeting_point: - + /* * Protected 32-bit. We want to reuse the code-seg descriptor, * the Default operand size must not be 1 when entering long mode. */ - + /* Save multiboot arguments */ movl %eax, multiboot_eax movl %ebx, multiboot_ebx - + pm_status $status_prot - + movl $(INTEL_CPUID_EXTENDED), %eax cpuid cmp $(INTEL_CPUID_EXTENDED), %eax ja extended_cpuid_supported - + pm_error $err_extended_cpuid - + extended_cpuid_supported: - + movl $(AMD_CPUID_EXTENDED), %eax cpuid bt $(AMD_EXT_LONG_MODE), %edx jc long_mode_supported - + pm_error $err_long_mode - + long_mode_supported: - + bt $(AMD_EXT_NOEXECUTE), %edx jc noexecute_supported - + pm_error $err_noexecute - + noexecute_supported: - + movl $(INTEL_CPUID_STANDARD), %eax cpuid bt $(INTEL_FXSAVE), %edx jc fx_supported - + pm_error $err_fx - + fx_supported: - + bt $(INTEL_SSE2), %edx jc sse2_supported - + pm_error $err_sse2 - + sse2_supported: - + #include "vesa_prot.inc" - + pm2_status $status_prot2 - + /* * Enable 64-bit page translation entries - CR4.PAE = 1. * Paging is not enabled until after long mode is enabled. */ - + movl %cr4, %eax orl $CR4_PAE, %eax movl %eax, %cr4 - + /* Set up paging tables */ leal ptl_0, %eax movl %eax, %cr3 - + /* Enable long mode */ movl $AMD_MSR_EFER, %ecx @@ -180,10 +180,10 @@ orl $AMD_LME, %eax /* set LME = 1 */ wrmsr - + /* Enable paging to activate long mode (set CR0.PG = 1) */ movl %cr0, %eax orl $CR0_PG, %eax movl %eax, %cr0 - + /* At this point we are in compatibility mode */ jmpl $GDT_SELECTOR(KTEXT_DES), $start64 @@ -204,48 +204,48 @@ movl $0xb8000, %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb err_cursor_ok - + movw $1998, %ax - + err_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + err_ploop: lodsb - + cmp $0, %al je err_ploop_end - + movb $0x0c, %ah /* black background, light red foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb err_ploop - + /* Scroll the screen (24 rows) */ movl %esi, %edx @@ -254,36 +254,36 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movl %edx, %esi movl $0xb8f00, %edi movw $1920, %bx - + jmp err_ploop err_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + cli hlt1: @@ -311,51 +311,51 @@ pushl %edx pushl %edi - + movl $0xb8000, %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb pm_puts_cursor_ok - + movw $1998, %ax - + pm_puts_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + pm_puts_ploop: lodsb - + cmp $0, %al je pm_puts_ploop_end - + movb $0x0a, %ah /* black background, light green foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb pm_puts_ploop - + /* Scroll the screen (24 rows) */ movl %esi, %edx @@ -364,36 +364,36 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movl %edx, %esi movl $0xb8f00, %edi movw $1920, %bx - + jmp pm_puts_ploop pm_puts_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + popl %edi popl %edx @@ -401,5 +401,5 @@ popl %ebx popl %eax - + ret @@ -414,21 +414,21 @@ start64: - + /* * Long mode. */ - + movq $(PA2KA(START_STACK)), %rsp - + /* Create the first stack frame */ pushq $0 movq %rsp, %rbp - + long_status $status_long - + /* Call amd64_pre_main(multiboot_eax, multiboot_ebx) */ movl multiboot_eax, %edi movl multiboot_ebx, %esi - + #ifdef MEMORY_MODEL_large movabsq $amd64_pre_main, %rax @@ -437,7 +437,7 @@ callq amd64_pre_main #endif - + long_status $status_main - + /* Call main_bsp() */ #ifdef MEMORY_MODEL_large @@ -447,5 +447,5 @@ callq main_bsp #endif - + /* Not reached */ cli @@ -468,59 +468,59 @@ */ early_puts: - + #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) - + /* Prologue, save preserved registers */ pushq %rbp movq %rsp, %rbp pushq %rbx - + movq %rdi, %rsi movq $(PA2KA(0xb8000)), %rdi /* base of EGA text mode memory */ xorq %rax, %rax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb early_puts_cursor_ok - + movw $1998, %ax - + early_puts_cursor_ok: - + movw %ax, %bx shl $1, %rax addq %rax, %rdi - + early_puts_ploop: lodsb - + cmp $0, %al je early_puts_ploop_end - + movb $0x0e, %ah /* black background, yellow foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb early_puts_ploop - + /* Scroll the screen (24 rows) */ movq %rsi, %rdx @@ -529,42 +529,42 @@ movl $480, %ecx rep movsq - + /* Clear the 24th row */ xorl %eax, %eax movl $20, %ecx rep stosq - + /* Go to row 24 */ movq %rdx, %rsi movq $(PA2KA(0xb8f00)), %rdi movw $1920, %bx - + jmp early_puts_ploop early_puts_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + /* Epilogue, restore preserved registers */ popq %rbx leave - + #endif - + ret Index: kernel/arch/amd64/src/boot/multiboot2.S =================================================================== --- kernel/arch/amd64/src/boot/multiboot2.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/boot/multiboot2.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,5 +47,5 @@ .long multiboot2_header_end - multiboot2_header_start .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH_I386 + (multiboot2_header_end - multiboot2_header_start)) - + /* Information request tag */ .align 8 @@ -61,5 +61,5 @@ #endif tag_info_req_end: - + /* Address tag */ .align 8 @@ -73,5 +73,5 @@ .long 0 tag_address_end: - + /* Entry address tag */ .align 8 @@ -82,5 +82,5 @@ .long multiboot2_image_start tag_entry_address_end: - + /* Flags tag */ .align 8 @@ -91,5 +91,5 @@ .long MULTIBOOT2_FLAGS_CONSOLE tag_flags_end: - + #ifdef CONFIG_FB /* Framebuffer tag */ @@ -104,5 +104,5 @@ tag_framebuffer_end: #endif - + /* Module alignment tag */ .align 8 @@ -113,5 +113,5 @@ .long 0 tag_module_align_end: - + /* Tag terminator */ .align 8 @@ -126,8 +126,8 @@ cli cld - + /* Initialize stack pointer */ movl $START_STACK, %esp - + /* * Initialize Global Descriptor Table and @@ -136,5 +136,5 @@ lgdtl bootstrap_gdtr lidtl bootstrap_idtr - + /* Kernel data + stack */ movw $GDT_SELECTOR(KDATA_DES), %cx @@ -142,5 +142,5 @@ movw %cx, %ds movw %cx, %ss - + /* * Simics seems to remove hidden part of GS on entering user mode @@ -150,71 +150,71 @@ movw %cx, %fs movw %cx, %gs - + jmpl $GDT_SELECTOR(KTEXT32_DES), $multiboot2_meeting_point multiboot2_meeting_point: - + /* * Protected 32-bit. We want to reuse the code-seg descriptor, * the Default operand size must not be 1 when entering long mode. */ - + /* Save multiboot arguments */ movl %eax, multiboot_eax movl %ebx, multiboot_ebx - + movl $(INTEL_CPUID_EXTENDED), %eax cpuid cmp $(INTEL_CPUID_EXTENDED), %eax ja extended_cpuid_supported - - jmp pm_error_halt - + + jmp pm_error_halt + extended_cpuid_supported: - + movl $(AMD_CPUID_EXTENDED), %eax cpuid bt $(AMD_EXT_LONG_MODE), %edx jc long_mode_supported - - jmp pm_error_halt - + + jmp pm_error_halt + long_mode_supported: - + bt $(AMD_EXT_NOEXECUTE), %edx jc noexecute_supported - - jmp pm_error_halt - + + jmp pm_error_halt + noexecute_supported: - + movl $(INTEL_CPUID_STANDARD), %eax cpuid bt $(INTEL_FXSAVE), %edx jc fx_supported - - jmp pm_error_halt - + + jmp pm_error_halt + fx_supported: - + bt $(INTEL_SSE2), %edx jc sse2_supported - - jmp pm_error_halt - + + jmp pm_error_halt + sse2_supported: - + /* * Enable 64-bit page translation entries - CR4.PAE = 1. * Paging is not enabled until after long mode is enabled. */ - + movl %cr4, %eax orl $CR4_PAE, %eax movl %eax, %cr4 - + /* Set up paging tables */ leal ptl_0, %eax movl %eax, %cr3 - + /* Enable long mode */ movl $AMD_MSR_EFER, %ecx @@ -222,10 +222,10 @@ orl $AMD_LME, %eax /* set LME = 1 */ wrmsr - + /* Enable paging to activate long mode (set CR0.PG = 1) */ movl %cr0, %eax orl $CR0_PG, %eax movl %eax, %cr0 - + /* At this point we are in compatibility mode */ jmpl $GDT_SELECTOR(KTEXT_DES), $start64 @@ -240,19 +240,19 @@ start64: - + /* * Long mode. */ - + movq $(PA2KA(START_STACK)), %rsp - + /* Create the first stack frame */ pushq $0 movq %rsp, %rbp - + /* Call amd64_pre_main(multiboot_eax, multiboot_ebx) */ movl multiboot_eax, %edi movl multiboot_ebx, %esi - + #ifdef MEMORY_MODEL_large movabsq $amd64_pre_main, %rax @@ -261,5 +261,5 @@ callq amd64_pre_main #endif - + /* Call main_bsp() */ #ifdef MEMORY_MODEL_large @@ -269,5 +269,5 @@ callq main_bsp #endif - + /* Not reached */ cli Index: kernel/arch/amd64/src/context.S =================================================================== --- kernel/arch/amd64/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,8 +40,8 @@ FUNCTION_BEGIN(context_save_arch) movq (%rsp), %rdx # the caller's return %rip - + movq %rdx, CONTEXT_OFFSET_PC(%rdi) movq %rsp, CONTEXT_OFFSET_SP(%rdi) - + movq %rbx, CONTEXT_OFFSET_RBX(%rdi) movq %rbp, CONTEXT_OFFSET_RBP(%rdi) @@ -50,5 +50,5 @@ movq %r14, CONTEXT_OFFSET_R14(%rdi) movq %r15, CONTEXT_OFFSET_R15(%rdi) - + #ifdef MEMORY_MODEL_large movabsq $vreg_ptr, %rsi @@ -59,5 +59,5 @@ movq %fs:VREG_TP(%rsi), %rsi movq %rsi, CONTEXT_OFFSET_TP(%rdi) - + xorl %eax, %eax # context_save returns 1 incl %eax @@ -78,10 +78,10 @@ movq CONTEXT_OFFSET_RBP(%rdi), %rbp movq CONTEXT_OFFSET_RBX(%rdi), %rbx - + movq CONTEXT_OFFSET_SP(%rdi), %rsp - + movq CONTEXT_OFFSET_PC(%rdi), %rdx movq %rdx, (%rsp) - + movq CONTEXT_OFFSET_TP(%rdi), %rcx #ifdef MEMORY_MODEL_large @@ -92,5 +92,5 @@ #endif movq %rcx, %fs:VREG_TP(%rsi) - + xorl %eax, %eax # context_restore returns 0 ret Index: kernel/arch/amd64/src/cpu/cpu.c =================================================================== --- kernel/arch/amd64/src/cpu/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/cpu/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -106,9 +106,9 @@ { cpu_info_t info; - + CPU->arch.vendor = VendorUnknown; if (has_cpuid()) { cpuid(INTEL_CPUID_LEVEL, &info); - + /* * Check for AMD processor. @@ -119,5 +119,5 @@ CPU->arch.vendor = VendorAMD; } - + /* * Check for Intel processor. @@ -128,5 +128,5 @@ CPU->arch.vendor = VendorIntel; } - + cpuid(INTEL_CPUID_STANDARD, &info); CPU->arch.family = (info.cpuid_eax >> 8) & 0xf; Index: kernel/arch/amd64/src/ddi/ddi.c =================================================================== --- kernel/arch/amd64/src/ddi/ddi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/ddi/ddi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,16 +59,16 @@ /* First, copy the I/O Permission Bitmap. */ irq_spinlock_lock(&TASK->lock, false); - + size_t ver = TASK->arch.iomapver; size_t elements = TASK->arch.iomap.elements; - + if (elements > 0) { assert(TASK->arch.iomap.bits); - + bitmap_t iomap; bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, CPU->arch.tss->iomap); bitmap_copy(&iomap, &TASK->arch.iomap, elements); - + /* * Set the trailing bits in the last byte of the map to disable @@ -77,5 +77,5 @@ bitmap_set_range(&iomap, elements, ALIGN_UP(elements, 8) - elements); - + /* * It is safe to set the trailing eight bits because of the @@ -84,7 +84,7 @@ bitmap_set_range(&iomap, ALIGN_UP(elements, 8), 8); } - + irq_spinlock_unlock(&TASK->lock, false); - + /* * Second, adjust TSS segment limit. @@ -93,10 +93,10 @@ ptr_16_64_t cpugdtr; gdtr_store(&cpugdtr); - + descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base; size_t size = bitmap_size(elements); gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size); gdtr_load(&cpugdtr); - + /* * Before we load new TSS limit, the current TSS descriptor @@ -106,5 +106,5 @@ tss_desc->type = AR_TSS; tr_load(GDT_SELECTOR(TSS_DES)); - + /* * Update the generation count so that faults caused by Index: kernel/arch/amd64/src/debug/stacktrace.c =================================================================== --- kernel/arch/amd64/src/debug/stacktrace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/debug/stacktrace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,5 +50,5 @@ uint64_t *stack = (void *) ctx->fp; *prev = stack[FRAME_OFFSET_FP_PREV]; - + return true; } @@ -58,5 +58,5 @@ uint64_t *stack = (void *) ctx->fp; *ra = stack[FRAME_OFFSET_RA]; - + return true; } Index: kernel/arch/amd64/src/delay.S =================================================================== --- kernel/arch/amd64/src/delay.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/delay.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -39,5 +39,5 @@ dec %rdi jnz 0b - + ret FUNCTION_END(asm_delay_loop) @@ -47,5 +47,5 @@ dec %rdi jz 0b - + ret FUNCTION_END(asm_fake_loop) Index: kernel/arch/amd64/src/interrupt.c =================================================================== --- kernel/arch/amd64/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,12 +70,12 @@ "rfl=%0#18" PRIx64 "\terr=%0#18" PRIx64 "\n", istate->cs, istate->rip, istate->rflags, istate->error_word); - + if (istate_from_uspace(istate)) log_printf("ss =%0#18" PRIx64 "\n", istate->ss); - + log_printf("rax=%0#18" PRIx64 "\trbx=%0#18" PRIx64 "\t" "rcx=%0#18" PRIx64 "\trdx=%0#18" PRIx64 "\n", istate->rax, istate->rbx, istate->rcx, istate->rdx); - + log_printf("rsi=%0#18" PRIx64 "\trdi=%0#18" PRIx64 "\t" "rbp=%0#18" PRIx64 "\trsp=%0#18" PRIx64 "\n", @@ -83,9 +83,9 @@ istate_from_uspace(istate) ? istate->rsp : (uintptr_t) &istate->rsp); - + log_printf("r8 =%0#18" PRIx64 "\tr9 =%0#18" PRIx64 "\t" "r10=%0#18" PRIx64 "\tr11=%0#18" PRIx64 "\n", istate->r8, istate->r9, istate->r10, istate->r11); - + log_printf("r12=%0#18" PRIx64 "\tr13=%0#18" PRIx64 "\t" "r14=%0#18" PRIx64 "\tr15=%0#18" PRIx64 "\n", @@ -123,5 +123,5 @@ size_t ver = TASK->arch.iomapver; irq_spinlock_unlock(&TASK->lock, false); - + if (CPU->arch.iomapver_copy != ver) { /* @@ -176,10 +176,10 @@ { assert(n >= IVT_IRQBASE); - + unsigned int inum = n - IVT_IRQBASE; bool ack = false; assert(inum < IRQ_COUNT); assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1)); - + irq_t *irq = irq_dispatch_and_lock(inum); if (irq) { @@ -187,5 +187,5 @@ * The IRQ handler was found. */ - + if (irq->preack) { /* Send EOI before processing the interrupt */ @@ -204,5 +204,5 @@ #endif } - + if (!ack) trap_virtual_eoi(); @@ -212,8 +212,8 @@ { unsigned int i; - + for (i = 0; i < IVT_ITEMS; i++) exc_register(i, "null", false, (iroutine_t) null_interrupt); - + for (i = 0; i < IRQ_COUNT; i++) { if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1)) @@ -221,10 +221,10 @@ (iroutine_t) irq_interrupt); } - + exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault); exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault); exc_register(VECTOR_SS, "ss_fault", true, (iroutine_t) ss_fault); exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault); - + #ifdef CONFIG_SMP exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true, Index: kernel/arch/amd64/src/mm/page.c =================================================================== --- kernel/arch/amd64/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,9 +57,9 @@ unsigned int identity_flags = PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ; - + page_mapping_operations = &pt_mapping_operations; - + page_table_lock(AS_KERNEL, true); - + /* * PA2KA(identity) mapping for all low-memory frames. @@ -68,7 +68,7 @@ cur += FRAME_SIZE) page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, identity_flags); - + page_table_unlock(AS_KERNEL, true); - + exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault); write_cr3((uintptr_t) AS_KERNEL->genarch.page_table); @@ -78,10 +78,10 @@ { uintptr_t badvaddr = read_cr2(); - + if (istate->error_word & PFERR_CODE_RSVD) panic("Reserved bit set in page table entry."); - + pf_access_t access; - + if (istate->error_word & PFERR_CODE_RW) access = PF_ACCESS_WRITE; @@ -90,5 +90,5 @@ else access = PF_ACCESS_READ; - + (void) as_page_fault(badvaddr, access, istate); } Index: kernel/arch/amd64/src/pm.c =================================================================== --- kernel/arch/amd64/src/pm.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/pm.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -130,5 +130,5 @@ { tss_descriptor_t *td = (tss_descriptor_t *) d; - + td->base_0_15 = base & 0xffffU; td->base_16_23 = ((base) >> 16) & 0xffU; @@ -140,5 +140,5 @@ { tss_descriptor_t *td = (tss_descriptor_t *) d; - + td->limit_0_15 = limit & 0xffffU; td->limit_16_19 = (limit >> 16) & 0x0fU; @@ -167,15 +167,15 @@ idescriptor_t *d; unsigned int i; - + for (i = 0; i < IDT_ITEMS; i++) { d = &idt[i]; - + d->unused = 0; d->selector = GDT_SELECTOR(KTEXT_DES); - + d->present = 1; d->type = AR_INTERRUPT; /* masking interrupt */ } - + d = &idt[0]; idt_setoffset(d++, (uintptr_t) &int_0); @@ -252,10 +252,10 @@ descriptor_t *gdt_p = (descriptor_t *) gdtr.base; tss_descriptor_t *tss_desc; - + /* * Each CPU has its private GDT and TSS. * All CPUs share one IDT. */ - + if (config.cpu_active == 1) { idt_init(); @@ -270,20 +270,20 @@ * ahead of page_init */ write_cr3((uintptr_t) AS_KERNEL->genarch.page_table); - + tss_p = (tss_t *) malloc(sizeof(tss_t), FRAME_ATOMIC); if (!tss_p) panic("Cannot allocate TSS."); } - + tss_initialize(tss_p); - + tss_desc = (tss_descriptor_t *) (&gdt_p[TSS_DES]); tss_desc->present = 1; tss_desc->type = AR_TSS; tss_desc->dpl = PL_KERNEL; - + gdt_tss_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p); gdt_tss_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1); - + gdtr_load(&gdtr); idtr_load(&idtr); Index: kernel/arch/amd64/src/smp/ap.S =================================================================== --- kernel/arch/amd64/src/smp/ap.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/smp/ap.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,7 +55,7 @@ xorw %ax, %ax movw %ax, %ds - + lgdtl ap_gdtr # initialize Global Descriptor Table register - + movl %cr0, %eax orl $CR0_PE, %eax @@ -71,15 +71,15 @@ movw $GDT_SELECTOR(UDATA_DES), %ax movw %ax, %gs - + # Enable 64-bit page transaltion entries (CR4.PAE = 1). # Paging is not enabled until after long mode is enabled - + movl %cr4, %eax orl $CR4_PAE, %eax movl %eax, %cr4 - + leal ptl_0, %eax movl %eax, %cr3 - + # Enable long mode movl $AMD_MSR_EFER, %ecx # EFER MSR number @@ -87,10 +87,10 @@ orl $AMD_LME, %eax # Set LME=1 wrmsr # Write EFER - + # Enable paging to activate long mode (set CR0.PG = 1) movl %cr0, %eax orl $CR0_PG, %eax movl %eax, %cr0 - + # At this point we are in compatibility mode jmpl $GDT_SELECTOR(KTEXT_DES), $start64 - BOOT_OFFSET + AP_BOOT_OFFSET @@ -100,8 +100,8 @@ movabsq $ctx, %rsp movq CONTEXT_OFFSET_SP(%rsp), %rsp - + pushq $0 movq %rsp, %rbp - + movabsq $main_ap, %rax callq *%rax # never returns Index: kernel/arch/amd64/src/syscall.c =================================================================== --- kernel/arch/amd64/src/syscall.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/syscall.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -51,5 +51,5 @@ /* Setup syscall entry address */ - + /* This is _mess_ - the 64-bit CS is argument + 16, * the SS is argument + 8. The order is: Index: kernel/arch/amd64/src/userspace.c =================================================================== --- kernel/arch/amd64/src/userspace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/amd64/src/userspace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,8 +49,8 @@ { uint64_t rflags = read_rflags(); - + rflags &= ~RFLAGS_NT; rflags |= RFLAGS_IF; - + asm volatile ( "pushq %[udata_des]\n" @@ -60,5 +60,5 @@ "pushq %[entry]\n" "movq %[uarg], %%rax\n" - + /* %rdi is defined to hold pcb_ptr - set it to 0 */ "xorq %%rdi, %%rdi\n" @@ -73,5 +73,5 @@ : "rax" ); - + /* Unreachable */ while (1); Index: kernel/arch/arm32/include/arch/asm.h =================================================================== --- kernel/arch/arm32/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -105,5 +105,5 @@ { uintptr_t v; - + asm volatile ( "and %[v], sp, %[size]\n" @@ -111,5 +111,5 @@ : [size] "r" (~(STACK_SIZE - 1)) ); - + return v; } Index: kernel/arch/arm32/include/arch/atomic.h =================================================================== --- kernel/arch/arm32/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ atomic_count_t ret = val->count; interrupts_restore(ipl); - + return ret; } Index: kernel/arch/arm32/include/arch/mm/page_armv4.h =================================================================== --- kernel/arch/arm32/include/arch/mm/page_armv4.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/include/arch/mm/page_armv4.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -137,5 +137,5 @@ pte_level0_t *p = &pt[i].l0; int np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT); - + return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | @@ -152,8 +152,8 @@ { pte_level1_t *p = &pt[i].l1; - + int dt = p->descriptor_type; int ap = p->access_permission_0; - + return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) | ((ap == PTE_AP_USER_RO_KERNEL_RW) << PAGE_READ_SHIFT) | @@ -177,5 +177,5 @@ { pte_level0_t *p = &pt[i].l0; - + if (flags & PAGE_NOT_PRESENT) { p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; @@ -206,17 +206,17 @@ { pte_level1_t *p = &pt[i].l1; - + if (flags & PAGE_NOT_PRESENT) p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; else p->descriptor_type = PTE_DESCRIPTOR_SMALL_PAGE; - + p->cacheable = p->bufferable = (flags & PAGE_CACHEABLE) != 0; - + /* default access permission */ p->access_permission_0 = p->access_permission_1 = p->access_permission_2 = p->access_permission_3 = PTE_AP_USER_NO_KERNEL_RW; - + if (flags & PAGE_USER) { if (flags & PAGE_READ) { Index: kernel/arch/arm32/include/arch/mm/page_armv6.h =================================================================== --- kernel/arch/arm32/include/arch/mm/page_armv6.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/include/arch/mm/page_armv6.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -170,5 +170,5 @@ const pte_level0_t *p = &pt[i].l0; const unsigned np = (p->descriptor_type == PTE_DESCRIPTOR_NOT_PRESENT); - + return (np << PAGE_PRESENT_SHIFT) | (1 << PAGE_USER_SHIFT) | (1 << PAGE_READ_SHIFT) | (1 << PAGE_WRITE_SHIFT) | @@ -185,9 +185,9 @@ { const pte_level1_t *p = &pt[i].l1; - + const unsigned dt = p->descriptor_type; const unsigned ap0 = p->access_permission_0; const unsigned ap1 = p->access_permission_1; - + return ((dt == PTE_DESCRIPTOR_NOT_PRESENT) << PAGE_PRESENT_SHIFT) | ((dt != PTE_DESCRIPTOR_SMALL_PAGE_NX) << PAGE_EXEC_SHIFT) | @@ -211,5 +211,5 @@ { pte_level0_t *p = &pt[i].l0; - + if (flags & PAGE_NOT_PRESENT) { p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; @@ -245,5 +245,5 @@ { pte_level1_t *p = &pt[i].l1; - + if (flags & PAGE_NOT_PRESENT) { p->descriptor_type = PTE_DESCRIPTOR_NOT_PRESENT; @@ -278,14 +278,14 @@ p->bufferable = 1; } - + /* Shareable is ignored for devices (non-cacheable), * turn it off for normal memory. */ p->shareable = 0; - + p->non_global = !(flags & PAGE_GLOBAL); - + /* default access permission: kernel only*/ p->access_permission_0 = PTE_AP0_USER_NO_KERNEL_FULL; - + if (flags & PAGE_USER) { p->access_permission_0 = PTE_AP0_USER_FULL_KERNEL_FULL; Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/arm32.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,5 +69,5 @@ { init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); - + size_t i; for (i = 0; i < init.cnt; i++) { @@ -93,5 +93,5 @@ { machine_init(); - + /* Initialize exception dispatch table */ exception_init(); @@ -100,5 +100,5 @@ /* Initialize Restartable Atomic Sequences support. */ ras_init(); - + machine_output_init(); } @@ -132,5 +132,5 @@ { uint8_t *stck; - + stck = &THREAD->kstack[STACK_SIZE]; supervisor_sp = (uintptr_t) stck; Index: kernel/arch/arm32/src/asm.S =================================================================== --- kernel/arch/arm32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -39,10 +39,10 @@ mov r5, r0 /* save dst */ beq 4f - + 1: cmp r2, #0 movne ip, #0 beq 3f - + 2: ldrb r3, [ip, r1] @@ -51,9 +51,9 @@ cmp ip, r2 bne 2b - + 3: mov r0, r5 ldmia sp!, {r4, r5, pc} - + 4: add r3, r0, #3 @@ -66,5 +66,5 @@ mov lr, #0 mov ip, lr - + 5: ldr r3, [ip, r1] @@ -74,5 +74,5 @@ add ip, ip, #4 bne 5b - + 6: ands r4, r2, #3 @@ -82,5 +82,5 @@ add ip, r3, r1 mov r2, #0 - + 7: ldrb r3, [r2, ip] Index: kernel/arch/arm32/src/atomic.c =================================================================== --- kernel/arch/arm32/src/atomic.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/atomic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,13 +54,13 @@ */ irq_spinlock_lock(&cas_lock, true); - + void * cur_val = *ptr; - + if (cur_val == expected) { *ptr = new_val; } - + irq_spinlock_unlock(&cas_lock, true); - + return cur_val; } Index: kernel/arch/arm32/src/context.S =================================================================== --- kernel/arch/arm32/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,5 +54,5 @@ ldmia r0!, {sp, lr} ldmia r0!, {r4-r11} - + mov r0, #0 mov pc, lr Index: kernel/arch/arm32/src/exc_handler.S =================================================================== --- kernel/arch/arm32/src/exc_handler.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/exc_handler.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -97,5 +97,5 @@ # Stop stack traces here mov fp, #0 - + b 2f Index: kernel/arch/arm32/src/exception.c =================================================================== --- kernel/arch/arm32/src/exception.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/exception.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -71,9 +71,9 @@ volatile uint32_t handler_address_ptr = EXC_VECTORS_SIZE - PREFETCH_OFFSET; - + /* make it LDR instruction and store at exception vector */ *vector = handler_address_ptr | LDR_OPCODE; smc_coherence(vector); - + /* store handler's address */ *(vector + EXC_VECTORS) = handler_addr; @@ -99,20 +99,20 @@ install_handler((unsigned) reset_exception_entry, (unsigned *) EXC_RESET_VEC); - + install_handler((unsigned) undef_instr_exception_entry, (unsigned *) EXC_UNDEF_INSTR_VEC); - + install_handler((unsigned) swi_exception_entry, (unsigned *) EXC_SWI_VEC); - + install_handler((unsigned) prefetch_abort_exception_entry, (unsigned *) EXC_PREFETCH_ABORT_VEC); - + install_handler((unsigned) data_abort_exception_entry, (unsigned *) EXC_DATA_ABORT_VEC); - + install_handler((unsigned) irq_exception_entry, (unsigned *) EXC_IRQ_VEC); - + install_handler((unsigned) fiq_exception_entry, (unsigned *) EXC_FIQ_VEC); @@ -140,8 +140,8 @@ { uint32_t control_reg = SCTLR_read(); - + /* switch on the high vectors bit */ control_reg |= SCTLR_HIGH_VECTORS_EN_FLAG; - + SCTLR_write(control_reg); } @@ -190,5 +190,5 @@ #endif install_exception_handlers(); - + exc_register(EXC_UNDEF_INSTR, "undefined instruction", true, (iroutine_t) undef_insn_exception); Index: kernel/arch/arm32/src/interrupt.c =================================================================== --- kernel/arch/arm32/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ current_status_reg_control_write(STATUS_REG_IRQ_DISABLED_BIT | ipl); - + return ipl; } @@ -62,5 +62,5 @@ current_status_reg_control_write(ipl & ~STATUS_REG_IRQ_DISABLED_BIT); - + return ipl; } Index: kernel/arch/arm32/src/mach/integratorcp/integratorcp.c =================================================================== --- kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/mach/integratorcp/integratorcp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -103,5 +103,5 @@ *(uint32_t *) ((char *)(icp.hw_map.vga) + 0x1C) = 0x182B; *(uint32_t *) ((char *)(icp.hw_map.cmcr) + 0xC) = 0x33805000; - + } @@ -259,5 +259,5 @@ uint32_t sources = icp_irqc_get_sources(); unsigned int i; - + for (i = 0; i < ICP_IRQC_MAX_IRQ; i++) { if (sources & (1 << i)) { @@ -295,5 +295,5 @@ vga_init = true; } - + fb_properties_t prop = { .addr = ICP_FB, @@ -304,5 +304,5 @@ .visual = VISUAL_RGB_8_8_8_0, }; - + outdev_t *fbdev = fb_init(&prop); if (fbdev) @@ -322,5 +322,5 @@ pl050->data = (ioport8_t *) icp.hw_map.kbd_data; pl050->ctrl = (ioport8_t *) icp.hw_map.kbd_ctrl; - + pl050_instance_t *pl050_instance = pl050_init(pl050, ICP_KBD_IRQ); if (pl050_instance) { Index: kernel/arch/arm32/src/mm/frame.c =================================================================== --- kernel/arch/arm32/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ base = ALIGN_UP(base, FRAME_SIZE); size = ALIGN_DOWN(size, FRAME_SIZE); - + if (!frame_adjust_zone_bounds(low, &base, &size)) return; @@ -64,5 +64,5 @@ ZONE_AVAILABLE | ZONE_HIGHMEM); } - + } Index: kernel/arch/arm32/src/mm/page.c =================================================================== --- kernel/arch/arm32/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ page_table_lock(AS_KERNEL, true); - + /* Kernel identity mapping */ //FIXME: We need to consider the possibility that @@ -66,5 +66,5 @@ cur += FRAME_SIZE) page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, flags); - + #ifdef HIGH_EXCEPTION_VECTORS /* Create mapping for exception table at high offset */ @@ -76,7 +76,7 @@ page_table_unlock(AS_KERNEL, true); - + as_switch(NULL, AS_KERNEL); - + boot_page_table_free(); } Index: kernel/arch/arm32/src/ras.c =================================================================== --- kernel/arch/arm32/src/ras.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/ras.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,8 +55,8 @@ if (!frame) frame = frame_alloc(1, FRAME_LOWMEM, 0); - + ras_page = (uintptr_t *) km_map(frame, PAGE_SIZE, PAGE_READ | PAGE_WRITE | PAGE_USER | PAGE_CACHEABLE); - + memsetb(ras_page, PAGE_SIZE, 0); ras_page[RAS_START] = 0; Index: kernel/arch/arm32/src/start.S =================================================================== --- kernel/arch/arm32/src/start.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/arm32/src/start.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -60,9 +60,9 @@ orr r3, r4, #0x13 msr cpsr_c, r3 - + ldr sp, =temp_stack - + bl arm32_pre_main - + # # Create the first stack frame. Index: kernel/arch/ia32/include/arch/asm.h =================================================================== --- kernel/arch/ia32/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -174,5 +174,5 @@ if (((void *)port) < IO_SPACE_BOUNDARY) { uint8_t val; - + asm volatile ( "inb %w[port], %b[val]\n" @@ -180,5 +180,5 @@ : [port] "d" (port) ); - + return val; } else @@ -198,5 +198,5 @@ if (((void *)port) < IO_SPACE_BOUNDARY) { uint16_t val; - + asm volatile ( "inw %w[port], %w[val]\n" @@ -204,5 +204,5 @@ : [port] "d" (port) ); - + return val; } else @@ -222,5 +222,5 @@ if (((void *)port) < IO_SPACE_BOUNDARY) { uint32_t val; - + asm volatile ( "inl %w[port], %[val]\n" @@ -228,5 +228,5 @@ : [port] "d" (port) ); - + return val; } else @@ -243,5 +243,5 @@ : [v] "=r" (eflags) ); - + return eflags; } @@ -276,7 +276,7 @@ { ipl_t ipl = interrupts_read(); - + asm volatile ("sti\n"); - + return ipl; } @@ -292,7 +292,7 @@ { ipl_t ipl = interrupts_read(); - + asm volatile ("cli\n"); - + return ipl; } @@ -336,5 +336,5 @@ { uint32_t ax, dx; - + asm volatile ( "rdmsr" @@ -343,5 +343,5 @@ : "c" (msr) ); - + return ((uint64_t) dx << 32) | ax; } @@ -360,5 +360,5 @@ { uintptr_t v; - + asm volatile ( "andl %%esp, %[v]\n" @@ -366,5 +366,5 @@ : "0" (~(STACK_SIZE - 1)) ); - + return v; } Index: kernel/arch/ia32/include/arch/atomic.h =================================================================== --- kernel/arch/ia32/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ { atomic_count_t r = 1; - + asm volatile ( "lock xaddl %[r], %[count]\n" @@ -81,5 +81,5 @@ [r] "+r" (r) ); - + return r; } @@ -88,5 +88,5 @@ { atomic_count_t r = -1; - + asm volatile ( "lock xaddl %[r], %[count]\n" @@ -94,5 +94,5 @@ [r] "+r" (r) ); - + return r; } @@ -104,5 +104,5 @@ { atomic_count_t v = 1; - + asm volatile ( "xchgl %[v], %[count]\n" @@ -110,5 +110,5 @@ [count] "+m" (val->count) ); - + return v; } @@ -119,5 +119,5 @@ { atomic_count_t tmp; - + preemption_disable(); asm volatile ( @@ -129,5 +129,5 @@ "testl %[tmp], %[tmp]\n" "jnz 0b\n" /* lightweight looping on locked spinlock */ - + "incl %[tmp]\n" /* now use the atomic operation */ "xchgl %[count], %[tmp]\n" @@ -137,5 +137,5 @@ [tmp] "=&r" (tmp) ); - + /* * Prevent critical section code from bleeding out this way up. Index: kernel/arch/ia32/include/arch/cpu.h =================================================================== --- kernel/arch/ia32/include/arch/cpu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/cpu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -80,5 +80,5 @@ tss_t *tss; - + size_t iomapver_copy; /** Copy of TASK's I/O Permission bitmap generation count. */ } cpu_arch_t; Index: kernel/arch/ia32/include/arch/cpuid.h =================================================================== --- kernel/arch/ia32/include/arch/cpuid.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/cpuid.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -83,17 +83,17 @@ uint32_t val; uint32_t ret; - + asm volatile ( "pushf\n" /* read flags */ "popl %[ret]\n" "movl %[ret], %[val]\n" - + "xorl %[eflags_id], %[val]\n" /* swap the ID bit */ - + "pushl %[val]\n" /* propagate the change into flags */ "popf\n" "pushf\n" "popl %[val]\n" - + "andl %[eflags_id], %[ret]\n" /* interrested only in ID bit */ "andl %[eflags_id], %[val]\n" @@ -102,5 +102,5 @@ : [eflags_id] "i" (EFLAGS_ID) ); - + return ret; } Index: kernel/arch/ia32/include/arch/cycle.h =================================================================== --- kernel/arch/ia32/include/arch/cycle.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/cycle.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,10 +44,10 @@ #else uint64_t v; - + asm volatile( "rdtsc\n" : "=A" (v) ); - + return v; #endif Index: kernel/arch/ia32/include/arch/mm/page.h =================================================================== --- kernel/arch/ia32/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -183,5 +183,5 @@ { pte_t *p = &pt[i]; - + return ((!p->page_cache_disable) << PAGE_CACHEABLE_SHIFT | (!p->present) << PAGE_PRESENT_SHIFT | @@ -196,5 +196,5 @@ { pte_t *p = &pt[i]; - + p->page_cache_disable = !(flags & PAGE_CACHEABLE); p->present = !(flags & PAGE_NOT_PRESENT); @@ -202,5 +202,5 @@ p->writeable = (flags & PAGE_WRITE) != 0; p->global = (flags & PAGE_GLOBAL) != 0; - + /* * Ensure that there is at least one bit set even if the present bit is Index: kernel/arch/ia32/include/arch/smp/apic.h =================================================================== --- kernel/arch/ia32/include/arch/smp/apic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/smp/apic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -334,5 +334,5 @@ } __attribute__ ((packed)); }; - + } __attribute__ ((packed)) io_redirection_reg_t; Index: kernel/arch/ia32/include/arch/smp/smp.h =================================================================== --- kernel/arch/ia32/include/arch/smp/smp.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/include/arch/smp/smp.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,11 +43,11 @@ /** Check whether a processor is enabled. */ bool (*cpu_enabled)(size_t); - + /** Check whether a processor is BSP. */ bool (*cpu_bootstrap)(size_t); - + /** Return APIC ID of a processor. */ uint8_t (*cpu_apic_id)(size_t); - + /** Return mapping between IRQ and APIC pin. */ int (*irq_to_pin)(unsigned int); Index: kernel/arch/ia32/src/asm.S =================================================================== --- kernel/arch/ia32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,26 +63,26 @@ movl %edi, %edx /* save %edi */ movl %esi, %eax /* save %esi */ - + movl MEMCPY_SIZE(%esp), %ecx shrl $2, %ecx /* size / 4 */ - + movl MEMCPY_DST(%esp), %edi movl MEMCPY_SRC(%esp), %esi - + /* Copy whole words */ rep movsl - + movl MEMCPY_SIZE(%esp), %ecx andl $3, %ecx /* size % 4 */ jz 0f - + /* Copy the rest byte by byte */ rep movsb - + 0: - + movl %edx, %edi movl %eax, %esi - + /* MEMCPY_DST(%esp), success */ movl MEMCPY_DST(%esp), %eax @@ -99,5 +99,5 @@ movl %edx, %edi movl %eax, %esi - + /* Return 0, failure */ xorl %eax, %eax @@ -112,10 +112,10 @@ movl %cr0, %edx orl $CR0_PG, %edx /* paging on */ - + /* Clear Cache Disable and not Write Though */ andl $~(CR0_CD | CR0_NW), %edx movl %edx, %cr0 jmp 0f - + 0: ret @@ -174,5 +174,5 @@ movl %edi, ISTATE_OFFSET_EDI(%esp) /* observability; not needed */ movl %ebp, ISTATE_OFFSET_EBP(%esp) /* observability; not needed */ - + /* * Fake up the stack trace linkage. @@ -190,5 +190,5 @@ movl $(GDT_SELECTOR(VREG_DES)), %eax movl %eax, %gs - + /* * Sanitize EFLAGS. @@ -207,5 +207,5 @@ call syscall_handler - + /* * Prepare return address and userspace stack for SYSEXIT. @@ -252,5 +252,5 @@ movl %es, %ecx movl %ds, %edx - + movl %ecx, ISTATE_OFFSET_ES(%esp) movl %edx, ISTATE_OFFSET_DS(%esp) @@ -264,15 +264,15 @@ movl $(GDT_SELECTOR(VREG_DES)), %eax movl %eax, %gs - + movl $0, ISTATE_OFFSET_EBP_FRAME(%esp) movl ISTATE_OFFSET_EIP(%esp), %eax movl %eax, ISTATE_OFFSET_EIP_FRAME(%esp) leal ISTATE_OFFSET_EBP_FRAME(%esp), %ebp - + cld - + /* Call syscall_handler(edx, ecx, ebx, esi, edi, ebp, eax) */ call syscall_handler - + /* * Restore the segment registers. @@ -286,8 +286,8 @@ movl ISTATE_OFFSET_ES(%esp), %ecx movl ISTATE_OFFSET_DS(%esp), %edx - + movl %ecx, %es movl %edx, %ds - + /* * Restore the preserved registers the handler cloberred itself @@ -295,8 +295,8 @@ */ movl ISTATE_OFFSET_EBP(%esp), %ebp - + addl $(ISTATE_SOFT_SIZE + 4), %esp iret - + /** * Mask for interrupts 0 - 31 (bits 0 - 31) where 0 means that int @@ -333,5 +333,5 @@ subl $(ISTATE_SOFT_SIZE + 4), %esp .endif - + /* * Save the general purpose registers. @@ -344,5 +344,5 @@ movl %esi, ISTATE_OFFSET_ESI(%esp) movl %ebp, ISTATE_OFFSET_EBP(%esp) - + /* * Save the segment registers. @@ -356,8 +356,8 @@ movl %es, %ecx movl %ds, %edx - + movl %ecx, ISTATE_OFFSET_ES(%esp) movl %edx, ISTATE_OFFSET_DS(%esp) - + /* * Switch to kernel selectors. @@ -368,5 +368,5 @@ movl $(GDT_SELECTOR(VREG_DES)), %eax movl %eax, %gs - + /* * Imitate a regular stack frame linkage. @@ -387,15 +387,15 @@ movl %eax, ISTATE_OFFSET_EIP_FRAME(%esp) leal ISTATE_OFFSET_EBP_FRAME(%esp), %ebp - + cld - + pushl %esp /* pass istate address */ pushl $(\i) /* pass intnum */ - + /* Call exc_dispatch(intnum, istate) */ call exc_dispatch - + addl $8, %esp /* clear arguments from the stack */ - + /* * Restore the selector registers. @@ -409,8 +409,8 @@ movl ISTATE_OFFSET_ES(%esp), %ecx movl ISTATE_OFFSET_DS(%esp), %edx - + movl %ecx, %es movl %edx, %ds - + /* * Restore the scratch registers and the preserved @@ -422,5 +422,5 @@ movl ISTATE_OFFSET_EDX(%esp), %edx movl ISTATE_OFFSET_EBP(%esp), %ebp - + addl $(ISTATE_SOFT_SIZE + 4), %esp iret @@ -452,7 +452,7 @@ */ FUNCTION_BEGIN(early_putchar) - + #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) - + /* Prologue, save preserved registers */ pushl %ebp @@ -461,83 +461,83 @@ pushl %esi pushl %edi - + movl $(PA2KA(0xb8000)), %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb early_putchar_cursor_ok - + movw $1998, %ax - + early_putchar_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + movl 0x08(%ebp), %eax - + cmp $0x0a, %al jne early_putchar_backspace - + /* Interpret newline */ - + movw %bx, %ax /* %bx -> %dx:%ax */ xorw %dx, %dx - + movw $80, %cx idivw %cx, %ax /* %dx = %bx % 80 */ - + /* %bx <- %bx + 80 - (%bx % 80) */ addw %cx, %bx subw %dx, %bx - + jmp early_putchar_skip - + early_putchar_backspace: - + cmp $0x08, %al jne early_putchar_print - + /* Interpret backspace */ - + cmp $0x0000, %bx je early_putchar_skip - + dec %bx jmp early_putchar_skip - + early_putchar_print: - + /* Print character */ - + movb $0x0e, %ah /* black background, yellow foreground */ stosw inc %bx - + early_putchar_skip: - + /* Sanity check for the cursor on the last line */ cmp $2000, %bx jb early_putchar_no_scroll - + /* Scroll the screen (24 rows) */ movl $(PA2KA(0xb80a0)), %esi @@ -545,33 +545,33 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movw $1920, %bx - + early_putchar_no_scroll: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + /* Epilogue, restore preserved registers */ popl %edi @@ -579,7 +579,7 @@ popl %ebx leave - + #endif - + ret FUNCTION_END(early_putchar) Index: kernel/arch/ia32/src/atomic.S =================================================================== --- kernel/arch/ia32/src/atomic.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/atomic.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -39,5 +39,5 @@ pushl %eax pushl %ebx - + movl 12(%esp),%ebx @@ -56,4 +56,4 @@ ret FUNCTION_END(spinlock_arch) - + #endif Index: kernel/arch/ia32/src/boot/multiboot.S =================================================================== --- kernel/arch/ia32/src/boot/multiboot.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/boot/multiboot.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,8 +77,8 @@ cli cld - + /* Initialize stack pointer */ movl $START_STACK, %esp - + /* * Initialize Global Descriptor Table and @@ -87,5 +87,5 @@ lgdtl bootstrap_gdtr lidtl bootstrap_idtr - + /* Kernel data + stack */ movw $GDT_SELECTOR(KDATA_DES), %cx @@ -95,61 +95,61 @@ movw %cx, %ds movw %cx, %ss - + jmpl $GDT_SELECTOR(KTEXT_DES), $multiboot_meeting_point multiboot_meeting_point: - + /* Save multiboot arguments */ movl %eax, multiboot_eax movl %ebx, multiboot_ebx - + pm_status $status_prot - + #include "vesa_prot.inc" - + #ifndef PROCESSOR_i486 - + pm_status $status_prot2 - + movl $(INTEL_CPUID_LEVEL), %eax cpuid cmp $0x0, %eax /* any function > 0? */ jbe pse_unsupported - + movl $(INTEL_CPUID_STANDARD), %eax cpuid bt $(INTEL_PSE), %edx jnc pse_unsupported - + /* Map kernel and turn paging on */ pm_status $status_pse call map_kernel_pse jmp stack_init - + #endif /* PROCESSOR_i486 */ - + pse_unsupported: - + /* Map kernel and turn paging on */ pm_status $status_non_pse call map_kernel_non_pse - + stack_init: - + /* Create the first stack frame */ pushl $0 movl %esp, %ebp - + pm2_status $status_prot3 - + /* Call ia32_pre_main(multiboot_eax, multiboot_ebx) */ pushl multiboot_ebx pushl multiboot_eax call ia32_pre_main - + pm2_status $status_main - + /* Call main_bsp() */ call main_bsp - + /* Not reached */ cli @@ -170,10 +170,10 @@ andl $~CR4_PAE, %ecx /* PAE off */ movl %ecx, %cr4 - + movl $(page_directory + 0), %esi movl $(page_directory + 2048), %edi xorl %ecx, %ecx xorl %ebx, %ebx - + floop_pse: movl $(PDE_4M | PDE_RW | PDE_P), %eax @@ -184,11 +184,11 @@ movl %eax, (%edi, %ecx, 4) addl $(4 * 1024 * 1024), %ebx - + incl %ecx cmpl $512, %ecx jl floop_pse - + movl %esi, %cr3 - + movl %cr0, %ebx orl $CR0_PG, %ebx /* paging on */ @@ -208,37 +208,37 @@ andl $~CR4_PAE, %ecx /* PAE off */ movl %ecx, %cr4 - + call calc_kernel_end call find_mem_for_pt - + mov kernel_end, %esi mov free_area, %ecx - + cmpl %esi, %ecx jbe use_kernel_end - + mov %ecx, %esi - + /* Align address down to 4k */ andl $(~(PAGE_SIZE - 1)), %esi - + use_kernel_end: - + /* Align address to 4k */ addl $(PAGE_SIZE - 1), %esi andl $(~(PAGE_SIZE - 1)), %esi - + /* Allocate space for page tables */ movl %esi, pt_loc movl $KA2PA(ballocs), %edi - + movl %esi, (%edi) addl $4, %edi movl $(2 * 1024 * 1024), (%edi) - + /* Fill page tables */ xorl %ecx, %ecx xorl %ebx, %ebx - + floop_pt: movl $(PTE_RW | PTE_P), %eax @@ -246,10 +246,10 @@ movl %eax, (%esi, %ecx, 4) addl $PAGE_SIZE, %ebx - + incl %ecx cmpl $(512 * 1024), %ecx - + jl floop_pt - + /* Fill page directory */ movl $(page_directory + 0), %esi @@ -257,27 +257,27 @@ xorl %ecx, %ecx movl pt_loc, %ebx - + floop: movl $(PDE_RW | PDE_P), %eax orl %ebx, %eax - + /* Mapping 0x00000000 + %ecx * 4M => 0x00000000 + %ecx * 4M */ movl %eax, (%esi, %ecx, 4) - + /* Mapping 0x80000000 + %ecx * 4M => 0x00000000 + %ecx * 4M */ movl %eax, (%edi, %ecx, 4) addl $PAGE_SIZE, %ebx - + incl %ecx cmpl $512, %ecx - + jl floop - + movl %esi, %cr3 - + movl %cr0, %ebx orl $CR0_PG, %ebx /* paging on */ movl %ebx, %cr0 - + ret FUNCTION_END(map_kernel_non_pse) @@ -288,14 +288,14 @@ movl (%edi), %esi leal KA2PA(0)(%esi), %esi - + movl $KA2PA(hardcoded_ktext_size), %edi addl (%edi), %esi leal KA2PA(0)(%esi), %esi - + movl $KA2PA(hardcoded_kdata_size), %edi addl (%edi), %esi leal KA2PA(0)(%esi), %esi movl %esi, kernel_end - + ret @@ -305,34 +305,34 @@ cmpl $MULTIBOOT_LOADER_MAGIC, multiboot_eax je check_multiboot_map - + ret - + check_multiboot_map: - + /* Copy address of the multiboot info to ebx */ movl multiboot_ebx, %ebx - + /* Check if memory map flag is present */ movl (%ebx), %edx andl $MULTIBOOT_INFO_FLAGS_MMAP, %edx jnz use_multiboot_map - + ret - + use_multiboot_map: - + /* Copy address of the memory map to edx */ movl MULTIBOOT_INFO_OFFSET_MMAP_ADDR(%ebx), %edx movl %edx, %ecx - + addl MULTIBOOT_INFO_OFFSET_MMAP_LENGTH(%ebx), %ecx - + /* Find a free region at least 2M in size */ check_memmap_loop: - + /* Is this a free region? */ cmpl $MEMMAP_MEMORY_AVAILABLE, MULTIBOOT_MEMMAP_OFFSET_MM_INFO + E820MEMMAP_OFFSET_TYPE(%edx) jnz next_region - + /* Check size */ cmpl $0, MULTIBOOT_MEMMAP_OFFSET_MM_INFO + E820MEMMAP_OFFSET_SIZE + 4(%edx) @@ -340,23 +340,23 @@ cmpl $(2 * 1024 * 1024 + PAGE_SIZE), MULTIBOOT_MEMMAP_OFFSET_MM_INFO + E820MEMMAP_OFFSET_SIZE(%edx) jbe next_region - + cmpl $0, MULTIBOOT_MEMMAP_OFFSET_MM_INFO + E820MEMMAP_OFFSET_BASE_ADDRESS + 4(%edx) jz found_region - + next_region: - + cmp %ecx, %edx jbe next_region_do - + ret - + next_region_do: - + addl MULTIBOOT_MEMMAP_OFFSET_SIZE(%edx), %edx addl $MULTIBOOT_MEMMAP_SIZE_SIZE, %edx jmp check_memmap_loop - + found_region: - + /* Use end of the found region */ mov MULTIBOOT_MEMMAP_OFFSET_MM_INFO + E820MEMMAP_OFFSET_BASE_ADDRESS(%edx), %ecx @@ -364,5 +364,5 @@ sub $(2 * 1024 * 1024), %ecx mov %ecx, free_area - + ret @@ -381,48 +381,48 @@ movl $0xb8000, %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb err_cursor_ok - + movw $1998, %ax - + err_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + err_ploop: lodsb - + cmp $0, %al je err_ploop_end - + movb $0x0c, %ah /* black background, light red foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb err_ploop - + /* Scroll the screen (24 rows) */ movl %esi, %edx @@ -431,36 +431,36 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movl %edx, %esi movl $0xb8f00, %edi movw $1920, %bx - + jmp err_ploop err_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + cli hlt1: @@ -486,51 +486,51 @@ pushl %edx pushl %edi - + movl $0xb8000, %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb pm_puts_cursor_ok - + movw $1998, %ax - + pm_puts_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + pm_puts_ploop: lodsb - + cmp $0, %al je pm_puts_ploop_end - + movb $0x0a, %ah /* black background, light green foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb pm_puts_ploop - + /* Scroll the screen (24 rows) */ movl %esi, %edx @@ -539,36 +539,36 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movl %edx, %esi movl $0xb8f00, %edi movw $1920, %bx - + jmp pm_puts_ploop pm_puts_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + popl %edi popl %edx @@ -576,5 +576,5 @@ popl %ebx popl %eax - + ret @@ -591,7 +591,7 @@ */ early_puts: - + #if ((defined(CONFIG_EGA)) && (!defined(CONFIG_FB))) - + /* Prologue, save preserved registers */ pushl %ebp @@ -600,52 +600,52 @@ pushl %esi pushl %edi - + movl 0x08(%ebp), %esi movl $(PA2KA(0xb8000)), %edi /* base of EGA text mode memory */ xorl %eax, %eax - + /* Read bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al shl $8, %ax - + /* Read bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx inb %dx, %al - + /* Sanity check for the cursor on screen */ cmp $2000, %ax jb early_puts_cursor_ok - + movw $1998, %ax - + early_puts_cursor_ok: - + movw %ax, %bx shl $1, %eax addl %eax, %edi - + early_puts_ploop: lodsb - + cmp $0, %al je early_puts_ploop_end - + movb $0x0e, %ah /* black background, yellow foreground */ stosw - + /* Sanity check for the cursor on the last line */ inc %bx cmp $2000, %bx jb early_puts_ploop - + /* Scroll the screen (24 rows) */ movl %esi, %edx @@ -654,36 +654,36 @@ movl $960, %ecx rep movsl - + /* Clear the 24th row */ xorl %eax, %eax movl $40, %ecx rep stosl - + /* Go to row 24 */ movl %edx, %esi movl $(PA2KA(0xb8f00)), %edi movw $1920, %bx - + jmp early_puts_ploop early_puts_ploop_end: - + /* Write bits 8 - 15 of the cursor address */ movw $0x3d4, %dx movb $0xe, %al outb %al, %dx - + movw $0x3d5, %dx movb %bh, %al outb %al, %dx - + /* Write bits 0 - 7 of the cursor address */ movw $0x3d4, %dx movb $0xf, %al outb %al, %dx - + movw $0x3d5, %dx movb %bl, %al outb %al, %dx - + /* Epilogue, restore preserved registers */ popl %edi @@ -691,7 +691,7 @@ popl %ebx leave - + #endif - + ret Index: kernel/arch/ia32/src/boot/multiboot2.S =================================================================== --- kernel/arch/ia32/src/boot/multiboot2.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/boot/multiboot2.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,5 +45,5 @@ .long multiboot2_header_end - multiboot2_header_start .long -(MULTIBOOT2_HEADER_MAGIC + MULTIBOOT2_HEADER_ARCH_I386 + (multiboot2_header_end - multiboot2_header_start)) - + /* Information request tag */ .align 8 @@ -59,5 +59,5 @@ #endif tag_info_req_end: - + /* Address tag */ .align 8 @@ -71,5 +71,5 @@ .long 0 tag_address_end: - + /* Entry address tag */ .align 8 @@ -80,5 +80,5 @@ .long multiboot2_image_start tag_entry_address_end: - + /* Flags tag */ .align 8 @@ -89,5 +89,5 @@ .long MULTIBOOT2_FLAGS_CONSOLE tag_flags_end: - + #ifdef CONFIG_FB /* Framebuffer tag */ @@ -102,5 +102,5 @@ tag_framebuffer_end: #endif - + /* Module alignment tag */ .align 8 @@ -111,5 +111,5 @@ .long 0 tag_module_align_end: - + /* Tag terminator */ .align 8 @@ -124,8 +124,8 @@ cli cld - + /* Initialize stack pointer */ movl $START_STACK, %esp - + /* * Initialize Global Descriptor Table and @@ -134,5 +134,5 @@ lgdtl bootstrap_gdtr lidtl bootstrap_idtr - + /* Kernel data + stack */ movw $GDT_SELECTOR(KDATA_DES), %cx @@ -142,49 +142,49 @@ movw %cx, %ds movw %cx, %ss - + jmpl $GDT_SELECTOR(KTEXT_DES), $multiboot2_meeting_point multiboot2_meeting_point: - + /* Save multiboot arguments */ movl %eax, multiboot_eax movl %ebx, multiboot_ebx - + #ifndef PROCESSOR_i486 - + movl $(INTEL_CPUID_LEVEL), %eax cpuid cmp $0x0, %eax /* any function > 0? */ jbe pse_unsupported - + movl $(INTEL_CPUID_STANDARD), %eax cpuid bt $(INTEL_PSE), %edx jnc pse_unsupported - + /* Map kernel and turn paging on */ call map_kernel_pse jmp stack_init - + #endif /* PROCESSOR_i486 */ - + pse_unsupported: - + /* Map kernel and turn paging on */ call map_kernel_non_pse - + stack_init: - + /* Create the first stack frame */ pushl $0 movl %esp, %ebp - + /* Call ia32_pre_main(multiboot_eax, multiboot_ebx) */ pushl multiboot_ebx pushl multiboot_eax call ia32_pre_main - + /* Call main_bsp() */ call main_bsp - + /* Not reached */ cli Index: kernel/arch/ia32/src/cpu/cpu.c =================================================================== --- kernel/arch/ia32/src/cpu/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/cpu/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -84,19 +84,19 @@ cpu_info_t info; uint32_t help = 0; - + CPU->arch.tss = tss_p; CPU->arch.tss->iomap_base = &CPU->arch.tss->iomap[0] - ((uint8_t *) CPU->arch.tss); - + CPU->fpu_owner = NULL; - + cpuid(INTEL_CPUID_STANDARD, &info); - + CPU->arch.fi.word = info.cpuid_edx; - + if (CPU->arch.fi.bits.fxsr) fpu_fxsr(); else fpu_fsr(); - + if (CPU->arch.fi.bits.sse) { asm volatile ( @@ -108,5 +108,5 @@ ); } - + #ifndef PROCESSOR_i486 if (CPU->arch.fi.bits.sep) { @@ -132,5 +132,5 @@ && (info.cpuid_edx == AMD_CPUID_EDX)) CPU->arch.vendor = VendorAMD; - + /* * Check for Intel processor. @@ -140,5 +140,5 @@ && (info.cpuid_edx == INTEL_CPUID_EDX)) CPU->arch.vendor = VendorIntel; - + cpuid(INTEL_CPUID_STANDARD, &info); CPU->arch.family = (info.cpuid_eax >> 8) & 0x0fU; Index: kernel/arch/ia32/src/ddi/ddi.c =================================================================== --- kernel/arch/ia32/src/ddi/ddi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/ddi/ddi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,16 +59,16 @@ /* First, copy the I/O Permission Bitmap. */ irq_spinlock_lock(&TASK->lock, false); - + size_t ver = TASK->arch.iomapver; size_t elements = TASK->arch.iomap.elements; - + if (elements > 0) { assert(TASK->arch.iomap.bits); - + bitmap_t iomap; bitmap_initialize(&iomap, TSS_IOMAP_SIZE * 8, CPU->arch.tss->iomap); bitmap_copy(&iomap, &TASK->arch.iomap, elements); - + /* * Set the trailing bits in the last byte of the map to disable @@ -77,5 +77,5 @@ bitmap_set_range(&iomap, elements, ALIGN_UP(elements, 8) - elements); - + /* * It is safe to set the trailing eight bits because of the @@ -84,7 +84,7 @@ bitmap_set_range(&iomap, ALIGN_UP(elements, 8), 8); } - + irq_spinlock_unlock(&TASK->lock, false); - + /* * Second, adjust TSS segment limit. @@ -93,10 +93,10 @@ ptr_16_32_t cpugdtr; gdtr_store(&cpugdtr); - + descriptor_t *gdt_p = (descriptor_t *) cpugdtr.base; size_t size = bitmap_size(elements); gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE + size); gdtr_load(&cpugdtr); - + /* * Before we load new TSS limit, the current TSS descriptor @@ -105,5 +105,5 @@ gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL; tr_load(GDT_SELECTOR(TSS_DES)); - + /* * Update the generation count so that faults caused by Index: kernel/arch/ia32/src/drivers/i8254.c =================================================================== --- kernel/arch/ia32/src/drivers/i8254.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/drivers/i8254.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -89,5 +89,5 @@ i8254_irq.handler = i8254_irq_handler; irq_register(&i8254_irq); - + i8254_normal_operation(); } @@ -111,9 +111,9 @@ pio_write_8(CLK_PORT1, 0xff); pio_write_8(CLK_PORT1, 0xff); - + uint8_t not_ok; uint32_t t1; uint32_t t2; - + do { /* will read both status and count */ @@ -123,11 +123,11 @@ t1 |= pio_read_8(CLK_PORT1) << 8; } while (not_ok); - + asm_delay_loop(LOOPS); - + pio_write_8(CLK_PORT4, 0xd2); t2 = pio_read_8(CLK_PORT1); t2 |= pio_read_8(CLK_PORT1) << 8; - + /* * We want to determine the overhead of the calibrating mechanism. @@ -136,21 +136,21 @@ uint32_t o1 = pio_read_8(CLK_PORT1); o1 |= pio_read_8(CLK_PORT1) << 8; - + asm_fake_loop(LOOPS); - + pio_write_8(CLK_PORT4, 0xd2); uint32_t o2 = pio_read_8(CLK_PORT1); o2 |= pio_read_8(CLK_PORT1) << 8; - + CPU->delay_loop_const = ((MAGIC_NUMBER * LOOPS) / 1000) / ((t1 - t2) - (o1 - o2)) + (((MAGIC_NUMBER * LOOPS) / 1000) % ((t1 - t2) - (o1 - o2)) ? 1 : 0); - + uint64_t clk1 = get_cycle(); delay(1 << SHIFT); uint64_t clk2 = get_cycle(); - + CPU->frequency_mhz = (clk2 - clk1) >> SHIFT; - + return; } Index: kernel/arch/ia32/src/fpu_context.c =================================================================== --- kernel/arch/ia32/src/fpu_context.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/fpu_context.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ X87_DENORMAL_EXC_FLAG = (1 << 1), X87_INVALID_OP_EXC_FLAG = (1 << 0), - + X87_ALL_MASK = X87_PRECISION_MASK | X87_UNDERFLOW_MASK | X87_OVERFLOW_MASK | X87_ZERO_DIV_MASK | X87_DENORMAL_OP_MASK | X87_INVALID_OP_MASK, }; @@ -129,5 +129,5 @@ uint32_t help0 = 0; uint32_t help1 = 0; - + asm volatile ( "fninit\n" Index: kernel/arch/ia32/src/ia32.c =================================================================== --- kernel/arch/ia32/src/ia32.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/ia32.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -92,5 +92,5 @@ multiboot_info_parse(signature, (multiboot_info_t *) info); multiboot2_info_parse(signature, (multiboot2_info_t *) info); - + #ifdef CONFIG_SMP /* Copy AP bootstrap routines below 1 MB. */ @@ -107,5 +107,5 @@ interrupt_init(); bios_init(); - + /* PIC */ i8259_init(); @@ -120,16 +120,16 @@ /* Initialize IRQ routing */ irq_init(IRQ_COUNT, IRQ_COUNT); - + /* hard clock */ i8254_init(); - + #if (defined(CONFIG_FB) || defined(CONFIG_EGA)) bool bfb = false; #endif - + #ifdef CONFIG_FB bfb = bfb_init(); #endif - + #ifdef CONFIG_EGA if (!bfb) { @@ -139,5 +139,5 @@ } #endif - + /* Merge all memory zones to 1 big zone */ zone_merge_all(); @@ -220,5 +220,5 @@ } #endif - + if (irqs_info != NULL) sysinfo_set_item_val(irqs_info, NULL, true); Index: kernel/arch/ia32/src/interrupt.c =================================================================== --- kernel/arch/ia32/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -72,16 +72,16 @@ "efl=%0#10" PRIx32 "\terr=%0#10" PRIx32 "\n", istate->cs, istate->eip, istate->eflags, istate->error_word); - + printf("ds =%0#10" PRIx32 "\tes =%0#10" PRIx32 "\t" "fs =%0#10" PRIx32 "\tgs =%0#10" PRIx32 "\n", istate->ds, istate->es, istate->fs, istate->gs); - + if (istate_from_uspace(istate)) printf("ss =%0#10" PRIx32 "\n", istate->ss); - + printf("eax=%0#10" PRIx32 "\tebx=%0#10" PRIx32 "\t" "ecx=%0#10" PRIx32 "\tedx=%0#10" PRIx32 "\n", istate->eax, istate->ebx, istate->ecx, istate->edx); - + printf("esi=%0#10" PRIx32 "\tedi=%0#10" PRIx32 "\t" "ebp=%0#10" PRIx32 "\tesp=%0#10" PRIxn "\n", @@ -119,5 +119,5 @@ size_t ver = TASK->arch.iomapver; irq_spinlock_unlock(&TASK->lock, false); - + if (CPU->arch.iomapver_copy != ver) { /* @@ -149,5 +149,5 @@ : [mxcsr] "=m" (mxcsr) ); - + fault_if_from_uspace(istate, "SIMD FP exception(19), MXCSR=%#0" PRIx32 ".", mxcsr); @@ -185,10 +185,10 @@ { assert(n >= IVT_IRQBASE); - + unsigned int inum = n - IVT_IRQBASE; bool ack = false; assert(inum < IRQ_COUNT); assert((inum != IRQ_PIC_SPUR) && (inum != IRQ_PIC1)); - + irq_t *irq = irq_dispatch_and_lock(inum); if (irq) { @@ -196,5 +196,5 @@ * The IRQ handler was found. */ - + if (irq->preack) { /* Send EOI before processing the interrupt */ @@ -212,5 +212,5 @@ #endif } - + if (!ack) trap_virtual_eoi(); @@ -220,8 +220,8 @@ { unsigned int i; - + for (i = 0; i < IVT_ITEMS; i++) exc_register(i, "null", false, (iroutine_t) null_interrupt); - + for (i = 0; i < IRQ_COUNT; i++) { if ((i != IRQ_PIC_SPUR) && (i != IRQ_PIC1)) @@ -229,5 +229,5 @@ (iroutine_t) irq_interrupt); } - + exc_register(VECTOR_DE, "de_fault", true, (iroutine_t) de_fault); exc_register(VECTOR_NM, "nm_fault", true, (iroutine_t) nm_fault); @@ -235,5 +235,5 @@ exc_register(VECTOR_GP, "gp_fault", true, (iroutine_t) gp_fault); exc_register(VECTOR_XM, "simd_fp", true, (iroutine_t) simd_fp_exception); - + #ifdef CONFIG_SMP exc_register(VECTOR_TLB_SHOOTDOWN_IPI, "tlb_shootdown", true, Index: kernel/arch/ia32/src/mm/frame.c =================================================================== --- kernel/arch/ia32/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,9 +54,9 @@ { unsigned int i; - + for (i = 0; i < e820counter; i++) { uint64_t base64 = e820table[i].base_address; uint64_t size64 = e820table[i].size; - + #ifdef KARCH_ia32 /* @@ -65,15 +65,15 @@ if (base64 >= PHYSMEM_LIMIT32) continue; - + if (base64 + size64 > PHYSMEM_LIMIT32) size64 = PHYSMEM_LIMIT32 - base64; #endif - + uintptr_t base = (uintptr_t) base64; size_t size = (size_t) size64; - + if (!frame_adjust_zone_bounds(low, &base, &size)) continue; - + if (e820table[i].type == MEMMAP_MEMORY_AVAILABLE) { /* To be safe, make the available zone possibly smaller */ @@ -81,9 +81,9 @@ uint64_t new_size = ALIGN_DOWN(size - (new_base - base), FRAME_SIZE); - + size_t count = SIZE2FRAMES(new_size); pfn_t pfn = ADDR2PFN(new_base); pfn_t conf; - + if (low) { if ((minconf < pfn) || (minconf >= pfn + count)) @@ -105,5 +105,5 @@ uint64_t new_size = ALIGN_UP(size + (base - new_base), FRAME_SIZE); - + zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0, ZONE_FIRMWARE); @@ -113,5 +113,5 @@ uint64_t new_size = ALIGN_UP(size + (base - new_base), FRAME_SIZE); - + zone_create(ADDR2PFN(new_base), SIZE2FRAMES(new_size), 0, ZONE_RESERVED); @@ -133,13 +133,13 @@ unsigned int i; printf("[base ] [size ] [name ]\n"); - + for (i = 0; i < e820counter; i++) { const char *name; - + if (e820table[i].type <= MEMMAP_MEMORY_UNUSABLE) name = e820names[e820table[i].type]; else name = "invalid"; - + printf("%#018" PRIx64 " %#018" PRIx64" %s\n", e820table[i].base_address, e820table[i].size, name); @@ -150,8 +150,8 @@ { pfn_t minconf; - + if (config.cpu_active == 1) { minconf = 1; - + #ifdef CONFIG_SMP minconf = max(minconf, @@ -159,10 +159,10 @@ hardcoded_unmapped_kdata_size)); #endif - + init_e820_memory(minconf, true); - + /* Reserve frame 0 (BIOS data) */ frame_mark_unavailable(0, 1); - + #ifdef CONFIG_SMP /* Reserve AP real mode bootstrap memory */ Index: kernel/arch/ia32/src/mm/page.c =================================================================== --- kernel/arch/ia32/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,5 +54,5 @@ uintptr_t cur; int flags; - + if (config.cpu_active > 1) { /* Fast path for non-boot CPUs */ @@ -63,5 +63,5 @@ page_mapping_operations = &pt_mapping_operations; - + /* * PA2KA(identity) mapping for all low-memory frames. @@ -74,8 +74,8 @@ } page_table_unlock(AS_KERNEL, true); - + exc_register(VECTOR_PF, "page_fault", true, (iroutine_t) page_fault); write_cr3((uintptr_t) AS_KERNEL->genarch.page_table); - + paging_on(); } @@ -85,15 +85,15 @@ uintptr_t badvaddr; pf_access_t access; - + badvaddr = read_cr2(); - + if (istate->error_word & PFERR_CODE_RSVD) panic("Reserved bit set in page directory."); - + if (istate->error_word & PFERR_CODE_RW) access = PF_ACCESS_WRITE; else access = PF_ACCESS_READ; - + (void) as_page_fault(badvaddr, access, istate); } Index: kernel/arch/ia32/src/pm.c =================================================================== --- kernel/arch/ia32/src/pm.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/pm.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -269,5 +269,5 @@ gdtr_load(&gdtr); idtr_load(&idtr); - + /* * Each CPU has its private GDT and TSS. @@ -289,9 +289,9 @@ tss_initialize(tss_p); - + gdt_p[TSS_DES].access = AR_PRESENT | AR_TSS | DPL_KERNEL; gdt_p[TSS_DES].special = 1; gdt_p[TSS_DES].granularity = 0; - + gdt_setbase(&gdt_p[TSS_DES], (uintptr_t) tss_p); gdt_setlimit(&gdt_p[TSS_DES], TSS_BASIC_SIZE - 1); @@ -302,5 +302,5 @@ */ tr_load(GDT_SELECTOR(TSS_DES)); - + /* Disable I/O on nonprivileged levels and clear NT flag. */ write_eflags(read_eflags() & ~(EFLAGS_IOPL | EFLAGS_NT)); Index: kernel/arch/ia32/src/proc/scheduler.c =================================================================== --- kernel/arch/ia32/src/proc/scheduler.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/proc/scheduler.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ { uintptr_t kstk = (uintptr_t) &THREAD->kstack[STACK_SIZE]; - + #ifndef PROCESSOR_i486 if (CPU->arch.fi.bits.sep) { @@ -66,5 +66,5 @@ } #endif - + /* Set kernel stack for CPL3 -> CPL0 switch via interrupt */ CPU->arch.tss->esp0 = kstk; Index: kernel/arch/ia32/src/smp/ap.S =================================================================== --- kernel/arch/ia32/src/smp/ap.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/smp/ap.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ /* initialize Global Descriptor Table register */ lgdtl ap_gdtr - + /* switch to protected mode */ movl %cr0, %eax @@ -68,5 +68,5 @@ movl %eax, %cr0 jmpl $KTEXT, $jump_to_kernel - BOOT_OFFSET + AP_BOOT_OFFSET - + jump_to_kernel: .code32 @@ -84,7 +84,7 @@ */ call map_kernel_pse - + addl $PA2KA(0), %esp /* PA2KA(ctx.sp) */ - + /* create the first stack frame */ pushl $0 Index: kernel/arch/ia32/src/smp/apic.c =================================================================== --- kernel/arch/ia32/src/smp/apic.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/smp/apic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -164,5 +164,5 @@ { l_apic_id_t idreg; - + idreg.value = l_apic[L_APIC_ID]; return idreg.apic_id; @@ -174,10 +174,10 @@ exc_register(VECTOR_APIC_SPUR, "apic_spurious", false, (iroutine_t) apic_spurious); - + enable_irqs_function = io_apic_enable_irqs; disable_irqs_function = io_apic_disable_irqs; eoi_function = l_apic_eoi; irqs_info = "apic"; - + /* * Configure interrupt routing. @@ -186,5 +186,5 @@ */ io_apic_disable_irqs(0xffffU); - + irq_initialize(&l_apic_timer_irq); l_apic_timer_irq.preack = true; @@ -193,18 +193,18 @@ l_apic_timer_irq.handler = l_apic_timer_irq_handler; 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((uint8_t) pin, DEST_ALL, (uint8_t) (IVT_IRQBASE + i), LOPRI); } - + /* * Ensure that io_apic has unique ID. */ io_apic_id_t idreg; - + idreg.value = io_apic_read(IOAPICID); if ((1 << idreg.apic_id) & apic_id_mask) { /* See if IO APIC ID is used already */ @@ -217,5 +217,5 @@ } } - + /* * Configure the BSP's lapic. @@ -223,5 +223,5 @@ l_apic_init(); l_apic_debug(); - + bsp_l_apic = l_apic_id(); } @@ -237,7 +237,7 @@ { esr_t esr; - + esr.value = l_apic[ESR]; - + if (esr.err_bitmap) { log_begin(LF_ARCH, LVL_ERROR); @@ -259,5 +259,5 @@ log_end(); } - + return !esr.err_bitmap; } @@ -267,5 +267,5 @@ { icr_t icr; - + do { icr.lo = l_apic[ICRlo]; @@ -286,8 +286,8 @@ /* Wait for a destination cpu to accept our previous ipi. */ l_apic_wait_for_delivery(); - + icr.lo = l_apic[ICRlo]; icr.hi = l_apic[ICRhi]; - + icr.delmod = DELMOD_FIXED; icr.destmod = DESTMOD_PHYS; @@ -301,5 +301,5 @@ l_apic[ICRhi] = icr.hi; l_apic[ICRlo] = icr.lo; - + return apic_poll_errors(); } @@ -318,5 +318,5 @@ /* Wait for a destination cpu to accept our previous ipi. */ l_apic_wait_for_delivery(); - + icr.lo = l_apic[ICRlo]; icr.delmod = DELMOD_FIXED; @@ -326,7 +326,7 @@ icr.trigger_mode = TRIGMOD_LEVEL; icr.vector = vector; - + l_apic[ICRlo] = icr.lo; - + return apic_poll_errors(); } @@ -345,8 +345,8 @@ */ icr_t icr; - + icr.lo = l_apic[ICRlo]; icr.hi = l_apic[ICRhi]; - + icr.delmod = DELMOD_INIT; icr.destmod = DESTMOD_PHYS; @@ -356,8 +356,8 @@ icr.vector = 0; icr.dest = apicid; - + l_apic[ICRhi] = icr.hi; l_apic[ICRlo] = icr.lo; - + /* * According to MP Specification, 20us should be enough to @@ -365,8 +365,8 @@ */ delay(20); - + if (!apic_poll_errors()) return 0; - + l_apic_wait_for_delivery(); @@ -379,10 +379,10 @@ icr.vector = 0; l_apic[ICRlo] = icr.lo; - + /* * Wait 10ms as MP Specification specifies. */ delay(10000); - + if (!is_82489DX_apic(l_apic[LAVR])) { /* @@ -402,5 +402,5 @@ } } - + return apic_poll_errors(); } @@ -411,32 +411,32 @@ /* Initialize LVT Error register. */ lvt_error_t error; - + error.value = l_apic[LVT_Err]; error.masked = true; l_apic[LVT_Err] = error.value; - + /* Initialize LVT LINT0 register. */ lvt_lint_t lint; - + lint.value = l_apic[LVT_LINT0]; lint.masked = true; l_apic[LVT_LINT0] = lint.value; - + /* Initialize LVT LINT1 register. */ lint.value = l_apic[LVT_LINT1]; lint.masked = true; l_apic[LVT_LINT1] = lint.value; - + /* Task Priority Register initialization. */ tpr_t tpr; - + tpr.value = l_apic[TPR]; tpr.pri_sc = 0; tpr.pri = 0; l_apic[TPR] = tpr.value; - + /* Spurious-Interrupt Vector Register initialization. */ svr_t svr; - + svr.value = l_apic[SVR]; svr.vector = VECTOR_APIC_SPUR; @@ -444,11 +444,11 @@ svr.focus_checking = true; l_apic[SVR] = svr.value; - + if (CPU->arch.family >= 6) enable_l_apic_in_msr(); - + /* Interrupt Command Register initialization. */ icr_t icr; - + icr.lo = l_apic[ICRlo]; icr.delmod = DELMOD_INIT; @@ -458,15 +458,15 @@ icr.trigger_mode = TRIGMOD_LEVEL; l_apic[ICRlo] = icr.lo; - + /* Timer Divide Configuration Register initialization. */ tdcr_t tdcr; - + tdcr.value = l_apic[TDCR]; tdcr.div_value = DIVIDE_1; l_apic[TDCR] = tdcr.value; - + /* Program local timer. */ lvt_tm_t tm; - + tm.value = l_apic[LVT_Tm]; tm.vector = VECTOR_CLK; @@ -474,5 +474,5 @@ tm.masked = false; l_apic[LVT_Tm] = tm.value; - + /* * Measure and configure the timer to generate timer @@ -481,24 +481,24 @@ uint32_t t1 = l_apic[CCRT]; l_apic[ICRT] = 0xffffffff; - + while (l_apic[CCRT] == t1); - + t1 = l_apic[CCRT]; delay(1000000 / HZ); uint32_t t2 = l_apic[CCRT]; - + l_apic[ICRT] = t1 - t2; - + /* Program Logical Destination Register. */ assert(CPU->id < 8); ldr_t ldr; - + ldr.value = l_apic[LDR]; ldr.id = (uint8_t) (1 << CPU->id); l_apic[LDR] = ldr.value; - + /* Program Destination Format Register for Flat mode. */ dfr_t dfr; - + dfr.value = l_apic[DFR]; dfr.model = MODEL_FLAT; @@ -519,5 +519,5 @@ log_printf("LVT on cpu%u, LAPIC ID: %" PRIu8 "\n", CPU->id, l_apic_id()); - + lvt_tm_t tm; tm.value = l_apic[LVT_Tm]; @@ -525,5 +525,5 @@ tm.vector, delivs_str[tm.delivs], mask_str[tm.masked], tm_mode_str[tm.mode]); - + lvt_lint_t lint; lint.value = l_apic[LVT_LINT0]; @@ -532,5 +532,5 @@ intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]); - + lint.value = l_apic[LVT_LINT1]; log_printf("LVT LINT1: vector=%" PRIu8 ", %s, %s, %s, irr=%u, %s, %s\n", @@ -538,5 +538,5 @@ intpol_str[lint.intpol], lint.irr, trigmod_str[lint.trigger_mode], mask_str[lint.masked]); - + lvt_error_t error; error.value = l_apic[LVT_Err]; @@ -557,5 +557,5 @@ { io_regsel_t regsel; - + regsel.value = io_apic[IOREGSEL]; regsel.reg_addr = address; @@ -573,5 +573,5 @@ { io_regsel_t regsel; - + regsel.value = io_apic[IOREGSEL]; regsel.reg_addr = address; @@ -592,14 +592,14 @@ { unsigned int dlvr; - + if (flags & LOPRI) dlvr = DELMOD_LOWPRI; else dlvr = DELMOD_FIXED; - + io_redirection_reg_t reg; reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2)); reg.hi = io_apic_read((uint8_t) (IOREDTBL + pin * 2 + 1)); - + reg.dest = dest; reg.destmod = DESTMOD_LOGIC; @@ -608,5 +608,5 @@ reg.delmod = dlvr; reg.intvec = vec; - + io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo); io_apic_write((uint8_t) (IOREDTBL + pin * 2 + 1), reg.hi); @@ -630,10 +630,10 @@ if (pin != -1) { io_redirection_reg_t reg; - + reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2)); reg.masked = true; io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo); } - + } } @@ -657,10 +657,10 @@ if (pin != -1) { io_redirection_reg_t reg; - + reg.lo = io_apic_read((uint8_t) (IOREDTBL + pin * 2)); reg.masked = false; io_apic_write((uint8_t) (IOREDTBL + pin * 2), reg.lo); } - + } } Index: kernel/arch/ia32/src/smp/mps.c =================================================================== --- kernel/arch/ia32/src/smp/mps.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/smp/mps.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ { assert(i < processor_entry_cnt); - + return processor_entries[i].l_apic_id; } @@ -82,5 +82,5 @@ { assert(i < processor_entry_cnt); - + /* * FIXME: The current local APIC driver limits usable @@ -90,5 +90,5 @@ if (i > 7) return false; - + return ((processor_entries[i].cpu_flags & 0x01) == 0x01); } @@ -97,5 +97,5 @@ { assert(i < processor_entry_cnt); - + return ((processor_entries[i].cpu_flags & 0x02) == 0x02); } @@ -104,5 +104,5 @@ { size_t i; - + for (i = 0; i < io_intr_entry_cnt; i++) { if (io_intr_entries[i].src_bus_irq == irq && @@ -110,5 +110,5 @@ return io_intr_entries[i].dst_io_apic_pin; } - + return -1; } @@ -131,8 +131,8 @@ unsigned int i; uint8_t sum; - + for (i = 0, sum = 0; i < 16; i++) sum = (uint8_t) (sum + base[i]); - + return (sum == 0); } @@ -147,16 +147,16 @@ uint8_t sum; uint16_t i; - + /* Compute the checksum for the base table */ for (i = 0, sum = 0; i < ct->base_table_length; i++) sum = (uint8_t) (sum + base[i]); - + if (sum) return false; - + /* Compute the checksum for the extended table */ for (i = 0, sum = 0; i < ct->ext_table_length; i++) sum = (uint8_t) (sum + ext[i]); - + return (sum == ct->ext_table_checksum); } @@ -169,5 +169,5 @@ if ((pr->cpu_flags & (1 << 0)) == 0) return; - + apic_id_mask |= (1 << pr->l_apic_id); } @@ -177,8 +177,8 @@ #ifdef MPSCT_VERBOSE char buf[7]; - + memcpy((void *) buf, (void *) bus->bus_type, 6); buf[6] = 0; - + log(LF_ARCH, LVL_DEBUG, "MPS: bus=%" PRIu8 " (%s)", bus->bus_id, buf); #endif @@ -190,5 +190,5 @@ if ((ioa->io_apic_flags & 1) == 0) return; - + if (io_apic_cnt++ > 0) { /* @@ -197,5 +197,5 @@ return; } - + io_apic = (uint32_t *) (uintptr_t) ioa->io_apic; } @@ -207,5 +207,5 @@ log_begin(LF_ARCH, LVL_DEBUG); log_printf("MPS: "); - + switch (iointr->intr_type) { case 0: @@ -222,7 +222,7 @@ break; } - + log_printf(", "); - + switch (iointr->poel & 3) { case 0: @@ -239,7 +239,7 @@ break; } - + log_printf(", "); - + switch ((iointr->poel >> 2) & 3) { case 0: @@ -256,5 +256,5 @@ break; } - + log_printf(", bus=%" PRIu8 " irq=%" PRIu8 " io_apic=%" PRIu8" pin=%" PRIu8, iointr->src_bus_id, iointr->src_bus_irq, @@ -270,5 +270,5 @@ log_begin(LF_ARCH, LVL_DEBUG); log_printf("MPS: "); - + switch (lintr->intr_type) { case 0: @@ -285,7 +285,7 @@ break; } - + log_printf(", "); - + switch (lintr->poel & 3) { case 0: @@ -302,7 +302,7 @@ break; } - + log_printf(", "); - + switch ((lintr->poel >> 2) & 3) { case 0: @@ -319,5 +319,5 @@ break; } - + log_printf(", bus=%" PRIu8 " irq=%" PRIu8 " l_apic=%" PRIu8" pin=%" PRIu8, lintr->src_bus_id, lintr->src_bus_irq, @@ -331,5 +331,5 @@ uint8_t *ext = (uint8_t *) ct + ct->base_table_length; uint8_t *cur; - + for (cur = ext; cur < ext + ct->ext_table_length; cur += cur[CT_EXT_ENTRY_LEN]) { @@ -349,20 +349,20 @@ return; } - + if (!mps_ct_check()) { log(LF_ARCH, LVL_WARN, "MPS: Wrong ct checksum"); return; } - + if (ct->oem_table) { log(LF_ARCH, LVL_WARN, "MPS: ct->oem_table not supported"); return; } - + l_apic = (uint32_t *) (uintptr_t) ct->l_apic; - + uint8_t *cur = &ct->base_table[0]; uint16_t i; - + for (i = 0; i < ct->entry_count; i++) { switch (*cur) { @@ -411,5 +411,5 @@ } } - + /* * Process extended entries. @@ -432,5 +432,5 @@ unsigned int j; unsigned int length[2] = { 1024, 64 * 1024 }; - + /* * Find MP Floating Pointer Structure @@ -439,5 +439,5 @@ * 2. search 64K starting at 0xf0000 */ - + addr[0] = (uint8_t *) PA2KA(ebda ? ebda : 639 * 1024); for (i = 0; i < 2; i++) { @@ -450,10 +450,10 @@ } } - + return; - + fs_found: log(LF_ARCH, LVL_NOTE, "%p: MPS Floating Pointer Structure", fs); - + if ((fs->config_type == 0) && (fs->configuration_table)) { if (fs->mpfib2 >> 7) { @@ -461,10 +461,10 @@ return; } - + ct = (struct mps_ct *) PA2KA((uintptr_t) fs->configuration_table); configure_via_ct(); } else configure_via_default(fs->config_type); - + if (processor_entry_cnt > 0) config.cpu_count = processor_entry_cnt; Index: kernel/arch/ia32/src/smp/smp.c =================================================================== --- kernel/arch/ia32/src/smp/smp.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/smp/smp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,10 +68,10 @@ ops = &madt_config_operations; } - + if (config.cpu_count == 1) { mps_init(); ops = &mps_config_operations; } - + if (config.cpu_count > 1) { l_apic = (uint32_t *) km_map((uintptr_t) l_apic, PAGE_SIZE, @@ -86,5 +86,5 @@ assert(ops != NULL); assert(cpus != NULL); - + for (unsigned int i = 0; i < config.cpu_count; ++i) { cpus[i].arch.id = ops->cpu_apic_id(i); @@ -102,5 +102,5 @@ { unsigned int i; - + assert(ops != NULL); @@ -110,10 +110,10 @@ */ cpu_arch_id_init(); - + /* * We need to access data in frame 0. * We boldly make use of kernel address space mapping. */ - + /* * Set the warm-reset vector to the real-mode address of 4K-aligned ap_boot() @@ -122,5 +122,5 @@ (uint16_t) (((uintptr_t) ap_boot) >> 4); /* segment */ *((uint16_t *) (PA2KA(0x467 + 2))) = 0; /* offset */ - + /* * Save 0xa to address 0xf of the CMOS RAM. @@ -129,8 +129,8 @@ pio_write_8((ioport8_t *) 0x70, 0xf); pio_write_8((ioport8_t *) 0x71, 0xa); - + pic_disable_irqs(0xffff); apic_init(); - + for (i = 0; i < config.cpu_count; i++) { /* @@ -139,5 +139,5 @@ if (!ops->cpu_enabled(i)) continue; - + /* * The bootstrap processor is already up. @@ -145,5 +145,5 @@ if (ops->cpu_bootstrap(i)) continue; - + if (ops->cpu_apic_id(i) == bsp_l_apic) { log(LF_ARCH, LVL_ERROR, "kmp: bad processor entry #%u, " @@ -151,9 +151,9 @@ continue; } - + /* * Prepare new GDT for CPU in question. */ - + /* XXX Flag FRAME_LOW_4_GiB was removed temporarily, * it needs to be replaced by a generic fuctionality of @@ -165,5 +165,5 @@ if (!gdt_new) panic("Cannot allocate memory for GDT."); - + memcpy(gdt_new, gdt, GDT_ITEMS * sizeof(descriptor_t)); memsetb(&gdt_new[TSS_DES], sizeof(descriptor_t), 0); @@ -171,5 +171,5 @@ protected_ap_gdtr.base = KA2PA((uintptr_t) gdt_new); gdtr.base = (uintptr_t) gdt_new; - + if (l_apic_send_init_ipi(ops->cpu_apic_id(i))) { /* Index: kernel/arch/ia32/src/userspace.c =================================================================== --- kernel/arch/ia32/src/userspace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia32/src/userspace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,9 +50,9 @@ { uint32_t eflags = read_eflags(); - + asm volatile ( /* Set up GS register (virtual register segment) */ "movl %[vreg_des], %%gs\n" - + "pushl %[udata_des]\n" "pushl %[stack_top]\n" @@ -61,8 +61,8 @@ "pushl %[entry]\n" "movl %[uarg], %%eax\n" - + /* %edi is defined to hold pcb_ptr - set it to 0 */ "xorl %%edi, %%edi\n" - + "iret\n" : @@ -77,5 +77,5 @@ [vreg_des] "r" (GDT_SELECTOR(VREG_DES)) : "eax"); - + /* Unreachable */ while (1); Index: kernel/arch/ia64/include/arch/asm.h =================================================================== --- kernel/arch/ia64/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -51,5 +51,5 @@ return legacyio_virt_base + (((prt >> 2) << 12) | (prt & 0xfff)); } - + NO_TRACE static inline void pio_write_8(ioport8_t *port, uint8_t v) { @@ -58,5 +58,5 @@ else *port = v; - + asm volatile ( "mf\n" @@ -72,5 +72,5 @@ else *port = v; - + asm volatile ( "mf\n" @@ -86,5 +86,5 @@ else *port = v; - + asm volatile ( "mf\n" @@ -112,5 +112,5 @@ ::: "memory" ); - + return v; } @@ -134,5 +134,5 @@ ::: "memory" ); - + return v; } @@ -141,10 +141,10 @@ { uint32_t v; - - asm volatile ( - "mf\n" - ::: "memory" - ); - + + asm volatile ( + "mf\n" + ::: "memory" + ); + if (port < (ioport32_t *) IO_SPACE_BOUNDARY) v = *((ioport32_t *) p2a(port)); @@ -169,10 +169,10 @@ { uint64_t value; - + asm volatile ( "mov %[value] = r12" : [value] "=r" (value) ); - + return (value & (~(STACK_SIZE / 2 - 1))); } @@ -186,10 +186,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = psr\n" : [value] "=r" (v) ); - + return v; } @@ -203,10 +203,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr.iva\n" : [value] "=r" (v) ); - + return v; } @@ -234,10 +234,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr.ivr\n" : [value] "=r" (v) ); - + return v; } @@ -246,10 +246,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr64\n" : [value] "=r" (v) ); - + return v; } @@ -276,10 +276,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = ar.itc\n" : [value] "=r" (v) ); - + return v; } @@ -306,10 +306,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr.itm\n" : [value] "=r" (v) ); - + return v; } @@ -323,10 +323,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr.itv\n" : [value] "=r" (v) ); - + return v; } @@ -366,10 +366,10 @@ { uint64_t v; - + asm volatile ( "mov %[value] = cr.tpr\n" : [value] "=r" (v) ); - + return v; } @@ -399,5 +399,5 @@ { uint64_t v; - + asm volatile ( "mov %[value] = psr\n" @@ -406,5 +406,5 @@ : [mask] "i" (PSR_I_MASK) ); - + return (ipl_t) v; } @@ -421,5 +421,5 @@ { uint64_t v; - + asm volatile ( "mov %[value] = psr\n" @@ -430,5 +430,5 @@ : [mask] "i" (PSR_I_MASK) ); - + return (ipl_t) v; } Index: kernel/arch/ia64/include/arch/atomic.h =================================================================== --- kernel/arch/ia64/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -41,5 +41,5 @@ { atomic_count_t v; - + asm volatile ( "movl %[v] = 0x1;;\n" @@ -48,5 +48,5 @@ [count] "+m" (val->count) ); - + return v; } @@ -62,5 +62,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], 1\n" @@ -73,5 +73,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], -1\n" @@ -84,5 +84,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], 1\n" @@ -90,5 +90,5 @@ [count] "+m" (val->count) ); - + return (v + 1); } @@ -97,5 +97,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], -1\n" @@ -103,5 +103,5 @@ [count] "+m" (val->count) ); - + return (v - 1); } @@ -110,5 +110,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], 1\n" @@ -116,5 +116,5 @@ [count] "+m" (val->count) ); - + return v; } @@ -123,5 +123,5 @@ { atomic_count_t v; - + asm volatile ( "fetchadd8.rel %[v] = %[count], -1\n" @@ -129,5 +129,5 @@ [count] "+m" (val->count) ); - + return v; } Index: kernel/arch/ia64/include/arch/bootinfo.h =================================================================== --- kernel/arch/ia64/include/arch/bootinfo.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/bootinfo.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,5 +44,5 @@ char name[BOOTINFO_TASK_NAME_BUFLEN]; } binit_task_t; - + typedef struct { size_t cnt; @@ -58,8 +58,8 @@ typedef struct { binit_t taskmap; - + memmap_item_t memmap[MEMMAP_ITEMS]; unsigned int memmap_items; - + sysarg_t *sapic; unsigned long sys_freq; Index: kernel/arch/ia64/include/arch/cpu.h =================================================================== --- kernel/arch/ia64/include/arch/cpu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/cpu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -66,5 +66,5 @@ { uint64_t v; - + asm volatile ( "mov %[v] = cpuid[%[r]]\n" @@ -72,5 +72,5 @@ : [r] "r" (n) ); - + return v; } Index: kernel/arch/ia64/include/arch/istate.h =================================================================== --- kernel/arch/ia64/include/arch/istate.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/istate.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ { /* FIXME */ - + return 0; } Index: kernel/arch/ia64/include/arch/mm/page.h =================================================================== --- kernel/arch/ia64/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -117,5 +117,5 @@ unsigned int ed : 1; unsigned int ig1 : 11; - + /* Word 1 */ unsigned int : 2; @@ -123,8 +123,8 @@ unsigned int key : 24; unsigned int : 32; - + /* Word 2 */ union vhpt_tag tag; - + /* Word 3 */ uint64_t ig3 : 64; @@ -136,13 +136,13 @@ unsigned long long ig0 : 52; unsigned int ig1 : 11; - + /* Word 1 */ unsigned int : 2; unsigned int ps : 6; unsigned long long ig2 : 56; - + /* Word 2 */ union vhpt_tag tag; - + /* Word 3 */ uint64_t ig3 : 64; @@ -194,5 +194,5 @@ { uint64_t ret; - + asm volatile ( "thash %[ret] = %[va]\n" @@ -200,5 +200,5 @@ : [va] "r" (va) ); - + return ret; } @@ -216,5 +216,5 @@ { uint64_t ret; - + asm volatile ( "ttag %[ret] = %[va]\n" @@ -222,5 +222,5 @@ : [va] "r" (va) ); - + return ret; } @@ -235,7 +235,7 @@ { uint64_t ret; - + assert(i < REGION_REGISTERS); - + asm volatile ( "mov %[ret] = rr[%[index]]\n" @@ -243,5 +243,5 @@ : [index] "r" (i << VRN_SHIFT) ); - + return ret; } @@ -255,5 +255,5 @@ { assert(i < REGION_REGISTERS); - + asm volatile ( "mov rr[%[index]] = %[value]\n" @@ -270,10 +270,10 @@ { uint64_t ret; - + asm volatile ( "mov %[ret] = cr.pta\n" : [ret] "=r" (ret) ); - + return ret; } Index: kernel/arch/ia64/include/arch/mm/tlb.h =================================================================== --- kernel/arch/ia64/include/arch/mm/tlb.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/mm/tlb.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,5 +63,5 @@ unsigned int ed : 1; unsigned int ig1 : 11; - + /* Word 1 */ unsigned int : 2; Index: kernel/arch/ia64/include/arch/mm/vhpt.h =================================================================== --- kernel/arch/ia64/include/arch/mm/vhpt.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/include/arch/mm/vhpt.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -32,5 +32,5 @@ /** @file */ - + #ifndef KERN_ia64_VHPT_H_ #define KERN_ia64_VHPT_H_ @@ -44,8 +44,8 @@ { vhpt_entry_t ventry; - + ventry.word[0] = tentry.word[0]; ventry.word[1] = tentry.word[1]; - + return ventry; } Index: kernel/arch/ia64/src/asm.S =================================================================== --- kernel/arch/ia64/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,5 +46,5 @@ FUNCTION_BEGIN(memcpy_to_uspace) alloc loc0 = ar.pfs, 3, 1, 0, 0 - + adds r14 = 7, in1 mov r2 = ar.lc @@ -53,7 +53,7 @@ cmp.ne p6, p7 = r14, in1 (p7) br.cond.dpnt 3f ;; - + 0: - + cmp.ne p6, p7 = 0, in2 (p7) br.cond.dpnt 2f ;; @@ -62,7 +62,7 @@ (p6) mov r17 = r0 ;; (p6) mov ar.lc = r14 - + 1: - + add r14 = r16, in1 add r15 = r16, in0 @@ -72,13 +72,13 @@ st1 [r15] = r14 br.cloop.sptk.few 1b ;; - + 2: - + mov ar.lc = r2 mov ar.pfs = loc0 br.ret.sptk.many rp - + 3: - + adds r14 = 7, in0 ;; and r14 = -8, r14 ;; @@ -92,7 +92,7 @@ (p6) mov r17 = r0 ;; (p6) mov ar.lc = r14 - + 4: - + shladd r14 = r16, 3, r0 adds r16 = 1, r17 ;; @@ -103,7 +103,7 @@ st8 [r14] = r15 br.cloop.sptk.few 4b - + 5: - + and r15 = 7, in2 shladd r14 = r18, 3, r0 @@ -116,7 +116,7 @@ (p6) br.cond.dpnt 2b ;; mov ar.lc = r15 - + 6: - + add r14 = r16, r17 add r15 = r16, in0 @@ -155,37 +155,37 @@ FUNCTION_BEGIN(switch_to_userspace) alloc loc0 = ar.pfs, 6, 3, 0, 0 - + /* Disable interruption collection and interrupts */ rsm (PSR_IC_MASK | PSR_I_MASK) srlz.d ;; srlz.i ;; - + mov cr.ipsr = in4 mov cr.iip = in0 mov r12 = in1 - + xor r1 = r1, r1 - + /* r2 is defined to hold pcb_ptr - set it to 0 */ xor r2 = r2, r2 - + mov loc1 = cr.ifs movl loc2 = PFM_MASK ;; and loc1 = loc2, loc1 ;; mov cr.ifs = loc1 ;; /* prevent decrementing BSP by rfi */ - + invala - + mov loc1 = ar.rsc ;; and loc1 = ~3, loc1 ;; mov ar.rsc = loc1 ;; /* put RSE into enforced lazy mode */ - + flushrs ;; - + mov ar.bspstore = in2 ;; mov ar.rsc = in5 ;; - + mov r8 = in3 - + rfi ;; FUNCTION_END(switch_to_userspace) Index: kernel/arch/ia64/src/context.S =================================================================== --- kernel/arch/ia64/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,5 +45,5 @@ flushrs mov loc4 = ar.bsp - + /* * Put RSE to enforced lazy mode. @@ -117,5 +117,5 @@ mov loc2 = ar.unat - + /* * Save application registers @@ -177,5 +177,5 @@ mov ar.unat = loc1 - + add r8 = r0, r0, 1 /* context_save returns 1 */ br.ret.sptk.many b0 @@ -239,5 +239,5 @@ ld8 loc5 = [loc14] /* load ar.rnat */ ld8 loc6 = [loc15] /* load ar.lc */ - + .auto @@ -274,5 +274,5 @@ mov ar.unat = loc2 ;; mov ar.lc = loc6 - + /* * Restore general registers including NaT bits @@ -332,7 +332,7 @@ ldf.fill f30 = [loc48] ldf.fill f31 = [loc49] - + mov ar.unat = loc1 - + mov r8 = r0 /* context_restore returns 0 */ br.ret.sptk.many b0 Index: kernel/arch/ia64/src/cpu/cpu.c =================================================================== --- kernel/arch/ia64/src/cpu/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/cpu/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,9 +54,9 @@ const char *family_str; char vendor[2 * sizeof(uint64_t) + 1]; - + memcpy(vendor, &CPU->arch.cpuid0, 8); memcpy(vendor + 8, &CPU->arch.cpuid1, 8); vendor[sizeof(vendor) - 1] = 0; - + switch (m->arch.cpuid3.family) { case FAMILY_ITANIUM: @@ -70,5 +70,5 @@ break; } - + printf("cpu%d: %s (%s), archrev=%d, model=%d, revision=%d\n", CPU->id, family_str, vendor, CPU->arch.cpuid3.archrev, Index: kernel/arch/ia64/src/ddi/ddi.c =================================================================== --- kernel/arch/ia64/src/ddi/ddi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/ddi/ddi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,17 +59,17 @@ if (task->arch.iomap == NULL) return ENOMEM; - + void *store = malloc(bitmap_size(IO_MEMMAP_PAGES), 0); if (store == NULL) return ENOMEM; - + bitmap_initialize(task->arch.iomap, IO_MEMMAP_PAGES, store); bitmap_clear_range(task->arch.iomap, 0, IO_MEMMAP_PAGES); } - + uintptr_t iopage = ioaddr / PORTS_PER_PAGE; size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE); bitmap_set_range(task->arch.iomap, iopage, size / 4); - + return EOK; } @@ -93,5 +93,5 @@ size = ALIGN_UP(size + ioaddr - 4 * iopage, PORTS_PER_PAGE); bitmap_clear_range(task->arch.iomap, iopage, size / 4); - + return EOK; } Index: kernel/arch/ia64/src/drivers/it.c =================================================================== --- kernel/arch/ia64/src/drivers/it.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/drivers/it.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,5 +68,5 @@ it_irq.handler = it_interrupt; irq_register(&it_irq); - + uint64_t base_freq; base_freq = ((bootinfo->freq_scale) & FREQ_NUMERATOR_MASK) >> @@ -75,22 +75,22 @@ base_freq /= ((bootinfo->freq_scale) & FREQ_DENOMINATOR_MASK) >> FREQ_DENOMINATOR_SHIFT; - + it_delta = base_freq / HZ; } - + /* Initialize Interval Timer external interrupt vector */ cr_itv_t itv; - + itv.value = itv_read(); itv.vector = INTERRUPT_TIMER; itv.m = 0; itv_write(itv.value); - + /* Set Interval Timer Counter to zero */ itc_write(0); - + /* Generate first Interval Timer interrupt in IT_DELTA ticks */ itm_write(IT_DELTA); - + /* Propagate changes */ srlz_d(); @@ -113,11 +113,11 @@ { eoi_write(EOI); - + int64_t itm = itm_read(); - + while (true) { int64_t itc = itc_read(); itc += IT_SERVICE_CLOCKS; - + itm += IT_DELTA; if (itm - itc < 0) @@ -126,8 +126,8 @@ break; } - + itm_write(itm); srlz_d(); /* Propagate changes */ - + /* * We are holding a lock which prevents preemption. Index: kernel/arch/ia64/src/drivers/ski.c =================================================================== --- kernel/arch/ia64/src/drivers/ski.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/drivers/ski.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,8 +49,8 @@ /** Interval between polling in microseconds */ POLL_INTERVAL = 10000, /* 0.01 s */ - + /** Max. number of characters to pull out at a time */ POLL_LIMIT = 30, - + SKI_INIT_CONSOLE = 20, SKI_GETCHAR = 21, @@ -82,15 +82,15 @@ { uint64_t ch; - + asm volatile ( "mov r15 = %1\n" "break 0x80000;;\n" /* modifies r8 */ "mov %0 = r8;;\n" - + : "=r" (ch) : "i" (SKI_GETCHAR) : "r15", "r8" ); - + return (wchar_t) ch; } @@ -103,11 +103,11 @@ { int count = POLL_LIMIT; - + while (count > 0) { wchar_t ch = ski_getchar(); - + if (ch == '\0') break; - + indev_push_character(instance->srlnin, ch); --count; @@ -119,5 +119,5 @@ { ski_instance_t *instance = (ski_instance_t *) arg; - + while (true) { // TODO FIXME: @@ -126,5 +126,5 @@ if (console_override) poll_keyboard(instance); - + thread_usleep(POLL_INTERVAL); } @@ -141,5 +141,5 @@ if (instance) return; - + asm volatile ( "mov r15 = %0\n" @@ -149,11 +149,11 @@ : "r15", "r8" ); - + instance = malloc(sizeof(ski_instance_t), FRAME_ATOMIC); - + if (instance) { instance->thread = thread_create(kskipoll, instance, TASK, THREAD_FLAG_UNCOUNTED, "kskipoll"); - + if (!instance->thread) { free(instance); @@ -161,5 +161,5 @@ return; } - + instance->srlnin = NULL; } @@ -196,5 +196,5 @@ if (ch == '\n') ski_do_putchar('\r'); - + ski_do_putchar(ch); } else @@ -208,12 +208,12 @@ if (!instance) return NULL; - + outdev_t *skidev = malloc(sizeof(outdev_t), FRAME_ATOMIC); if (!skidev) return NULL; - + outdev_initialize("skidev", skidev, &skidev_ops); skidev->data = instance; - + if (!fb_exported) { /* @@ -224,8 +224,8 @@ sysinfo_set_item_val("fb", NULL, true); sysinfo_set_item_val("fb.kind", NULL, 6); - + fb_exported = true; } - + return skidev; } @@ -241,8 +241,8 @@ assert(instance); assert(srlnin); - + instance->srlnin = srlnin; thread_ready(instance->thread); - + sysinfo_set_item_val("kbd", NULL, true); sysinfo_set_item_val("kbd.type", NULL, KBD_SKI); Index: kernel/arch/ia64/src/fpu_context.c =================================================================== --- kernel/arch/ia64/src/fpu_context.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/fpu_context.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -103,5 +103,5 @@ [f61] "=m" (fctx->fr[29]) ); - + asm volatile ( "stf.spill %[f62] = f62\n" @@ -314,5 +314,5 @@ [f61] "m" (fctx->fr[29]) ); - + asm volatile ( "ldf.fill f62 = %[f62]\n" Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/ia64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -108,7 +108,7 @@ PAGE_WRITE | PAGE_NOT_CACHEABLE); int i; - + int myid, myeid; - + myid = ia64_get_cpu_id(); myeid = ia64_get_cpu_eid(); @@ -167,10 +167,10 @@ } } - + outdev_t *skidev = skiout_init(); if (skidev) stdout_wire(skidev); #endif - + #ifdef CONFIG_EGA outdev_t *egadev = ega_init(EGA_BASE, EGA_VIDEORAM); @@ -178,5 +178,5 @@ stdout_wire(egadev); #endif - + #ifdef CONFIG_NS16550 ns16550_instance_t *ns16550_instance @@ -191,5 +191,5 @@ } } - + sysinfo_set_item_val("kbd", NULL, true); sysinfo_set_item_val("kbd.inr", NULL, NS16550_IRQ); @@ -198,5 +198,5 @@ (uintptr_t) NS16550_BASE); #endif - + #ifdef CONFIG_I8042 i8042_instance_t *i8042_instance = i8042_init((i8042_t *) I8042_BASE, @@ -211,5 +211,5 @@ } #endif - + sysinfo_set_item_val("ia64_iospace", NULL, true); sysinfo_set_item_val("ia64_iospace.address", NULL, true); @@ -251,5 +251,5 @@ kernel_uarg->uspace_stack_size / 2, (uintptr_t) kernel_uarg->uspace_uarg, psr.value, rsc.value); - + while (1); } @@ -274,5 +274,5 @@ fptr->fnc = (sysarg_t) addr; fptr->gp = ((sysarg_t *) caller)[1]; - + return (void *) fptr; } Index: kernel/arch/ia64/src/interrupt.c =================================================================== --- kernel/arch/ia64/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -124,5 +124,5 @@ { assert(n <= VECTOR_MAX); - + if (n >= VECTORS_16_BUNDLE_START) return vector_names_16_bundle[n - VECTORS_16_BUNDLE_START]; @@ -141,5 +141,5 @@ printf("cr.isr=%#0" PRIx64 "\tcr.ipsr=%#0" PRIx64 "\n", istate->cr_isr.value, istate->cr_ipsr.value); - + printf("cr.iip=%#0" PRIxPTR ", #%u\t(%s)\n", istate->cr_iip, istate->cr_isr.ei, @@ -154,5 +154,5 @@ { const char *desc; - + switch (istate->cr_isr.ge_code) { case GE_ILLEGALOP: @@ -178,5 +178,5 @@ break; } - + fault_if_from_uspace(istate, "General Exception (%s).", desc); panic_badtrap(istate, n, "General Exception (%s).", desc); @@ -209,5 +209,5 @@ istate->cr_ipsr.ri++; } - + interrupts_enable(); ret = syscall_handler(istate->in0, istate->in1, istate->in2, @@ -236,10 +236,10 @@ { cr_ivr_t ivr; - + ivr.value = ivr_read(); srlz_d(); - + irq_t *irq; - + switch (ivr.vector) { case INTERRUPT_SPURIOUS: @@ -248,5 +248,5 @@ #endif break; - + #ifdef CONFIG_SMP case VECTOR_TLB_SHOOTDOWN_IPI: @@ -255,5 +255,5 @@ break; #endif - + case INTERRUPT_TIMER: irq = irq_dispatch_and_lock(ivr.vector); Index: kernel/arch/ia64/src/ivt.S =================================================================== --- kernel/arch/ia64/src/ivt.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/ivt.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,8 +57,8 @@ mov r19 = cr.ipsr mov r20 = cr.isr ;; - + /* 2. Move IIP to IIPA. */ mov cr.iipa = r18 - + /* 3. Sign extend IIM[20:0], shift left by 4 and add to IIP. */ shl r17 = r17, 43 ;; /* shift bit 20 to bit 63 */ @@ -66,9 +66,9 @@ add r18 = r18, r17 ;; mov cr.iip = r18 - + /* 4. Set IPSR.ri to 0. */ dep r19 = 0, r19, PSR_RI_SHIFT, PSR_RI_LEN ;; mov cr.ipsr = r19 - + /* 5. Check whether IPSR.tb or IPSR.ss is set. */ @@ -76,5 +76,5 @@ * Implement this when Taken Branch and Single Step traps can occur. */ - + /* 6. Restore predicates and return from interruption. */ mov pr = r16 ;; @@ -104,9 +104,9 @@ SYMBOL(heavyweight_handler) /* 1. copy interrupt registers into bank 0 */ - + /* * Note that r24-r31 from bank 0 can be used only as long as PSR.ic = 0. */ - + /* Set up FPU as in interrupted context. */ mov r24 = psr @@ -126,8 +126,8 @@ mov r27 = cr.isr mov r28 = cr.ifa - + /* 2. preserve predicate register into bank 0 */ mov r29 = pr ;; - + /* 3. switch to kernel memory stack */ mov r30 = cr.ipsr @@ -149,5 +149,5 @@ */ (p3) cmp.eq p3, p4 = VRN_KERNEL, r31 ;; - + /* * Now, p4 is true iff the stack needs to be switched to kernel stack. @@ -155,5 +155,5 @@ mov r30 = r12 (p4) mov r12 = R_KSTACK ;; - + add r12 = -STACK_FRAME_SIZE, r12 ;; add r31 = STACK_SCRATCH_AREA_SIZE + ISTATE_OFFSET_IN6, r12 @@ -166,5 +166,5 @@ */ cmp.eq p6, p5 = EXC_BREAK_INSTRUCTION, R_VECTOR ;; - + /* * From now on, if this is break_instruction handler, p6 is true and p5 @@ -181,7 +181,7 @@ (p6) st8 [r31] = r32, -STACK_ITEM_SIZE ;; /* save in0 */ (p5) add r31 = -(7 * STACK_ITEM_SIZE), r31 ;; - + st8 [r31] = r30, -STACK_ITEM_SIZE ;; /* save old stack pointer */ - + st8 [r31] = r29, -STACK_ITEM_SIZE ;; /* save predicate registers */ @@ -197,16 +197,16 @@ cover mov r26 = cr.ifs - + st8 [r31] = r24, -STACK_ITEM_SIZE ;; /* save ar.rsc */ st8 [r31] = r25, -STACK_ITEM_SIZE ;; /* save ar.pfs */ st8 [r31] = r26, -STACK_ITEM_SIZE /* save ar.ifs */ - + and r24 = ~(RSC_PL_MASK), r24 ;; and r30 = ~(RSC_MODE_MASK), r24 ;; mov ar.rsc = r30 ;; /* update RSE state */ - + mov r27 = ar.rnat mov r28 = ar.bspstore ;; - + /* * Inspect BSPSTORE to figure out whether it is necessary to switch to @@ -215,5 +215,5 @@ (p1) shr.u r30 = r28, VRN_SHIFT ;; (p1) cmp.eq p1, p2 = VRN_KERNEL, r30 ;; - + /* * If BSPSTORE needs to be switched, p1 is false and p2 is true. @@ -222,14 +222,14 @@ (p2) mov r30 = R_KSTACK_BSP ;; (p2) mov ar.bspstore = r30 ;; - + mov r29 = ar.bsp - + st8 [r31] = r27, -STACK_ITEM_SIZE ;; /* save ar.rnat */ st8 [r31] = r30, -STACK_ITEM_SIZE ;; /* save new value written to ar.bspstore */ st8 [r31] = r28, -STACK_ITEM_SIZE ;; /* save ar.bspstore */ st8 [r31] = r29, -STACK_ITEM_SIZE /* save ar.bsp */ - + mov ar.rsc = r24 /* restore RSE's setting + kernel privileges */ - + /* steps 6 - 15 are done by heavyweight_handler_inner() */ mov R_RET = b0 /* save b0 belonging to interrupted context */ @@ -292,5 +292,5 @@ ld8 r29 = [r31], +STACK_ITEM_SIZE ;; /* load predicate registers */ mov pr = r29 - + /* 19. return from interruption */ ld8 r12 = [r31] /* load stack pointer */ @@ -303,10 +303,10 @@ */ alloc loc0 = ar.pfs, 0, 48, 2, 0 ;; - + /* bank 0 is going to be shadowed, copy essential data from there */ mov loc1 = R_RET /* b0 belonging to interrupted context */ mov loc2 = R_HANDLER mov out0 = R_VECTOR - + add out1 = STACK_SCRATCH_AREA_SIZE, r12 @@ -315,5 +315,5 @@ bsw.1 ;; srlz.d - + /* 7. preserve branch and application registers */ mov loc3 = ar.unat @@ -323,5 +323,5 @@ mov loc7 = ar.csd mov loc8 = ar.ssd - + mov loc9 = b0 mov loc10 = b1 @@ -332,5 +332,5 @@ mov loc15 = b6 mov loc16 = b7 - + /* 8. preserve general and floating-point registers */ mov loc17 = r1 @@ -374,5 +374,5 @@ add r30 = ISTATE_OFFSET_F6 + STACK_SCRATCH_AREA_SIZE, r12 add r31 = ISTATE_OFFSET_F7 + STACK_SCRATCH_AREA_SIZE, r12 ;; - + stf.spill [r26] = f2, 8 * FLOAT_ITEM_SIZE stf.spill [r27] = f3, 8 * FLOAT_ITEM_SIZE @@ -410,5 +410,5 @@ mov loc47 = ar.fpsr /* preserve floating point status register */ - + /* 9. skipped (will not enable interrupts) */ /* @@ -420,5 +420,5 @@ /* 10. call handler */ movl r1 = __gp - + mov b1 = loc2 br.call.sptk.many b0 = b1 @@ -426,5 +426,5 @@ /* 11. return from handler */ 0: - + /* 12. skipped (will not disable interrupts) */ /* @@ -477,5 +477,5 @@ ldf.fill f30 = [r30] ldf.fill f31 = [r31] ;; - + mov r1 = loc17 mov r2 = loc18 @@ -511,5 +511,5 @@ mov ar.fpsr = loc47 /* restore floating point status register */ - + /* 14. restore branch and application registers */ mov ar.unat = loc3 @@ -519,5 +519,5 @@ mov ar.csd = loc7 mov ar.ssd = loc8 - + mov b0 = loc9 mov b1 = loc10 @@ -528,5 +528,5 @@ mov b6 = loc15 mov b7 = loc16 - + /* 15. disable PSR.ic and switch to bank 0 */ rsm PSR_IC_MASK @@ -578,5 +578,5 @@ HEAVYWEIGHT_HANDLER 0x5e HEAVYWEIGHT_HANDLER 0x5f - + HEAVYWEIGHT_HANDLER 0x60 HEAVYWEIGHT_HANDLER 0x61 Index: kernel/arch/ia64/src/mm/as.c =================================================================== --- kernel/arch/ia64/src/mm/as.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/mm/as.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,7 +58,7 @@ region_register_t rr; int i; - + assert(as->asid != ASID_INVALID); - + /* * Load respective ASID (7 consecutive RIDs) to @@ -68,5 +68,5 @@ if (i == VRN_KERNEL) continue; - + rr.word = rr_read(i); rr.map.ve = false; /* disable VHPT walker */ Index: kernel/arch/ia64/src/mm/frame.c =================================================================== --- kernel/arch/ia64/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -92,7 +92,7 @@ if (config.cpu_active > 1) return; - + frame_common_arch_init(true); - + /* * Blacklist ROM regions. @@ -112,5 +112,5 @@ if (config.cpu_active > 1) return; - + frame_common_arch_init(false); } Index: kernel/arch/ia64/src/mm/page.c =================================================================== --- kernel/arch/ia64/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -124,5 +124,5 @@ vrn = page >> VRN_SHIFT; rid = ASID2RID(asid, vrn); - + rr_save.word = rr_read(vrn); if (rr_save.map.rid == rid) { @@ -133,5 +133,5 @@ return v; } - + /* * The RID must be written to some region register. @@ -171,5 +171,5 @@ vrn = page >> VRN_SHIFT; rid = ASID2RID(asid, vrn); - + rr_save.word = rr_read(vrn); if (rr_save.map.rid == rid) { @@ -179,5 +179,5 @@ return ttag(page) == v->present.tag.tag_word; } - + /* * The RID must be written to some region register. @@ -218,5 +218,5 @@ vrn = page >> VRN_SHIFT; rid = ASID2RID(asid, vrn); - + /* * Compute ttag. @@ -231,5 +231,5 @@ srlz_i(); srlz_d(); - + /* * Clear the entry. @@ -239,5 +239,5 @@ v->word[2] = 0; v->word[3] = 0; - + v->present.p = true; v->present.ma = (flags & PAGE_CACHEABLE) ? Index: kernel/arch/ia64/src/mm/tlb.c =================================================================== --- kernel/arch/ia64/src/mm/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/mm/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -61,7 +61,7 @@ uintptr_t adr; uint32_t count1, count2, stride1, stride2; - + unsigned int i, j; - + adr = PAL_PTCE_INFO_BASE(); count1 = PAL_PTCE_INFO_COUNT1(); @@ -69,7 +69,7 @@ stride1 = PAL_PTCE_INFO_STRIDE1(); stride2 = PAL_PTCE_INFO_STRIDE2(); - + ipl = interrupts_disable(); - + for (i = 0; i < count1; i++) { for (j = 0; j < count2; j++) { @@ -82,10 +82,10 @@ adr += stride1; } - + interrupts_restore(ipl); - + srlz_d(); srlz_i(); - + #ifdef CONFIG_VHPT vhpt_invalidate_all(); @@ -110,8 +110,8 @@ int b = 0; int c = cnt; - + uintptr_t va; va = page; - + rr.word = rr_read(VA2VRN(page)); if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(page))))) { @@ -121,5 +121,5 @@ */ region_register_t rr0; - + rr0 = rr; rr0.map.rid = ASID2RID(asid, VA2VRN(page)); @@ -128,10 +128,10 @@ srlz_i(); } - + while (c >>= 1) b++; b >>= 1; uint64_t ps; - + switch (b) { case 0: /* cnt 1 - 3 */ @@ -172,5 +172,5 @@ break; } - + for (; va < (page + cnt * PAGE_SIZE); va += (1UL << ps)) asm volatile ( @@ -179,8 +179,8 @@ [ps] "r" (ps << 2) ); - + srlz_d(); srlz_i(); - + if (restore_rr) { rr_write(VA2VRN(page), rr.word); @@ -229,5 +229,5 @@ region_register_t rr; bool restore_rr = false; - + rr.word = rr_read(VA2VRN(va)); if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(va))))) { @@ -237,5 +237,5 @@ */ region_register_t rr0; - + rr0 = rr; rr0.map.rid = ASID2RID(asid, VA2VRN(va)); @@ -244,5 +244,5 @@ srlz_i(); } - + asm volatile ( "mov r8 = psr ;;\n" @@ -264,5 +264,5 @@ : "p6", "p7", "r8" ); - + if (restore_rr) { rr_write(VA2VRN(va), rr.word); @@ -316,5 +316,5 @@ region_register_t rr; bool restore_rr = false; - + rr.word = rr_read(VA2VRN(va)); if ((restore_rr = (rr.map.rid != ASID2RID(asid, VA2VRN(va))))) { @@ -324,5 +324,5 @@ */ region_register_t rr0; - + rr0 = rr; rr0.map.rid = ASID2RID(asid, VA2VRN(va)); @@ -331,5 +331,5 @@ srlz_i(); } - + asm volatile ( "mov r8 = psr ;;\n" @@ -352,5 +352,5 @@ : "p6", "p7", "r8" ); - + if (restore_rr) { rr_write(VA2VRN(va), rr.word); @@ -373,8 +373,8 @@ { tlb_entry_t entry; - + entry.word[0] = 0; entry.word[1] = 0; - + entry.p = true; /* present */ entry.ma = MA_WRITEBACK; @@ -385,5 +385,5 @@ entry.ppn = frame >> PPN_SHIFT; entry.ps = PAGE_WIDTH; - + if (dtr) dtr_mapping_insert(page, ASID_KERNEL, entry, tr); @@ -418,8 +418,8 @@ { tlb_entry_t entry; - + entry.word[0] = 0; entry.word[1] = 0; - + entry.p = t->p; entry.ma = t->c ? MA_WRITEBACK : MA_UNCACHEABLE; @@ -430,7 +430,7 @@ entry.ppn = t->frame >> PPN_SHIFT; entry.ps = PAGE_WIDTH; - + dtc_mapping_insert(t->page, t->as->asid, entry); - + #ifdef CONFIG_VHPT vhpt_mapping_insert(t->page, t->as->asid, entry); @@ -446,10 +446,10 @@ { tlb_entry_t entry; - + entry.word[0] = 0; entry.word[1] = 0; - + assert(t->x); - + entry.p = t->p; entry.ma = t->c ? MA_WRITEBACK : MA_UNCACHEABLE; @@ -459,7 +459,7 @@ entry.ppn = t->frame >> PPN_SHIFT; entry.ps = PAGE_WIDTH; - + itc_mapping_insert(t->page, t->as->asid, entry); - + #ifdef CONFIG_VHPT vhpt_mapping_insert(t->page, t->as->asid, entry); @@ -486,7 +486,7 @@ uintptr_t va; pte_t t; - + va = istate->cr_ifa; /* faulting address */ - + assert(!is_kernel_fault(va)); @@ -532,18 +532,18 @@ uint64_t io_page = (va & ((1 << LEGACYIO_PAGE_WIDTH) - 1)) >> LEGACYIO_SINGLE_PAGE_WIDTH; - + if (is_io_page_accessible(io_page)) { uint64_t page, frame; - + page = LEGACYIO_USER_BASE + (1 << LEGACYIO_SINGLE_PAGE_WIDTH) * io_page; frame = LEGACYIO_PHYS_BASE + (1 << LEGACYIO_SINGLE_PAGE_WIDTH) * io_page; - + tlb_entry_t entry; - + entry.word[0] = 0; entry.word[1] = 0; - + entry.p = true; /* present */ entry.ma = MA_UNCACHEABLE; @@ -554,5 +554,5 @@ entry.ppn = frame >> PPN_SHIFT; entry.ps = LEGACYIO_SINGLE_PAGE_WIDTH; - + dtc_mapping_insert(page, TASK->as->asid, entry); return 1; @@ -563,5 +563,5 @@ } } - + return 0; } @@ -586,8 +586,8 @@ return; } - + uintptr_t va = istate->cr_ifa; /* faulting address */ as_t *as = AS; - + if (is_kernel_fault(va)) { if (va < end_of_identity) { @@ -601,6 +601,6 @@ } } - - + + pte_t t; bool found = page_mapping_find(as, va, true, &t); @@ -616,5 +616,5 @@ if (try_memmap_io_insertion(va, istate)) return; - + /* * Forward the page fault to the address space page fault @@ -649,7 +649,7 @@ pte_t t; as_t *as = AS; - + va = istate->cr_ifa; /* faulting address */ - + if (is_kernel_fault(va)) as = AS_KERNEL; @@ -683,9 +683,9 @@ uintptr_t va; pte_t t; - + va = istate->cr_ifa; /* faulting address */ assert(!is_kernel_fault(va)); - + bool found = page_mapping_find(AS, va, true, &t); @@ -717,7 +717,7 @@ pte_t t; as_t *as = AS; - + va = istate->cr_ifa; /* faulting address */ - + if (is_kernel_fault(va)) as = AS_KERNEL; @@ -755,9 +755,9 @@ uintptr_t va; pte_t t; - + va = istate->cr_ifa; /* faulting address */ assert(!is_kernel_fault(va)); - + /* * Assume a write to a read-only page. @@ -782,7 +782,7 @@ uintptr_t va; pte_t t; - + va = istate->cr_ifa; /* faulting address */ - + assert(!is_kernel_fault(va)); @@ -790,5 +790,5 @@ assert(found); - + if (t.p) { /* Index: kernel/arch/ia64/src/mm/vhpt.c =================================================================== --- kernel/arch/ia64/src/mm/vhpt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/mm/vhpt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,5 +46,5 @@ if (!vhpt_frame) panic("Kernel configured with VHPT but no memory for table."); - + vhpt_base = (vhpt_entry_t *) PA2KA(vhpt_frame); vhpt_invalidate_all(); @@ -59,10 +59,10 @@ rid_t rid; uint64_t tag; - + vhpt_entry_t *ventry; - + vrn = va >> VRN_SHIFT; rid = ASID2RID(asid, vrn); - + rr_save.word = rr_read(vrn); rr.word = rr_save.word; @@ -70,5 +70,5 @@ rr_write(vrn, rr.word); srlz_i(); - + ventry = (vhpt_entry_t *) thash(va); tag = ttag(va); @@ -76,5 +76,5 @@ srlz_i(); srlz_d(); - + ventry->word[0] = entry.word[0]; ventry->word[1] = entry.word[1]; Index: kernel/arch/ia64/src/proc/scheduler.c =================================================================== --- kernel/arch/ia64/src/proc/scheduler.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/proc/scheduler.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,5 +54,5 @@ { uintptr_t base; - + base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH); @@ -63,8 +63,8 @@ * Use DTR[TR_KSTACK1] and DTR[TR_KSTACK2] to map it. */ - + /* purge DTR[TR_STACK1] and DTR[TR_STACK2] */ dtr_purge((uintptr_t) THREAD->kstack, PAGE_WIDTH+1); - + /* insert DTR[TR_STACK1] and DTR[TR_STACK2] */ dtlb_kernel_mapping_insert((uintptr_t) THREAD->kstack, @@ -74,5 +74,5 @@ DTR_KSTACK2); } - + /* * Record address of kernel backing store to bank 0 r22. Index: kernel/arch/ia64/src/start.S =================================================================== --- kernel/arch/ia64/src/start.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ia64/src/start.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,46 +54,46 @@ SYMBOL(kernel_image_start) .auto - + mov psr.l = r0 srlz.i srlz.d - + # Fill TR.i and TR.d using Region Register #VRN_KERNEL - + movl r8 = (VRN_KERNEL << VRN_SHIFT) mov r9 = rr[r8] - + movl r10 = (RR_MASK) and r9 = r10, r9 movl r10 = (((RID_KERNEL7) << RID_SHIFT) | (KERNEL_PAGE_WIDTH << PS_SHIFT)) or r9 = r10, r9 - + mov rr[r8] = r9 - + movl r8 = (VRN_KERNEL << VRN_SHIFT) mov cr.ifa = r8 - + mov r11 = cr.itir movl r10 = (KERNEL_PAGE_WIDTH << PS_SHIFT) or r10 = r10, r11 mov cr.itir = r10 - + movl r10 = (KERNEL_TRANSLATION_I) itr.i itr[r0] = r10 movl r10 = (KERNEL_TRANSLATION_D) itr.d dtr[r0] = r10 - + # Initialize DCR - + movl r10 = (DCR_DP_MASK | DCR_DK_MASK | DCR_DX_MASK | DCR_DR_MASK | DCR_DA_MASK | DCR_DD_MASK | DCR_LC_MASK) mov r9 = cr.dcr or r10 = r10, r9 mov cr.dcr = r10 - + # Initialize PSR - + movl r10 = (PSR_DT_MASK | PSR_RT_MASK | PSR_IT_MASK | PSR_IC_MASK) /* Enable paging */ mov r9 = psr - + or r10 = r10, r9 mov cr.ipsr = r10 @@ -103,7 +103,7 @@ srlz.d srlz.i - + .explicit - + /* * Return From Interrupt is the only way to @@ -113,5 +113,5 @@ paging_start: - + /* * Now we are paging. @@ -126,8 +126,8 @@ srlz.d ;; - + # Switch to register bank 1 bsw.1 - + # Initialize register stack mov ar.rsc = r0 @@ -135,5 +135,5 @@ mov ar.bspstore = r8 loadrs - + # # Initialize memory stack to some sane value and allocate a scratch area @@ -142,8 +142,8 @@ movl sp = stack0 ;; add sp = -16, sp - + # Initialize gp (Global Pointer) register movl gp = __gp - + # # Initialize bootinfo on BSP. @@ -153,9 +153,9 @@ addl r21 = @gprel(bootinfo), gp ;; st8 [r21] = r20 - + ssm (1 << 19) ;; /* Disable f32 - f127 */ srlz.i srlz.d ;; - + br.call.sptk.many b0 = ia64_pre_main 0: Index: kernel/arch/mips32/include/arch/asm.h =================================================================== --- kernel/arch/mips32/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ { uintptr_t base; - + asm volatile ( "and %[base], $29, %[mask]\n" @@ -61,5 +61,5 @@ : [mask] "r" (~(STACK_SIZE - 1)) ); - + return base; } Index: kernel/arch/mips32/include/arch/atomic.h =================================================================== --- kernel/arch/mips32/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -60,5 +60,5 @@ atomic_count_t tmp; atomic_count_t v; - + asm volatile ( "1:\n" @@ -75,5 +75,5 @@ "i" (0) ); - + return v; } @@ -83,5 +83,5 @@ atomic_count_t tmp; atomic_count_t v; - + asm volatile ( "1:\n" @@ -98,5 +98,5 @@ : "i" (1) ); - + return v; } Index: kernel/arch/mips32/include/arch/mm/page.h =================================================================== --- kernel/arch/mips32/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -165,5 +165,5 @@ { pte_t *p = &pt[i]; - + return ((p->cacheable << PAGE_CACHEABLE_SHIFT) | ((!p->p) << PAGE_PRESENT_SHIFT) | @@ -178,10 +178,10 @@ { pte_t *p = &pt[i]; - + p->cacheable = (flags & PAGE_CACHEABLE) != 0; p->p = !(flags & PAGE_NOT_PRESENT); p->g = (flags & PAGE_GLOBAL) != 0; p->w = (flags & PAGE_WRITE) != 0; - + /* * Ensure that valid entries have at least one bit set. Index: kernel/arch/mips32/src/asm.S =================================================================== --- kernel/arch/mips32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ FUNCTION_BEGIN(memcpy_to_uspace) move $t2, $a0 /* save dst */ - + addiu $v0, $a1, 3 li $v1, -4 /* 0xfffffffffffffffc */ @@ -68,9 +68,9 @@ beq $a1, $v0, 3f move $t0, $a0 - + 0: beq $a2, $zero, 2f move $a3, $zero - + 1: addu $v0, $a1, $a3 @@ -80,9 +80,9 @@ bne $a3, $a2, 1b sb $a0, 0($v1) - + 2: jr $ra move $v0, $t2 - + 3: addiu $v0, $a0, 3 @@ -90,11 +90,11 @@ bne $a0, $v0, 0b srl $t1, $a2, 2 - + beq $t1, $zero, 5f move $a3, $zero - + move $a3, $zero move $a0, $zero - + 4: addu $v0, $a1, $a0 @@ -105,15 +105,15 @@ bne $a3, $t1, 4b addiu $a0, $a0, 4 - + 5: andi $a2, $a2, 0x3 beq $a2, $zero, 2b nop - + sll $v0, $a3, 2 addu $t1, $v0, $t0 move $a3, $zero addu $t0, $v0, $a1 - + 6: addu $v0, $t0, $a3 @@ -123,5 +123,5 @@ bne $a3, $a2, 6b sb $a0, 0($v1) - + jr $ra move $v0, $t2 @@ -188,5 +188,5 @@ fpu_gp_save 30, $a0 fpu_gp_save 31, $a0 - + fpu_ct_save 1, $a0 fpu_ct_save 2, $a0 @@ -259,5 +259,5 @@ fpu_gp_restore 30, $a0 fpu_gp_restore 31, $a0 - + fpu_ct_restore 1, $a0 fpu_ct_restore 2, $a0 Index: kernel/arch/mips32/src/context.S =================================================================== --- kernel/arch/mips32/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,8 +47,8 @@ sw $s8, CONTEXT_OFFSET_S8($a0) sw $gp, CONTEXT_OFFSET_GP($a0) - + sw $ra, CONTEXT_OFFSET_PC($a0) sw $sp, CONTEXT_OFFSET_SP($a0) - + # context_save returns 1 j $31 @@ -67,8 +67,8 @@ lw $s8, CONTEXT_OFFSET_S8($a0) lw $gp, CONTEXT_OFFSET_GP($a0) - + lw $ra, CONTEXT_OFFSET_PC($a0) lw $sp, CONTEXT_OFFSET_SP($a0) - + # context_restore returns 0 j $31 Index: kernel/arch/mips32/src/debug/stacktrace.c =================================================================== --- kernel/arch/mips32/src/debug/stacktrace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/debug/stacktrace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -157,5 +157,5 @@ * We have a candidate for frame pointer. */ - + /* Seek to the end of this function. */ for (cur = inst + 1; !IS_JR_RA(*cur); cur++) @@ -170,5 +170,5 @@ continue; } - + if (IS_JR_RA(*inst)) { if (!ctx->istate) @@ -189,5 +189,5 @@ } while ((!IS_ADDIU_SP_SP_IMM(*inst) && !IS_ADDI_SP_SP_IMM(*inst)) || (IMM_GET(*inst) >= 0)); - + /* * We are at the instruction which allocates the space for the current @@ -210,5 +210,5 @@ if (base == SP || (has_fp && base == fp)) { uint32_t *addr = (void *) (ctx->fp + offset); - + if (offset % 4 != 0) return false; Index: kernel/arch/mips32/src/debugger.c =================================================================== --- kernel/arch/mips32/src/debugger.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/debugger.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -138,10 +138,10 @@ { unsigned int i; - + for (i = 0; jmpinstr[i].andmask; i++) { if ((instr & jmpinstr[i].andmask) == jmpinstr[i].value) return true; } - + return false; } @@ -158,7 +158,7 @@ return 1; } - + irq_spinlock_lock(&bkpoint_lock, true); - + /* Check, that the breakpoints do not conflict */ unsigned int i; @@ -176,9 +176,9 @@ return 0; } - - } - + + } + bpinfo_t *cur = NULL; - + for (i = 0; i < BKPOINTS_MAX; i++) { if (!breakpoints[i].address) { @@ -187,5 +187,5 @@ } } - + if (!cur) { printf("Too many breakpoints.\n"); @@ -193,7 +193,7 @@ return 0; } - + printf("Adding breakpoint on address %p\n", (void *) argv->intval); - + cur->address = (uintptr_t) argv->intval; cur->instruction = ((sysarg_t *) cur->address)[0]; @@ -205,16 +205,16 @@ cur->bkfunc = (void (*)(void *, istate_t *)) argv[1].intval; } - + if (is_jump(cur->instruction)) cur->flags |= BKPOINT_ONESHOT; - + cur->counter = 0; - + /* Set breakpoint */ *((sysarg_t *) cur->address) = 0x0d; smc_coherence(cur->address); - + irq_spinlock_unlock(&bkpoint_lock, true); - + return 1; } @@ -229,7 +229,7 @@ return 0; } - + irq_spinlock_lock(&bkpoint_lock, true); - + bpinfo_t *cur = &breakpoints[argv->intval]; if (!cur->address) { @@ -238,5 +238,5 @@ return 0; } - + if ((cur->flags & BKPOINT_INPROG) && (cur->flags & BKPOINT_ONESHOT)) { printf("Cannot remove one-shot breakpoint in-progress\n"); @@ -244,12 +244,12 @@ return 0; } - + ((uint32_t *) cur->address)[0] = cur->instruction; smc_coherence(((uint32_t *) cur->address)[0]); ((uint32_t *) cur->address)[1] = cur->nextinstruction; smc_coherence(((uint32_t *) cur->address)[1]); - + cur->address = (uintptr_t) NULL; - + irq_spinlock_unlock(&bkpoint_lock, true); return 1; @@ -262,12 +262,12 @@ { unsigned int i; - + printf("[nr] [count] [address ] [inprog] [oneshot] [funccall] [in symbol\n"); - + for (i = 0; i < BKPOINTS_MAX; i++) { if (breakpoints[i].address) { const char *symbol = symtab_fmt_name_lookup( breakpoints[i].address); - + printf("%-4u %7zu %p %-8s %-9s %-10s %s\n", i, breakpoints[i].counter, (void *) breakpoints[i].address, @@ -278,5 +278,5 @@ } } - + return 1; } @@ -290,8 +290,8 @@ { unsigned int i; - + for (i = 0; i < BKPOINTS_MAX; i++) breakpoints[i].address = (uintptr_t) NULL; - + #ifdef CONFIG_KCONSOLE cmd_initialize(&bkpts_info); @@ -299,15 +299,15 @@ log(LF_OTHER, LVL_WARN, "Cannot register command %s", bkpts_info.name); - + cmd_initialize(&delbkpt_info); if (!cmd_register(&delbkpt_info)) log(LF_OTHER, LVL_WARN, "Cannot register command %s", delbkpt_info.name); - + cmd_initialize(&addbkpt_info); if (!cmd_register(&addbkpt_info)) log(LF_OTHER, LVL_WARN, "Cannot register command %s", addbkpt_info.name); - + cmd_initialize(&addbkpte_info); if (!cmd_register(&addbkpte_info)) @@ -331,11 +331,11 @@ if (cp0_cause_read() & 0x80000000) panic("Breakpoint in branch delay slot not supported."); - + irq_spinlock_lock(&bkpoint_lock, false); - + bpinfo_t *cur = NULL; uintptr_t fireaddr = istate->epc; unsigned int i; - + for (i = 0; i < BKPOINTS_MAX; i++) { /* Normal breakpoint */ @@ -345,5 +345,5 @@ break; } - + /* Reinst only breakpoint */ if ((breakpoints[i].flags & BKPOINT_REINST) && @@ -353,5 +353,5 @@ } } - + if (cur) { if (cur->flags & BKPOINT_REINST) { @@ -359,17 +359,17 @@ ((uint32_t *) cur->address)[0] = 0x0d; smc_coherence(((uint32_t *)cur->address)[0]); - + /* Return back the second */ ((uint32_t *) cur->address)[1] = cur->nextinstruction; smc_coherence(((uint32_t *) cur->address)[1]); - + cur->flags &= ~BKPOINT_REINST; irq_spinlock_unlock(&bkpoint_lock, false); return; } - + if (cur->flags & BKPOINT_INPROG) printf("Warning: breakpoint recursion\n"); - + if (!(cur->flags & BKPOINT_FUNCCALL)) { printf("***Breakpoint %u: %p in %s.\n", i, @@ -377,5 +377,5 @@ symtab_fmt_name_lookup(fireaddr)); } - + /* Return first instruction back */ ((uint32_t *)cur->address)[0] = cur->instruction; @@ -392,12 +392,12 @@ (void *) fireaddr, symtab_fmt_name_lookup(fireaddr)); - + /* Move on to next instruction */ istate->epc += 4; } - + if (cur) cur->counter++; - + if (cur && (cur->flags & BKPOINT_FUNCCALL)) { /* Allow zero bkfunc, just for counting */ @@ -414,12 +414,12 @@ atomic_set(&haltstate, 1); irq_spinlock_unlock(&bkpoint_lock, false); - + kconsole("debug", "Debug console ready.\n", false); - + irq_spinlock_lock(&bkpoint_lock, false); atomic_set(&haltstate, 0); #endif } - + if ((cur) && (cur->address == fireaddr) && ((cur->flags & BKPOINT_INPROG))) { @@ -427,9 +427,9 @@ if ((cur->flags & BKPOINT_ONESHOT)) cur->address = (uintptr_t) NULL; - + /* Remove in-progress flag */ cur->flags &= ~BKPOINT_INPROG; } - + irq_spinlock_unlock(&bkpoint_lock, false); } Index: kernel/arch/mips32/src/exception.c =================================================================== --- kernel/arch/mips32/src/exception.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/exception.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,33 +77,33 @@ "lo =%#010" PRIx32 "\thi =%#010" PRIx32 "\n", istate->epc, istate->status, istate->lo, istate->hi); - + log_printf("a0 =%#010" PRIx32 "\ta1 =%#010" PRIx32 "\t" "a2 =%#010" PRIx32 "\ta3 =%#010" PRIx32 "\n", istate->a0, istate->a1, istate->a2, istate->a3); - + log_printf("t0 =%#010" PRIx32 "\tt1 =%#010" PRIx32 "\t" "t2 =%#010" PRIx32 "\tt3 =%#010" PRIx32 "\n", istate->t0, istate->t1, istate->t2, istate->t3); - + log_printf("t4 =%#010" PRIx32 "\tt5 =%#010" PRIx32 "\t" "t6 =%#010" PRIx32 "\tt7 =%#010" PRIx32 "\n", istate->t4, istate->t5, istate->t6, istate->t7); - + log_printf("t8 =%#010" PRIx32 "\tt9 =%#010" PRIx32 "\t" "v0 =%#010" PRIx32 "\tv1 =%#010" PRIx32 "\n", istate->t8, istate->t9, istate->v0, istate->v1); - + log_printf("s0 =%#010" PRIx32 "\ts1 =%#010" PRIx32 "\t" "s2 =%#010" PRIx32 "\ts3 =%#010" PRIx32 "\n", istate->s0, istate->s1, istate->s2, istate->s3); - + log_printf("s4 =%#010" PRIx32 "\ts5 =%#010" PRIx32 "\t" "s6 =%#010" PRIx32 "\ts7 =%#010" PRIx32 "\n", istate->s4, istate->s5, istate->s6, istate->s7); - + log_printf("s8 =%#010" PRIx32 "\tat =%#010" PRIx32 "\t" "kt0=%#010" PRIx32 "\tkt1=%#010" PRIx32 "\n", istate->s8, istate->at, istate->kt0, istate->kt1); - + log_printf("sp =%#010" PRIx32 "\tra =%#010" PRIx32 "\t" "gp =%#010" PRIx32 "\n", @@ -171,5 +171,5 @@ ip = (cp0_cause_read() & cp0_cause_ip_mask) >> cp0_cause_ip_shift; im = (cp0_status_read() & cp0_status_im_mask) >> cp0_status_im_shift; - + unsigned int i; for (i = 0; i < 8; i++) { @@ -212,10 +212,10 @@ { unsigned int i; - + /* Clear exception table */ for (i = 0; i < IVT_ITEMS; i++) exc_register(i, "undef", false, (iroutine_t) unhandled_exception); - + exc_register(EXC_Bp, "bkpoint", true, (iroutine_t) breakpoint_exception); @@ -230,10 +230,10 @@ exc_register(EXC_Int, "interrupt", true, (iroutine_t) interrupt_exception); - + #ifdef CONFIG_FPU_LAZY exc_register(EXC_CpU, "cpunus", true, (iroutine_t) cpuns_exception); #endif - + exc_register(EXC_Sys, "syscall", true, (iroutine_t) syscall_exception); Index: kernel/arch/mips32/src/interrupt.c =================================================================== --- kernel/arch/mips32/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -132,7 +132,7 @@ /* Count overflow detected */ count_hi++; - + lastcount = cp0_count_read(); - + unsigned long drift = cp0_count_read() - nextcount; while (drift > cp0_compare_value) { @@ -140,8 +140,8 @@ CPU->missed_clock_ticks++; } - + nextcount = cp0_count_read() + cp0_compare_value - drift; cp0_compare_write(nextcount); - + /* * We are holding a lock which prevents preemption. @@ -151,5 +151,5 @@ clock(); irq_spinlock_lock(&irq->lock, false); - + if (virtual_timer_fnc != NULL) virtual_timer_fnc(); @@ -172,5 +172,5 @@ { irq_init(IRQ_COUNT, IRQ_COUNT); - + irq_initialize(&timer_irq); timer_irq.inr = TIMER_IRQ; @@ -178,8 +178,8 @@ timer_irq.handler = timer_irq_handler; irq_register(&timer_irq); - + timer_start(); cp0_unmask_int(TIMER_IRQ); - + #ifdef MACHINE_msim irq_initialize(&dorder_irq); @@ -188,5 +188,5 @@ dorder_irq.handler = dorder_irq_handler; irq_register(&dorder_irq); - + cp0_unmask_int(DORDER_IRQ); #endif Index: kernel/arch/mips32/src/mips32.c =================================================================== --- kernel/arch/mips32/src/mips32.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/mips32.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -86,5 +86,5 @@ { init.cnt = min3(bootinfo->cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); - + size_t i; for (i = 0; i < init.cnt; i++) { @@ -94,5 +94,5 @@ bootinfo->tasks[i].name); } - + for (i = 0; i < CPUMAP_MAX_RECORDS; i++) { if ((bootinfo->cpumap & (1 << i)) != 0) @@ -112,5 +112,5 @@ /* It is not assumed by default */ interrupts_disable(); - + /* Initialize dispatch table */ exception_init(); @@ -123,5 +123,5 @@ memcpy(CACHE_EXC, (char *) cache_error_entry, EXCEPTION_JUMP_SIZE); smc_coherence_block(CACHE_EXC, EXCEPTION_JUMP_SIZE); - + /* * Switch to BEV normal level so that exception vectors point to the @@ -130,10 +130,10 @@ cp0_status_write(cp0_status_read() & ~(cp0_status_bev_bootstrap_bit | cp0_status_erl_error_bit)); - + /* * Mask all interrupts */ cp0_mask_all_int(); - + debugger_init(); } @@ -171,5 +171,5 @@ (uintptr_t) kernel_uarg->uspace_uarg, (uintptr_t) kernel_uarg->uspace_entry); - + while (1); } Index: kernel/arch/mips32/src/mm/frame.c =================================================================== --- kernel/arch/mips32/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -82,5 +82,5 @@ if (frame == (KA2PA(MSIM_VIDEORAM) >> ZERO_PAGE_WIDTH)) return false; - + /* MSIM device (dkeyboard) */ if (frame == (KA2PA(MSIM_KBD_ADDRESS) >> ZERO_PAGE_WIDTH)) @@ -92,5 +92,5 @@ return false; #endif - + return true; } @@ -108,15 +108,15 @@ if ((frame << ZERO_PAGE_WIDTH) < KA2PA(config.base)) return false; - + /* Kernel */ if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE, KA2PA(config.base), config.kernel_size)) return false; - + /* Kernel stack */ if (overlaps(frame << ZERO_PAGE_WIDTH, ZERO_PAGE_SIZE, KA2PA(config.stack_base), config.stack_size)) return false; - + /* Init tasks */ bool safe = true; @@ -128,5 +128,5 @@ break; } - + return safe; } @@ -161,5 +161,5 @@ ZONE_AVAILABLE | ZONE_HIGHMEM); } - + if (phys_regions_count < MAX_REGIONS) { phys_regions[phys_regions_count].start = first; @@ -182,5 +182,5 @@ { ipl_t ipl = interrupts_disable(); - + /* Clear and initialize TLB */ cp0_pagemask_write(ZERO_PAGE_MASK); @@ -194,9 +194,9 @@ tlbwi(); } - + pfn_t start_frame = 0; pfn_t frame; bool avail = true; - + /* Walk through all 1 MB frames */ for (frame = 0; frame < ZERO_FRAMES; frame++) { @@ -211,5 +211,5 @@ tlb_prepare_entry_lo(&lo1, false, false, false, false, 0); tlb_prepare_entry_hi(&hi, ZERO_PAGE_ASID, ZERO_PAGE_ADDR); - + cp0_pagemask_write(ZERO_PAGE_MASK); cp0_entry_lo0_write(lo0.value); @@ -218,5 +218,5 @@ cp0_index_write(ZERO_PAGE_TLBI); tlbwi(); - + ZERO_PAGE_VALUE = 0; if (ZERO_PAGE_VALUE != 0) @@ -229,5 +229,5 @@ } } - + if (!avail) { frame_add_region(start_frame, frame, true); @@ -236,7 +236,7 @@ } } - + frame_add_region(start_frame, frame, true); - + /* Blacklist interrupt vector frame */ frame_mark_unavailable(0, 1); @@ -267,5 +267,5 @@ frame_mark_unavailable(0, 1024 * 1024 / FRAME_SIZE); #endif - + /* Cleanup */ cp0_pagemask_write(ZERO_PAGE_MASK); @@ -275,5 +275,5 @@ cp0_index_write(ZERO_PAGE_TLBI); tlbwi(); - + interrupts_restore(ipl); } @@ -286,5 +286,5 @@ { printf("[base ] [size ]\n"); - + size_t i; for (i = 0; i < phys_regions_count; i++) { Index: kernel/arch/mips32/src/mm/tlb.c =================================================================== --- kernel/arch/mips32/src/mm/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/mm/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -76,10 +76,10 @@ /* Clear and initialize TLB. */ - + for (i = 0; i < TLB_ENTRY_COUNT; i++) { cp0_index_write(i); tlbwi(); } - + /* * The kernel is going to make use of some wired @@ -98,5 +98,5 @@ uintptr_t badvaddr; pte_t pte; - + badvaddr = cp0_badvaddr_read(); @@ -291,16 +291,16 @@ lo1_save.value = cp0_entry_lo1_read(); mask_save.value = cp0_pagemask_read(); - + printf("[nr] [asid] [vpn2 ] [mask] [gvdc] [pfn ]\n"); - + for (i = 0; i < TLB_ENTRY_COUNT; i++) { cp0_index_write(i); tlbr(); - + mask.value = cp0_pagemask_read(); hi.value = cp0_entry_hi_read(); lo0.value = cp0_entry_lo0_read(); lo1.value = cp0_entry_lo1_read(); - + printf("%-4u %-6u %0#10x %-#6x %1u%1u%1u%1u %0#10x\n", i, hi.asid, HI_VPN22ADDR(hi.vpn2), mask.mask, @@ -309,5 +309,5 @@ lo1.g, lo1.v, lo1.d, lo1.c, LO_PFN2ADDR(lo1.pfn)); } - + cp0_entry_hi_write(hi_save.value); cp0_entry_lo0_write(lo0_save.value); @@ -339,8 +339,8 @@ cp0_entry_lo0_write(lo0.value); cp0_entry_lo1_write(lo1.value); - + tlbwi(); } - + cp0_entry_hi_write(hi_save.value); } @@ -360,11 +360,11 @@ hi_save.value = cp0_entry_hi_read(); - + for (i = 0; i < TLB_ENTRY_COUNT; i++) { cp0_index_write(i); tlbr(); - + hi.value = cp0_entry_hi_read(); - + if (hi.asid == asid) { lo0.value = cp0_entry_lo0_read(); @@ -380,5 +380,5 @@ } } - + cp0_entry_hi_write(hi_save.value); } @@ -399,5 +399,5 @@ assert(interrupts_disabled()); - + if (asid == ASID_INVALID) return; @@ -431,5 +431,5 @@ } } - + cp0_entry_hi_write(hi_save.value); } Index: kernel/arch/mips32/src/start.S =================================================================== --- kernel/arch/mips32/src/start.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/mips32/src/start.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -89,25 +89,25 @@ sw $s7, ISTATE_OFFSET_S7(\r) sw $s8, ISTATE_OFFSET_S8(\r) - + mflo $at sw $at, ISTATE_OFFSET_LO(\r) mfhi $at sw $at, ISTATE_OFFSET_HI(\r) - + sw $gp, ISTATE_OFFSET_GP(\r) sw $ra, ISTATE_OFFSET_RA(\r) sw $k0, ISTATE_OFFSET_KT0(\r) sw $k1, ISTATE_OFFSET_KT1(\r) - + mfc0 $t0, $status mfc0 $t1, $epc - + /* save only KSU, EXL, ERL, IE */ and $t2, $t0, REG_SAVE_MASK - + /* clear KSU, EXL, ERL, IE */ li $t3, ~(REG_SAVE_MASK) and $t0, $t0, $t3 - + sw $t2, ISTATE_OFFSET_STATUS(\r) sw $t1, ISTATE_OFFSET_EPC(\r) @@ -122,13 +122,13 @@ mfc0 $t0, $status lw $t1, ISTATE_OFFSET_STATUS(\r) - + /* mask UM, EXL, ERL, IE */ li $t2, ~REG_SAVE_MASK and $t0, $t0, $t2 - + /* copy UM, EXL, ERL, IE from saved status */ or $t0, $t0, $t1 mtc0 $t0, $status - + lw $v0, ISTATE_OFFSET_V0(\r) lw $v1, ISTATE_OFFSET_V1(\r) @@ -147,17 +147,17 @@ lw $t8, ISTATE_OFFSET_T8(\r) lw $t9, ISTATE_OFFSET_T9(\r) - + lw $gp, ISTATE_OFFSET_GP(\r) lw $ra, ISTATE_OFFSET_RA(\r) lw $k1, ISTATE_OFFSET_KT1(\r) - + lw $at, ISTATE_OFFSET_LO(\r) mtlo $at lw $at, ISTATE_OFFSET_HI(\r) mthi $at - + lw $at, ISTATE_OFFSET_EPC(\r) mtc0 $at, $epc - + lw $at, ISTATE_OFFSET_AT(\r) lw $sp, ISTATE_OFFSET_SP(\r) @@ -172,14 +172,14 @@ mfc0 $k0, $status andi $k0, 0x10 - + beq $k0, $0, 1f move $k0, $sp - + /* move $k0 pointer to kernel stack */ la $k0, supervisor_sp - + /* move $k0 (supervisor_sp) */ lw $k0, ($k0) - + 1: .endm @@ -190,12 +190,12 @@ lui $sp, %hi(end_stack) ori $sp, $sp, %lo(end_stack) - + /* not sure about this, but might be needed for PIC code */ lui $gp, 0x8000 - + /* $a1 contains physical address of bootinfo_t */ jal mips32_pre_main addiu $sp, -ABI_STACK_FRAME - + j main_bsp nop @@ -219,20 +219,20 @@ exception_handler: KERNEL_STACK_TO_K0 - + sub $k0, ISTATE_SIZE sw $sp, ISTATE_OFFSET_SP($k0) move $sp, $k0 - + mfc0 $k0, $cause - + sra $k0, $k0, 0x2 /* cp0_exc_cause() part 1 */ andi $k0, $k0, 0x1f /* cp0_exc_cause() part 2 */ sub $k0, 8 /* 8 = SYSCALL */ - + beqz $k0, syscall_shortcut add $k0, 8 /* revert $k0 back to correct exc number */ - + REGISTERS_STORE_AND_EXC_RESET $sp - + move $a1, $sp move $a0, $k0 @@ -240,5 +240,5 @@ addiu $sp, -ABI_STACK_FRAME addiu $sp, ABI_STACK_FRAME - + REGISTERS_LOAD $sp /* the $sp is automatically restored to former value */ @@ -265,13 +265,13 @@ sw $t3, ISTATE_OFFSET_EPC($sp) /* save EPC */ sw $k1, ISTATE_OFFSET_KT1($sp) /* save $k1 not saved on context switch */ - + and $t4, $t2, REG_SAVE_MASK /* save only KSU, EXL, ERL, IE */ li $t5, ~(0x1f) and $t2, $t2, $t5 /* clear KSU, EXL, ERL */ ori $t2, $t2, 0x1 /* set IE */ - + sw $t4, ISTATE_OFFSET_STATUS($sp) mtc0 $t2, $status - + /* * Call the higher level system call handler. @@ -280,12 +280,12 @@ sw $t0, ISTATE_OFFSET_T0($sp) /* save the 5th argument on the stack */ sw $t1, ISTATE_OFFSET_T1($sp) /* save the 6th argument on the stack */ - + jal syscall_handler sw $v0, ISTATE_OFFSET_V0($sp) /* save the syscall number on the stack */ - + /* restore status */ mfc0 $t2, $status lw $t3, ISTATE_OFFSET_STATUS($sp) - + /* * Change back to EXL = 1 (from last exception), otherwise @@ -297,5 +297,5 @@ or $t2, $t2, $t3 /* copy saved UM, EXL, ERL, IE */ mtc0 $t2, $status - + /* restore epc + 4 */ lw $t2, ISTATE_OFFSET_EPC($sp) @@ -303,5 +303,5 @@ addi $t2, $t2, 4 mtc0 $t2, $epc - + lw $sp, ISTATE_OFFSET_SP($sp) /* restore $sp */ eret @@ -314,10 +314,10 @@ sw $sp, ISTATE_OFFSET_SP($k0) move $sp, $k0 - + move $a0, $sp jal tlb_refill addiu $sp, -ABI_STACK_FRAME addiu $sp, ABI_STACK_FRAME - + REGISTERS_LOAD $sp eret @@ -330,10 +330,10 @@ sw $sp, ISTATE_OFFSET_SP($k0) move $sp, $k0 - + move $a0, $sp jal cache_error addiu $sp, -ABI_STACK_FRAME addiu $sp, ABI_STACK_FRAME - + REGISTERS_LOAD $sp eret Index: kernel/arch/ppc32/include/arch/asm.h =================================================================== --- kernel/arch/ppc32/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,10 +45,10 @@ { uint32_t msr; - + asm volatile ( "mfmsr %[msr]\n" : [msr] "=r" (msr) ); - + return msr; } @@ -77,5 +77,5 @@ { uint32_t vsid; - + asm volatile ( "mfsrin %[vsid], %[vaddr]\n" @@ -83,5 +83,5 @@ : [vaddr] "r" (vaddr) ); - + return vsid; } @@ -90,10 +90,10 @@ { uint32_t sdr1; - + asm volatile ( "mfsdr1 %[sdr1]\n" : [sdr1] "=r" (sdr1) ); - + return sdr1; } @@ -173,5 +173,5 @@ { uintptr_t base; - + asm volatile ( "and %[base], %%sp, %[mask]\n" @@ -179,5 +179,5 @@ : [mask] "r" (~(STACK_SIZE - 1)) ); - + return base; } Index: kernel/arch/ppc32/include/arch/atomic.h =================================================================== --- kernel/arch/ppc32/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -41,5 +41,5 @@ { atomic_count_t tmp; - + asm volatile ( "1:\n" @@ -59,5 +59,5 @@ { atomic_count_t tmp; - + asm volatile ( "1:\n" Index: kernel/arch/ppc32/include/arch/barrier.h =================================================================== --- kernel/arch/ppc32/include/arch/barrier.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/barrier.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,5 +77,5 @@ { unsigned int i; - + for (i = 0; i < len; i += COHERENCE_INVAL_MIN) asm volatile ( @@ -83,7 +83,7 @@ :: [addr] "r" (addr + i) ); - + memory_barrier(); - + for (i = 0; i < len; i += COHERENCE_INVAL_MIN) asm volatile ( @@ -91,5 +91,5 @@ :: [addr] "r" (addr + i) ); - + instruction_barrier(); } Index: kernel/arch/ppc32/include/arch/cycle.h =================================================================== --- kernel/arch/ppc32/include/arch/cycle.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/cycle.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,5 +43,5 @@ uint32_t upper; uint32_t tmp; - + do { asm volatile ( @@ -54,5 +54,5 @@ ); } while (upper != tmp); - + return ((uint64_t) upper << 32) + (uint64_t) lower; } Index: kernel/arch/ppc32/include/arch/mm/frame.h =================================================================== --- kernel/arch/ppc32/include/arch/mm/frame.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/mm/frame.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,10 +49,10 @@ { uint32_t physmem; - + asm volatile ( "mfsprg3 %[physmem]\n" : [physmem] "=r" (physmem) ); - + return physmem; } Index: kernel/arch/ppc32/include/arch/mm/page.h =================================================================== --- kernel/arch/ppc32/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -165,5 +165,5 @@ { pte_t *entry = &pt[i]; - + return (((!entry->page_cache_disable) << PAGE_CACHEABLE_SHIFT) | ((!entry->present) << PAGE_PRESENT_SHIFT) | @@ -178,5 +178,5 @@ { pte_t *entry = &pt[i]; - + entry->page_cache_disable = !(flags & PAGE_CACHEABLE); entry->present = !(flags & PAGE_NOT_PRESENT); Index: kernel/arch/ppc32/src/asm.S =================================================================== --- kernel/arch/ppc32/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,32 +40,32 @@ * r5 = entry */ - + /* Disable interrupts */ - + mfmsr r31 rlwinm r31, r31, 0, 17, 15 mtmsr r31 isync - + /* Set entry point */ - + mtsrr0 r5 - + /* Set privileged state, enable interrupts */ - + ori r31, r31, MSR_PR ori r31, r31, MSR_EE mtsrr1 r31 - + /* Set stack */ - + mr sp, r4 - + /* %r6 is defined to hold pcb_ptr - set it to 0 */ - + xor r6, r6, r6 - + /* Jump to userspace */ - + rfi FUNCTION_END(userspace_asm) @@ -73,10 +73,10 @@ SYMBOL(iret) /* Disable interrupts */ - + mfmsr r31 rlwinm r31, r31, 0, 17, 15 mtmsr r31 isync - + lwz r0, ISTATE_OFFSET_R0(sp) lwz r2, ISTATE_OFFSET_R2(sp) @@ -109,36 +109,36 @@ lwz r30, ISTATE_OFFSET_R30(sp) lwz r31, ISTATE_OFFSET_R31(sp) - + lwz r12, ISTATE_OFFSET_CR(sp) mtcr r12 - + lwz r12, ISTATE_OFFSET_PC(sp) mtsrr0 r12 - + lwz r12, ISTATE_OFFSET_SRR1(sp) mtsrr1 r12 - + lwz r12, ISTATE_OFFSET_LR(sp) mtlr r12 - + lwz r12, ISTATE_OFFSET_CTR(sp) mtctr r12 - + lwz r12, ISTATE_OFFSET_XER(sp) mtxer r12 - + lwz r12, ISTATE_OFFSET_R12(sp) lwz sp, ISTATE_OFFSET_SP(sp) - + rfi SYMBOL(iret_syscall) /* Disable interrupts */ - + mfmsr r31 rlwinm r31, r31, 0, 17, 15 mtmsr r31 isync - + lwz r0, ISTATE_OFFSET_R0(sp) lwz r2, ISTATE_OFFSET_R2(sp) @@ -170,26 +170,26 @@ lwz r30, ISTATE_OFFSET_R30(sp) lwz r31, ISTATE_OFFSET_R31(sp) - + lwz r12, ISTATE_OFFSET_CR(sp) mtcr r12 - + lwz r12, ISTATE_OFFSET_PC(sp) mtsrr0 r12 - + lwz r12, ISTATE_OFFSET_SRR1(sp) mtsrr1 r12 - + lwz r12, ISTATE_OFFSET_LR(sp) mtlr r12 - + lwz r12, ISTATE_OFFSET_CTR(sp) mtctr r12 - + lwz r12, ISTATE_OFFSET_XER(sp) mtxer r12 - + lwz r12, ISTATE_OFFSET_R12(sp) lwz sp, ISTATE_OFFSET_SP(sp) - + rfi @@ -200,11 +200,11 @@ addi r4, r4, -4 beq 2f - + andi. r0, r6, 3 mtctr r7 bne 5f - + 1: - + lwz r7, 4(r4) lwzu r8, 8(r4) @@ -212,18 +212,18 @@ stwu r8, 8(r6) bdnz 1b - + andi. r5, r5, 7 - + 2: - + cmplwi 0, r5, 4 blt 3f - + lwzu r0, 4(r4) addi r5, r5, -4 stwu r0, 4(r6) - + 3: - + cmpwi 0, r5, 0 beqlr @@ -231,19 +231,19 @@ addi r4, r4, 3 addi r6, r6, 3 - + 4: - + lbzu r0, 1(r4) stbu r0, 1(r6) bdnz 4b blr - + 5: - + subfic r0, r0, 4 mtctr r0 - + 6: - + lbz r7, 4(r4) addi r4, r4, 1 Index: kernel/arch/ppc32/src/boot/boot.S =================================================================== --- kernel/arch/ppc32/src/boot/boot.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/boot/boot.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -35,16 +35,16 @@ SYMBOL(kernel_image_start) # load temporal kernel stack - + lis sp, kernel_stack@ha addi sp, sp, kernel_stack@l - + # set kernel stack for interrupt handling - + mr r31, sp subis r31, r31, 0x8000 mtsprg0 r31 - + # r3 contains physical address of bootinfo_t - + addis r3, r3, 0x8000 bl ppc32_pre_main Index: kernel/arch/ppc32/src/context.S =================================================================== --- kernel/arch/ppc32/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,11 +55,11 @@ stw r30, CONTEXT_OFFSET_R30(r3) stw r31, CONTEXT_OFFSET_R31(r3) - + mflr r4 stw r4, CONTEXT_OFFSET_PC(r3) - + mfcr r4 stw r4, CONTEXT_OFFSET_CR(r3) - + # context_save returns 1 li r3, 1 @@ -89,11 +89,11 @@ lwz r30, CONTEXT_OFFSET_R30(r3) lwz r31, CONTEXT_OFFSET_R31(r3) - + lwz r4, CONTEXT_OFFSET_CR(r3) mtcr r4 - + lwz r4, CONTEXT_OFFSET_PC(r3) mtlr r4 - + # context_restore returns 0 li r3, 0 Index: kernel/arch/ppc32/src/cpu/cpu.c =================================================================== --- kernel/arch/ppc32/src/cpu/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/cpu/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,5 +54,5 @@ { const char *name; - + switch (cpu->arch.version) { case 8: @@ -71,5 +71,5 @@ name = "unknown"; } - + printf("cpu%u: version=%" PRIu16" (%s), revision=%" PRIu16 "\n", cpu->id, cpu->arch.version, name, cpu->arch.revision); Index: kernel/arch/ppc32/src/drivers/pic.c =================================================================== --- kernel/arch/ppc32/src/drivers/pic.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/drivers/pic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ pic[PIC_MASK_HIGH] = pic[PIC_MASK_HIGH] | (1 << (intnum - 32)); } - + } @@ -85,14 +85,14 @@ if (pic) { uint32_t pending; - + pending = pic[PIC_PENDING_LOW]; if (pending != 0) return fnzb32(pending); - + pending = pic[PIC_PENDING_HIGH]; if (pending != 0) return fnzb32(pending) + 32; } - + return 255; } Index: kernel/arch/ppc32/src/exception.S =================================================================== --- kernel/arch/ppc32/src/exception.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/exception.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,29 +38,29 @@ .macro CONTEXT_STORE - + # save r12 in SPRG1, backup CR in r12 # save SP in SPRG2 - + mtsprg1 r12 mfcr r12 mtsprg2 sp - + # check whether the previous mode was user or kernel - + mfsrr1 sp # use sp as a temporary register to hold SRR1 andi. sp, sp, MSR_PR bne 1f # previous mode was kernel - + mfsprg2 sp subis sp, sp, 0x8000 b 2f - + 1: # previous mode was user - + mfsprg0 sp 2: - + subi sp, sp, ALIGN_UP(ISTATE_SIZE, STACK_ALIGNMENT) stw r0, ISTATE_OFFSET_R0(sp) @@ -94,28 +94,28 @@ stw r30, ISTATE_OFFSET_R30(sp) stw r31, ISTATE_OFFSET_R31(sp) - + stw r12, ISTATE_OFFSET_CR(sp) - + mfsrr0 r12 stw r12, ISTATE_OFFSET_PC(sp) - + mfsrr1 r12 stw r12, ISTATE_OFFSET_SRR1(sp) - + mflr r12 stw r12, ISTATE_OFFSET_LR(sp) - + mfctr r12 stw r12, ISTATE_OFFSET_CTR(sp) - + mfxer r12 stw r12, ISTATE_OFFSET_XER(sp) - + mfdar r12 stw r12, ISTATE_OFFSET_DAR(sp) - + mfsprg1 r12 stw r12, ISTATE_OFFSET_R12(sp) - + mfsprg2 r12 stw r12, ISTATE_OFFSET_SP(sp) @@ -129,5 +129,5 @@ SYMBOL(exc_system_reset) CONTEXT_STORE - + li r3, 0 b jump_to_kernel @@ -136,5 +136,5 @@ SYMBOL(exc_machine_check) CONTEXT_STORE - + li r3, 1 b jump_to_kernel @@ -143,5 +143,5 @@ SYMBOL(exc_data_storage) CONTEXT_STORE - + li r3, 2 b jump_to_kernel @@ -150,5 +150,5 @@ SYMBOL(exc_instruction_storage) CONTEXT_STORE - + li r3, 3 b jump_to_kernel @@ -157,5 +157,5 @@ SYMBOL(exc_external) CONTEXT_STORE - + li r3, 4 b jump_to_kernel @@ -164,5 +164,5 @@ SYMBOL(exc_alignment) CONTEXT_STORE - + li r3, 5 b jump_to_kernel @@ -171,5 +171,5 @@ SYMBOL(exc_program) CONTEXT_STORE - + li r3, 6 b jump_to_kernel @@ -178,5 +178,5 @@ SYMBOL(exc_fp_unavailable) CONTEXT_STORE - + li r3, 7 b jump_to_kernel @@ -185,5 +185,5 @@ SYMBOL(exc_decrementer) CONTEXT_STORE - + li r3, 8 b jump_to_kernel @@ -192,5 +192,5 @@ SYMBOL(exc_reserved0) CONTEXT_STORE - + li r3, 9 b jump_to_kernel @@ -199,5 +199,5 @@ SYMBOL(exc_reserved1) CONTEXT_STORE - + li r3, 10 b jump_to_kernel @@ -206,5 +206,5 @@ SYMBOL(exc_syscall) CONTEXT_STORE - + b jump_to_kernel_syscall @@ -212,5 +212,5 @@ SYMBOL(exc_trace) CONTEXT_STORE - + li r3, 12 b jump_to_kernel @@ -219,5 +219,5 @@ SYMBOL(exc_itlb_miss) CONTEXT_STORE - + li r3, 13 b jump_to_kernel @@ -226,5 +226,5 @@ SYMBOL(exc_dtlb_miss_load) CONTEXT_STORE - + li r3, 14 b jump_to_kernel @@ -233,5 +233,5 @@ SYMBOL(exc_dtlb_miss_store) CONTEXT_STORE - + li r3, 15 b jump_to_kernel @@ -244,5 +244,5 @@ # Previous mode was kernel. # We can construct a proper frame linkage. - + mfsrr0 r12 stw r12, ISTATE_OFFSET_LR_FRAME(sp) @@ -265,8 +265,8 @@ ori r12, r12, (MSR_IR | MSR_DR) mtsrr1 r12 - + addis sp, sp, 0x8000 mr r4, sp - + rfi @@ -275,5 +275,5 @@ addi r12, r12, syscall_handler@l mtsrr0 r12 - + lis r12, iret_syscall@ha addi r12, r12, iret_syscall@l @@ -286,5 +286,5 @@ ori r12, r12, (MSR_IR | MSR_DR | MSR_EE) mtsrr1 r12 - + addis sp, sp, 0x8000 rfi Index: kernel/arch/ppc32/src/fpu_context.S =================================================================== --- kernel/arch/ppc32/src/fpu_context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/fpu_context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -106,8 +106,8 @@ FUNCTION_BEGIN(fpu_context_save) FPU_CONTEXT_STORE r3 - + mffs fr0 stfd fr0, FPU_CONTEXT_OFFSET_FPSCR(r3) - + blr FUNCTION_END(fpu_context_save) @@ -116,7 +116,7 @@ lfd fr0, FPU_CONTEXT_OFFSET_FPSCR(r3) mtfsf 0xff, fr0 - + FPU_CONTEXT_LOAD r3 - + blr FUNCTION_END(fpu_context_restore) @@ -125,12 +125,12 @@ mfmsr r0 ori r0, r0, MSR_FP - + # Disable FPU exceptions li r3, MSR_FE0 | MSR_FE1 andc r0, r0, r3 - + mtmsr r0 isync - + blr FUNCTION_END(fpu_init) Index: kernel/arch/ppc32/src/interrupt.c =================================================================== --- kernel/arch/ppc32/src/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -66,41 +66,41 @@ log_printf("r0 =%0#10" PRIx32 "\tr1 =%0#10" PRIx32 "\t" "r2 =%0#10" PRIx32 "\n", istate->r0, istate->sp, istate->r2); - + log_printf("r3 =%0#10" PRIx32 "\tr4 =%0#10" PRIx32 "\t" "r5 =%0#10" PRIx32 "\n", istate->r3, istate->r4, istate->r5); - + log_printf("r6 =%0#10" PRIx32 "\tr7 =%0#10" PRIx32 "\t" "r8 =%0#10" PRIx32 "\n", istate->r6, istate->r7, istate->r8); - + log_printf("r9 =%0#10" PRIx32 "\tr10=%0#10" PRIx32 "\t" "r11=%0#10" PRIx32 "\n", istate->r9, istate->r10, istate->r11); - + log_printf("r12=%0#10" PRIx32 "\tr13=%0#10" PRIx32 "\t" "r14=%0#10" PRIx32 "\n", istate->r12, istate->r13, istate->r14); - + log_printf("r15=%0#10" PRIx32 "\tr16=%0#10" PRIx32 "\t" "r17=%0#10" PRIx32 "\n", istate->r15, istate->r16, istate->r17); - + log_printf("r18=%0#10" PRIx32 "\tr19=%0#10" PRIx32 "\t" "r20=%0#10" PRIx32 "\n", istate->r18, istate->r19, istate->r20); - + log_printf("r21=%0#10" PRIx32 "\tr22=%0#10" PRIx32 "\t" "r23=%0#10" PRIx32 "\n", istate->r21, istate->r22, istate->r23); - + log_printf("r24=%0#10" PRIx32 "\tr25=%0#10" PRIx32 "\t" "r26=%0#10" PRIx32 "\n", istate->r24, istate->r25, istate->r26); - + log_printf("r27=%0#10" PRIx32 "\tr28=%0#10" PRIx32 "\t" "r29=%0#10" PRIx32 "\n", istate->r27, istate->r28, istate->r29); - + log_printf("r30=%0#10" PRIx32 "\tr31=%0#10" PRIx32 "\n", istate->r30, istate->r31); - + log_printf("cr =%0#10" PRIx32 "\tpc =%0#10" PRIx32 "\t" "lr =%0#10" PRIx32 "\n", istate->cr, istate->pc, istate->lr); - + log_printf("ctr=%0#10" PRIx32 "\txer=%0#10" PRIx32 "\t" "dar=%0#10" PRIx32 "\n", istate->ctr, istate->xer, istate->dar); - + log_printf("srr1=%0#10" PRIx32 "\n", istate->srr1); } @@ -119,5 +119,5 @@ * The IRQ handler was found. */ - + if (irq->preack) { /* Acknowledge the interrupt before processing */ @@ -125,12 +125,12 @@ irq->cir(irq->cir_arg, irq->inr); } - + irq->handler(irq); - + if (!irq->preack) { if (irq->cir) irq->cir(irq->cir_arg, irq->inr); } - + irq_spinlock_unlock(&irq->lock, false); } else { Index: kernel/arch/ppc32/src/mm/as.c =================================================================== --- kernel/arch/ppc32/src/mm/as.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/mm/as.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,9 +56,9 @@ { uint32_t sr; - + /* Lower 2 GB, user and supervisor access */ for (sr = 0; sr < 8; sr++) sr_set(0x6000, as->asid, sr); - + /* Upper 2 GB, only supervisor access */ for (sr = 8; sr < 16; sr++) Index: kernel/arch/ppc32/src/mm/frame.c =================================================================== --- kernel/arch/ppc32/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,5 +45,5 @@ { printf("[base ] [size ]\n"); - + size_t i; for (i = 0; i < memmap.cnt; i++) { @@ -57,5 +57,5 @@ pfn_t minconf = 2; size_t i; - + for (i = 0; i < memmap.cnt; i++) { /* To be safe, make the available zone possibly smaller */ @@ -64,5 +64,5 @@ size_t size = ALIGN_DOWN(memmap.zones[i].size - (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE); - + if (!frame_adjust_zone_bounds(low, &base, &size)) return; @@ -86,5 +86,5 @@ } } - + } @@ -92,12 +92,12 @@ { frame_common_arch_init(true); - + /* First is exception vector, second is 'implementation specific', third and fourth is reserved, other contain real mode code */ frame_mark_unavailable(0, 8); - + /* Mark the Page Hash Table frames as unavailable */ uint32_t sdr1 = sdr1_get(); - + // FIXME: compute size of PHT exactly frame_mark_unavailable(ADDR2PFN(sdr1 & 0xffff000), 16); Index: kernel/arch/ppc32/src/mm/pht.c =================================================================== --- kernel/arch/ppc32/src/mm/pht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/mm/pht.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -93,11 +93,11 @@ uint32_t page = (vaddr >> 12) & 0xffff; uint32_t api = (vaddr >> 22) & 0x3f; - + uint32_t vsid = sr_get(vaddr); uint32_t sdr1 = sdr1_get(); - + // FIXME: compute size of PHT exactly phte_t *phte = (phte_t *) PA2KA(sdr1 & 0xffff0000); - + /* Primary hash (xor) */ uint32_t h = 0; @@ -106,5 +106,5 @@ uint32_t i; bool found = false; - + /* Find colliding PTE in PTEG */ for (i = 0; i < 8; i++) { @@ -117,5 +117,5 @@ } } - + if (!found) { /* Find unused PTE in PTEG */ @@ -127,9 +127,9 @@ } } - + if (!found) { /* Secondary hash (not) */ uint32_t base2 = (~hash & 0x3ff) << 3; - + /* Find colliding PTE in PTEG */ for (i = 0; i < 8; i++) { @@ -144,5 +144,5 @@ } } - + if (!found) { /* Find unused PTE in PTEG */ @@ -156,9 +156,9 @@ } } - + if (!found) i = RANDI(seed) % 8; } - + phte[base + i].v = 1; phte[base + i].vsid = vsid; @@ -181,14 +181,14 @@ { uintptr_t badvaddr; - + if (n == VECTOR_DATA_STORAGE) badvaddr = istate->dar; else badvaddr = istate->pc; - + pte_t pte; bool found = find_mapping_and_check(AS, badvaddr, PF_ACCESS_READ /* FIXME */, istate, &pte); - + if (found) { /* Record access to PTE */ @@ -201,8 +201,8 @@ { uint32_t sdr1 = sdr1_get(); - + // FIXME: compute size of PHT exactly phte_t *phte = (phte_t *) PA2KA(sdr1 & 0xffff0000); - + // FIXME: this invalidates all PHT entries, // which is an overkill, invalidate only Index: kernel/arch/ppc32/src/mm/tlb.c =================================================================== --- kernel/arch/ppc32/src/mm/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/mm/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -42,5 +42,5 @@ ptehi_t ptehi; ptelo_t ptelo; - + asm volatile ( "mfspr %[tlbmiss], 980\n" @@ -51,15 +51,15 @@ [ptelo] "=r" (ptelo) ); - + uint32_t badvaddr = tlbmiss & 0xfffffffc; uint32_t physmem = physmem_top(); - + if ((badvaddr < PA2KA(0)) || (badvaddr >= PA2KA(physmem))) return; // FIXME - + ptelo.rpn = KA2PA(badvaddr) >> 12; ptelo.wimg = 0; ptelo.pp = 2; // FIXME - + uint32_t index = 0; asm volatile ( @@ -84,5 +84,5 @@ "sync\n" ); - + for (unsigned int i = 0; i < 0x00040000; i += 0x00001000) { asm volatile ( @@ -91,5 +91,5 @@ ); } - + asm volatile ( "eieio\n" @@ -143,8 +143,8 @@ { uint32_t sr; - + for (sr = 0; sr < 16; sr++) { uint32_t vsid = sr_get(sr << 28); - + printf("sr[%02" PRIu32 "]: vsid=%#0" PRIx32 " (asid=%" PRIu32 ")" "%s%s\n", sr, vsid & UINT32_C(0x00ffffff), @@ -153,15 +153,15 @@ ((vsid >> 29) & 1) ? " user" : ""); } - + uint32_t upper; uint32_t lower; uint32_t mask; uint32_t length; - + PRINT_BAT("ibat[0]", 528, 529); PRINT_BAT("ibat[1]", 530, 531); PRINT_BAT("ibat[2]", 532, 533); PRINT_BAT("ibat[3]", 534, 535); - + PRINT_BAT("dbat[0]", 536, 537); PRINT_BAT("dbat[1]", 538, 539); Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/ppc32.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -91,5 +91,5 @@ bootinfo->taskmap.tasks[i].name); } - + /* Copy physical memory map. */ memmap.total = bootinfo->memmap.total; @@ -99,9 +99,9 @@ memmap.zones[i].size = bootinfo->memmap.zones[i].size; } - + /* Copy boot allocations info. */ ballocs.base = bootinfo->ballocs.base; ballocs.size = bootinfo->ballocs.size; - + /* Copy OFW tree. */ ofw_tree_init(bootinfo->ofw_root); @@ -112,5 +112,5 @@ /* Initialize dispatch table */ interrupt_init(); - + ofw_tree_node_t *cpus_node; ofw_tree_node_t *cpu_node; @@ -144,17 +144,17 @@ uint32_t fb_scanline = 0; unsigned int visual = VISUAL_UNKNOWN; - + ofw_tree_property_t *prop = ofw_tree_getprop(node, "address"); if ((prop) && (prop->value)) fb_addr = *((uintptr_t *) prop->value); - + prop = ofw_tree_getprop(node, "width"); if ((prop) && (prop->value)) fb_width = *((uint32_t *) prop->value); - + prop = ofw_tree_getprop(node, "height"); if ((prop) && (prop->value)) fb_height = *((uint32_t *) prop->value); - + prop = ofw_tree_getprop(node, "depth"); if ((prop) && (prop->value)) { @@ -180,9 +180,9 @@ } } - + prop = ofw_tree_getprop(node, "linebytes"); if ((prop) && (prop->value)) fb_scanline = *((uint32_t *) prop->value); - + if ((fb_addr) && (fb_width > 0) && (fb_height > 0) && (fb_scanline > 0) && (visual != VISUAL_UNKNOWN)) { @@ -195,10 +195,10 @@ .visual = visual, }; - + outdev_t *fbdev = fb_init(&fb_prop); if (fbdev) stdout_wire(fbdev); } - + return true; } @@ -213,8 +213,8 @@ /* Map OFW information into sysinfo */ ofw_sysinfo_map(); - + /* Initialize IRQ routing */ irq_init(IRQ_COUNT, IRQ_COUNT); - + /* Merge all zones to 1 big zone */ zone_merge_all(); @@ -225,14 +225,14 @@ { ofw_pci_reg_t *assigned_address = NULL; - + ofw_tree_property_t *prop = ofw_tree_getprop(node, "assigned-addresses"); if ((prop) && (prop->value)) assigned_address = ((ofw_pci_reg_t *) prop->value); - + if (assigned_address) { /* Initialize PIC */ pic_init(assigned_address[0].addr, PAGE_SIZE, &pic_cir, &pic_cir_arg); - + #ifdef CONFIG_MAC_KBD uintptr_t pa = assigned_address[0].addr + 0x16000; @@ -240,8 +240,8 @@ size_t offset = pa - aligned_addr; size_t size = 2 * PAGE_SIZE; - + cuda_t *cuda = (cuda_t *) (km_map(aligned_addr, offset + size, PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset); - + /* Initialize I/O controller */ cuda_instance_t *cuda_instance = @@ -256,5 +256,5 @@ } } - + /* * This is the necessary evil until the userspace driver is entirely @@ -266,5 +266,5 @@ #endif } - + /* Consider only a single device for now */ return false; @@ -299,5 +299,5 @@ kernel_uarg->uspace_stack_size - SP_DELTA, (uintptr_t) kernel_uarg->uspace_entry); - + /* Unreachable */ while (true); Index: kernel/arch/ppc32/src/proc/scheduler.c =================================================================== --- kernel/arch/ppc32/src/proc/scheduler.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/ppc32/src/proc/scheduler.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -52,5 +52,5 @@ { tlb_invalidate_all(); - + asm volatile ( "mtsprg0 %[ksp]\n" Index: kernel/arch/riscv64/include/arch/asm.h =================================================================== --- kernel/arch/riscv64/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,10 +45,10 @@ { ipl_t ipl; - + asm volatile ( "csrrsi %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n" : [ipl] "=r" (ipl) ); - + return ipl; } @@ -57,10 +57,10 @@ { ipl_t ipl; - + asm volatile ( "csrrci %[ipl], sstatus, " STRING(SSTATUS_SIE_MASK) "\n" : [ipl] "=r" (ipl) ); - + return ipl; } @@ -77,10 +77,10 @@ { ipl_t ipl; - + asm volatile ( "csrr %[ipl], sstatus\n" : [ipl] "=r" (ipl) ); - + return ipl; } @@ -94,5 +94,5 @@ { uintptr_t base; - + asm volatile ( "and %[base], sp, %[mask]\n" @@ -100,5 +100,5 @@ : [mask] "r" (~(STACK_SIZE - 1)) ); - + return base; } Index: kernel/arch/riscv64/include/arch/atomic.h =================================================================== --- kernel/arch/riscv64/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ { atomic_count_t orig; - + asm volatile ( "amoadd.d %[orig], %[inc], %[addr]\n" @@ -65,5 +65,5 @@ : [inc] "r" (1) ); - + return orig; } @@ -72,5 +72,5 @@ { atomic_count_t orig; - + asm volatile ( "amoadd.d %[orig], %[inc], %[addr]\n" @@ -78,5 +78,5 @@ : [inc] "r" (-1) ); - + return orig; } @@ -85,5 +85,5 @@ { atomic_count_t orig; - + asm volatile ( "amoadd.d %[orig], %[inc], %[addr]\n" @@ -91,5 +91,5 @@ : [inc] "r" (1) ); - + return orig - 1; } @@ -98,5 +98,5 @@ { atomic_count_t orig; - + asm volatile ( "amoadd.d %[orig], %[inc], %[addr]\n" @@ -104,5 +104,5 @@ : [inc] "r" (-1) ); - + return orig + 1; } Index: kernel/arch/riscv64/include/arch/cycle.h =================================================================== --- kernel/arch/riscv64/include/arch/cycle.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/include/arch/cycle.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -41,10 +41,10 @@ { uint64_t cycle; - + asm volatile ( "rdcycle %[cycle]\n" : [cycle] "=r" (cycle) ); - + return cycle; } Index: kernel/arch/riscv64/include/arch/mm/page.h =================================================================== --- kernel/arch/riscv64/include/arch/mm/page.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/include/arch/mm/page.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -182,5 +182,5 @@ { pte_t *entry = &pt[i]; - + return (((!entry->valid) << PAGE_PRESENT_SHIFT) | (entry->user << PAGE_USER_SHIFT) | @@ -194,5 +194,5 @@ { pte_t *entry = &pt[i]; - + entry->valid = !(flags & PAGE_NOT_PRESENT); entry->readable = (flags & PAGE_READ) != 0; Index: kernel/arch/riscv64/src/boot/boot.S =================================================================== --- kernel/arch/riscv64/src/boot/boot.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/boot/boot.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -36,14 +36,14 @@ /* Setup temporary stack */ la sp, temp_stack - + /* Create the first stack frame */ addi sp, sp, -16 - + /* Call riscv64_pre_main() */ jal riscv64_pre_main - + /* Call main_bsp() */ jal main_bsp - + /* Not reached */ csrci sstatus, SSTATUS_SIE_MASK Index: kernel/arch/riscv64/src/context.S =================================================================== --- kernel/arch/riscv64/src/context.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/context.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,8 +47,8 @@ sd s10, CONTEXT_OFFSET_S10(a0) sd s11, CONTEXT_OFFSET_S11(a0) - + sd ra, CONTEXT_OFFSET_PC(a0) sd sp, CONTEXT_OFFSET_SP(a0) - + # context_save returns 1 li a0, 1 @@ -71,8 +71,8 @@ ld s10, CONTEXT_OFFSET_S10(a0) ld s11, CONTEXT_OFFSET_S11(a0) - + ld ra, CONTEXT_OFFSET_PC(a0) ld sp, CONTEXT_OFFSET_SP(a0) - + # context_restore returns 0 li a0, 0 Index: kernel/arch/riscv64/src/drivers/ucb.c =================================================================== --- kernel/arch/riscv64/src/drivers/ucb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/drivers/ucb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,5 +53,5 @@ if (!val) return; - + *fromhost = 0; } @@ -68,5 +68,5 @@ if (!htifdev) return NULL; - + outdev_initialize("htifdev", htifdev, &htifdev_ops); return htifdev; @@ -78,8 +78,8 @@ (((uint64_t) cmd) << 48) | (payload & UINT64_C(0xffffffffffff)); - + while (*tohost) poll_fromhost(); - + *tohost = val; } Index: kernel/arch/riscv64/src/mm/frame.c =================================================================== --- kernel/arch/riscv64/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ pfn_t minconf = max3(ADDR2PFN(physmem_start), htif_frame + 1, pt_frame + 1); - + for (size_t i = 0; i < memmap.cnt; i++) { /* To be safe, make the available zone possibly smaller */ @@ -63,12 +63,12 @@ size_t size = ALIGN_DOWN(memmap.zones[i].size - (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE); - + if (!frame_adjust_zone_bounds(low, &base, &size)) return; - + pfn_t pfn = ADDR2PFN(base); size_t count = SIZE2FRAMES(size); pfn_t conf; - + if (low) { if ((minconf < pfn) || (minconf >= pfn + count)) @@ -76,5 +76,5 @@ else conf = minconf; - + zone_create(pfn, count, conf, ZONE_AVAILABLE | ZONE_LOWMEM); @@ -91,5 +91,5 @@ { frame_common_arch_init(true); - + frame_mark_unavailable(htif_frame, 1); frame_mark_unavailable(pt_frame, 1); Index: kernel/arch/riscv64/src/mm/page.c =================================================================== --- kernel/arch/riscv64/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,7 +53,7 @@ if (config.cpu_active == 1) { page_mapping_operations = &pt_mapping_operations; - + page_table_lock(AS_KERNEL, true); - + /* * PA2KA(identity) mapping for all low-memory frames. @@ -64,11 +64,11 @@ page_mapping_insert(AS_KERNEL, PA2KA(cur), cur, PAGE_GLOBAL | PAGE_CACHEABLE | PAGE_EXEC | PAGE_WRITE | PAGE_READ); - + page_table_unlock(AS_KERNEL, true); - + // FIXME: register page fault extension handler - + write_satp((uintptr_t) AS_KERNEL->genarch.page_table); - + /* The boot page table is no longer needed. */ // FIXME: frame_mark_available(pt_frame, 1); @@ -84,5 +84,5 @@ uint64_t satp = ((ptl0 >> FRAME_WIDTH) & SATP_PFN_MASK) | SATP_MODE_SV48; - + asm volatile ( "csrw sptbr, %[satp]\n" Index: kernel/arch/riscv64/src/riscv64.c =================================================================== --- kernel/arch/riscv64/src/riscv64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/riscv64/src/riscv64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,11 +69,11 @@ htif_frame = bootinfo->htif_frame; pt_frame = bootinfo->pt_frame; - + htif_init(bootinfo->ucbinfo.tohost, bootinfo->ucbinfo.fromhost); - + /* Copy tasks map. */ init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); - + for (size_t i = 0; i < init.cnt; i++) { init.tasks[i].paddr = KA2PA(bootinfo->taskmap.tasks[i].addr); @@ -82,5 +82,5 @@ bootinfo->taskmap.tasks[i].name); } - + /* Copy physical memory map. */ memmap.total = bootinfo->memmap.total; Index: kernel/arch/sparc64/include/arch/asm.h =================================================================== --- kernel/arch/sparc64/include/arch/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -91,10 +91,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%pstate, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -122,10 +122,10 @@ { uint64_t v; - + asm volatile ( "rd %%tick_cmpr, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -153,10 +153,10 @@ { uint64_t v; - + asm volatile ( "rd %%asr25, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -184,10 +184,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%tick, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -215,10 +215,10 @@ { uint64_t v; - + asm volatile ( "rd %%fprs, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -246,10 +246,10 @@ { uint64_t v; - + asm volatile ( "rd %%softint, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -312,9 +312,9 @@ pstate_reg_t pstate; uint64_t value = pstate_read(); - + pstate.value = value; pstate.ie = true; pstate_write(pstate.value); - + return (ipl_t) value; } @@ -331,9 +331,9 @@ pstate_reg_t pstate; uint64_t value = pstate_read(); - + pstate.value = value; pstate.ie = false; pstate_write(pstate.value); - + return (ipl_t) value; } @@ -348,5 +348,5 @@ NO_TRACE static inline void interrupts_restore(ipl_t ipl) { pstate_reg_t pstate; - + pstate.value = pstate_read(); pstate.ie = ((pstate_reg_t)(uint64_t) ipl).ie; @@ -373,5 +373,5 @@ { pstate_reg_t pstate; - + pstate.value = pstate_read(); return !pstate.ie; @@ -388,5 +388,5 @@ { uintptr_t unbiased_sp; - + asm volatile ( "add %%sp, %[stack_bias], %[unbiased_sp]\n" @@ -394,5 +394,5 @@ : [stack_bias] "i" (STACK_BIAS) ); - + return ALIGN_DOWN(unbiased_sp, STACK_SIZE); } @@ -406,10 +406,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%ver, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -423,10 +423,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%tpc, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -440,10 +440,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%tl, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -457,10 +457,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%tba, %[v]\n" : [v] "=r" (v) ); - + return v; } @@ -492,5 +492,5 @@ { uint64_t v; - + asm volatile ( "ldxa [%[va]] %[asi], %[v]\n" @@ -499,5 +499,5 @@ [asi] "i" ((unsigned int) asi) ); - + return v; } Index: kernel/arch/sparc64/include/arch/atomic.h =================================================================== --- kernel/arch/sparc64/include/arch/atomic.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/atomic.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,11 +56,11 @@ atomic_count_t a; atomic_count_t b; - + do { volatile uintptr_t ptr = (uintptr_t) &val->count; - + a = *((atomic_count_t *) ptr); b = a + i; - + asm volatile ( "casx %0, %2, %1\n" @@ -70,5 +70,5 @@ ); } while (a != b); - + return a; } @@ -108,5 +108,5 @@ atomic_count_t v = 1; volatile uintptr_t ptr = (uintptr_t) &val->count; - + asm volatile ( "casx %0, %2, %1\n" @@ -115,5 +115,5 @@ : "r" (0) ); - + return v; } @@ -123,9 +123,9 @@ atomic_count_t tmp1 = 1; atomic_count_t tmp2 = 0; - + volatile uintptr_t ptr = (uintptr_t) &val->count; - + preemption_disable(); - + asm volatile ( "0:\n" @@ -144,5 +144,5 @@ : "r" (0) ); - + /* * Prevent critical section code from bleeding out this way up. Index: kernel/arch/sparc64/include/arch/barrier.h =================================================================== --- kernel/arch/sparc64/include/arch/barrier.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/barrier.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -83,5 +83,5 @@ { unsigned long pc; - + /* * The FLUSH instruction takes address parameter. @@ -94,5 +94,5 @@ * */ - + asm volatile ( "rd %%pc, %[pc]\n" Index: kernel/arch/sparc64/include/arch/cpu_family.h =================================================================== --- kernel/arch/sparc64/include/arch/cpu_family.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/cpu_family.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -76,5 +76,5 @@ return (impl == IMPL_ULTRASPARCIV) || (impl == IMPL_ULTRASPARCIV_PLUS); } - + #endif Index: kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h =================================================================== --- kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/mm/sun4u/mmu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -111,5 +111,5 @@ unsigned dc : 1; /**< D-Cache enable. */ unsigned ic : 1; /**< I-Cache enable. */ - + } __attribute__ ((packed)); } lsu_cr_reg_t; Index: kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h =================================================================== --- kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/mm/sun4u/tlb.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -79,5 +79,5 @@ #define TLB_DBIG_0 2 #define TLB_DBIG_1 3 - + /* I-MMU: one small (16-entry) TLB and one big TLB */ #define TLB_ISMALL 0 @@ -327,5 +327,5 @@ { itlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_entry = entry; @@ -341,5 +341,5 @@ { itlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_entry = entry; @@ -358,5 +358,5 @@ { dtlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_entry = entry; @@ -372,5 +372,5 @@ { dtlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_entry = entry; @@ -423,5 +423,5 @@ { itlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_number = tlb; @@ -439,5 +439,5 @@ { itlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_number = tlb; @@ -458,5 +458,5 @@ { dtlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_number = tlb; @@ -475,5 +475,5 @@ { dtlb_data_access_addr_t reg; - + reg.value = 0; reg.tlb_number = tlb; @@ -638,12 +638,12 @@ tlb_demap_addr_t da; page_address_t pg; - + da.value = 0; pg.address = page; - + da.type = type; da.context = context_encoding; da.vpn = pg.vpn; - + /* da.value is the address within the ASI */ asi_u64_write(ASI_IMMU_DEMAP, da.value, 0); @@ -664,12 +664,12 @@ tlb_demap_addr_t da; page_address_t pg; - + da.value = 0; pg.address = page; - + da.type = type; da.context = context_encoding; da.vpn = pg.vpn; - + /* da.value is the address within the ASI */ asi_u64_write(ASI_DMMU_DEMAP, da.value, 0); Index: kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h =================================================================== --- kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/mm/sun4v/mmu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -41,5 +41,5 @@ #define VA_PRIMARY_CONTEXT_REG 0x8 /**< primary context register VA. */ #define ASI_PRIMARY_CONTEXT_REG 0x21 /**< primary context register ASI. */ - + #define VA_SECONDARY_CONTEXT_REG 0x10 /**< secondary context register VA. */ #define ASI_SECONDARY_CONTEXT_REG 0x21 /**< secondary context register ASI. */ Index: kernel/arch/sparc64/include/arch/sun4u/asm.h =================================================================== --- kernel/arch/sparc64/include/arch/sun4u/asm.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/sun4u/asm.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,10 +46,10 @@ { uint64_t v; - + asm volatile ( "rdpr %%ver, %[v]\n" : [v] "=r" (v) ); - + return v; } Index: kernel/arch/sparc64/include/arch/sun4u/cpu.h =================================================================== --- kernel/arch/sparc64/include/arch/sun4u/cpu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/sun4u/cpu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -78,5 +78,5 @@ uint64_t icbus_config = asi_u64_read(ASI_ICBUS_CONFIG, 0); icbus_config = icbus_config >> ICBUS_CONFIG_MID_SHIFT; - + #if defined (US) return icbus_config & 0x1f; Index: kernel/arch/sparc64/include/arch/sun4v/hypercall.h =================================================================== --- kernel/arch/sparc64/include/arch/sun4v/hypercall.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/include/arch/sun4v/hypercall.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -105,5 +105,5 @@ set function_number, %o5; \ ta FAST_TRAP; - + /** * Performs a fast hypervisor API call from the assembly language code. @@ -197,5 +197,5 @@ register uint64_t a4 asm("o3") = p4; register uint64_t a5 asm("o4") = p5; - + asm volatile ( "ta %8\n" @@ -239,5 +239,5 @@ : "memory" ); - + return a1; } Index: kernel/arch/sparc64/src/asm.S =================================================================== --- kernel/arch/sparc64/src/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,12 +47,12 @@ add %o0, 7, %g1 mov 0, %g3 - + 0: - + brz,pn %o2, 2f mov 0, %g2 - + 1: - + lduba [%g3 + %o1] ASI_AIUS, %g1 add %g2, 1, %g2 @@ -61,12 +61,12 @@ bne,pt %xcc, 1b mov %g2, %g3 - + 2: - + jmp %o7 + 8 /* exit point */ mov %o3, %o0 - + 3: - + and %g1, -8, %g1 cmp %o0, %g1 @@ -76,7 +76,7 @@ brz,pn %g4, 5f mov 0, %g5 - + 4: - + sllx %g3, 3, %g2 add %g5, 1, %g3 @@ -86,7 +86,7 @@ bne,pt %xcc, 4b stx %g1, [%o0 + %g2] - + 5: - + and %o2, 7, %o2 brz,pn %o2, 2b @@ -96,7 +96,7 @@ add %g1, %o1, %g4 mov 0, %g3 - + 6: - + lduba [%g2 + %g4] ASI_AIUS, %g1 stb %g1, [%g2 + %o0] @@ -105,5 +105,5 @@ bne,pt %xcc, 6b mov %g2, %g3 - + jmp %o7 + 8 /* exit point */ mov %o3, %o0 @@ -121,12 +121,12 @@ add %o0, 7, %g1 mov 0, %g3 - + 0: - + brz,pn %o2, 2f mov 0, %g2 - + 1: - + ldub [%g3 + %o1], %g1 add %g2, 1, %g2 @@ -135,12 +135,12 @@ bne,pt %xcc, 1b mov %g2, %g3 - + 2: - + jmp %o7 + 8 /* exit point */ mov %o3, %o0 - + 3: - + and %g1, -8, %g1 cmp %o0, %g1 @@ -150,7 +150,7 @@ brz,pn %g4, 5f mov 0, %g5 - + 4: - + sllx %g3, 3, %g2 add %g5, 1, %g3 @@ -160,7 +160,7 @@ bne,pt %xcc, 4b stxa %g1, [%o0 + %g2] ASI_AIUS - + 5: - + and %o2, 7, %o2 brz,pn %o2, 2b @@ -170,7 +170,7 @@ add %g1, %o1, %g4 mov 0, %g3 - + 6: - + ldub [%g2 + %g4], %g1 stba %g1, [%g2 + %o0] ASI_AIUS @@ -179,5 +179,5 @@ bne,pt %xcc, 6b mov %g2, %g3 - + jmp %o7 + 8 /* exit point */ mov %o3, %o0 Index: kernel/arch/sparc64/src/console.c =================================================================== --- kernel/arch/sparc64/src/console.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/console.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,5 +69,5 @@ if (!screen) panic("Cannot find %s.", (char *) prop_scr->value); - + scr_init(screen); #endif @@ -82,5 +82,5 @@ if (!keyboard) panic("Cannot find %s.", (char *) prop_kbd->value); - + kbd_init(keyboard); #endif @@ -95,12 +95,12 @@ ofw_tree_node_t *aliases; ofw_tree_property_t *prop; - + aliases = ofw_tree_lookup("/aliases"); if (!aliases) panic("Cannot find '/aliases'."); - + /* "def-cn" = "default console" */ prop = ofw_tree_getprop(aliases, "def-cn"); - + if ((!prop) || (!prop->value)) standard_console_init(aliases); Index: kernel/arch/sparc64/src/cpu/sun4u/cpu.c =================================================================== --- kernel/arch/sparc64/src/cpu/sun4u/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/cpu/sun4u/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ if ((!prop) || (!prop->value)) prop = ofw_tree_getprop(node, "cpuid"); - + if (prop && prop->value) { mid = *((uint32_t *) prop->value); @@ -69,5 +69,5 @@ } } - + return -1; } @@ -80,7 +80,7 @@ ofw_tree_node_t *node; uint32_t clock_frequency = 0; - + CPU->arch.mid = read_mid(); - + /* * Detect processor frequency. @@ -109,5 +109,5 @@ } } - + CPU->arch.clock_frequency = clock_frequency; tick_init(); @@ -146,5 +146,5 @@ break; } - + switch (CPU->arch.ver.impl) { case IMPL_ULTRASPARCI: Index: kernel/arch/sparc64/src/cpu/sun4v/cpu.c =================================================================== --- kernel/arch/sparc64/src/cpu/sun4v/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/cpu/sun4v/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -71,5 +71,5 @@ } } - + tick_init(); Index: kernel/arch/sparc64/src/debug/stacktrace.c =================================================================== --- kernel/arch/sparc64/src/debug/stacktrace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/debug/stacktrace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,5 +57,5 @@ { uintptr_t kstack; - + #if defined(SUN4U) kstack = read_from_ag_g6(); Index: kernel/arch/sparc64/src/drivers/kbd.c =================================================================== --- kernel/arch/sparc64/src/drivers/kbd.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/drivers/kbd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,8 +62,8 @@ { const char *name = ofw_tree_node_name(node); - + if (str_cmp(name, "su") != 0) return false; - + /* * Read 'interrupts' property. @@ -75,7 +75,7 @@ return false; } - + uint32_t interrupts = *((uint32_t *) prop->value); - + /* * Read 'reg' property. @@ -87,7 +87,7 @@ return false; } - + size_t size = ((ofw_ebus_reg_t *) prop->value)->size; - + uintptr_t pa = 0; // Prevent -Werror=maybe-uninitialized if (!ofw_ebus_apply_ranges(node->parent, @@ -97,5 +97,5 @@ return false; } - + inr_t inr; cir_t cir; @@ -108,5 +108,5 @@ return false; } - + /* * We need to pass aligned address to hw_map(). @@ -117,8 +117,8 @@ uintptr_t aligned_addr = ALIGN_DOWN(pa, PAGE_SIZE); size_t offset = pa - aligned_addr; - + ioport8_t *ns16550 = (ioport8_t *) (km_map(aligned_addr, offset + size, PAGE_WRITE | PAGE_NOT_CACHEABLE) + offset); - + ns16550_instance_t *ns16550_instance = ns16550_init(ns16550, 0, inr, cir, cir_arg, NULL); @@ -131,5 +131,5 @@ } } - + /* * This is the necessary evil until the userspace drivers are @@ -140,5 +140,5 @@ sysinfo_set_item_val("kbd.address.physical", NULL, pa); sysinfo_set_item_val("kbd.type.ns16550", NULL, true); - + return true; } Index: kernel/arch/sparc64/src/drivers/niagara.c =================================================================== --- kernel/arch/sparc64/src/drivers/niagara.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/drivers/niagara.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -126,5 +126,5 @@ * shared buffer to the console. */ - + while (output_buffer.read_ptr != output_buffer.write_ptr) { do_putchar(output_buffer.data[output_buffer.read_ptr]); @@ -132,9 +132,9 @@ ((output_buffer.read_ptr) + 1) % OUTPUT_BUFFER_SIZE; } - + /* * Read character from keyboard. */ - + uint64_t c; if (__hypercall_fast_ret1(0, 0, 0, 0, 0, CONS_GETCHAR, &c) == HV_EOK) { @@ -174,9 +174,9 @@ if (instance) return; - + instance = malloc(sizeof(niagara_instance_t), FRAME_ATOMIC); instance->thread = thread_create(kniagarapoll, NULL, TASK, THREAD_FLAG_UNCOUNTED, "kniagarapoll"); - + if (!instance->thread) { free(instance); @@ -184,12 +184,12 @@ return; } - + instance->srlnin = NULL; - + output_buffer.read_ptr = 0; output_buffer.write_ptr = 0; input_buffer.write_ptr = 0; input_buffer.read_ptr = 0; - + /* * Set sysinfos and pareas so that the userspace counterpart of the @@ -197,8 +197,8 @@ * buffers. */ - + sysinfo_set_item_val("fb", NULL, true); sysinfo_set_item_val("fb.kind", NULL, 5); - + sysinfo_set_item_val("niagara.outbuf.address", NULL, KA2PA(&output_buffer)); @@ -207,5 +207,5 @@ sysinfo_set_item_val("niagara.outbuf.datasize", NULL, OUTPUT_BUFFER_SIZE); - + sysinfo_set_item_val("niagara.inbuf.address", NULL, KA2PA(&input_buffer)); @@ -214,5 +214,5 @@ sysinfo_set_item_val("niagara.inbuf.datasize", NULL, INPUT_BUFFER_SIZE); - + outbuf_parea.pbase = (uintptr_t) (KA2PA(&output_buffer)); outbuf_parea.frames = 1; @@ -220,5 +220,5 @@ outbuf_parea.mapped = false; ddi_parea_register(&outbuf_parea); - + inbuf_parea.pbase = (uintptr_t) (KA2PA(&input_buffer)); inbuf_parea.frames = 1; @@ -226,5 +226,5 @@ inbuf_parea.mapped = false; ddi_parea_register(&inbuf_parea); - + outdev_t *niagara_dev = malloc(sizeof(outdev_t), FRAME_ATOMIC); outdev_initialize("niagara_dev", niagara_dev, &niagara_ops); @@ -238,5 +238,5 @@ { niagara_init(); - + if (instance) { srln_instance_t *srln_instance = srln_init(); @@ -244,10 +244,10 @@ indev_t *sink = stdin_wire(); indev_t *srln = srln_wire(srln_instance, sink); - + instance->srlnin = srln; thread_ready(instance->thread); } } - + return instance; } Index: kernel/arch/sparc64/src/drivers/pci.c =================================================================== --- kernel/arch/sparc64/src/drivers/pci.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/drivers/pci.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -183,5 +183,5 @@ if (!prop || !prop->value) return NULL; - + if (str_cmp(prop->value, "SUNW,sabre") == 0) { /* Index: kernel/arch/sparc64/src/drivers/scr.c =================================================================== --- kernel/arch/sparc64/src/drivers/scr.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/drivers/scr.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,7 +67,7 @@ ofw_sbus_reg_t *sbus_reg; const char *name; - + name = ofw_tree_node_name(node); - + if (str_cmp(name, "SUNW,m64B") == 0) scr_type = SCR_ATYFB; @@ -80,10 +80,10 @@ else if (str_cmp(name, "QEMU,VGA") == 0) scr_type = SCR_QEMU_VGA; - + if (scr_type == SCR_UNKNOWN) { log(LF_ARCH, LVL_ERROR, "Unknown screen device."); return; } - + uintptr_t fb_addr; unsigned int fb_offset = 0; @@ -121,7 +121,7 @@ return; } - + pci_reg = &((ofw_pci_reg_t *) prop->value)[1]; - + if (!ofw_pci_reg_absolutize(node, pci_reg, &pci_abs_reg)) { log(LF_ARCH, LVL_ERROR, @@ -129,5 +129,5 @@ return; } - + if (!ofw_pci_apply_ranges(node->parent, &pci_abs_reg, &fb_addr)) { @@ -136,5 +136,5 @@ return; } - + switch (fb_depth) { case 8: @@ -159,5 +159,5 @@ return; } - + break; case SCR_XVR: @@ -167,7 +167,7 @@ return; } - + pci_reg = &((ofw_pci_reg_t *) prop->value)[1]; - + if (!ofw_pci_reg_absolutize(node, pci_reg, &pci_abs_reg)) { log(LF_ARCH, LVL_ERROR, @@ -175,5 +175,5 @@ return; } - + if (!ofw_pci_apply_ranges(node->parent, &pci_abs_reg, &fb_addr)) { @@ -207,5 +207,5 @@ return; } - + break; case SCR_FFB: @@ -231,5 +231,5 @@ return; } - + sbus_reg = &((ofw_sbus_reg_t *) prop->value)[0]; if (!ofw_sbus_apply_ranges(node->parent, sbus_reg, &fb_addr)) { @@ -238,5 +238,5 @@ return; } - + break; @@ -297,5 +297,5 @@ .visual = visual, }; - + outdev_t *fbdev = fb_init(&props); if (fbdev) Index: kernel/arch/sparc64/src/drivers/tick.c =================================================================== --- kernel/arch/sparc64/src/drivers/tick.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/drivers/tick.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -89,10 +89,10 @@ softint.value = softint_read(); - + /* * Make sure we are servicing interrupt_level_14 */ assert(n == TT_INTERRUPT_LEVEL_14); - + /* * Make sure we are servicing TICK_INT. @@ -106,5 +106,5 @@ clear.tick_int = 1; clear_softint_write(clear.value); - + /* * Reprogram the compare register. Index: kernel/arch/sparc64/src/fpu_context.c =================================================================== --- kernel/arch/sparc64/src/fpu_context.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/fpu_context.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -67,5 +67,5 @@ * GCC (4.1.1) can't handle more than 30 operands in one asm statement. */ - + asm volatile ( "std %%f32, %0\n" @@ -90,5 +90,5 @@ "=m" (fctx->d[28]), "=m" (fctx->d[29]), "=m" (fctx->d[30]), "=m" (fctx->d[31]) ); - + asm volatile ("stx %%fsr, %0\n" : "=m" (fctx->fsr)); } @@ -119,10 +119,10 @@ "m" (fctx->d[12]), "m" (fctx->d[13]), "m" (fctx->d[14]), "m" (fctx->d[15]) ); - + /* * We need to split loading of the floating-point registers because * GCC (4.1.1) can't handle more than 30 operands in one asm statement. */ - + asm volatile ( "ldd %0, %%f32\n" @@ -148,5 +148,5 @@ "m" (fctx->d[28]), "m" (fctx->d[29]), "m" (fctx->d[30]), "m" (fctx->d[31]) ); - + asm volatile ("ldx %0, %%fsr\n" : : "m" (fctx->fsr)); } @@ -155,5 +155,5 @@ { pstate_reg_t pstate; - + pstate.value = pstate_read(); pstate.pef = true; @@ -164,5 +164,5 @@ { pstate_reg_t pstate; - + pstate.value = pstate_read(); pstate.pef = false; Index: kernel/arch/sparc64/src/mm/sun4u/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/as.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4u/as.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,9 +69,9 @@ tsb_entry_t *tsb = (tsb_entry_t *) PA2KA(tsb_base); memsetb(tsb, TSB_SIZE, 0); - + as->arch.itsb = tsb; as->arch.dtsb = tsb + ITSB_ENTRY_COUNT; #endif - + return EOK; } @@ -81,5 +81,5 @@ #ifdef CONFIG_TSB frame_free(KA2PA((uintptr_t) as->arch.itsb), TSB_FRAMES); - + return TSB_FRAMES; #else @@ -93,5 +93,5 @@ tsb_invalidate(as, 0, (size_t) -1); #endif - + return 0; } @@ -107,5 +107,5 @@ { tlb_context_reg_t ctx; - + /* * Note that we don't and may not lock the address space. That's ok @@ -115,5 +115,5 @@ * */ - + /* * Write ASID to secondary context register. The primary context @@ -126,13 +126,13 @@ ctx.context = as->asid; mmu_secondary_context_write(ctx.v); - + #ifdef CONFIG_TSB uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH); - + assert(as->arch.itsb); assert(as->arch.dtsb); - + uintptr_t tsb = (uintptr_t) as->arch.itsb; - + if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) { /* @@ -145,5 +145,5 @@ dtlb_insert_mapping(tsb, KA2PA(tsb), PAGESIZE_64K, true, true); } - + /* * Setup TSB Base registers. @@ -151,14 +151,14 @@ */ tsb_base_reg_t tsb_base_reg; - + tsb_base_reg.value = 0; tsb_base_reg.size = TSB_BASE_REG_SIZE; tsb_base_reg.split = 0; - + tsb_base_reg.base = ((uintptr_t) as->arch.itsb) >> MMU_PAGE_WIDTH; itsb_base_write(tsb_base_reg.value); tsb_base_reg.base = ((uintptr_t) as->arch.dtsb) >> MMU_PAGE_WIDTH; dtsb_base_write(tsb_base_reg.value); - + #if defined (US3) /* @@ -198,13 +198,13 @@ * */ - + #ifdef CONFIG_TSB uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH); - + assert(as->arch.itsb); assert(as->arch.dtsb); - + uintptr_t tsb = (uintptr_t) as->arch.itsb; - + if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) { /* Index: kernel/arch/sparc64/src/mm/sun4u/frame.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4u/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,5 +48,5 @@ { unsigned int i; - + for (i = 0; i < memmap.cnt; i++) { uintptr_t base; @@ -62,8 +62,8 @@ size = ALIGN_DOWN(memmap.zones[i].size - (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE); - + if (!frame_adjust_zone_bounds(low, &base, &size)) continue; - + pfn_t confdata; pfn_t pfn = ADDR2PFN(base); @@ -74,5 +74,5 @@ if (confdata == ADDR2PFN(KA2PA(PFN2ADDR(0)))) confdata = ADDR2PFN(KA2PA(PFN2ADDR(2))); - + zone_create(pfn, count, confdata, ZONE_AVAILABLE | ZONE_LOWMEM); @@ -90,7 +90,7 @@ if (config.cpu_active > 1) return; - + frame_common_arch_init(true); - + /* * On sparc64, physical memory can start on a non-zero address. Index: kernel/arch/sparc64/src/mm/sun4u/tlb.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4u/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -178,7 +178,7 @@ tag.context = t->as->asid; tag.vpn = pg.vpn; - + itlb_tag_access_write(tag.value); - + data.value = 0; data.v = true; @@ -190,5 +190,5 @@ data.w = false; data.g = t->g; - + itlb_data_in_write(data.value); } @@ -353,5 +353,5 @@ tlb_data_t d; tlb_tag_read_reg_t t; - + printf("I-TLB contents:\n"); for (i = 0; i < ITLB_ENTRY_COUNT; i++) { @@ -377,5 +377,5 @@ tlb_data_t d; tlb_tag_read_reg_t t; - + printf("TLB_ISMALL contents:\n"); for (i = 0; i < tlb_ismall_size(); i++) { @@ -384,5 +384,5 @@ print_tlb_entry(i, t, d); } - + printf("TLB_IBIG contents:\n"); for (i = 0; i < tlb_ibig_size(); i++) { @@ -391,5 +391,5 @@ print_tlb_entry(i, t, d); } - + printf("TLB_DSMALL contents:\n"); for (i = 0; i < tlb_dsmall_size(); i++) { @@ -398,5 +398,5 @@ print_tlb_entry(i, t, d); } - + printf("TLB_DBIG_1 contents:\n"); for (i = 0; i < tlb_dbig_size(); i++) { @@ -405,5 +405,5 @@ print_tlb_entry(i, t, d); } - + printf("TLB_DBIG_2 contents:\n"); for (i = 0; i < tlb_dbig_size(); i++) { @@ -423,5 +423,5 @@ sfsr.value = dtlb_sfsr_read(); sfar = dtlb_sfar_read(); - + #if defined (US) printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, " @@ -433,7 +433,7 @@ sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv); #endif - + printf("DTLB SFAR: address=%p\n", (void *) sfar); - + dtlb_sfsr_write(0); } @@ -446,5 +446,5 @@ sfsr.value = dtlb_sfsr_read(); sfar = dtlb_sfar_read(); - + #if defined (US) printf("DTLB SFSR: asi=%#x, ft=%#x, e=%d, ct=%d, pr=%d, w=%d, ow=%d, " @@ -456,7 +456,7 @@ sfsr.e, sfsr.ct, sfsr.pr, sfsr.w, sfsr.ow, sfsr.fv); #endif - + printf("DTLB SFAR: address=%p\n", (void *) sfar); - + dtlb_sfsr_write(0); } @@ -467,5 +467,5 @@ { int i; - + /* * Walk all ITLB and DTLB entries and remove all unlocked mappings. @@ -521,17 +521,17 @@ { tlb_context_reg_t pc_save, ctx; - + /* switch to nucleus because we are mapped by the primary context */ nucleus_enter(); - + ctx.v = pc_save.v = mmu_primary_context_read(); ctx.context = asid; mmu_primary_context_write(ctx.v); - + itlb_demap(TLB_DEMAP_CONTEXT, TLB_DEMAP_PRIMARY, 0); dtlb_demap(TLB_DEMAP_CONTEXT, TLB_DEMAP_PRIMARY, 0); - + mmu_primary_context_write(pc_save.v); - + nucleus_leave(); } @@ -548,12 +548,12 @@ unsigned int i; tlb_context_reg_t pc_save, ctx; - + /* switch to nucleus because we are mapped by the primary context */ nucleus_enter(); - + ctx.v = pc_save.v = mmu_primary_context_read(); ctx.context = asid; mmu_primary_context_write(ctx.v); - + for (i = 0; i < cnt * MMU_PAGES_PER_PAGE; i++) { itlb_demap(TLB_DEMAP_PAGE, TLB_DEMAP_PRIMARY, @@ -562,7 +562,7 @@ page + i * MMU_PAGE_SIZE); } - + mmu_primary_context_write(pc_save.v); - + nucleus_leave(); } Index: kernel/arch/sparc64/src/mm/sun4u/tsb.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4u/tsb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4u/tsb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,8 +57,8 @@ size_t i; size_t cnt; - + assert(as->arch.itsb); assert(as->arch.dtsb); - + i0 = (page >> MMU_PAGE_WIDTH) & ITSB_ENTRY_MASK; @@ -67,5 +67,5 @@ else cnt = pages * 2; - + for (i = 0; i < cnt; i++) { as->arch.itsb[(i0 + i) & ITSB_ENTRY_MASK].tag.invalid = true; @@ -86,5 +86,5 @@ assert(index <= 1); - + as = t->as; entry = ((t->page >> MMU_PAGE_WIDTH) + index) & ITSB_ENTRY_MASK; @@ -112,7 +112,7 @@ tte->data.p = t->k; /* p as privileged, k as kernel */ tte->data.v = t->p; /* v as valid, p as present */ - + write_barrier(); - + tte->tag.invalid = false; /* mark the entry as valid */ } @@ -129,5 +129,5 @@ tsb_entry_t *tte; size_t entry; - + assert(index <= 1); @@ -161,7 +161,7 @@ tte->data.w = ro ? false : t->w; tte->data.v = t->p; - + write_barrier(); - + tte->tag.invalid = false; /* mark the entry as valid */ } Index: kernel/arch/sparc64/src/mm/sun4v/as.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/as.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4v/as.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -79,8 +79,8 @@ as->arch.tsb_description.reserved = 0; as->arch.tsb_description.context = 0; - + memsetb(tsb, TSB_SIZE, 0); #endif - + return EOK; } @@ -90,5 +90,5 @@ #ifdef CONFIG_TSB frame_free(as->arch.tsb_description.tsb_base, TSB_FRAMES); - + return TSB_FRAMES; #else @@ -102,5 +102,5 @@ tsb_invalidate(as, 0, (size_t) -1); #endif - + return EOK; } @@ -117,11 +117,11 @@ { mmu_secondary_context_write(as->asid); - + #ifdef CONFIG_TSB uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH); - + assert(as->arch.tsb_description.tsb_base); uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base); - + if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) { /* @@ -134,5 +134,5 @@ dtlb_insert_mapping(tsb, KA2PA(tsb), PAGESIZE_64K, true, true); } - + __hypercall_fast2(MMU_TSB_CTXNON0, 1, KA2PA(&as->arch.tsb_description)); #endif @@ -156,12 +156,12 @@ * */ - + #ifdef CONFIG_TSB uintptr_t base = ALIGN_DOWN(config.base, 1 << KERNEL_PAGE_WIDTH); - + assert(as->arch.tsb_description.tsb_base); - + uintptr_t tsb = PA2KA(as->arch.tsb_description.tsb_base); - + if (!overlaps(tsb, TSB_SIZE, base, 1 << KERNEL_PAGE_WIDTH)) { /* Index: kernel/arch/sparc64/src/mm/sun4v/frame.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4v/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,5 +48,5 @@ { unsigned int i; - + for (i = 0; i < memmap.cnt; i++) { uintptr_t base; @@ -62,5 +62,5 @@ size = ALIGN_DOWN(memmap.zones[i].size - (base - ((uintptr_t) memmap.zones[i].start)), FRAME_SIZE); - + if (!frame_adjust_zone_bounds(low, &base, &size)) continue; @@ -74,5 +74,5 @@ if (confdata == ADDR2PFN(KA2PA(PFN2ADDR(0)))) confdata = ADDR2PFN(KA2PA(PFN2ADDR(2))); - + zone_create(pfn, count, confdata, ZONE_AVAILABLE | ZONE_LOWMEM); Index: kernel/arch/sparc64/src/mm/sun4v/tlb.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4v/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -128,5 +128,5 @@ { tte_data_t data; - + data.value = 0; data.v = true; @@ -143,5 +143,5 @@ data.w = true; data.size = pagesize; - + if (locked) { __hypercall_fast4( @@ -163,5 +163,5 @@ { tte_data_t data; - + data.value = 0; data.v = true; @@ -178,5 +178,5 @@ data.w = ro ? false : t->w; data.size = PAGESIZE_8K; - + __hypercall_hyperfast( t->page, t->as->asid, data.value, MMU_FLAG_DTLB, 0, MMU_MAP_ADDR); @@ -190,5 +190,5 @@ { tte_data_t data; - + data.value = 0; data.v = true; @@ -203,5 +203,5 @@ data.w = false; data.size = PAGESIZE_8K; - + __hypercall_hyperfast( t->page, t->as->asid, data.value, MMU_FLAG_ITLB, 0, MMU_MAP_ADDR); @@ -387,5 +387,5 @@ { unsigned int i; - + /* switch to nucleus because we are mapped by the primary context */ nucleus_enter(); Index: kernel/arch/sparc64/src/mm/sun4v/tsb.c =================================================================== --- kernel/arch/sparc64/src/mm/sun4v/tsb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/mm/sun4v/tsb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,7 +59,7 @@ size_t i0, i; size_t cnt; - + assert(as->arch.tsb_description.tsb_base); - + i0 = (page >> MMU_PAGE_WIDTH) & TSB_ENTRY_MASK; @@ -68,5 +68,5 @@ else cnt = pages; - + tsb = (tsb_entry_t *) PA2KA(as->arch.tsb_description.tsb_base); for (i = 0; i < cnt; i++) @@ -87,5 +87,5 @@ as = t->as; index = (t->page >> MMU_PAGE_WIDTH) & TSB_ENTRY_MASK; - + tsb = (tsb_entry_t *) PA2KA(as->arch.tsb_description.tsb_base); tte = &tsb[index]; @@ -114,7 +114,7 @@ tte->data.w = false; tte->data.size = PAGESIZE_8K; - + write_barrier(); - + tte->data.v = t->p; /* v as valid, p as present */ } @@ -162,7 +162,7 @@ tte->data.w = ro ? false : t->w; tte->data.size = PAGESIZE_8K; - + write_barrier(); - + tte->data.v = t->p; /* v as valid, p as present */ } Index: kernel/arch/sparc64/src/proc/sun4v/scheduler.c =================================================================== --- kernel/arch/sparc64/src/proc/sun4v/scheduler.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/proc/sun4v/scheduler.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -71,5 +71,5 @@ THREAD->arch.uspace_window_buffer = (uint8_t *) asi_u64_read(ASI_SCRATCHPAD, SCRATCHPAD_WBUF); - + } } Index: kernel/arch/sparc64/src/smp/sun4u/ipi.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/smp/sun4u/ipi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -97,13 +97,13 @@ * we explicitly disable preemption. */ - + preemption_disable(); - + status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0); if (status & INTR_DISPATCH_STATUS_BUSY) panic("Interrupt Dispatch Status busy bit set\n"); - + assert(!(pstate_read() & PSTATE_IE_BIT)); - + do { set_intr_w_data(func); @@ -111,11 +111,11 @@ (mid << INTR_VEC_DISPATCH_MID_SHIFT) | VA_INTR_W_DISPATCH, 0); - + membar(); - + do { status = asi_u64_read(ASI_INTR_DISPATCH_STATUS, 0); } while (status & INTR_DISPATCH_STATUS_BUSY); - + done = !(status & INTR_DISPATCH_STATUS_NACK); if (!done) { @@ -128,5 +128,5 @@ } } while (!done); - + preemption_enable(); } @@ -147,7 +147,7 @@ { unsigned int i; - + void (* func)(void); - + switch (ipi) { case IPI_TLB_SHOOTDOWN: @@ -158,5 +158,5 @@ break; } - + /* * As long as we don't support hot-plugging @@ -165,5 +165,5 @@ * without locking. */ - + for (i = 0; i < config.cpu_active; i++) { if (&cpus[i] == CPU) @@ -187,5 +187,5 @@ { assert(&cpus[cpu_id] != CPU); - + if (ipi == IPI_SMP_CALL) { cross_call(cpus[cpu_id].arch.mid, smp_call_ipi_recv); Index: kernel/arch/sparc64/src/smp/sun4u/smp.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4u/smp.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/smp/sun4u/smp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ ofw_tree_node_t *node; unsigned int cnt = 0; - + if (is_us() || is_us_iii()) { node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); @@ -76,5 +76,5 @@ } } - + config.cpu_count = max(1, cnt); } @@ -89,5 +89,5 @@ uint32_t mid; ofw_tree_property_t *prop; - + /* 'upa-portid' for US, 'portid' for US-III, 'cpuid' for US-IV */ prop = ofw_tree_getprop(node, "upa-portid"); @@ -96,8 +96,8 @@ if ((!prop) || (!prop->value)) prop = ofw_tree_getprop(node, "cpuid"); - + if (!prop || prop->value == NULL) return; - + mid = *((uint32_t *) prop->value); if (CPU->arch.mid == mid) @@ -105,5 +105,5 @@ waking_up_mid = mid; - + if (waitq_sleep_timeout(&ap_completion_wq, 1000000, SYNCH_FLAGS_NONE, NULL) == ETIMEOUT) @@ -117,5 +117,5 @@ ofw_tree_node_t *node; int i; - + if (is_us() || is_us_iii()) { node = ofw_tree_find_child_by_device_type(cpus_parent(), "cpu"); Index: kernel/arch/sparc64/src/smp/sun4v/ipi.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4v/ipi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/smp/sun4v/ipi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -96,5 +96,5 @@ { void (* func)(void); - + switch (ipi) { case IPI_TLB_SHOOTDOWN: Index: kernel/arch/sparc64/src/smp/sun4v/smp.c =================================================================== --- kernel/arch/sparc64/src/smp/sun4v/smp.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/smp/sun4v/smp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -359,5 +359,5 @@ if (__hypercall_fast1(CPU_STOP, cpuid) != EOK) return false; - + /* wait for the CPU to stop */ uint64_t state; @@ -365,5 +365,5 @@ while (state == CPU_STATE_RUNNING) __hypercall_fast_ret1(cpuid, 0, 0, 0, 0, CPU_STATE, &state); - + /* make the CPU run again and execute HelenOS code */ if (__hypercall_fast4(CPU_START, cpuid, @@ -372,10 +372,10 @@ return false; #endif - + if (waitq_sleep_timeout(&ap_completion_wq, 10000000, SYNCH_FLAGS_NONE, NULL) == ETIMEOUT) printf("%s: waiting for processor (cpuid = %" PRIu64 ") timed out\n", __func__, cpuid); - + return true; } Index: kernel/arch/sparc64/src/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sparc64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sparc64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -79,5 +79,5 @@ if (options) { ofw_tree_property_t *prop; - + prop = ofw_tree_getprop(options, "boot-args"); if (prop && prop->value) { Index: kernel/arch/sparc64/src/sun4u/asm.S =================================================================== --- kernel/arch/sparc64/src/sun4u/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4u/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -102,5 +102,5 @@ wrpr %g1, TSTATE_IE_BIT, %tstate wrpr %i0, 0, %tnpc - + /* * Set primary context according to secondary context. @@ -117,5 +117,5 @@ */ wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(1), %wstate - + done ! jump to userspace FUNCTION_END(switch_to_userspace) Index: kernel/arch/sparc64/src/sun4u/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sun4u/sparc64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4u/sparc64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -72,5 +72,5 @@ /* Copy init task info. */ init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); - + size_t i; for (i = 0; i < init.cnt; i++) { @@ -80,5 +80,5 @@ bootinfo->taskmap.tasks[i].name); } - + /* Copy physical memory map. */ memmap.total = bootinfo->memmap.total; @@ -88,9 +88,9 @@ memmap.zones[i].size = bootinfo->memmap.zones[i].size; } - + /* Copy boot allocations info. */ ballocs.base = bootinfo->ballocs.base; ballocs.size = bootinfo->ballocs.size; - + ofw_tree_init(bootinfo->ofw_root); } @@ -111,5 +111,5 @@ /* Map OFW information into sysinfo */ ofw_sysinfo_map(); - + /* * We have 2^11 different interrupt vectors. @@ -167,5 +167,5 @@ (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS), (uintptr_t) kernel_uarg->uspace_uarg); - + /* Not reached */ while (1); Index: kernel/arch/sparc64/src/sun4u/start.S =================================================================== --- kernel/arch/sparc64/src/sun4u/start.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4u/start.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -85,5 +85,5 @@ ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base. srlx %l6, 13, %l5 - + ! l5 <= physmem_base[(PHYSMEM_ADDR_SIZE - 1):13] sllx %l5, 13 + (63 - (PHYSMEM_ADDR_SIZE - 1)), %l5 @@ -101,5 +101,5 @@ wrpr %g0, NWINDOWS - 1, %cleanwin ! prevent needless clean_window ! traps for kernel - + wrpr %g0, 0, %wstate ! use default spill/fill trap @@ -132,5 +132,5 @@ set (TLB_DEMAP_CONTEXT << TLB_DEMAP_TYPE_SHIFT) | (context_id << \ TLB_DEMAP_CONTEXT_SHIFT), %r1 - + ! demap context 0 SET_TLB_DEMAP_CMD(g1, TLB_DEMAP_NUCLEUS) @@ -161,5 +161,5 @@ sllx %r2, TTE_V_SHIFT, %r2; \ or %r1, %r2, %r1; - + ! write DTLB data and install the kernel mapping SET_TLB_DATA(g1, g2, TTE_L | TTE_W) ! use non-global mapping @@ -182,5 +182,5 @@ stxa %g1, [%g0] ASI_DTLB_DATA_IN_REG membar #Sync - + /* * Now is time to take over the IMMU. Unfortunatelly, it cannot be done @@ -202,7 +202,7 @@ * the taken over DTLB. */ - + set kernel_image_start, %g5 - + ! write ITLB tag of context 1 SET_TLB_TAG(g1, MEM_CONTEXT_TEMP) @@ -215,15 +215,15 @@ stxa %g1, [%g0] ASI_ITLB_DATA_IN_REG flush %g5 - + ! switch to context 1 mov MEM_CONTEXT_TEMP, %g1 stxa %g1, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!! flush %g5 - + ! demap context 0 SET_TLB_DEMAP_CMD(g1, TLB_DEMAP_NUCLEUS) stxa %g0, [%g1] ASI_IMMU_DEMAP flush %g5 - + ! write ITLB tag of context 0 SET_TLB_TAG(g1, MEM_CONTEXT_KERNEL) @@ -244,9 +244,9 @@ stxa %g0, [%g1] ASI_IMMU_DEMAP flush %g5 - + ! set context 0 in the primary context register stxa %g0, [VA_PRIMARY_CONTEXT_REG] %asi ! ASI_DMMU is correct here !!! flush %g5 - + ! leave nucleus - using primary context, i.e. context 0 wrpr %g0, 0, %tl @@ -271,9 +271,9 @@ or %l3, %l5, %l3 stx %l3, [%l4 + %lo(kernel_8k_tlb_data_template)] - + ! flush the whole D-cache set (DCACHE_SIZE - DCACHE_LINE_SIZE), %g1 stxa %g0, [%g1] ASI_DCACHE_TAG - + 0: membar #Sync @@ -282,5 +282,5 @@ stxa %g0, [%g1] ASI_DCACHE_TAG membar #Sync - + /* * So far, we have not touched the stack. @@ -290,5 +290,5 @@ or %sp, %lo(temporary_boot_stack), %sp sub %sp, STACK_BIAS, %sp - + /* * Call sparc64_pre_main(bootinfo) @@ -296,5 +296,5 @@ call sparc64_pre_main mov %o1, %o0 - + /* * Create the first stack frame. @@ -372,5 +372,5 @@ /* Not reached. */ #endif - + 0: ba,a %xcc, 0b Index: kernel/arch/sparc64/src/sun4v/asm.S =================================================================== --- kernel/arch/sparc64/src/sun4v/asm.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4v/asm.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,5 +58,5 @@ wrpr %g1, TSTATE_IE_BIT, %tstate wrpr %i0, 0, %tnpc - + /* * Set primary context according to secondary context. Index: kernel/arch/sparc64/src/sun4v/md.c =================================================================== --- kernel/arch/sparc64/src/sun4v/md.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4v/md.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -244,5 +244,5 @@ char *head; more = str_parse_head(&name, &head); - + while (md_next_child(&node)) { element_idx_t child = md_get_child_node(node); @@ -292,5 +292,5 @@ return true; } - + (*node)++; } while (element->tag != LIST_END); Index: kernel/arch/sparc64/src/sun4v/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sun4v/sparc64.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4v/sparc64.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -74,5 +74,5 @@ /* Copy init task info. */ init.cnt = min3(bootinfo->taskmap.cnt, TASKMAP_MAX_RECORDS, CONFIG_INIT_TASKS); - + size_t i; for (i = 0; i < init.cnt; i++) { @@ -82,5 +82,5 @@ bootinfo->taskmap.tasks[i].name); } - + /* Copy physical memory map. */ memmap.total = bootinfo->memmap.total; @@ -90,5 +90,5 @@ memmap.zones[i].size = bootinfo->memmap.zones[i].size; } - + md_init(); } @@ -109,5 +109,5 @@ /* Map OFW information into sysinfo */ ofw_sysinfo_map(); - + /* * We have 2^11 different interrupt vectors. @@ -165,5 +165,5 @@ (ALIGN_UP(STACK_ITEM_SIZE, STACK_ALIGNMENT) + STACK_BIAS), (uintptr_t) kernel_uarg->uspace_uarg); - + /* Not reached */ while (1); Index: kernel/arch/sparc64/src/sun4v/start.S =================================================================== --- kernel/arch/sparc64/src/sun4v/start.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/sun4v/start.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -115,5 +115,5 @@ ! Get bits (PHYSMEM_ADDR_SIZE - 1):13 of physmem_base. srlx %l6, 13, %l5 - + ! l5 <= physmem_base[(PHYSMEM_ADDR_SIZE - 1):13] sllx %l5, 13 + (63 - (PHYSMEM_ADDR_SIZE - 1)), %l5 @@ -130,5 +130,5 @@ wrpr %g0, NWINDOWS - 1, %cleanwin ! prevent needless clean_window ! traps for kernel - + wrpr %g0, 0, %wstate ! use default spill/fill trap @@ -252,5 +252,5 @@ call sparc64_pre_main or %l1, %g0, %o0 - + /* * Create the first stack frame. Index: kernel/arch/sparc64/src/trap/exception.c =================================================================== --- kernel/arch/sparc64/src/trap/exception.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/trap/exception.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,5 +48,5 @@ const char *tpcs = symtab_fmt_name_lookup(istate->tpc); const char *tnpcs = symtab_fmt_name_lookup(istate->tnpc); - + printf("TSTATE=%#" PRIx64 "\n", istate->tstate); printf("TPC=%#" PRIx64 " (%s)\n", istate->tpc, tpcs); @@ -100,5 +100,5 @@ { fprs_reg_t fprs; - + fprs.value = fprs_read(); if (!fprs.fef) { Index: kernel/arch/sparc64/src/trap/sun4u/interrupt.c =================================================================== --- kernel/arch/sparc64/src/trap/sun4u/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/trap/sun4u/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,5 +58,5 @@ if (status & (!INTR_DISPATCH_STATUS_BUSY)) panic("Interrupt Dispatch Status busy bit not set\n"); - + uint64_t intrcv = asi_u64_read(ASI_INTR_RECEIVE, 0); #if defined (US) @@ -65,5 +65,5 @@ uint64_t data0 = asi_u64_read(ASI_INTR_R, VA_INTR_R_DATA_0); #endif - + irq_t *irq = irq_dispatch_and_lock(data0); if (irq) { @@ -72,5 +72,5 @@ */ irq->handler(irq); - + /* * See if there is a clear-interrupt-routine and call it. @@ -78,5 +78,5 @@ if (irq->cir) irq->cir(irq->cir_arg, irq->inr); - + irq_spinlock_unlock(&irq->lock, false); } else if (data0 > config.base) { @@ -103,5 +103,5 @@ #endif } - + membar(); asi_u64_write(ASI_INTR_RECEIVE, 0, 0); Index: kernel/arch/sparc64/src/trap/sun4u/trap_table.S =================================================================== --- kernel/arch/sparc64/src/trap/sun4u/trap_table.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/trap/sun4u/trap_table.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -502,5 +502,5 @@ .if NOT(\is_syscall) rdpr %tstate, %g3 - + /* * One of the ways this handler can be invoked is after a nested MMU trap from @@ -576,5 +576,5 @@ */ wrpr %g0, WSTATE_OTHER(0) | WSTATE_NORMAL(0), %wstate - + /* * Copy arguments. @@ -605,9 +605,9 @@ */ stx %g4, [%sp + STACK_BIAS + ISTATE_OFFSET_Y] - + wrpr %g0, 0, %tl wrpr %g0, PSTATE_PRIV_BIT | PSTATE_PEF_BIT, %pstate SAVE_GLOBALS - + .if NOT(\is_syscall) /* @@ -629,5 +629,5 @@ wrpr %g0, PSTATE_AG_BIT | PSTATE_PRIV_BIT, %pstate wrpr %g0, 1, %tl - + /* * Read TSTATE, TPC and TNPC from saved copy. @@ -742,5 +742,5 @@ rd %pc, %g1 flush %g1 - + rdpr %cwp, %g1 rdpr %otherwin, %g2 @@ -800,5 +800,5 @@ mov NWINDOWS - 2, %g1 ! use dealy slot for both cases sub %g1, %g2, %g1 - + wrpr %g0, 0, %otherwin wrpr %g1, 0, %cansave ! NWINDOWS - 2 - CANRESTORE @@ -845,5 +845,5 @@ and %g1, NWINDOWS - 1, %g1 wrpr %g1, 0, %cwp ! CWP-- - + .if \is_syscall done Index: kernel/arch/sparc64/src/trap/sun4v/trap_table.S =================================================================== --- kernel/arch/sparc64/src/trap/sun4v/trap_table.S (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/arch/sparc64/src/trap/sun4v/trap_table.S (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -606,5 +606,5 @@ and \tmpreg1, NWINDOWS - 1, \tmpreg1 ! modulo NWINDOWS wrpr \tmpreg1, %cwp - + ! spill to kernel stack stx %l0, [%sp + STACK_BIAS + L0_OFFSET] @@ -766,5 +766,5 @@ ldx [%sp + STACK_BIAS + ISTATE_OFFSET_Y], %g4 wr %g4, %y - + /* If TSTATE.CWP + 1 == CWP, then we do not have to fix CWP. */ and %g1, TSTATE_CWP_MASK, %l0 @@ -871,5 +871,5 @@ and \tmpreg1, NWINDOWS - 1, \tmpreg1 ! modulo NWINDOWS wrpr \tmpreg1, %cwp - + ! spill to userspace window buffer SAVE_TO_USPACE_WBUF \tmpreg3, \tmpreg1 @@ -1028,5 +1028,5 @@ mov NWINDOWS - 2, %g1 ! use dealy slot for both cases sub %g1, %g2, %g1 - + wrpr %g0, 0, %otherwin wrpr %g1, 0, %cansave ! NWINDOWS - 2 - CANRESTORE @@ -1073,5 +1073,5 @@ and %g1, NWINDOWS - 1, %g1 wrpr %g1, 0, %cwp ! CWP-- - + .if \is_syscall done Index: kernel/doc/doxygroups.h =================================================================== --- kernel/doc/doxygroups.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/doc/doxygroups.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -23,9 +23,9 @@ * @ingroup kernel */ - + /** @defgroup genericproc generic * @ingroup proc */ - + /** @@ -94,15 +94,15 @@ * @ingroup kernel */ - + /** * @defgroup genericmm generic * @ingroup mm */ - + /** * @defgroup genarchmm genarch * @ingroup mm */ - + /** * @cond amd64 @@ -111,5 +111,5 @@ * @endcond */ - + /** * @cond arm32 @@ -118,5 +118,5 @@ * @endcond */ - + /** * @cond ia32 @@ -125,5 +125,5 @@ * @endcond */ - + /** * @cond ia64 @@ -132,5 +132,5 @@ * @endcond */ - + /** * @cond mips32 @@ -139,5 +139,5 @@ * @endcond */ - + /** * @cond ppc32 @@ -146,5 +146,5 @@ * @endcond */ - + /** * @cond ppc64 @@ -153,5 +153,5 @@ * @endcond */ - + /** * @cond sparc64 @@ -160,11 +160,11 @@ * @endcond */ - - - + + + /** @defgroup genericipc IPC * @ingroup kernel */ - + /** @defgroup generickio KIO * @brief Kernel character input/output facility @@ -187,5 +187,5 @@ * @endcond */ - + /** * @cond arm32 @@ -240,9 +240,9 @@ * @ingroup others */ - + /** @defgroup genericdebug generic * @ingroup debug */ - + /** * @cond amd64 @@ -251,5 +251,5 @@ * @endcond */ - + /** * @cond arm32 @@ -315,5 +315,5 @@ * @endcond */ - + /** * @cond arm32 @@ -376,5 +376,5 @@ * @ingroup others */ - + /** * @cond amd64 @@ -383,5 +383,5 @@ * @endcond */ - + /** * @cond arm32 Index: kernel/genarch/include/genarch/fb/fb.h =================================================================== --- kernel/genarch/include/genarch/fb/fb.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/fb/fb.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,5 +46,5 @@ /** Physical address of the framebuffer device. */ uintptr_t addr; - + /** * Address where the first (top left) pixel is mapped, @@ -52,14 +52,14 @@ */ unsigned int offset; - + /** Screen width in pixels. */ unsigned int x; - + /** Screen height in pixels. */ unsigned int y; - + /** Bytes per one scanline. */ unsigned int scan; - + /** Color model. */ visual_t visual; Index: kernel/genarch/include/genarch/kbrd/kbrd.h =================================================================== --- kernel/genarch/include/genarch/kbrd/kbrd.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/kbrd/kbrd.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,8 +43,8 @@ typedef struct { thread_t *thread; - + indev_t *sink; indev_t raw; - + SPINLOCK_DECLARE(keylock); /**< keylock protects keyflags and lockflags. */ volatile unsigned int keyflags; /**< Tracking of multiple keypresses. */ Index: kernel/genarch/include/genarch/ofw/ebus.h =================================================================== --- kernel/genarch/include/genarch/ofw/ebus.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/ebus.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,5 +45,5 @@ uint32_t child_base; uint32_t parent_space; - + /* Group phys.mid and phys.lo together */ uint64_t parent_base; Index: kernel/genarch/include/genarch/ofw/ofw_tree.h =================================================================== --- kernel/genarch/include/genarch/ofw/ofw_tree.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/ofw_tree.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,12 +49,12 @@ struct ofw_tree_node *peer; struct ofw_tree_node *child; - + phandle node_handle; /**< Old OpenFirmware node handle. */ - + char *da_name; /**< Disambigued name. */ - + size_t properties; /**< Number of properties. */ ofw_tree_property_t *property; - + /** * Pointer to a structure representing respective device. Index: kernel/genarch/include/genarch/ofw/pci.h =================================================================== --- kernel/genarch/include/genarch/ofw/pci.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/ofw/pci.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -38,5 +38,5 @@ /* Needs to be masked to obtain pure space id */ uint32_t space; - + /* Group phys.mid and phys.lo together */ uint64_t addr; @@ -46,5 +46,5 @@ typedef struct { uint32_t space; - + /* Group phys.mid and phys.lo together */ uint64_t child_base; Index: kernel/genarch/include/genarch/srln/srln.h =================================================================== --- kernel/genarch/include/genarch/srln/srln.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/include/genarch/srln/srln.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -42,5 +42,5 @@ typedef struct { thread_t *thread; - + indev_t *sink; indev_t raw; Index: kernel/genarch/src/acpi/acpi.c =================================================================== --- kernel/genarch/src/acpi/acpi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/acpi/acpi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,17 +69,17 @@ uint8_t sum = 0; uint32_t i; - + for (i = 0; i < 20; i++) sum = (uint8_t) (sum + _rsdp[i]); - + if (sum) return 0; /* bad checksum */ - + if (rsdp->revision == 0) return 1; /* ACPI 1.0 */ - + for (; i < rsdp->length; i++) sum = (uint8_t) (sum + _rsdp[i]); - + return !sum; } @@ -90,8 +90,8 @@ uint8_t sum = 0; unsigned int i; - + for (i = 0; i < hdr->length; i++) sum = (uint8_t) (sum + sdt[i]); - + return !sum; } @@ -109,5 +109,5 @@ vsdt = (struct acpi_sdt_header *) km_map((uintptr_t) psdt, vhdr->length, PAGE_WRITE | PAGE_NOT_CACHEABLE); - + // TODO: do not leak vtmp @@ -121,5 +121,5 @@ 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) @@ -127,10 +127,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) (sysarg_t) acpi_rsdt->entry[i]; - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -147,5 +147,5 @@ 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) @@ -153,10 +153,10 @@ struct acpi_sdt_header *hdr = (struct acpi_sdt_header *) ((uintptr_t) acpi_xsdt->entry[i]); - + struct acpi_sdt_header *vhdr = map_sdt(hdr); if (CMP_SIGNATURE(vhdr->signature, signature_map[j].signature)) { if (!acpi_sdt_check((uint8_t *) vhdr)) break; - + *signature_map[j].sdt_ptr = vhdr; LOG("%p: ACPI %s", *signature_map[j].sdt_ptr, @@ -174,5 +174,5 @@ unsigned int length[2] = { 1024, 128 * 1024 }; uint64_t *sig = (uint64_t *) RSDP_SIGNATURE; - + /* * Find Root System Description Pointer @@ -180,5 +180,5 @@ * 2. search 128K starting at 0xe0000 */ - + addr[0] = (uint8_t *) PA2KA(ebda); for (i = (ebda ? 0 : 1); i < 2; i++) { @@ -191,10 +191,10 @@ } } - + return; - + rsdp_found: LOG("%p: ACPI Root System Description Pointer", acpi_rsdp); - + uintptr_t acpi_rsdt_p = (uintptr_t) acpi_rsdp->rsdt_address; uintptr_t acpi_xsdt_p = 0; @@ -202,23 +202,23 @@ if (acpi_rsdp->revision) acpi_xsdt_p = (uintptr_t) acpi_rsdp->xsdt_address; - + if (acpi_rsdt_p) acpi_rsdt = (struct acpi_rsdt *) map_sdt( (struct acpi_sdt_header *) acpi_rsdt_p); - + if (acpi_xsdt_p) acpi_xsdt = (struct acpi_xsdt *) map_sdt( (struct acpi_sdt_header *) acpi_xsdt_p); - + if ((acpi_rsdt) && (!acpi_sdt_check((uint8_t *) acpi_rsdt))) { log(LF_ARCH, LVL_ERROR, "RSDT: bad checksum"); return; } - + if ((acpi_xsdt) && (!acpi_sdt_check((uint8_t *) acpi_xsdt))) { log(LF_ARCH, LVL_ERROR, "XSDT: bad checksum"); return; } - + if (acpi_xsdt) configure_via_xsdt(); Index: kernel/genarch/src/acpi/madt.c =================================================================== --- kernel/genarch/src/acpi/madt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/acpi/madt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -83,5 +83,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id; @@ -91,5 +91,5 @@ { assert(i < madt_l_apic_entry_cnt); - + /* * FIXME: The current local APIC driver limits usable @@ -99,5 +99,5 @@ if (i > 7) return false; - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->flags & 0x1; @@ -107,5 +107,5 @@ { assert(i < madt_l_apic_entry_cnt); - + return ((struct madt_l_apic *) madt_entries_index[madt_l_apic_entry_index + i])->apic_id == @@ -117,5 +117,5 @@ if (irq >= sizeof(isa_irq_map) / sizeof(int)) return (int) irq; - + return isa_irq_map[irq]; } @@ -135,11 +135,11 @@ uint8_t typea = (*((struct madt_apic_header **) a))->type; uint8_t typeb = (*((struct madt_apic_header **) b))->type; - + if (typea > typeb) return 1; - + if (typea < typeb) return -1; - + return 0; } @@ -149,12 +149,12 @@ if (madt_l_apic_entry_cnt == 0) madt_l_apic_entry_index = i; - + madt_l_apic_entry_cnt++; - + if (!(la->flags & 0x1)) { /* Processor is unusable, skip it. */ return; } - + apic_id_mask |= 1 << la->apic_id; } @@ -169,5 +169,5 @@ /* Currently not supported */ } - + madt_io_apic_entry_cnt++; } @@ -177,5 +177,5 @@ { assert(override->source < sizeof(isa_irq_map) / sizeof(int)); - + isa_irq_map[override->source] = override->global_int; } @@ -186,7 +186,7 @@ (((uint8_t *) acpi_madt) + acpi_madt->header.length); struct madt_apic_header *hdr; - + l_apic = (uint32_t *) (sysarg_t) acpi_madt->l_apic_address; - + /* Count MADT entries */ unsigned int madt_entries_index_cnt = 0; @@ -194,5 +194,5 @@ hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) madt_entries_index_cnt++; - + /* Create MADT APIC entries index array */ madt_entries_index = (struct madt_apic_header **) @@ -201,7 +201,7 @@ if (!madt_entries_index) panic("Memory allocation error."); - + size_t i = 0; - + for (hdr = acpi_madt->apic_header; hdr < end; hdr = (struct madt_apic_header *) (((uint8_t *) hdr) + hdr->length)) { @@ -209,14 +209,14 @@ i++; } - + /* Sort MADT index structure */ if (!gsort(madt_entries_index, madt_entries_index_cnt, sizeof(struct madt_apic_header *), madt_cmp, NULL)) panic("Sorting error."); - + /* Parse MADT entries */ for (i = 0; i < madt_entries_index_cnt; i++) { hdr = madt_entries_index[i]; - + switch (hdr->type) { case MADT_L_APIC: @@ -245,14 +245,14 @@ "MADT: Skipping reserved entry (type=%" PRIu8 ")", hdr->type); - + if (hdr->type >= MADT_RESERVED_OEM_BEGIN) log(LF_ARCH, LVL_NOTE, "MADT: Skipping OEM entry (type=%" PRIu8 ")", hdr->type); - + break; } } - + if (madt_l_apic_entry_cnt > 0) config.cpu_count = madt_l_apic_entry_cnt; Index: kernel/genarch/src/ddi/ddi-bitmap.c =================================================================== --- kernel/genarch/src/ddi/ddi-bitmap.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ddi/ddi-bitmap.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,20 +62,20 @@ if (elements > IO_PORTS) return ENOENT; - + if (task->arch.iomap.elements < elements) { /* * The I/O permission bitmap is too small and needs to be grown. */ - + void *store = malloc(bitmap_size(elements), FRAME_ATOMIC); if (!store) return ENOMEM; - + bitmap_t oldiomap; bitmap_initialize(&oldiomap, task->arch.iomap.elements, task->arch.iomap.bits); - + bitmap_initialize(&task->arch.iomap, elements, store); - + /* * Mark the new range inaccessible. @@ -83,5 +83,5 @@ bitmap_set_range(&task->arch.iomap, oldiomap.elements, elements - oldiomap.elements); - + /* * In case there really existed smaller iomap, @@ -91,19 +91,19 @@ bitmap_copy(&task->arch.iomap, &oldiomap, oldiomap.elements); - + free(oldiomap.bits); } } - + /* * Enable the range and we are done. */ bitmap_clear_range(&task->arch.iomap, (size_t) ioaddr, size); - + /* * Increment I/O Permission bitmap generation counter. */ task->arch.iomapver++; - + return EOK; } @@ -125,5 +125,5 @@ if (elements > IO_PORTS) return ENOENT; - + if (ioaddr >= task->arch.iomap.elements) return EINVAL; @@ -136,10 +136,10 @@ */ bitmap_set_range(&task->arch.iomap, (size_t) ioaddr, size); - + /* * Increment I/O Permission bitmap generation counter. */ task->arch.iomapver++; - + return 0; } Index: kernel/genarch/src/drivers/dsrln/dsrlnin.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/dsrln/dsrlnin.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -50,5 +50,5 @@ dsrlnin_instance_t *instance = irq->instance; dsrlnin_t *dev = instance->dsrlnin; - + indev_push_character(instance->srlnin, pio_read_8(&dev->data)); } @@ -61,5 +61,5 @@ instance->dsrlnin = dev; instance->srlnin = NULL; - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -68,5 +68,5 @@ instance->irq.instance = instance; } - + return instance; } @@ -76,5 +76,5 @@ assert(instance); assert(srlnin); - + instance->srlnin = srlnin; irq_register(&instance->irq); Index: kernel/genarch/src/drivers/dsrln/dsrlnout.c =================================================================== --- kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/dsrln/dsrlnout.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -52,5 +52,5 @@ { dsrlnout_instance_t *instance = (dsrlnout_instance_t *) dev->data; - + if ((!instance->parea.mapped) || (console_override)) { if (ascii_check(ch)) @@ -73,5 +73,5 @@ if (!dsrlndev) return NULL; - + dsrlnout_instance_t *instance = malloc(sizeof(dsrlnout_instance_t), FRAME_ATOMIC); @@ -80,8 +80,8 @@ return NULL; } - + outdev_initialize("dsrlndev", dsrlndev, &dsrlndev_ops); dsrlndev->data = instance; - + instance->base = base; link_initialize(&instance->parea.link); @@ -91,5 +91,5 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + if (!fb_exported) { /* @@ -101,8 +101,8 @@ sysinfo_set_item_val("fb.kind", NULL, 3); sysinfo_set_item_val("fb.address.physical", NULL, KA2PA(base)); - + fb_exported = true; } - + return dsrlndev; } Index: kernel/genarch/src/drivers/ega/ega.c =================================================================== --- kernel/genarch/src/drivers/ega/ega.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/ega/ega.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,7 +63,7 @@ typedef struct { IRQ_SPINLOCK_DECLARE(lock); - + parea_t parea; - + uint32_t cursor; uint8_t *addr; @@ -86,353 +86,353 @@ if ((ch >= 0x0000) && (ch <= 0x007f)) return ch; - + if (ch == 0x00a0) return 255; - + if (ch == 0x00a1) return 173; - + if ((ch >= 0x00a2) && (ch <= 0x00a3)) return (ch - 7); - + if (ch == 0x00a5) return 157; - + if (ch == 0x00aa) return 166; - + if (ch == 0x00ab) return 174; - + if (ch == 0x00ac) return 170; - + if (ch == 0x00b0) return 248; - + if (ch == 0x00b1) return 241; - + if (ch == 0x00b2) return 253; - + if (ch == 0x00b5) return 230; - + if (ch == 0x00b7) return 250; - + if (ch == 0x00ba) return 167; - + if (ch == 0x00bb) return 175; - + if (ch == 0x00bc) return 172; - + if (ch == 0x00bd) return 171; - + if (ch == 0x00bf) return 168; - + if ((ch >= 0x00c4) && (ch <= 0x00c5)) return (ch - 54); - + if (ch == 0x00c6) return 146; - + if (ch == 0x00c7) return 128; - + if (ch == 0x00c9) return 144; - + if (ch == 0x00d1) return 165; - + if (ch == 0x00d6) return 153; - + if (ch == 0x00dc) return 154; - + if (ch == 0x00df) return 225; - + if (ch == 0x00e0) return 133; - + if (ch == 0x00e1) return 160; - + if (ch == 0x00e2) return 131; - + if (ch == 0x00e4) return 132; - + if (ch == 0x00e5) return 134; - + if (ch == 0x00e6) return 145; - + if (ch == 0x00e7) return 135; - + if (ch == 0x00e8) return 138; - + if (ch == 0x00e9) return 130; - + if ((ch >= 0x00ea) && (ch <= 0x00eb)) return (ch - 98); - + if (ch == 0x00ec) return 141; - + if (ch == 0x00ed) return 161; - + if (ch == 0x00ee) return 140; - + if (ch == 0x00ef) return 139; - + if (ch == 0x00f1) return 164; - + if (ch == 0x00f2) return 149; - + if (ch == 0x00f3) return 162; - + if (ch == 0x00f4) return 147; - + if (ch == 0x00f6) return 148; - + if (ch == 0x00f7) return 246; - + if (ch == 0x00f9) return 151; - + if (ch == 0x00fa) return 163; - + if (ch == 0x00fb) return 150; - + if (ch == 0x00fc) return 129; - + if (ch == 0x00ff) return 152; - + if (ch == 0x0192) return 159; - + if (ch == 0x0393) return 226; - + if (ch == 0x0398) return 233; - + if (ch == 0x03a3) return 228; - + if (ch == 0x03a6) return 232; - + if (ch == 0x03a9) return 234; - + if (ch == 0x03b1) return 224; - + if (ch == 0x03b4) return 235; - + if (ch == 0x03b5) return 238; - + if (ch == 0x03c0) return 227; - + if (ch == 0x03c3) return 229; - + if (ch == 0x03c4) return 231; - + if (ch == 0x03c6) return 237; - + if (ch == 0x207f) return 252; - + if (ch == 0x20a7) return 158; - + if (ch == 0x2219) return 249; - + if (ch == 0x221a) return 251; - + if (ch == 0x221e) return 236; - + if (ch == 0x2229) return 239; - + if (ch == 0x2248) return 247; - + if (ch == 0x2261) return 240; - + if (ch == 0x2264) return 243; - + if (ch == 0x2265) return 242; - + if (ch == 0x2310) return 169; - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 8748); - + if (ch == 0x2500) return 196; - + if (ch == 0x2502) return 179; - + if (ch == 0x250c) return 218; - + if (ch == 0x2510) return 191; - + if (ch == 0x2514) return 192; - + if (ch == 0x2518) return 217; - + if (ch == 0x251c) return 195; - + if (ch == 0x2524) return 180; - + if (ch == 0x252c) return 194; - + if (ch == 0x2534) return 193; - + if (ch == 0x253c) return 197; - + if (ch == 0x2550) return 205; - + if (ch == 0x2551) return 186; - + if ((ch >= 0x2552) && (ch <= 0x2553)) return (ch - 9341); - + if (ch == 0x2554) return 201; - + if (ch == 0x2555) return 184; - + if (ch == 0x2556) return 183; - + if (ch == 0x2557) return 187; - + if (ch == 0x2558) return 212; - + if (ch == 0x2559) return 211; - + if (ch == 0x255a) return 200; - + if (ch == 0x255b) return 190; - + if (ch == 0x255c) return 189; - + if (ch == 0x255d) return 188; - + if ((ch >= 0x255e) && (ch <= 0x255f)) return (ch - 9368); - + if (ch == 0x2560) return 204; - + if ((ch >= 0x2561) && (ch <= 0x2562)) return (ch - 9388); - + if (ch == 0x2563) return 185; - + if ((ch >= 0x2564) && (ch <= 0x2565)) return (ch - 9363); - + if (ch == 0x2566) return 203; - + if ((ch >= 0x2567) && (ch <= 0x2568)) return (ch - 9368); - + if (ch == 0x2569) return 202; - + if (ch == 0x256a) return 216; - + if (ch == 0x256b) return 215; - + if (ch == 0x256c) return 206; - + if (ch == 0x2580) return 223; - + if (ch == 0x2584) return 220; - + if (ch == 0x2588) return 219; - + if (ch == 0x258c) return 221; - + if (ch == 0x2590) return 222; - + if ((ch >= 0x2591) && (ch <= 0x2593)) return (ch - 9441); - + return 256; } @@ -445,5 +445,5 @@ if (instance->cursor < EGA_SCREEN) return; - + memmove((void *) instance->backbuf, (void *) (instance->backbuf + EGA_COLS * 2), @@ -451,5 +451,5 @@ memsetw(instance->backbuf + (EGA_SCREEN - EGA_COLS) * 2, EGA_COLS, EMPTY_CHAR); - + if ((!instance->parea.mapped) || (console_override)) { memmove((void *) instance->addr, @@ -459,5 +459,5 @@ EGA_COLS, EMPTY_CHAR); } - + instance->cursor = instance->cursor - EGA_COLS; } @@ -492,23 +492,23 @@ pio_write_8(instance->base + EGA_INDEX_REG, 0x0f); uint8_t lo = pio_read_8(instance->base + EGA_DATA_REG); - + instance->cursor = (hi << 8) | lo; } else instance->cursor = 0; - + if (instance->cursor >= EGA_SCREEN) instance->cursor = 0; - + if ((instance->cursor % EGA_COLS) != 0) instance->cursor = (instance->cursor + EGA_COLS) - instance->cursor % EGA_COLS; - + memsetw(instance->backbuf + instance->cursor * 2, EGA_SCREEN - instance->cursor, EMPTY_CHAR); - + if ((!instance->parea.mapped) || (console_override)) memsetw(instance->addr + instance->cursor * 2, EGA_SCREEN - instance->cursor, EMPTY_CHAR); - + ega_check_cursor(instance); ega_move_cursor(instance); @@ -521,5 +521,5 @@ uint8_t glyph; uint8_t style; - + if ((index >> 8)) { glyph = U_SPECIAL; @@ -529,8 +529,8 @@ style = STYLE; } - + instance->backbuf[instance->cursor * 2] = glyph; instance->backbuf[instance->cursor * 2 + 1] = style; - + if ((!instance->parea.mapped) || (console_override)) { instance->addr[instance->cursor * 2] = glyph; @@ -542,7 +542,7 @@ { ega_instance_t *instance = (ega_instance_t *) dev->data; - + irq_spinlock_lock(&instance->lock, true); - + switch (ch) { case '\n': @@ -565,5 +565,5 @@ ega_check_cursor(instance); ega_move_cursor(instance); - + irq_spinlock_unlock(&instance->lock, true); } @@ -572,11 +572,11 @@ { ega_instance_t *instance = (ega_instance_t *) dev->data; - + irq_spinlock_lock(&instance->lock, true); - + memcpy(instance->addr, instance->backbuf, EGA_VRAM_SIZE); ega_move_cursor(instance); ega_show_cursor(instance); - + irq_spinlock_unlock(&instance->lock, true); } @@ -587,5 +587,5 @@ if (!egadev) return NULL; - + ega_instance_t *instance = malloc(sizeof(ega_instance_t), FRAME_ATOMIC); if (!instance) { @@ -593,10 +593,10 @@ return NULL; } - + outdev_initialize("egadev", egadev, &egadev_ops); egadev->data = instance; - + irq_spinlock_initialize(&instance->lock, "*ega.instance.lock"); - + instance->base = base; instance->addr = (uint8_t *) km_map(addr, EGA_VRAM_SIZE, @@ -608,5 +608,5 @@ return NULL; } - + instance->backbuf = (uint8_t *) malloc(EGA_VRAM_SIZE, 0); if (!instance->backbuf) { @@ -616,5 +616,5 @@ return NULL; } - + link_initialize(&instance->parea.link); instance->parea.pbase = addr; @@ -623,9 +623,9 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + /* Synchronize the back buffer and cursor position. */ memcpy(instance->backbuf, instance->addr, EGA_VRAM_SIZE); ega_sync_cursor(instance); - + if (!fb_exported) { /* @@ -640,8 +640,8 @@ sysinfo_set_item_val("fb.blinking", NULL, true); sysinfo_set_item_val("fb.address.physical", NULL, addr); - + fb_exported = true; } - + return egadev; } Index: kernel/genarch/src/drivers/i8042/i8042.c =================================================================== --- kernel/genarch/src/drivers/i8042/i8042.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/i8042/i8042.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,5 +59,5 @@ i8042_instance_t *i8042_instance = irq->instance; i8042_t *dev = i8042_instance->i8042; - + if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) return IRQ_ACCEPT; @@ -70,5 +70,5 @@ i8042_instance_t *instance = irq->instance; i8042_t *dev = instance->i8042; - + if (pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) { uint8_t data = pio_read_8(&dev->data); @@ -83,5 +83,5 @@ if ((pio_read_8(&dev->status) & i8042_BUFFER_FULL_MASK) == 0) break; - + (void) pio_read_8(&dev->data); delay(50); /* 50 us think time */ @@ -94,8 +94,8 @@ if ((pio_read_8(&dev->status) & i8042_WAIT_MASK) == 0) break; - + delay(50); /* 50 us think time */ } - + pio_write_8(&dev->status, cmd); delay(10000); /* 10 ms think time */ @@ -110,5 +110,5 @@ instance->i8042 = dev; instance->kbrdin = NULL; - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -117,5 +117,5 @@ instance->irq.instance = instance; } - + return instance; } @@ -125,7 +125,7 @@ assert(instance); assert(kbrdin); - + i8042_clear_buffer(instance->i8042); - + instance->kbrdin = kbrdin; irq_register(&instance->irq); Index: kernel/genarch/src/drivers/ns16550/ns16550.c =================================================================== --- kernel/genarch/src/drivers/ns16550/ns16550.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/ns16550/ns16550.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -71,5 +71,5 @@ { ns16550_instance_t *instance = irq->instance; - + while (ns16550_reg_read(instance, NS16550_REG_LSR) & LSR_DATA_READY) { uint8_t data = ns16550_reg_read(instance, NS16550_REG_RBR); @@ -95,5 +95,5 @@ { ns16550_instance_t *instance = (ns16550_instance_t *) dev->data; - + if ((!instance->parea.mapped) || (console_override)) { if (ascii_check(ch)) @@ -135,5 +135,5 @@ instance->input = NULL; instance->output = NULL; - + if (output) { instance->output = malloc(sizeof(outdev_t), @@ -143,5 +143,5 @@ return NULL; } - + outdev_initialize("ns16550", instance->output, &ns16550_ops); @@ -149,5 +149,5 @@ *output = instance->output; } - + irq_initialize(&instance->irq); instance->irq.inr = inr; @@ -157,5 +157,5 @@ instance->irq.cir = cir; instance->irq.cir_arg = cir_arg; - + instance->parea.pbase = (uintptr_t) dev; instance->parea.frames = 1; @@ -164,5 +164,5 @@ ddi_parea_register(&instance->parea); } - + return instance; } @@ -172,10 +172,10 @@ assert(instance); assert(input); - + instance->input = input; irq_register(&instance->irq); - + ns16550_clear_buffer(instance); - + /* Enable interrupts */ ns16550_reg_write(instance, NS16550_REG_IER, IER_ERBFI); Index: kernel/genarch/src/drivers/pl050/pl050.c =================================================================== --- kernel/genarch/src/drivers/pl050/pl050.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/pl050/pl050.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -64,5 +64,5 @@ uint8_t status; pl050_instance_t *instance = irq->instance; - + while ((status = pio_read_8(pl050->status)) & PL050_STAT_RXFULL) { data = pio_read_8(pl050->data); @@ -98,5 +98,5 @@ { uint8_t val; - + instance->kbrdin = kbrdin; irq_register(&instance->irq); @@ -108,5 +108,5 @@ /* reset the data buffer */ pio_read_8(pl050->data); - + } Index: kernel/genarch/src/drivers/s3c24xx/uart.c =================================================================== --- kernel/genarch/src/drivers/s3c24xx/uart.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/s3c24xx/uart.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ s3c24xx_uart_t *uart = (s3c24xx_uart_t *) dev->data; - + if ((!uart->parea.mapped) || (console_override)) { if (!ascii_check(ch)) { @@ -134,5 +134,5 @@ pio_write_32(&uart->io->ucon, pio_read_32(&uart->io->ucon) & ~UCON_RX_INT_LEVEL); - + link_initialize(&uart->parea.link); uart->parea.pbase = paddr; @@ -141,5 +141,5 @@ uart->parea.mapped = false; ddi_parea_register(&uart->parea); - + if (!fb_exported) { /* Index: kernel/genarch/src/drivers/via-cuda/cuda.c =================================================================== --- kernel/genarch/src/drivers/via-cuda/cuda.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/drivers/via-cuda/cuda.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -113,5 +113,5 @@ instance->irq.preack = true; } - + return instance; } @@ -239,8 +239,8 @@ cuda_t *dev = instance->cuda; uint8_t b; - + b = pio_read_8(&dev->b); pio_read_8(&dev->sr); - + if ((b & TREQ) == 0) { instance->xstate = cx_receive; @@ -250,5 +250,5 @@ cuda_send_start(instance); } - + memcpy(buf, instance->rcv_buf, instance->bidx); *len = instance->bidx; Index: kernel/genarch/src/fb/bfb.c =================================================================== --- kernel/genarch/src/fb/bfb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/bfb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -61,5 +61,5 @@ (bfb_bpp == 0) || (bfb_scanline == 0)) return false; - + fb_properties_t bfb_props = { .addr = bfb_addr, @@ -69,5 +69,5 @@ .scan = bfb_scanline }; - + switch (bfb_bpp) { case 8: @@ -92,9 +92,9 @@ return false; } - + outdev_t *fbdev = fb_init(&bfb_props); if (!fbdev) return false; - + stdout_wire(fbdev); return true; Index: kernel/genarch/src/fb/fb.c =================================================================== --- kernel/genarch/src/fb/fb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/fb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -84,38 +84,38 @@ typedef struct { SPINLOCK_DECLARE(lock); - + parea_t parea; - + uint8_t *addr; uint16_t *backbuf; uint8_t *glyphs; uint8_t *bgscan; - + rgb_conv_t rgb_conv; - + unsigned int xres; unsigned int yres; - + /** Number of rows that fit on framebuffer */ unsigned int rowtrim; - + unsigned int scanline; unsigned int glyphscanline; - + unsigned int pixelbytes; unsigned int glyphbytes; unsigned int bgscanbytes; - + /** Number of columns in the backbuffer */ unsigned int cols; /** Number of rows in the backbuffer */ unsigned int rows; - + /** Starting row in the cyclic backbuffer */ unsigned int start_row; - + /** Top-most visible row (relative to start_row) */ unsigned int offset_row; - + /** Current backbuffer position */ unsigned int position; @@ -236,20 +236,20 @@ if (!overlay) instance->backbuf[BB_POS(instance, col, row)] = glyph; - + /* Do not output if the framebuffer is used by user space */ if ((instance->parea.mapped) && (!console_override)) return; - + /* Check whether the glyph should be visible */ if (row < instance->offset_row) return; - + unsigned int rel_row = row - instance->offset_row; if (rel_row >= instance->rowtrim) return; - + unsigned int x = COL2X(col); unsigned int y = ROW2Y(rel_row); - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) memcpy(&instance->addr[FB_POS(instance, x, y + yd)], @@ -267,22 +267,22 @@ unsigned int y = ROW2Y(rel_row); unsigned int row = rel_row + instance->offset_row; - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) { unsigned int x; unsigned int col; - + for (col = 0, x = 0; col < instance->cols; col++, x += FONT_WIDTH) { uint16_t glyph; - + if (row < instance->rows - 1) { if (instance->backbuf[BB_POS(instance, col, row)] == instance->backbuf[BB_POS(instance, col, row + 1)]) continue; - + glyph = instance->backbuf[BB_POS(instance, col, row + 1)]; } else glyph = 0; - + memcpy(&instance->addr[FB_POS(instance, x, y + yd)], &instance->glyphs[GLYPH_POS(instance, glyph, yd)], @@ -292,14 +292,14 @@ } } - + /* * Implement backbuffer scrolling by wrapping around * the cyclic buffer. */ - + instance->start_row++; if (instance->start_row == instance->rows) instance->start_row = 0; - + memsetw(&instance->backbuf[BB_POS(instance, 0, instance->rows - 1)], instance->cols, 0); @@ -310,5 +310,5 @@ unsigned int col = instance->position % instance->cols; unsigned int row = instance->position / instance->cols; - + glyph_draw(instance, fb_font_glyph(U_CURSOR), col, row, true); } @@ -318,5 +318,5 @@ unsigned int col = instance->position % instance->cols; unsigned int row = instance->position / instance->cols; - + glyph_draw(instance, instance->backbuf[BB_POS(instance, col, row)], col, row, true); @@ -333,18 +333,18 @@ /* Prerender glyphs */ uint16_t glyph; - + for (glyph = 0; glyph < FONT_GLYPHS; glyph++) { uint32_t fg_color; - + if (glyph == FONT_GLYPHS - 1) fg_color = INV_COLOR; else fg_color = FG_COLOR; - + unsigned int y; - + for (y = 0; y < FONT_SCANLINES; y++) { unsigned int x; - + for (x = 0; x < FONT_WIDTH; x++) { void *dst = @@ -357,8 +357,8 @@ } } - + /* Prerender background scanline */ unsigned int x; - + for (x = 0; x < instance->xres; x++) instance->rgb_conv(&instance->bgscan[x * instance->pixelbytes], BG_COLOR); @@ -370,9 +370,9 @@ unsigned int y = ROW2Y(rel_row); unsigned int row = rel_row + instance->offset_row; - + for (unsigned int yd = 0; yd < FONT_SCANLINES; yd++) { unsigned int x; unsigned int col; - + for (col = 0, x = 0; col < instance->cols; col++, x += FONT_WIDTH) { @@ -385,18 +385,18 @@ } } - + if (COL2X(instance->cols) < instance->xres) { unsigned int y; unsigned int size = (instance->xres - COL2X(instance->cols)) * instance->pixelbytes; - + for (y = 0; y < instance->yres; y++) memcpy(&instance->addr[FB_POS(instance, COL2X(instance->cols), y)], instance->bgscan, size); } - + if (ROW2Y(instance->rowtrim) < instance->yres) { unsigned int y; - + for (y = ROW2Y(instance->rowtrim); y < instance->yres; y++) memcpy(&instance->addr[FB_POS(instance, 0, y)], @@ -414,5 +414,5 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + switch (ch) { case '\n': @@ -446,12 +446,12 @@ instance->position++; } - + if (instance->position >= instance->cols * instance->rows) { instance->position -= instance->cols; screen_scroll(instance); } - + cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -464,13 +464,13 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + if (instance->offset_row >= instance->rowtrim / 2) instance->offset_row -= instance->rowtrim / 2; else instance->offset_row = 0; - + fb_redraw_internal(instance); cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -483,5 +483,5 @@ fb_instance_t *instance = (fb_instance_t *) dev->data; spinlock_lock(&instance->lock); - + if (instance->offset_row + instance->rowtrim / 2 <= instance->rows - instance->rowtrim) @@ -489,8 +489,8 @@ else instance->offset_row = instance->rows - instance->rowtrim; - + fb_redraw_internal(instance); cursor_put(instance); - + spinlock_unlock(&instance->lock); } @@ -502,5 +502,5 @@ { fb_instance_t *instance = (fb_instance_t *) dev->data; - + spinlock_lock(&instance->lock); fb_redraw_internal(instance); @@ -517,8 +517,8 @@ assert(props->y > 0); assert(props->scan > 0); - + rgb_conv_t rgb_conv; unsigned int pixelbytes; - + switch (props->visual) { case VISUAL_INDIRECT_8: @@ -570,9 +570,9 @@ return NULL; } - + outdev_t *fbdev = malloc(sizeof(outdev_t), FRAME_ATOMIC); if (!fbdev) return NULL; - + fb_instance_t *instance = malloc(sizeof(fb_instance_t), FRAME_ATOMIC); if (!instance) { @@ -580,10 +580,10 @@ return NULL; } - + outdev_initialize("fbdev", fbdev, &fbdev_ops); fbdev->data = instance; - + spinlock_initialize(&instance->lock, "*fb.instance.lock"); - + instance->rgb_conv = rgb_conv; instance->pixelbytes = pixelbytes; @@ -591,22 +591,22 @@ instance->yres = props->y; instance->scanline = props->scan; - + instance->rowtrim = Y2ROW(instance->yres); - + instance->cols = X2COL(instance->xres); instance->rows = FB_PAGES * instance->rowtrim; - + instance->start_row = instance->rows - instance->rowtrim; instance->offset_row = instance->start_row; instance->position = instance->start_row * instance->cols; - + instance->glyphscanline = FONT_WIDTH * instance->pixelbytes; instance->glyphbytes = ROW2Y(instance->glyphscanline); instance->bgscanbytes = instance->xres * instance->pixelbytes; - + size_t fbsize = instance->scanline * instance->yres; size_t bbsize = instance->cols * instance->rows * sizeof(uint16_t); size_t glyphsize = FONT_GLYPHS * instance->glyphbytes; - + instance->addr = (uint8_t *) km_map((uintptr_t) props->addr, fbsize, PAGE_WRITE | PAGE_NOT_CACHEABLE); @@ -617,5 +617,5 @@ return NULL; } - + instance->backbuf = (uint16_t *) malloc(bbsize, 0); if (!instance->backbuf) { @@ -625,5 +625,5 @@ return NULL; } - + instance->glyphs = (uint8_t *) malloc(glyphsize, 0); if (!instance->glyphs) { @@ -634,5 +634,5 @@ return NULL; } - + instance->bgscan = malloc(instance->bgscanbytes, 0); if (!instance->bgscan) { @@ -644,8 +644,8 @@ return NULL; } - + memsetw(instance->backbuf, instance->cols * instance->rows, 0); glyphs_render(instance); - + link_initialize(&instance->parea.link); instance->parea.pbase = props->addr; @@ -654,5 +654,5 @@ instance->parea.mapped = false; ddi_parea_register(&instance->parea); - + if (!fb_exported) { /* @@ -668,8 +668,8 @@ sysinfo_set_item_val("fb.visual", NULL, props->visual); sysinfo_set_item_val("fb.address.physical", NULL, props->addr); - + fb_exported = true; } - + fb_redraw(fbdev); return fbdev; Index: kernel/genarch/src/fb/font-8x16.c =================================================================== --- kernel/genarch/src/fb/font-8x16.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/fb/font-8x16.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,317 +47,317 @@ if (ch == 0x0000) return 0; - + if ((ch >= 0x0020) && (ch <= 0x007f)) return (ch - 32); - + if ((ch >= 0x00a0) && (ch <= 0x021f)) return (ch - 64); - + if ((ch >= 0x0222) && (ch <= 0x0233)) return (ch - 66); - + if ((ch >= 0x0250) && (ch <= 0x02ad)) return (ch - 94); - + if ((ch >= 0x02b0) && (ch <= 0x02cf)) return (ch - 96); - + if ((ch >= 0x02d8) && (ch <= 0x02dd)) return (ch - 104); - + if (ch == 0x02ee) return 630; - + if ((ch >= 0x0300) && (ch <= 0x0301)) return (ch - 137); - + if (ch == 0x0303) return 633; - + if (ch == 0x0309) return 634; - + if ((ch >= 0x0312) && (ch <= 0x0314)) return (ch - 151); - + if (ch == 0x0323) return 638; - + if ((ch >= 0x0340) && (ch <= 0x0341)) return (ch - 193); - + if ((ch >= 0x0374) && (ch <= 0x0375)) return (ch - 243); - + if (ch == 0x037a) return 643; - + if (ch == 0x037e) return 644; - + if ((ch >= 0x0384) && (ch <= 0x038a)) return (ch - 255); - + if (ch == 0x038c) return 652; - + if ((ch >= 0x038e) && (ch <= 0x03a1)) return (ch - 257); - + if ((ch >= 0x03a3) && (ch <= 0x03ce)) return (ch - 258); - + if ((ch >= 0x03d0) && (ch <= 0x03d7)) return (ch - 259); - + if ((ch >= 0x03da) && (ch <= 0x03f3)) return (ch - 261); - + if ((ch >= 0x0400) && (ch <= 0x0486)) return (ch - 273); - + if ((ch >= 0x0488) && (ch <= 0x04ce)) return (ch - 274); - + if ((ch >= 0x04d0) && (ch <= 0x04f5)) return (ch - 275); - + if ((ch >= 0x04f8) && (ch <= 0x04f9)) return (ch - 277); - + if ((ch >= 0x0500) && (ch <= 0x050f)) return (ch - 283); - + if ((ch >= 0x0530) && (ch <= 0x0556)) return (ch - 315); - + if ((ch >= 0x0559) && (ch <= 0x055f)) return (ch - 317); - + if ((ch >= 0x0561) && (ch <= 0x0587)) return (ch - 318); - + if ((ch >= 0x0589) && (ch <= 0x058a)) return (ch - 319); - + if ((ch >= 0x0591) && (ch <= 0x05a1)) return (ch - 325); - + if ((ch >= 0x05a3) && (ch <= 0x05b9)) return (ch - 326); - + if ((ch >= 0x05bb) && (ch <= 0x05c4)) return (ch - 327); - + if ((ch >= 0x05d0) && (ch <= 0x05ea)) return (ch - 338); - + if ((ch >= 0x05f0) && (ch <= 0x05f4)) return (ch - 343); - + if (ch == 0x060c) return 1182; - + if (ch == 0x061b) return 1183; - + if (ch == 0x061f) return 1184; - + if ((ch >= 0x0621) && (ch <= 0x063a)) return (ch - 384); - + if ((ch >= 0x0640) && (ch <= 0x0655)) return (ch - 389); - + if ((ch >= 0x0660) && (ch <= 0x066d)) return (ch - 399); - + if ((ch >= 0x0670) && (ch <= 0x06ed)) return (ch - 401); - + if ((ch >= 0x06f0) && (ch <= 0x06fe)) return (ch - 403); - + if (ch == 0x10d3) return 1388; - + if (ch == 0x10d7) return 1389; - + if (ch == 0x10da) return 1390; - + if (ch == 0x10dd) return 1391; - + if (ch == 0x10e6) return 1392; - + if ((ch >= 0x1e00) && (ch <= 0x1e9b)) return (ch - 6287); - + if ((ch >= 0x1ea0) && (ch <= 0x1ef9)) return (ch - 6291); - + if ((ch >= 0x1f00) && (ch <= 0x1f07)) return (ch - 6297); - + if ((ch >= 0x2000) && (ch <= 0x2027)) return (ch - 6545); - + if ((ch >= 0x2030) && (ch <= 0x2046)) return (ch - 6553); - + if ((ch >= 0x2048) && (ch <= 0x204d)) return (ch - 6554); - + if (ch == 0x2070) return 1716; - + if ((ch >= 0x2074) && (ch <= 0x208f)) return (ch - 6591); - + if ((ch >= 0x20a0) && (ch <= 0x20af)) return (ch - 6607); - + if ((ch >= 0x2100) && (ch <= 0x213a)) return (ch - 6687); - + if ((ch >= 0x2153) && (ch <= 0x2183)) return (ch - 6711); - + if ((ch >= 0x2190) && (ch <= 0x21f3)) return (ch - 6723); - + if ((ch >= 0x2200) && (ch <= 0x22f1)) return (ch - 6735); - + if (ch == 0x2300) return 2211; - + if (ch == 0x2302) return 2212; - + if ((ch >= 0x2308) && (ch <= 0x230b)) return (ch - 6755); - + if (ch == 0x2310) return 2217; - + if (ch == 0x2318) return 2218; - + if ((ch >= 0x231a) && (ch <= 0x231b)) return (ch - 6767); - + if ((ch >= 0x2320) && (ch <= 0x2321)) return (ch - 6771); - + if ((ch >= 0x2329) && (ch <= 0x232a)) return (ch - 6778); - + if ((ch >= 0x239b) && (ch <= 0x23bd)) return (ch - 6890); - + if (ch == 0x23ce) return 2260; - + if ((ch >= 0x2409) && (ch <= 0x240d)) return (ch - 6964); - + if ((ch >= 0x2423) && (ch <= 0x2424)) return (ch - 6985); - + if (ch == 0x2426) return 2268; - + if ((ch >= 0x2500) && (ch <= 0x2595)) return (ch - 7203); - + if ((ch >= 0x25a0) && (ch <= 0x25f7)) return (ch - 7213); - + if ((ch >= 0x2600) && (ch <= 0x2602)) return (ch - 7221); - + if ((ch >= 0x2605) && (ch <= 0x260d)) return (ch - 7223); - + if ((ch >= 0x2610) && (ch <= 0x2613)) return (ch - 7225); - + if (ch == 0x2620) return 2523; - + if (ch == 0x2622) return 2524; - + if (ch == 0x2626) return 2525; - + if ((ch >= 0x2628) && (ch <= 0x262b)) return (ch - 7242); - + if ((ch >= 0x262e) && (ch <= 0x2637)) return (ch - 7244); - + if ((ch >= 0x2639) && (ch <= 0x2653)) return (ch - 7245); - + if ((ch >= 0x2660) && (ch <= 0x2667)) return (ch - 7257); - + if ((ch >= 0x2669) && (ch <= 0x266f)) return (ch - 7258); - + if ((ch >= 0xfb00) && (ch <= 0xfb05)) return (ch - 61674); - + if ((ch >= 0xfb50) && (ch <= 0xfbb1)) return (ch - 61748); - + if ((ch >= 0xfbd3) && (ch <= 0xfbe9)) return (ch - 61781); - + if ((ch >= 0xfbfc) && (ch <= 0xfbff)) return (ch - 61799); - + if ((ch >= 0xfc5b) && (ch <= 0xfc63)) return (ch - 61890); - + if (ch == 0xfc90) return 2722; - + if ((ch >= 0xfcf2) && (ch <= 0xfcf4)) return (ch - 62031); - + if ((ch >= 0xfd3c) && (ch <= 0xfd3f)) return (ch - 62102); - + if (ch == 0xfdf2) return 2730; - + if ((ch >= 0xfe50) && (ch <= 0xfe52)) return (ch - 62373); - + if ((ch >= 0xfe54) && (ch <= 0xfe66)) return (ch - 62374); - + if ((ch >= 0xfe68) && (ch <= 0xfe6b)) return (ch - 62375); - + if ((ch >= 0xfe70) && (ch <= 0xfe72)) return (ch - 62379); - + if (ch == 0xfe74) return 2760; - + if ((ch >= 0xfe76) && (ch <= 0xfefc)) return (ch - 62381); - + if (ch == 0xfeff) return 2896; - + return 2898; } @@ -3262,5 +3262,5 @@ {0xf1, 0x35, 0x55, 0x8a, 0xe0, 0x06, 0x95, 0xd6, 0xb5, 0x97, 0x00, 0xee, 0x8a, 0xee, 0x28, 0xe8}, {0x00, 0x38, 0x7c, 0x7c, 0xc6, 0x92, 0xf2, 0xe6, 0xfe, 0xe6, 0x7c, 0x7c, 0x38, 0x00, 0x00, 0x00}, - + /* Special glyph for unknown character */ {0x00, 0x00, 0x7c, 0xc6, 0xc6, 0x0c, 0x18, 0x18, 0x18, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00} Index: kernel/genarch/src/kbrd/kbrd.c =================================================================== --- kernel/genarch/src/kbrd/kbrd.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/kbrd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -78,5 +78,5 @@ { spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -94,5 +94,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -108,7 +108,7 @@ bool capslock; wchar_t ch; - + spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -126,13 +126,13 @@ capslock = (instance->keyflags & PRESSED_CAPSLOCK) || (instance->lockflags & LOCKED_CAPSLOCK); - + if ((letter) && (capslock)) shift = !shift; - + if (shift) ch = sc_secondary_map[sc]; else ch = sc_primary_map[sc]; - + switch (ch) { case U_PAGE_UP: @@ -145,8 +145,8 @@ indev_push_character(instance->sink, ch); } - - break; - } - + + break; + } + spinlock_unlock(&instance->keylock); } @@ -155,11 +155,11 @@ { kbrd_instance_t *instance = (kbrd_instance_t *) arg; - + while (true) { wchar_t sc = indev_pop_character(&instance->raw); - + if (sc == IGNORE_CODE) continue; - + if (sc & KEY_RELEASE) key_released(instance, (sc ^ KEY_RELEASE) & 0x7f); @@ -176,18 +176,18 @@ instance->thread = thread_create(kkbrd, (void *) instance, TASK, THREAD_FLAG_NONE, "kkbrd"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops); - + spinlock_initialize(&instance->keylock, "kbrd.instance.keylock"); instance->keyflags = 0; instance->lockflags = 0; } - + return instance; } @@ -197,8 +197,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; } Index: kernel/genarch/src/kbrd/kbrd_at.c =================================================================== --- kernel/genarch/src/kbrd/kbrd_at.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/kbrd_at.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -71,5 +71,5 @@ { spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -87,5 +87,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -100,7 +100,7 @@ bool shift; bool capslock; - + spinlock_lock(&instance->keylock); - + switch (sc) { case SC_LSHIFT: @@ -118,8 +118,8 @@ capslock = (instance->keyflags & PRESSED_CAPSLOCK) || (instance->lockflags & LOCKED_CAPSLOCK); - + if ((letter) && (capslock)) shift = !shift; - + if (shift) indev_push_character(instance->sink, sc_secondary_map[sc]); @@ -128,5 +128,5 @@ break; } - + spinlock_unlock(&instance->keylock); } @@ -137,5 +137,5 @@ static int is_locked = 0; kbrd_instance_t *instance = (kbrd_instance_t *) arg; - + while (true) { wchar_t sc = indev_pop_character(&instance->raw); @@ -162,5 +162,5 @@ } } - + } } @@ -174,18 +174,18 @@ instance->thread = thread_create(kkbrd, (void *) instance, TASK, 0, "kkbrd"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("kbrd", &instance->raw, &kbrd_raw_ops); - + spinlock_initialize(&instance->keylock, "kbrd_at.instance.keylock"); instance->keyflags = 0; instance->lockflags = 0; } - + return instance; } @@ -195,8 +195,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; } Index: kernel/genarch/src/kbrd/scanc_pc.c =================================================================== --- kernel/genarch/src/kbrd/scanc_pc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/kbrd/scanc_pc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -158,5 +158,5 @@ U_SPECIAL, /* 0x45 - NumLock */ U_SPECIAL, /* 0x46 - ScrollLock */ - + U_HOME_ARROW, /* 0x47 - Home */ U_UP_ARROW, /* 0x48 - Up Arrow */ Index: kernel/genarch/src/mm/as_ht.c =================================================================== --- kernel/genarch/src/mm/as_ht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/as_ht.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -79,5 +79,5 @@ NULL, NULL, SLAB_CACHE_MAGDEFERRED); } - + return NULL; } Index: kernel/genarch/src/mm/as_pt.c =================================================================== --- kernel/genarch/src/mm/as_pt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/as_pt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ pte_t *dst_ptl0 = (pte_t *) PA2KA(frame_alloc(PTL0_FRAMES, FRAME_LOWMEM, PTL0_SIZE - 1)); - + if (flags & FLAG_AS_KERNEL) memsetb(dst_ptl0, PTL0_SIZE, 0); @@ -82,22 +82,22 @@ * Copy the kernel address space portion to new PTL0. */ - + mutex_lock(&AS_KERNEL->lock); - + pte_t *src_ptl0 = (pte_t *) PA2KA((uintptr_t) AS_KERNEL->genarch.page_table); - + uintptr_t src = (uintptr_t) &src_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)]; uintptr_t dst = (uintptr_t) &dst_ptl0[PTL0_INDEX(KERNEL_ADDRESS_SPACE_START)]; - + memsetb(dst_ptl0, PTL0_SIZE, 0); memcpy((void *) dst, (void *) src, PTL0_SIZE - (src - (uintptr_t) src_ptl0)); - + mutex_unlock(&AS_KERNEL->lock); } - + return (pte_t *) KA2PA((uintptr_t) dst_ptl0); } Index: kernel/genarch/src/mm/asid.c =================================================================== --- kernel/genarch/src/mm/asid.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/asid.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -84,5 +84,5 @@ * Check if there is an unallocated ASID. */ - + if (asids_allocated == ASIDS_ALLOCABLE) { @@ -91,5 +91,5 @@ * Resort to stealing. */ - + /* * Remove the first item on the list. @@ -100,5 +100,5 @@ assert(tmp != NULL); list_remove(tmp); - + as = list_get_instance(tmp, as_t, inactive_as_with_asid_link); @@ -115,5 +115,5 @@ */ as->asid = ASID_INVALID; - + /* * If the architecture uses some software cache @@ -122,5 +122,5 @@ */ as_invalidate_translation_cache(as, 0, (size_t) -1); - + /* * Get the system rid of the stolen ASID. @@ -146,5 +146,5 @@ tlb_shootdown_finalize(ipl); } - + return asid; } Index: kernel/genarch/src/mm/asid_fifo.c =================================================================== --- kernel/genarch/src/mm/asid_fifo.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/asid_fifo.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -30,5 +30,5 @@ * @{ */ - + /** * @file @@ -66,5 +66,5 @@ fifo_create(free_asids); #endif - + for (i = 0; i < ASIDS_ALLOCABLE; i++) { fifo_push(free_asids, ASID_START + i); Index: kernel/genarch/src/mm/page_ht.c =================================================================== --- kernel/genarch/src/mm/page_ht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/page_ht.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -135,5 +135,5 @@ { assert(item); - + pte_t *pte = hash_table_get_inst(item, pte_t, link); slab_free(pte_cache, pte); @@ -162,9 +162,9 @@ irq_spinlock_lock(&page_ht_lock, true); - + if (!hash_table_find(&page_ht, key)) { pte_t *pte = slab_alloc(pte_cache, FRAME_LOWMEM | FRAME_ATOMIC); assert(pte != NULL); - + pte->g = (flags & PAGE_GLOBAL) != 0; pte->x = (flags & PAGE_EXEC) != 0; @@ -175,5 +175,5 @@ pte->a = false; pte->d = false; - + pte->as = as; pte->page = ALIGN_DOWN(page, PAGE_SIZE); @@ -185,5 +185,5 @@ */ write_barrier(); - + hash_table_insert(&page_ht, &pte->link); } @@ -210,5 +210,5 @@ assert(page_table_locked(as)); - + irq_spinlock_lock(&page_ht_lock, true); @@ -235,5 +235,5 @@ if (cur) return hash_table_get_inst(cur, pte_t, link); - + return NULL; } @@ -257,5 +257,5 @@ irq_spinlock_unlock(&page_ht_lock, true); - + return t != NULL; } @@ -275,5 +275,5 @@ if (!t) panic("Updating non-existent PTE"); - + assert(pte->as == t->as); assert(pte->page == t->page); Index: kernel/genarch/src/mm/page_pt.c =================================================================== --- kernel/genarch/src/mm/page_pt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/mm/page_pt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -83,5 +83,5 @@ assert(page_table_locked(as)); - + if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -100,7 +100,7 @@ SET_PTL1_PRESENT(ptl0, PTL0_INDEX(page)); } - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); - + if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -117,7 +117,7 @@ SET_PTL2_PRESENT(ptl1, PTL1_INDEX(page)); } - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); - + if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) { pte_t *newpt = (pte_t *) @@ -134,7 +134,7 @@ SET_PTL3_PRESENT(ptl2, PTL2_INDEX(page)); } - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + SET_FRAME_ADDRESS(ptl3, PTL3_INDEX(page), frame); SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), flags | PAGE_NOT_PRESENT); @@ -165,19 +165,19 @@ * First, remove the mapping, if it exists. */ - + pte_t *ptl0 = (pte_t *) PA2KA((uintptr_t) as->genarch.page_table); if (GET_PTL1_FLAGS(ptl0, PTL0_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) return; - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + /* * Destroy the mapping. @@ -189,13 +189,13 @@ SET_FRAME_FLAGS(ptl3, PTL3_INDEX(page), PAGE_NOT_PRESENT); memsetb(&ptl3[PTL3_INDEX(page)], sizeof(pte_t), 0); - + /* * Second, free all empty tables along the way from PTL3 down to PTL0 * except those needed for sharing the kernel non-identity mappings. */ - + /* Check PTL3 */ bool empty = true; - + unsigned int i; for (i = 0; i < PTL3_ENTRIES; i++) { @@ -205,5 +205,5 @@ } } - + if (empty) { /* @@ -232,5 +232,5 @@ return; } - + /* Check PTL2, empty is still true */ #if (PTL2_ENTRIES != 0) @@ -241,5 +241,5 @@ } } - + if (empty) { /* @@ -267,5 +267,5 @@ } #endif /* PTL2_ENTRIES != 0 */ - + /* check PTL1, empty is still true */ #if (PTL1_ENTRIES != 0) @@ -276,5 +276,5 @@ } } - + if (empty) { /* @@ -301,5 +301,5 @@ read_barrier(); - + pte_t *ptl1 = (pte_t *) PA2KA(GET_PTL1_ADDRESS(ptl0, PTL0_INDEX(page))); if (GET_PTL2_FLAGS(ptl1, PTL1_INDEX(page)) & PAGE_NOT_PRESENT) @@ -312,5 +312,5 @@ read_barrier(); #endif - + pte_t *ptl2 = (pte_t *) PA2KA(GET_PTL2_ADDRESS(ptl1, PTL1_INDEX(page))); if (GET_PTL3_FLAGS(ptl2, PTL2_INDEX(page)) & PAGE_NOT_PRESENT) @@ -323,7 +323,7 @@ read_barrier(); #endif - + pte_t *ptl3 = (pte_t *) PA2KA(GET_PTL3_ADDRESS(ptl2, PTL2_INDEX(page))); - + return &ptl3[PTL3_INDEX(page)]; } @@ -400,9 +400,9 @@ { assert(size > 0); - + uintptr_t ptl0 = PA2KA((uintptr_t) AS_KERNEL->genarch.page_table); uintptr_t ptl0_step = ptl0_step_get(); size_t frames; - + #if (PTL1_ENTRIES != 0) frames = PTL1_FRAMES; @@ -412,5 +412,5 @@ frames = PTL3_FRAMES; #endif - + for (uintptr_t addr = ALIGN_DOWN(base, ptl0_step); addr - 1 < base + size - 1; Index: kernel/genarch/src/multiboot/multiboot.c =================================================================== --- kernel/genarch/src/multiboot/multiboot.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/multiboot/multiboot.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -52,5 +52,5 @@ if (end == NULL) end = cmd_line + str_size(cmd_line); - + /* * Find last occurence of '/' before 'end'. If found, place start at @@ -59,5 +59,5 @@ const char *cp = end; const char *start = buf; - + while (cp != start) { if (*cp == '/') { @@ -67,5 +67,5 @@ cp--; } - + /* Copy the command. */ str_ncpy(buf, size, start, (size_t) (end - start)); @@ -106,8 +106,8 @@ if (init.cnt >= CONFIG_INIT_TASKS) break; - + init.tasks[init.cnt].paddr = mods[i].start; init.tasks[init.cnt].size = mods[i].end - mods[i].start; - + /* Copy command line, if available. */ if (mods[i].string) { @@ -120,5 +120,5 @@ init.tasks[init.cnt].arguments[0] = 0; } - + init.cnt++; } @@ -128,13 +128,13 @@ { uint32_t pos = 0; - + while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) { e820table[e820counter] = memmap->mm_info; - + /* Compute address of next structure. */ uint32_t size = sizeof(memmap->size) + memmap->size; memmap = (multiboot_memmap_t *) ((uintptr_t) memmap + size); pos += size; - + e820counter++; } @@ -163,5 +163,5 @@ multiboot_modules(info->mods_count, (multiboot_module_t *) MULTIBOOT_PTR(info->mods_addr)); - + /* Copy memory map. */ if ((info->flags & MULTIBOOT_INFO_FLAGS_MMAP) != 0) Index: kernel/genarch/src/multiboot/multiboot2.c =================================================================== --- kernel/genarch/src/multiboot/multiboot2.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/multiboot/multiboot2.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ multiboot_extract_argument(init.tasks[init.cnt].arguments, CONFIG_TASK_ARGUMENTS_BUFLEN, module->string); - + init.cnt++; } @@ -66,15 +66,15 @@ ((uintptr_t) memmap + sizeof(*memmap)); uint32_t pos = sizeof(*memmap); - + while ((pos < length) && (e820counter < MEMMAP_E820_MAX_RECORDS)) { e820table[e820counter].base_address = entry->base_address; e820table[e820counter].size = entry->size; e820table[e820counter].type = entry->type; - + /* Compute address of next entry. */ entry = (multiboot2_memmap_entry_t *) ((uintptr_t) entry + memmap->entry_size); pos += memmap->entry_size; - + e820counter++; } @@ -90,11 +90,11 @@ bfb_bpp = fbinfo->bpp; bfb_scanline = fbinfo->scanline; - + bfb_red_pos = fbinfo->rgb.red_pos; bfb_red_size = fbinfo->rgb.red_size; - + bfb_green_pos = fbinfo->rgb.green_pos; bfb_green_size = fbinfo->rgb.green_size; - + bfb_blue_pos = fbinfo->rgb.blue_pos; bfb_blue_size = fbinfo->rgb.blue_size; @@ -116,8 +116,8 @@ if (signature != MULTIBOOT2_LOADER_MAGIC) return; - + const multiboot2_tag_t *tag = (const multiboot2_tag_t *) ALIGN_UP((uintptr_t) info + sizeof(*info), MULTIBOOT2_TAG_ALIGN); - + while (tag->type != MULTIBOOT2_TAG_TERMINATOR) { switch (tag->type) { @@ -135,5 +135,5 @@ break; } - + tag = (const multiboot2_tag_t *) ALIGN_UP((uintptr_t) tag + tag->size, MULTIBOOT2_TAG_ALIGN); Index: kernel/genarch/src/ofw/ebus.c =================================================================== --- kernel/genarch/src/ofw/ebus.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/ebus.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,10 +55,10 @@ if (!prop) return false; - + ranges = prop->size / sizeof(ofw_ebus_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if (reg->space != range[i].child_space) @@ -67,10 +67,10 @@ range[i].size)) { ofw_pci_reg_t pci_reg; - + pci_reg.space = range[i].parent_space; pci_reg.addr = range[i].parent_base + (reg->addr - range[i].child_base); pci_reg.size = reg->size; - + return ofw_pci_apply_ranges(node->parent, &pci_reg, pa); } @@ -86,5 +86,5 @@ ofw_tree_property_t *prop; ofw_tree_node_t *controller; - + prop = ofw_tree_getprop(node, "interrupt-map"); if (!prop || !prop->value) @@ -93,19 +93,19 @@ ofw_ebus_intr_map_t *intr_map = prop->value; size_t count = prop->size / sizeof(ofw_ebus_intr_map_t); - + assert(count); - + prop = ofw_tree_getprop(node, "interrupt-map-mask"); if (!prop || !prop->value) return false; - + ofw_ebus_intr_mask_t *intr_mask = prop->value; - + assert(prop->size == sizeof(ofw_ebus_intr_mask_t)); - + uint32_t space = reg->space & intr_mask->space_mask; uint32_t addr = reg->addr & intr_mask->addr_mask; uint32_t intr = interrupt & intr_mask->intr_mask; - + unsigned int i; for (i = 0; i < count; i++) { @@ -127,5 +127,5 @@ if (!controller) return false; - + if (str_cmp(ofw_tree_node_name(controller), "pci") != 0) { /* Index: kernel/genarch/src/ofw/ofw_tree.c =================================================================== --- kernel/genarch/src/ofw/ofw_tree.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/ofw_tree.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,5 +70,5 @@ return &node->property[i]; } - + return NULL; } @@ -87,5 +87,5 @@ if ((!prop) || (prop->size < 2)) return NULL; - + return prop->value; } @@ -110,5 +110,5 @@ return cur; } - + /* * Disambigued name not found. @@ -122,5 +122,5 @@ return cur; } - + return NULL; } @@ -141,12 +141,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, dtype) == 0) return cur; } - + return NULL; } @@ -170,5 +170,5 @@ if (cur->node_handle == handle) return cur; - + if (cur->child) { ofw_tree_node_t *node = @@ -178,5 +178,5 @@ } } - + return NULL; } @@ -197,12 +197,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, dtype) == 0) return cur; } - + return NULL; } @@ -223,12 +223,12 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "name"); - + if ((!prop) || (!prop->value)) continue; - + if (str_cmp(prop->value, name) == 0) return cur; } - + return NULL; } @@ -246,15 +246,15 @@ if (path[0] != '/') return NULL; - + ofw_tree_node_t *node = ofw_root; size_t j; - + for (size_t i = 1; (i < str_size(path)) && (node); i = j + 1) { for (j = i; (j < str_size(path)) && (path[j] != '/'); j++); - + /* Skip extra slashes */ if (i == j) continue; - + char buf[NAME_BUF_LEN + 1]; memcpy(buf, &path[i], j - i); @@ -262,5 +262,5 @@ node = ofw_tree_find_child(node, buf); } - + return node; } @@ -285,5 +285,5 @@ ofw_tree_property_t *prop = ofw_tree_getprop(cur, "device_type"); - + if ((prop) && (prop->value) && (str_cmp(prop->value, dtype) == 0)) { bool ret = walker(cur, arg); @@ -291,5 +291,5 @@ return false; } - + if (cur->child) { bool ret = @@ -299,5 +299,5 @@ } } - + return true; } @@ -336,5 +336,5 @@ { ofw_tree_node_t *node = (ofw_tree_node_t *) data; - + /* Compute serialized data size */ *size = 0; @@ -342,8 +342,8 @@ *size += str_size(node->property[i].name) + 1 + sizeof(node->property[i].size) + node->property[i].size; - + if (dry_run) return NULL; - + void *dump = malloc(*size, FRAME_ATOMIC); if (dump == NULL) { @@ -351,5 +351,5 @@ return NULL; } - + /* Serialize the data */ size_t pos = 0; @@ -358,10 +358,10 @@ str_cpy(dump + pos, *size - pos, node->property[i].name); pos += str_size(node->property[i].name) + 1; - + /* Value size */ memcpy(dump + pos, &node->property[i].size, sizeof(node->property[i].size)); pos += sizeof(node->property[i].size); - + /* Value */ memcpy(dump + pos, node->property[i].value, @@ -369,5 +369,5 @@ pos += node->property[i].size; } - + return ((void *) dump); } @@ -385,5 +385,5 @@ { char *cur_path = (char *) malloc(PATH_MAX_LEN, 0); - + for (ofw_tree_node_t *cur = node; cur; cur = cur->peer) { if ((cur->parent) && (path)) @@ -391,12 +391,12 @@ else snprintf(cur_path, PATH_MAX_LEN, "firmware.%s", cur->da_name); - + sysinfo_set_item_gen_data(cur_path, NULL, ofw_sysinfo_properties, (void *) cur); - + if (cur->child) ofw_tree_node_sysinfo(cur->child, cur_path); } - + free(cur_path); } Index: kernel/genarch/src/ofw/pci.c =================================================================== --- kernel/genarch/src/ofw/pci.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/pci.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,10 +63,10 @@ return false; } - + ranges = prop->size / sizeof(ofw_pci_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if ((reg->space & PCI_SPACE_MASK) != @@ -95,18 +95,18 @@ return true; } - + ofw_tree_property_t *prop; ofw_pci_reg_t *assigned_address; size_t assigned_addresses; - + prop = ofw_tree_getprop(node, "assigned-addresses"); if (!prop) panic("Cannot find 'assigned-addresses' property."); - + assigned_addresses = prop->size / sizeof(ofw_pci_reg_t); assigned_address = prop->value; - + unsigned int i; - + for (i = 0; i < assigned_addresses; i++) { if ((assigned_address[i].space & PCI_REG_MASK) == @@ -118,5 +118,5 @@ } } - + return false; } Index: kernel/genarch/src/ofw/sbus.c =================================================================== --- kernel/genarch/src/ofw/sbus.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/ofw/sbus.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,5 +46,5 @@ ofw_sbus_range_t *range; size_t ranges; - + /* * The SBUS support is very rudimentary in that we simply assume @@ -55,14 +55,14 @@ if (!node->parent || node->parent->parent) return false; - + prop = ofw_tree_getprop(node, "ranges"); if (!prop) return false; - + ranges = prop->size / sizeof(ofw_sbus_range_t); range = prop->value; - + unsigned int i; - + for (i = 0; i < ranges; i++) { if (overlaps(reg->addr, reg->size, range[i].child_base, @@ -73,5 +73,5 @@ } } - + return false; } Index: kernel/genarch/src/softint/division.c =================================================================== --- kernel/genarch/src/softint/division.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/softint/division.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,23 +43,23 @@ unsigned int result; int steps = sizeof(unsigned int) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | (( a >> 31) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -68,5 +68,5 @@ a <<= 1; } - + return result; } @@ -77,23 +77,23 @@ unsigned long long result; int steps = sizeof(unsigned long long) * 8; - + *remainder = 0; result = 0; - + if (b == 0) { /* FIXME: division by zero */ return 0; } - + if (a < b) { *remainder = a; return 0; } - + for (; steps > 0; steps--) { /* shift one bit to remainder */ *remainder = ((*remainder) << 1) | ((a >> 63) & 0x1); result <<= 1; - + if (*remainder >= b) { *remainder -= b; @@ -102,5 +102,5 @@ a <<= 1; } - + return result; } @@ -111,8 +111,8 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -123,8 +123,8 @@ unsigned long long rem; long long result = (long long) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) return result; - + return -result; } @@ -149,9 +149,9 @@ unsigned int rem; divandmod32(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((int) rem); - + return (int) rem; } @@ -162,9 +162,9 @@ unsigned long long rem; divandmod64(a, b, &rem); - + /* if divident is negative, remainder must be too */ if (!(SGN(a))) return -((long long) rem); - + return (long long) rem; } @@ -190,10 +190,10 @@ unsigned int rem; int result = (int) divandmod32(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; @@ -210,10 +210,10 @@ unsigned long long rem; long long result = (int) divandmod64(ABSVAL(a), ABSVAL(b), &rem); - + if (SGN(a) == SGN(b)) { *c = rem; return result; } - + *c = -rem; return -result; Index: kernel/genarch/src/srln/srln.c =================================================================== --- kernel/genarch/src/srln/srln.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/genarch/src/srln/srln.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -53,16 +53,16 @@ bool cr = false; uint32_t escape = 0; - + while (true) { wchar_t ch = indev_pop_character(&instance->raw); - + /* ANSI escape sequence processing */ if (escape != 0) { escape <<= 8; escape |= ch & 0xff; - + if ((escape == 0x1b4f) || (escape == 0x1b5b) || (escape == 0x1b5b33)) continue; - + switch (escape) { case 0x1b4f46: @@ -100,10 +100,10 @@ } } - + if (ch == 0x1b) { escape = ch & 0xff; continue; } - + /* Replace carriage return with line feed and suppress any following line feed */ @@ -112,5 +112,5 @@ continue; } - + if (ch == '\r') { ch = '\n'; @@ -118,9 +118,9 @@ } else cr = false; - + /* Backspace */ if (ch == 0x7f) ch = '\b'; - + indev_push_character(instance->sink, ch); } @@ -134,14 +134,14 @@ instance->thread = thread_create(ksrln, (void *) instance, TASK, THREAD_FLAG_NONE, "ksrln"); - + if (!instance->thread) { free(instance); return NULL; } - + instance->sink = NULL; indev_initialize("srln", &instance->raw, &srln_raw_ops); } - + return instance; } @@ -151,8 +151,8 @@ assert(instance); assert(sink); - + instance->sink = sink; thread_ready(instance->thread); - + return &instance->raw; } Index: kernel/generic/include/adt/avl.h =================================================================== --- kernel/generic/include/adt/avl.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/avl.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,5 +69,5 @@ */ struct avltree_node *lft; - + /** * Pointer to the right descendant of this node. @@ -77,11 +77,11 @@ */ struct avltree_node *rgt; - + /** Pointer to the parent node. Root node has NULL parent. */ struct avltree_node *par; - + /** Node's key. */ avltree_key_t key; - + /** * Difference between the heights of the left and the right subtree of Index: kernel/generic/include/adt/bitmap.h =================================================================== --- kernel/generic/include/adt/bitmap.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/bitmap.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,8 +54,8 @@ if (element >= bitmap->elements) return; - + size_t byte = element / BITMAP_ELEMENT; uint8_t mask = 1 << (element & BITMAP_REMAINER); - + if (value) { bitmap->bits[byte] |= mask; @@ -70,8 +70,8 @@ if (element >= bitmap->elements) return 0; - + size_t byte = element / BITMAP_ELEMENT; uint8_t mask = 1 << (element & BITMAP_REMAINER); - + return !!((bitmap->bits)[byte] & mask); } Index: kernel/generic/include/adt/btree.h =================================================================== --- kernel/generic/include/adt/btree.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/btree.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -60,5 +60,5 @@ */ void *value[BTREE_MAX_KEYS + 1]; - + /** * Pointers to descendants of this node sorted according to the key Index: kernel/generic/include/adt/cht.h =================================================================== --- kernel/generic/include/adt/cht.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/cht.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -95,5 +95,5 @@ /** Item specific operations. */ cht_ops_t *op; - + /** Buckets currently in use. */ cht_buckets_t *b; @@ -120,5 +120,5 @@ */ atomic_t resize_reqs; - + /** Number of items in the table that have not been logically deleted. */ atomic_t item_cnt; Index: kernel/generic/include/adt/hash_table.h =================================================================== --- kernel/generic/include/adt/hash_table.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/hash_table.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -51,8 +51,8 @@ /** Returns the hash of the key stored in the item (ie its lookup key). */ size_t (*hash)(const ht_link_t *item); - + /** Returns the hash of the key. */ size_t (*key_hash)(void *key); - + /** True if the items are equal (have the same lookup keys). */ bool (*equal)(const ht_link_t *item1, const ht_link_t *item2); Index: kernel/generic/include/adt/list.h =================================================================== --- kernel/generic/include/adt/list.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/adt/list.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -231,5 +231,5 @@ link->prev->next = link->next; } - + link_initialize(link); } @@ -314,7 +314,7 @@ part1->prev->next = part2; part2->prev->next = part1; - + link_t *hlp = part1->prev; - + part1->prev = part2->prev; part2->prev = hlp; @@ -378,14 +378,14 @@ { unsigned long cnt = 0; - + link_t *link = list_first(list); while (link != NULL) { if (cnt == n) return link; - + cnt++; link = list_next(link, list); } - + return NULL; } Index: kernel/generic/include/bitops.h =================================================================== --- kernel/generic/include/bitops.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/bitops.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,28 +54,28 @@ { uint8_t n = 0; - + if (arg >> 16) { arg >>= 16; n += 16; } - + if (arg >> 8) { arg >>= 8; n += 8; } - + if (arg >> 4) { arg >>= 4; n += 4; } - + if (arg >> 2) { arg >>= 2; n += 2; } - + if (arg >> 1) n += 1; - + return n; } @@ -89,10 +89,10 @@ { uint8_t n = 0; - + if (arg >> 32) { arg >>= 32; n += 32; } - + return n + fnzb32((uint32_t) arg); } Index: kernel/generic/include/config.h =================================================================== --- kernel/generic/include/config.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/config.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -82,14 +82,14 @@ /** Number of processors that are up and running. */ volatile size_t cpu_active; - + uintptr_t base; /** Size of memory in bytes taken by kernel and stack. */ size_t kernel_size; - + /** Base adddress of initial stack. */ uintptr_t stack_base; /** Size of initial stack. */ size_t stack_size; - + bool identity_configured; /** Base address of the kernel identity mapped memory. */ @@ -97,7 +97,7 @@ /** Size of the kernel identity mapped memory. */ size_t identity_size; - + bool non_identity_configured; - + /** End of physical memory. */ uint64_t physmem_end; Index: kernel/generic/include/console/chardev.h =================================================================== --- kernel/generic/include/console/chardev.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/console/chardev.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ /** Read character directly from device, assume interrupts disabled. */ wchar_t (* poll)(struct indev *); - + /** Signal out-of-band condition. */ void (* signal)(struct indev *, indev_signal_t); @@ -65,10 +65,10 @@ const char *name; waitq_t wq; - + /** Protects everything below. */ IRQ_SPINLOCK_DECLARE(lock); wchar_t buffer[INDEV_BUFLEN]; size_t counter; - + /** Implementation of indev operations. */ indev_operations_t *op; @@ -83,11 +83,11 @@ /** Write character to output. */ void (* write)(struct outdev *, wchar_t); - + /** Redraw any previously cached characters. */ void (* redraw)(struct outdev *); - + /** Scroll up in the device cache. */ void (* scroll_up)(struct outdev *); - + /** Scroll down in the device cache. */ void (* scroll_down)(struct outdev *); @@ -97,12 +97,12 @@ typedef struct outdev { const char *name; - + /** Protects everything below. */ SPINLOCK_DECLARE(lock); - + /** Fields suitable for multiplexing. */ link_t link; list_t list; - + /** Implementation of outdev operations. */ outdev_operations_t *op; Index: kernel/generic/include/cpu.h =================================================================== --- kernel/generic/include/cpu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/cpu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -54,17 +54,17 @@ typedef struct cpu { IRQ_SPINLOCK_DECLARE(lock); - + tlb_shootdown_msg_t tlb_messages[TLB_MESSAGE_QUEUE_LEN]; size_t tlb_messages_count; - + context_t saved_context; - + atomic_t nrdy; runq_t rq[RQ_COUNT]; volatile size_t needs_relink; - + IRQ_SPINLOCK_DECLARE(timeoutlock); list_t timeout_active_list; - + /** * When system clock loses a tick, it is @@ -75,5 +75,5 @@ */ size_t missed_clock_ticks; - + /** * Processor cycle accounting. @@ -83,20 +83,20 @@ uint64_t idle_cycles; uint64_t busy_cycles; - + /** * Processor ID assigned by kernel. */ unsigned int id; - + bool active; volatile bool tlb_active; - + uint16_t frequency_mhz; uint32_t delay_loop_const; - + cpu_arch_t arch; - + struct thread *fpu_owner; - + /** * SMP calls to invoke on this CPU. @@ -104,8 +104,8 @@ SPINLOCK_DECLARE(smp_calls_lock); list_t smp_pending_calls; - + /** RCU per-cpu data. Uses own locking. */ rcu_cpu_data_t rcu; - + /** * Stack used by scheduler when there is no running thread. Index: kernel/generic/include/ddi/ddi.h =================================================================== --- kernel/generic/include/ddi/ddi.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/ddi/ddi.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,5 +44,5 @@ typedef struct { link_t link; /**< Linked list link */ - + uintptr_t pbase; /**< Physical base of the area. */ pfn_t frames; /**< Number of frames in the area. */ Index: kernel/generic/include/ddi/irq.h =================================================================== --- kernel/generic/include/ddi/irq.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/ddi/irq.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -93,5 +93,5 @@ /** Hash table link. */ ht_link_t link; - + /** Lock protecting everything in this structure * except the link member. When both the IRQ @@ -100,5 +100,5 @@ */ IRQ_SPINLOCK_DECLARE(lock); - + /** Send EOI before processing the interrupt. * This is essential for timer interrupt which @@ -108,5 +108,5 @@ */ bool preack; - + /** Actual IRQ number. -1 if not yet assigned. */ inr_t inr; @@ -119,10 +119,10 @@ /** Instance argument for the handler and the claim function. */ void *instance; - + /** Clear interrupt routine. */ cir_t cir; /** First argument to the clear interrupt routine. */ void *cir_arg; - + /** Notification configuration structure. */ ipc_notif_cfg_t notif_cfg; Index: kernel/generic/include/ipc/event.h =================================================================== --- kernel/generic/include/ipc/event.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/ipc/event.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,5 +48,5 @@ typedef struct { SPINLOCK_DECLARE(lock); - + /** Answerbox for notifications. */ answerbox_t *answerbox; @@ -55,5 +55,5 @@ /** Counter. */ size_t counter; - + /** Masked flag. */ bool masked; Index: kernel/generic/include/ipc/ipc.h =================================================================== --- kernel/generic/include/ipc/ipc.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/ipc/ipc.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,9 +77,9 @@ /** Answerbox is active until it enters cleanup. */ bool active; - + struct task *task; - + waitq_t wq; - + /** Phones connected to this answerbox. */ list_t connected_phones; @@ -87,10 +87,10 @@ list_t calls; list_t dispatched_calls; /* Should be hash table in the future */ - + /** Answered calls. */ list_t answers; - + IRQ_SPINLOCK_DECLARE(irq_lock); - + /** Notifications from IRQ handlers. */ list_t irq_notifs; @@ -126,5 +126,5 @@ /** Answerbox link. */ link_t ab_link; - + unsigned int flags; @@ -145,5 +145,5 @@ /** True if the call is in the active list. */ bool active; - + /** * Identification of the caller. @@ -151,5 +151,5 @@ */ struct task *sender; - + /* * Answerbox that will receive the answer. @@ -161,8 +161,8 @@ /** Phone which was used to send the call. */ phone_t *caller_phone; - + /** Private data to internal IPC. */ sysarg_t priv; - + /** Data passed from/to userspace. */ ipc_data_t data; Index: kernel/generic/include/macros.h =================================================================== --- kernel/generic/include/macros.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/macros.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ if (sz2) return ((s1 >= s2) && (s1 <= e2)); - + if (sz1) return ((s2 >= s1) && (s2 <= e1)); @@ -87,9 +87,9 @@ if (sz1 == 0) return (s1 == s2) && (sz2 == 0); - + e1 = s1 + sz1 - 1; if (sz2 == 0) return (s1 <= s2) && (s2 <= e1); - + e2 = s2 + sz2 - 1; Index: kernel/generic/include/mm/as.h =================================================================== --- kernel/generic/include/mm/as.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/mm/as.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -94,5 +94,5 @@ /** Protected by asidlock. */ link_t inactive_as_with_asid_link; - + /** * Number of processors on which this @@ -101,5 +101,5 @@ */ size_t cpu_refcount; - + /** Address space identifier. * @@ -109,16 +109,16 @@ */ asid_t asid; - + /** Number of references (i.e. tasks that reference this as). */ atomic_t refcount; - + mutex_t lock; - + /** B+tree of address space areas. */ btree_t as_area_btree; - + /** Non-generic content. */ as_genarch_t genarch; - + /** Architecture specific content. */ as_arch_t arch; @@ -178,5 +178,5 @@ elf_segment_header_t *segment; }; - + /** phys_backend members */ struct { @@ -200,26 +200,26 @@ typedef struct { mutex_t lock; - + /** Containing address space. */ as_t *as; - + /** Memory flags. */ unsigned int flags; - + /** Address space area attributes. */ unsigned int attributes; - + /** Number of pages in the area. */ size_t pages; - + /** Number of resident pages in the area. */ size_t resident; - + /** Base address of this area. */ uintptr_t base; - + /** Map of used space. */ btree_t used_space; - + /** * If the address space area is shared. this is @@ -227,8 +227,8 @@ */ share_info_t *sh_info; - + /** Memory backend backing this address space area. */ struct mem_backend *backend; - + /** Data to be used by the backend. */ mem_backend_data_t backend_data; Index: kernel/generic/include/mm/frame.h =================================================================== --- kernel/generic/include/mm/frame.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/mm/frame.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -97,20 +97,20 @@ /** Frame_no of the first frame in the frames array */ pfn_t base; - + /** Size of zone */ size_t count; - + /** Number of free frame_t structures */ size_t free_count; - + /** Number of busy frame_t structures */ size_t busy_count; - + /** Type of the zone */ zone_flags_t flags; - + /** Frame bitmap */ bitmap_t bitmap; - + /** Array of frame_t structures in this zone */ frame_t *frames; Index: kernel/generic/include/mm/slab.h =================================================================== --- kernel/generic/include/mm/slab.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/mm/slab.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -86,22 +86,22 @@ typedef struct { const char *name; - + link_t link; - + /* Configuration */ - + /** Size of slab position - align_up(sizeof(obj)) */ size_t size; - + errno_t (*constructor)(void *obj, unsigned int kmflag); size_t (*destructor)(void *obj); - + /** Flags changing behaviour of cache */ unsigned int flags; - + /* Computed values */ size_t frames; /**< Number of frames to be allocated */ size_t objects; /**< Number of objects that fit in */ - + /* Statistics */ atomic_t allocated_slabs; @@ -110,5 +110,5 @@ /** How many magazines in magazines list */ atomic_t magazine_counter; - + /* Slabs */ list_t full_slabs; /**< List of full slabs */ @@ -118,5 +118,5 @@ list_t magazines; /**< List o full magazines */ IRQ_SPINLOCK_DECLARE(maglock); - + /** CPU cache */ slab_mag_cache_t *mag_cache; Index: kernel/generic/include/printf/printf_core.h =================================================================== --- kernel/generic/include/printf/printf_core.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/printf/printf_core.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -43,8 +43,8 @@ /* String output function, returns number of printed characters or EOF */ int (*str_write)(const char *, size_t, void *); - + /* Wide string output function, returns number of printed characters or EOF */ int (*wstr_write)(const wchar_t *, size_t, void *); - + /* User data - output stream specification, state, locks, etc. */ void *data; Index: kernel/generic/include/proc/task.h =================================================================== --- kernel/generic/include/proc/task.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/proc/task.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -73,5 +73,5 @@ /** Task's linkage for the tasks_tree AVL tree. */ avltree_node_t tasks_tree_node; - + /** Task lock. * @@ -80,5 +80,5 @@ */ IRQ_SPINLOCK_DECLARE(lock); - + char name[TASK_NAME_BUFLEN]; /** List of threads contained in this task. */ @@ -90,10 +90,10 @@ /** Task security container. */ container_id_t container; - + /** Number of references (i.e. threads). */ atomic_t refcount; /** Number of threads that haven't exited yet. */ atomic_t lifecount; - + /** Task permissions. */ perm_t perms; @@ -101,5 +101,5 @@ /** Capabilities */ cap_info_t *cap_info; - + /* IPC stuff */ @@ -120,16 +120,16 @@ /** IPC statistics */ stats_ipc_t ipc_info; - + #ifdef CONFIG_UDEBUG /** Debugging stuff. */ udebug_task_t udebug; - + /** Kernel answerbox. */ kbox_t kb; #endif /* CONFIG_UDEBUG */ - + /** Architecture specific task data. */ task_arch_t arch; - + struct futex_cache { /** CHT mapping virtual addresses of futex variables to futex objects.*/ @@ -141,5 +141,5 @@ work_t destroy_work; } *futexes; - + /** Accumulated accounting. */ uint64_t ucycles; Index: kernel/generic/include/proc/thread.h =================================================================== --- kernel/generic/include/proc/thread.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/proc/thread.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,8 +75,8 @@ link_t wq_link; /**< Wait queue link. */ link_t th_link; /**< Links to threads within containing task. */ - + /** Threads linkage to the threads_tree. */ avltree_node_t threads_tree_node; - + /** Lock protecting thread structure. * @@ -84,12 +84,12 @@ */ IRQ_SPINLOCK_DECLARE(lock); - + char name[THREAD_NAME_BUFLEN]; - + /** Function implementing the thread. */ void (*thread_code)(void *); /** Argument passed to thread_code() function. */ void *thread_arg; - + /** * From here, the stored context is restored @@ -97,5 +97,5 @@ */ context_t saved_context; - + /** * From here, the stored timeout context @@ -103,5 +103,5 @@ */ context_t sleep_timeout_context; - + /** * From here, the stored interruption context @@ -109,5 +109,5 @@ */ context_t sleep_interruption_context; - + /** If true, the thread can be interrupted from sleep. */ bool sleep_interruptible; @@ -118,5 +118,5 @@ /** Flag signalling sleep timeout in progress. */ volatile bool timeout_pending; - + /** * True if this thread is executing copy_from_uspace(). @@ -124,5 +124,5 @@ */ bool in_copy_from_uspace; - + /** * True if this thread is executing copy_to_uspace(). @@ -130,5 +130,5 @@ */ bool in_copy_to_uspace; - + /** * If true, the thread will not go to sleep at all and will call @@ -136,5 +136,5 @@ */ bool interrupted; - + /** If true, thread_join_timeout() cannot be used on this thread. */ bool detached; @@ -143,8 +143,8 @@ /** Link used in the joiner_head list. */ link_t joiner_link; - + fpu_context_t *saved_fpu_context; bool fpu_context_exists; - + /* * Defined only if thread doesn't run. @@ -153,11 +153,11 @@ */ bool fpu_context_engaged; - + /* The thread will not be migrated if nomigrate is non-zero. */ unsigned int nomigrate; - + /** Thread state. */ state_t state; - + /** Thread CPU. */ cpu_t *cpu; @@ -170,8 +170,8 @@ /** Thread is executed in user space. */ bool uspace; - + /** Ticks before preemption. */ uint64_t ticks; - + /** Thread accounting. */ uint64_t ucycles; @@ -181,5 +181,5 @@ /** Thread doesn't affect accumulated accounting. */ bool uncounted; - + /** Thread's priority. Implemented as index to CPU->rq */ int priority; @@ -195,14 +195,14 @@ /** True if the worker will block in order to become idle. Use workq->lock. */ bool workq_idling; - + /** RCU thread related data. Protected by its own locks. */ rcu_thread_data_t rcu; - + /** Architecture-specific data. */ thread_arch_t arch; - + /** Thread's kernel stack. */ uint8_t *kstack; - + #ifdef CONFIG_UDEBUG /** @@ -211,5 +211,5 @@ */ bool btrace; - + /** Debugging stuff */ udebug_thread_t udebug; Index: kernel/generic/include/synch/rcu.h =================================================================== --- kernel/generic/include/synch/rcu.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/synch/rcu.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -147,5 +147,5 @@ compiler_barrier(); THE->rcu_nesting -= RCU_CNT_INC; - + if (RCU_WAS_PREEMPTED == THE->rcu_nesting) { _rcu_preempted_unlock(); @@ -164,5 +164,5 @@ { assert(PREEMPTION_DISABLED || interrupts_disabled()); - + /* * A new GP was started since the last time we passed a QS. @@ -225,8 +225,8 @@ assert(CPU); preemption_disable(); - + if (0 == --CPU->rcu.nesting_cnt) { _rcu_record_qs(); - + /* * The thread was preempted while in a critical section or @@ -238,5 +238,5 @@ } } - + preemption_enable(); } Index: kernel/generic/include/synch/rcu_types.h =================================================================== --- kernel/generic/include/synch/rcu_types.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/synch/rcu_types.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,5 +70,5 @@ */ bool is_delaying_gp; - + /** True if we should signal the detector that we exited a reader section. * @@ -85,5 +85,5 @@ size_t nesting_cnt; #endif - + /** Callbacks to invoke once the current grace period ends, ie cur_cbs_gp. * Accessed by the local reclaimer only. @@ -118,17 +118,17 @@ */ rcu_gp_t next_cbs_gp; - + /** Positive if there are callbacks pending in arriving_cbs. */ semaphore_t arrived_flag; - + /** The reclaimer should expedite GPs for cbs in arriving_cbs. */ bool expedite_arriving; - + /** Protected by global rcu.barrier_mtx. */ rcu_item_t barrier_item; - + /** Interruptable attached reclaimer thread. */ struct thread *reclaimer_thr; - + /* Some statistics. */ size_t stat_max_cbs; @@ -150,5 +150,5 @@ #ifdef RCU_PREEMPT_PODZIMEK - + /** True if the thread was preempted in a reader section. * @@ -160,5 +160,5 @@ bool was_preempted; #endif - + /** Preempted threads link. Access with rcu.prempt_lock.*/ link_t preempt_link; Index: kernel/generic/include/synch/spinlock.h =================================================================== --- kernel/generic/include/synch/spinlock.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/synch/spinlock.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,5 +47,5 @@ typedef struct spinlock { atomic_t val; - + #ifdef CONFIG_DEBUG_SPINLOCK const char *name; @@ -130,5 +130,5 @@ */ CS_LEAVE_BARRIER(); - + atomic_set(&lock->val, 0); preemption_enable(); Index: kernel/generic/include/synch/waitq.h =================================================================== --- kernel/generic/include/synch/waitq.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/synch/waitq.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ */ IRQ_SPINLOCK_DECLARE(lock); - + /** * Number of waitq_wakeup() calls that didn't find a thread to wake up. @@ -61,5 +61,5 @@ */ int missed_wakeups; - + /** List of sleeping threads for which there was no missed_wakeup. */ list_t sleepers; Index: kernel/generic/include/synch/workqueue.h =================================================================== --- kernel/generic/include/synch/workqueue.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/synch/workqueue.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,5 +49,5 @@ link_t queue_link; work_func_t func; - + #ifdef CONFIG_DEBUG /* Magic number for integrity checks. */ Index: kernel/generic/include/sysinfo/sysinfo.h =================================================================== --- kernel/generic/include/sysinfo/sysinfo.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/sysinfo/sysinfo.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -137,11 +137,11 @@ typedef struct sysinfo_item { char *name; /**< Item name */ - + sysinfo_item_val_type_t val_type; /**< Item value type */ sysinfo_item_val_t val; /**< Item value */ - + sysinfo_subtree_type_t subtree_type; /**< Subtree type */ sysinfo_subtree_t subtree; /**< Subtree */ - + struct sysinfo_item *next; /**< Sibling item */ } sysinfo_item_t; Index: kernel/generic/include/time/timeout.h =================================================================== --- kernel/generic/include/time/timeout.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/time/timeout.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -44,5 +44,5 @@ typedef struct { IRQ_SPINLOCK_DECLARE(lock); - + /** Link to the list of active timeouts on THE->cpu */ link_t link; Index: kernel/generic/include/udebug/udebug.h =================================================================== --- kernel/generic/include/udebug/udebug.h (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/include/udebug/udebug.h (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,5 +58,5 @@ mutex_t lock; char *lock_owner; - + udebug_task_state_t dt_state; call_t *begin_call; @@ -71,10 +71,10 @@ /** Synchronize debug ops on this thread / access to this structure. */ mutex_t lock; - + waitq_t go_wq; call_t *go_call; sysarg_t syscall_args[6]; istate_t *uspace_state; - + /** What type of event are we stopped in or 0 if none. */ udebug_event_t cur_event; Index: kernel/generic/src/adt/avl.c =================================================================== --- kernel/generic/src/adt/avl.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/avl.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -66,5 +66,5 @@ { avltree_node_t *p; - + /* * Iteratively descend to the leaf that can contain the searched key. @@ -92,5 +92,5 @@ { avltree_node_t *p = t->root; - + /* * Check whether the tree is empty. @@ -98,5 +98,5 @@ if (!p) return NULL; - + /* * Iteratively descend to the leftmost leaf in the tree. @@ -104,5 +104,5 @@ while (p->lft != NULL) p = p->lft; - + return p; } @@ -151,5 +151,5 @@ #define REBALANCE_INSERT_LR() REBALANCE_INSERT_XY(lft, rgt, 1) #define REBALANCE_INSERT_RL() REBALANCE_INSERT_XY(rgt, lft, -1) - + /** Insert new node into AVL tree. * @@ -172,5 +172,5 @@ */ key = newnode->key + t->base; - + /* * Iteratively descend to the leaf that can contain the new node. @@ -244,5 +244,5 @@ } } - + /* * To balance the tree, we must check and balance top node. @@ -260,5 +260,5 @@ */ assert(par->balance == 1); - + REBALANCE_INSERT_LR(); } @@ -275,5 +275,5 @@ */ assert(par->balance == -1); - + REBALANCE_INSERT_RL(); } @@ -375,5 +375,5 @@ assert(t); assert(node); - + if (node->lft == NULL) { if (node->rgt) { @@ -451,5 +451,5 @@ cur->par = node->par; } - + /* * Repair the parent node's pointer which pointed previously to the @@ -457,5 +457,5 @@ */ (void) repair(t, node, node, cur, NULL, false); - + /* * Repair cycle which repairs balances of nodes on the way from from the @@ -484,5 +484,5 @@ * RL rotation. */ - + cur = par->lft; par->lft = cur->rgt; @@ -490,5 +490,5 @@ gpa->rgt = cur->lft; cur->lft = gpa; - + /* * Repair balances and paternity of @@ -497,5 +497,5 @@ */ REBALANCE_DELETE_RL(); - + /* * Repair paternity. @@ -513,10 +513,10 @@ * RR rotation. */ - + gpa->rgt = par->lft; if (par->lft) par->lft->par = gpa; par->lft = gpa; - + /* * Repair paternity. @@ -524,5 +524,5 @@ par->par = gpa->par; gpa->par = par; - + if (par->balance == 0) { /* @@ -575,10 +575,10 @@ */ par = gpa->lft; - + if (par->balance == 1) { /* * LR rotation. */ - + cur = par->rgt; par->rgt = cur->lft; @@ -586,5 +586,5 @@ gpa->lft = cur->rgt; cur->rgt = gpa; - + /* * Repair balances and paternity of @@ -619,5 +619,5 @@ par->par = gpa->par; gpa->par = par; - + if (par->balance == 0) { /* @@ -630,5 +630,5 @@ par->balance = 1; gpa->balance = -1; - + (void) repair(t, par, gpa, par, NULL, false); @@ -637,5 +637,5 @@ par->balance = 0; gpa->balance = 0; - + if (!repair(t, par, gpa, par, &dir, false)) @@ -667,5 +667,5 @@ { avltree_node_t *node; - + /* * Start searching for the smallest key in the tree starting in the root @@ -673,12 +673,12 @@ * must have the smallest key). */ - + node = t->root; if (!node) return false; - + while (node->lft != NULL) node = node->lft; - + avltree_delete(t, node); Index: kernel/generic/src/adt/bitmap.c =================================================================== --- kernel/generic/src/adt/bitmap.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/bitmap.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -62,5 +62,5 @@ size_t byte = element / BITMAP_ELEMENT; uint8_t mask = 1 << (element & BITMAP_REMAINER); - + return !!((bitmap->bits)[byte] & mask); } @@ -78,8 +78,8 @@ { size_t size = elements / BITMAP_ELEMENT; - + if ((elements % BITMAP_ELEMENT) != 0) size++; - + return size; } @@ -113,20 +113,20 @@ { assert(start + count <= bitmap->elements); - + if (count == 0) return; - + size_t start_byte = start / BITMAP_ELEMENT; size_t aligned_start = ALIGN_UP(start, BITMAP_ELEMENT); - + /* Leading unaligned bits */ size_t lub = min(aligned_start - start, count); - + /* Aligned middle bits */ size_t amb = (count > lub) ? (count - lub) : 0; - + /* Trailing aligned bits */ size_t tab = amb % BITMAP_ELEMENT; - + if (start + count < aligned_start) { /* Set bits in the middle of byte. */ @@ -135,5 +135,5 @@ return; } - + if (lub) { /* Make sure to set any leading unaligned bits. */ @@ -141,7 +141,7 @@ ~((1 << (BITMAP_ELEMENT - lub)) - 1); } - + size_t i; - + for (i = 0; i < amb / BITMAP_ELEMENT; i++) { /* The middle bits can be set byte by byte. */ @@ -149,5 +149,5 @@ ALL_ONES; } - + if (tab) { /* Make sure to set any trailing aligned bits. */ @@ -167,20 +167,20 @@ { assert(start + count <= bitmap->elements); - + if (count == 0) return; - + size_t start_byte = start / BITMAP_ELEMENT; size_t aligned_start = ALIGN_UP(start, BITMAP_ELEMENT); - + /* Leading unaligned bits */ size_t lub = min(aligned_start - start, count); - + /* Aligned middle bits */ size_t amb = (count > lub) ? (count - lub) : 0; - + /* Trailing aligned bits */ size_t tab = amb % BITMAP_ELEMENT; - + if (start + count < aligned_start) { /* Set bits in the middle of byte */ @@ -189,5 +189,5 @@ return; } - + if (lub) { /* Make sure to clear any leading unaligned bits. */ @@ -195,7 +195,7 @@ (1 << (BITMAP_ELEMENT - lub)) - 1; } - + size_t i; - + for (i = 0; i < amb / BITMAP_ELEMENT; i++) { /* The middle bits can be cleared byte by byte. */ @@ -203,5 +203,5 @@ ALL_ZEROES; } - + if (tab) { /* Make sure to clear any trailing aligned bits. */ @@ -209,5 +209,5 @@ ~((1 << tab) - 1); } - + bitmap->next_fit = start_byte; } @@ -224,10 +224,10 @@ assert(count <= dst->elements); assert(count <= src->elements); - + size_t i; - + for (i = 0; i < count / BITMAP_ELEMENT; i++) dst->bits[i] = src->bits[i]; - + if (count % BITMAP_ELEMENT) { bitmap_clear_range(dst, i * BITMAP_ELEMENT, @@ -274,8 +274,8 @@ if (count == 0) return false; - + size_t size = bitmap_size(bitmap->elements); size_t next_fit = bitmap->next_fit; - + /* * Adjust the next-fit value according to the address @@ -284,30 +284,30 @@ if ((prefered > base) && (prefered < base + bitmap->elements)) { size_t prefered_fit = (prefered - base) / BITMAP_ELEMENT; - + if (prefered_fit > next_fit) next_fit = prefered_fit; } - + for (size_t pos = 0; pos < size; pos++) { size_t byte = (next_fit + pos) % size; - + /* Skip if the current byte has all bits set */ if (bitmap->bits[byte] == ALL_ONES) continue; - + size_t byte_bit = byte * BITMAP_ELEMENT; - + for (size_t bit = 0; bit < BITMAP_ELEMENT; bit++) { size_t i = byte_bit + bit; - + if (i >= bitmap->elements) break; - + if (!constraint_satisfy(i, base, constraint)) continue; - + if (!bitmap_get_fast(bitmap, i)) { size_t continuous = 1; - + for (size_t j = 1; j < count; j++) { if ((i + j < bitmap->elements) && @@ -317,5 +317,5 @@ break; } - + if (continuous == count) { if (index != NULL) { @@ -324,5 +324,5 @@ *index = i; } - + return true; } else @@ -331,5 +331,5 @@ } } - + return false; } Index: kernel/generic/src/adt/btree.c =================================================================== --- kernel/generic/src/adt/btree.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/btree.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -83,7 +83,7 @@ { unsigned int i; - + node->keys = 0; - + /* Clean also space for the extra key. */ for (i = 0; i < BTREE_MAX_KEYS + 1; i++) { @@ -92,8 +92,8 @@ node->subtree[i] = NULL; } - + node->subtree[i] = NULL; node->parent = NULL; - + link_initialize(&node->leaf_link); link_initialize(&node->bfs_link); @@ -122,5 +122,5 @@ { size_t i; - + if (root->keys) { for (i = 0; i < root->keys + 1; i++) { @@ -129,5 +129,5 @@ } } - + slab_free(btree_node_cache, root); } @@ -156,9 +156,9 @@ { size_t i; - + for (i = 0; i < node->keys; i++) { if (key < node->key[i]) { size_t j; - + for (j = node->keys; j > i; j--) { node->key[j] = node->key[j - 1]; @@ -166,9 +166,9 @@ node->subtree[j + 1] = node->subtree[j]; } - + break; } } - + node->key[i] = key; node->value[i] = value; @@ -191,10 +191,10 @@ { size_t i; - + for (i = 0; i < node->keys + 1; i++) { if (subtree == node->subtree[i]) return i - (int) (right != false); } - + panic("Node %p does not contain subtree %p.", node, subtree); } @@ -215,5 +215,5 @@ size_t i; size_t j; - + for (i = 0; i < node->keys; i++) { if (key == node->key[i]) { @@ -223,12 +223,12 @@ node->subtree[j - 1] = node->subtree[j]; } - + node->subtree[j - 1] = node->subtree[j]; node->keys--; - + return; } } - + panic("Node %p does not contain key %" PRIu64 ".", node, key); } @@ -248,5 +248,5 @@ { size_t i, j; - + for (i = 0; i < node->keys; i++) { if (key == node->key[i]) { @@ -256,10 +256,10 @@ node->subtree[j] = node->subtree[j + 1]; } - + node->keys--; return; } } - + panic("Node %p does not contain key %" PRIu64 ".", node, key); } @@ -280,9 +280,9 @@ { size_t i; - + for (i = 0; i < node->keys; i++) { if (key < node->key[i]) { size_t j; - + for (j = node->keys; j > i; j--) { node->key[j] = node->key[j - 1]; @@ -290,14 +290,14 @@ node->subtree[j + 1] = node->subtree[j]; } - + node->subtree[j + 1] = node->subtree[j]; break; } } - + node->key[i] = key; node->value[i] = value; node->subtree[i] = lsubtree; - + node->keys++; } @@ -320,8 +320,8 @@ { btree_key_t key = lnode->key[lnode->keys - 1]; - + if (LEAF_NODE(lnode)) { void *value = lnode->value[lnode->keys - 1]; - + node_remove_key_and_rsubtree(lnode, key); node_insert_key_and_lsubtree(rnode, key, value, NULL); @@ -329,9 +329,9 @@ } else { btree_node_t *rsubtree = lnode->subtree[lnode->keys]; - + node_remove_key_and_rsubtree(lnode, key); node_insert_key_and_lsubtree(rnode, lnode->parent->key[idx], NULL, rsubtree); lnode->parent->key[idx] = key; - + /* Fix parent link of the reconnected right subtree. */ rsubtree->parent = rnode; @@ -356,8 +356,8 @@ { btree_key_t key = rnode->key[0]; - + if (LEAF_NODE(rnode)) { void *value = rnode->value[0]; - + node_remove_key_and_lsubtree(rnode, key); node_insert_key_and_rsubtree(lnode, key, value, NULL); @@ -365,9 +365,9 @@ } else { btree_node_t *lsubtree = rnode->subtree[0]; - + node_remove_key_and_lsubtree(rnode, key); node_insert_key_and_rsubtree(lnode, rnode->parent->key[idx], NULL, lsubtree); rnode->parent->key[idx] = key; - + /* Fix parent link of the reconnected left subtree. */ lsubtree->parent = lnode; @@ -395,5 +395,5 @@ size_t idx; btree_node_t *lnode; - + /* * If this is root node, the rotation can not be done. @@ -401,5 +401,5 @@ if (ROOT_NODE(node)) return false; - + idx = find_key_by_subtree(node->parent, node, true); if ((int) idx == -1) { @@ -410,5 +410,5 @@ return false; } - + lnode = node->parent->subtree[idx]; if (lnode->keys < BTREE_MAX_KEYS) { @@ -420,5 +420,5 @@ return true; } - + return false; } @@ -444,5 +444,5 @@ size_t idx; btree_node_t *rnode; - + /* * If this is root node, the rotation can not be done. @@ -450,5 +450,5 @@ if (ROOT_NODE(node)) return false; - + idx = find_key_by_subtree(node->parent, node, false); if (idx == node->parent->keys) { @@ -459,5 +459,5 @@ return false; } - + rnode = node->parent->subtree[idx + 1]; if (rnode->keys < BTREE_MAX_KEYS) { @@ -469,5 +469,5 @@ return true; } - + return false; } @@ -499,18 +499,18 @@ size_t i; size_t j; - + assert(median); assert(node->keys == BTREE_MAX_KEYS); - + /* * Use the extra space to store the extra node. */ node_insert_key_and_rsubtree(node, key, value, rsubtree); - + /* * Compute median of keys. */ *median = MEDIAN_HIGH(node); - + /* * Allocate and initialize new right sibling. @@ -520,5 +520,5 @@ rnode->parent = node->parent; rnode->depth = node->depth; - + /* * Copy big keys, values and subtree pointers to the new right sibling. @@ -530,5 +530,5 @@ rnode->value[j] = node->value[i]; rnode->subtree[j] = node->subtree[i]; - + /* * Fix parent links in subtrees. @@ -537,12 +537,12 @@ rnode->subtree[j]->parent = rnode; } - + rnode->subtree[j] = node->subtree[i]; if (rnode->subtree[j]) rnode->subtree[j]->parent = rnode; - + rnode->keys = j; /* Set number of keys of the new node. */ node->keys /= 2; /* Shrink the old node. */ - + return rnode; } @@ -578,5 +578,5 @@ btree_node_t *rnode; btree_key_t median; - + /* * Node is full and both siblings (if both exist) are full too. @@ -584,11 +584,11 @@ * bigger keys (i.e. the new node) into its parent. */ - + rnode = node_split(node, key, value, rsubtree, &median); - + if (LEAF_NODE(node)) { list_insert_after(&rnode->leaf_link, &node->leaf_link); } - + if (ROOT_NODE(node)) { /* @@ -599,5 +599,5 @@ rnode->parent = t->root; node_initialize(t->root); - + /* * Left-hand side subtree will be the old root (i.e. node). @@ -605,5 +605,5 @@ */ t->root->subtree[0] = node; - + t->root->depth = node->depth + 1; } @@ -624,7 +624,7 @@ { btree_node_t *lnode; - + assert(value); - + lnode = leaf_node; if (!lnode) { @@ -632,5 +632,5 @@ panic("B-tree %p already contains key %" PRIu64 ".", t, key); } - + _btree_insert(t, key, value, NULL, lnode); } @@ -648,5 +648,5 @@ size_t idx; btree_node_t *lnode; - + /* * If this is root node, the rotation can not be done. @@ -654,5 +654,5 @@ if (ROOT_NODE(rnode)) return false; - + idx = find_key_by_subtree(rnode->parent, rnode, true); if ((int) idx == -1) { @@ -663,5 +663,5 @@ return false; } - + lnode = rnode->parent->subtree[idx]; if (lnode->keys > FILL_FACTOR) { @@ -669,5 +669,5 @@ return true; } - + return false; } @@ -685,5 +685,5 @@ size_t idx; btree_node_t *rnode; - + /* * If this is root node, the rotation can not be done. @@ -691,5 +691,5 @@ if (ROOT_NODE(lnode)) return false; - + idx = find_key_by_subtree(lnode->parent, lnode, false); if (idx == lnode->parent->keys) { @@ -700,5 +700,5 @@ return false; } - + rnode = lnode->parent->subtree[idx + 1]; if (rnode->keys > FILL_FACTOR) { @@ -706,5 +706,5 @@ return true; } - + return false; } @@ -724,7 +724,7 @@ btree_node_t *rnode; size_t i; - + assert(!ROOT_NODE(node)); - + idx = find_key_by_subtree(node->parent, node, false); if (idx == node->parent->keys) { @@ -737,14 +737,14 @@ } else rnode = node->parent->subtree[idx + 1]; - + /* Index nodes need to insert parent node key in between left and right node. */ if (INDEX_NODE(node)) node->key[node->keys++] = node->parent->key[idx]; - + /* Copy the key-value-subtree triplets from the right node. */ for (i = 0; i < rnode->keys; i++) { node->key[node->keys + i] = rnode->key[i]; node->value[node->keys + i] = rnode->value[i]; - + if (INDEX_NODE(node)) { node->subtree[node->keys + i] = rnode->subtree[i]; @@ -752,10 +752,10 @@ } } - + if (INDEX_NODE(node)) { node->subtree[node->keys + i] = rnode->subtree[i]; rnode->subtree[i]->parent = node; } - + node->keys += rnode->keys; return rnode; @@ -789,8 +789,8 @@ node_remove_key_and_rsubtree(node, key); } - + return; } - + if (node->keys <= FILL_FACTOR) { /* @@ -801,8 +801,8 @@ try_rotation_from_right(node); } - + if (node->keys > FILL_FACTOR) { size_t i; - + /* * The key can be immediately removed. @@ -813,5 +813,5 @@ */ node_remove_key_and_rsubtree(node, key); - + for (i = 0; i < node->parent->keys; i++) { if (node->parent->key[i] == key) @@ -822,5 +822,5 @@ btree_node_t *rnode; btree_node_t *parent; - + /* * The node is below the fill factor as well as its left and right sibling. @@ -832,8 +832,8 @@ node_remove_key_and_rsubtree(node, key); rnode = node_combine(node); - + if (LEAF_NODE(rnode)) list_remove(&rnode->leaf_link); - + idx = find_key_by_subtree(parent, rnode, true); assert((int) idx != -1); @@ -855,5 +855,5 @@ { btree_node_t *lnode; - + lnode = leaf_node; if (!lnode) { @@ -861,5 +861,5 @@ panic("B-tree %p does not contain key %" PRIu64 ".", t, key); } - + _btree_remove(t, key, lnode); } @@ -877,5 +877,5 @@ { btree_node_t *cur, *next; - + /* * Iteratively descend to the leaf that can contain the searched key. @@ -887,5 +887,5 @@ */ *leaf_node = cur; - + if (cur->keys == 0) return NULL; @@ -901,5 +901,5 @@ void *val; size_t i; - + /* * Now if the key is smaller than cur->key[i] @@ -911,12 +911,12 @@ next = cur->subtree[i]; val = cur->value[i - 1]; - + if (LEAF_NODE(cur)) return key == cur->key[i - 1] ? val : NULL; - + goto descend; } } - + /* * Last possibility is that the key is @@ -925,5 +925,5 @@ next = cur->subtree[i]; val = cur->value[i - 1]; - + if (LEAF_NODE(cur)) return key == cur->key[i - 1] ? val : NULL; @@ -932,5 +932,5 @@ ; } - + /* * The key was not found in the *leaf_node and @@ -952,5 +952,5 @@ { assert(LEAF_NODE(node)); - + if (node->leaf_link.prev != &t->leaf_list.head) return list_get_instance(node->leaf_link.prev, btree_node_t, leaf_link); @@ -971,5 +971,5 @@ { assert(LEAF_NODE(node)); - + if (node->leaf_link.next != &t->leaf_list.head) return list_get_instance(node->leaf_link.next, btree_node_t, leaf_link); @@ -988,9 +988,9 @@ int depth = t->root->depth; list_t list; - + printf("Printing B-tree:\n"); list_initialize(&list); list_append(&t->root->bfs_link, &list); - + /* * Use BFS search to print out the tree. @@ -1000,19 +1000,19 @@ link_t *hlp; btree_node_t *node; - + hlp = list_first(&list); assert(hlp != NULL); node = list_get_instance(hlp, btree_node_t, bfs_link); list_remove(hlp); - + assert(node); - + if (node->depth != depth) { printf("\n"); depth = node->depth; } - + printf("("); - + for (i = 0; i < node->keys; i++) { printf("%" PRIu64 "%s", node->key[i], i < node->keys - 1 ? "," : ""); @@ -1021,25 +1021,25 @@ } } - + if (node->depth && node->subtree[i]) list_append(&node->subtree[i]->bfs_link, &list); - + printf(")"); } - + printf("\n"); - + printf("Printing list of leaves:\n"); list_foreach(t->leaf_list, leaf_link, btree_node_t, node) { assert(node); - + printf("("); - + for (i = 0; i < node->keys; i++) printf("%" PRIu64 "%s", node->key[i], i < node->keys - 1 ? "," : ""); - + printf(")"); } - + printf("\n"); } Index: kernel/generic/src/adt/cht.c =================================================================== --- kernel/generic/src/adt/cht.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/cht.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -531,13 +531,13 @@ if (!op || !op->hash || !op->key_hash || !op->equal || !op->key_equal) return false; - + size_t min_order = size_to_order(min_size, CHT_MIN_ORDER); size_t order = size_to_order(init_size, min_order); - + h->b = alloc_buckets(order, false, can_block); - + if (!h->b) return false; - + h->max_load = (max_load == 0) ? CHT_MAX_LOAD : max_load; h->min_order = min_order; @@ -546,9 +546,9 @@ atomic_set(&h->item_cnt, 0); atomic_set(&h->resize_reqs, 0); - + if (NULL == op->remove_callback) { h->op->remove_callback = dummy_remove_callback; } - + /* * Cached item hashes are stored in item->rcu_link.func. Once the item @@ -556,8 +556,8 @@ */ h->invalid_hash = (uintptr_t)h->op->remove_callback; - + /* Ensure the initialization takes place before we start using the table. */ write_barrier(); - + return true; } @@ -581,18 +581,18 @@ sizeof(cht_buckets_t) + (bucket_cnt - 1) * sizeof(marked_ptr_t); cht_buckets_t *b = malloc(bytes, can_block ? 0 : FRAME_ATOMIC); - + if (!b) return NULL; - + b->order = order; - + 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) { b->head[i] = head_link; } - + return b; } @@ -607,8 +607,8 @@ if (bucket_cnt <= ((size_t)1 << order)) return order; - + ++order; } while (order < CHT_MAX_ORDER); - + return order; } @@ -623,5 +623,5 @@ { cht_destroy_unsafe(h); - + /* You must clear the table of items. Otherwise cht_destroy will leak. */ assert(atomic_get(&h->item_cnt) == 0); @@ -635,8 +635,8 @@ rcu_barrier(); } - + /* Wait for all remove_callback()s to complete. */ rcu_barrier(); - + free(h->b); h->b = NULL; @@ -688,7 +688,7 @@ /* See docs to cht_find() and cht_find_lazy(). */ assert(rcu_read_locked()); - + size_t hash = calc_key_hash(h, key); - + cht_buckets_t *b = rcu_access(h->b); size_t idx = calc_bucket_idx(hash, b->order); @@ -698,9 +698,9 @@ */ marked_ptr_t head = b->head[idx]; - + /* Undergoing a resize - take the slow path. */ if (N_INVALID == get_mark(head)) return find_resizing(h, key, hash, head, idx); - + return search_bucket(h, head, key, hash); } @@ -734,5 +734,5 @@ assert(rcu_read_locked()); assert(item); - + return find_duplicate(h, item, calc_node_hash(h, item), get_next(item->link)); } @@ -758,5 +758,5 @@ prev = cur->link; } while (node_hash(h, cur) < search_hash); - + /* * Only search for an item with an equal key if cur is not the sentinel @@ -768,9 +768,9 @@ return cur; } - + cur = get_next(cur->link); assert(cur); } - + /* * In the unlikely case that we have encountered a node whose cached @@ -782,5 +782,5 @@ goto try_again; } - + return NULL; } @@ -792,9 +792,9 @@ assert(N_INVALID == get_mark(old_head)); assert(h->new_b); - + size_t new_idx = calc_bucket_idx(hash, h->new_b->order); marked_ptr_t new_head = h->new_b->head[new_idx]; marked_ptr_t search_head = new_head; - + /* Growing. */ if (h->b->order < h->new_b->order) { @@ -818,7 +818,7 @@ new_head = h->new_b->head[grow_idx(old_idx)]; } - + /* new_head is now the moved bucket, either valid or invalid. */ - + /* * The old bucket was definitely moved to new_head but the @@ -845,13 +845,13 @@ } } - + return search_bucket(h, search_head, key, hash); } else if (h->b->order > h->new_b->order) { /* Shrinking. */ - + /* Index of the bucket in the old table that was moved. */ size_t move_src_idx = grow_idx(new_idx); marked_ptr_t moved_old_head = h->b->head[move_src_idx]; - + /* * h->b->head[move_src_idx] had already been moved to new_head @@ -883,7 +883,7 @@ search_head = moved_old_head; } - + cht_link_t *ret = search_bucket(h, search_head, key, hash); - + if (ret) return ret; @@ -906,5 +906,5 @@ return search_bucket(h, old_head, key, hash); } - + return NULL; } else { @@ -979,16 +979,16 @@ bool resizing = false; bool inserted = false; - + do { walk_mode_t walk_mode = WM_NORMAL; bool join_finishing; - + resizing = resizing || (N_NORMAL != get_mark(*phead)); - + /* The table is resizing. Get the correct bucket head. */ if (resizing) { upd_resizing_head(h, hash, &phead, &join_finishing, &walk_mode); } - + wnd_t wnd = { .ppred = phead, @@ -996,18 +996,18 @@ .last = NULL }; - + if (!find_wnd_and_gc(h, hash, walk_mode, &wnd, &resizing)) { /* Could not GC a node; or detected an unexpected resize. */ continue; } - + if (dup_item && has_duplicate(h, item, hash, wnd.cur, dup_item)) { rcu_read_unlock(); return false; } - + inserted = insert_at(item, &wnd, walk_mode, &resizing); } while (!inserted); - + rcu_read_unlock(); @@ -1032,13 +1032,13 @@ { marked_ptr_t ret; - + if (walk_mode == WM_NORMAL) { item->link = make_link(wnd->cur, N_NORMAL); /* Initialize the item before adding it to a bucket. */ memory_barrier(); - + /* Link a clean/normal predecessor to the item. */ ret = cas_link(wnd->ppred, wnd->cur, N_NORMAL, item, N_NORMAL); - + if (ret == make_link(wnd->cur, N_NORMAL)) { return true; @@ -1054,8 +1054,8 @@ /* Initialize the item before adding it to a bucket. */ memory_barrier(); - + /* Link the not-deleted predecessor to the item. Move its JF mark. */ ret = cas_link(wnd->ppred, wnd->cur, jf_mark, item, N_NORMAL); - + return ret == make_link(wnd->cur, jf_mark); } else { @@ -1065,5 +1065,5 @@ /* Initialize the item before adding it to a bucket. */ memory_barrier(); - + mark_t pred_mark = get_mark(*wnd->ppred); /* If the predecessor is a join node it may be marked deleted.*/ @@ -1090,5 +1090,5 @@ assert(cur == &sentinel || hash <= node_hash(h, cur) || node_hash(h, cur) == h->invalid_hash); - + /* hash < node_hash(h, cur) */ if (hash != node_hash(h, cur) && h->invalid_hash != node_hash(h, cur)) @@ -1101,5 +1101,5 @@ */ read_barrier(); - + *dup_item = find_duplicate(h, item, hash, cur); return NULL != *dup_item; @@ -1113,5 +1113,5 @@ cht_link_t *cur = start; - + try_again: assert(cur); @@ -1119,11 +1119,11 @@ while (node_hash(h, cur) == hash) { assert(cur != &sentinel); - + bool deleted = (N_DELETED & get_mark(cur->link)); - + /* Skip logically deleted nodes. */ if (!deleted && h->op->equal(item, cur)) return cur; - + cur = get_next(cur->link); assert(cur); @@ -1135,5 +1135,5 @@ goto try_again; } - + return NULL; } @@ -1143,11 +1143,11 @@ { assert(h); - + size_t hash = calc_key_hash(h, key); size_t removed = 0; - + while (remove_pred(h, hash, h->op->key_equal, key)) ++removed; - + return removed; } @@ -1181,24 +1181,24 @@ { rcu_read_lock(); - + bool resizing = false; bool deleted = false; bool deleted_but_gc = false; - + cht_buckets_t *b = rcu_access(h->b); size_t idx = calc_bucket_idx(hash, b->order); marked_ptr_t *phead = &b->head[idx]; - + do { walk_mode_t walk_mode = WM_NORMAL; bool join_finishing = false; - + resizing = resizing || (N_NORMAL != get_mark(*phead)); - + /* The table is resizing. Get the correct bucket head. */ if (resizing) { upd_resizing_head(h, hash, &phead, &join_finishing, &walk_mode); } - + wnd_t wnd = { .ppred = phead, @@ -1206,5 +1206,5 @@ .last = NULL }; - + if (!find_wnd_and_gc_pred( h, hash, walk_mode, pred, pred_arg, &wnd, &resizing)) { @@ -1212,5 +1212,5 @@ continue; } - + /* * The item lookup is affected by a bucket join but effects of @@ -1225,19 +1225,19 @@ continue; } - + /* Already deleted, but delete_at() requested one GC pass. */ if (deleted_but_gc) break; - + bool found = (wnd.cur != &sentinel && pred(pred_arg, wnd.cur)); - + if (!found) { rcu_read_unlock(); return false; } - + deleted = delete_at(h, &wnd, walk_mode, &deleted_but_gc, &resizing); } while (!deleted || deleted_but_gc); - + rcu_read_unlock(); return true; @@ -1263,20 +1263,20 @@ { assert(wnd->cur && wnd->cur != &sentinel); - + *deleted_but_gc = false; - + if (!mark_deleted(wnd->cur, walk_mode, resizing)) { /* Already deleted, or unexpectedly marked as JOIN/JOIN_FOLLOWS. */ return false; } - + /* Marked deleted. Unlink from the bucket. */ - + /* Never unlink join nodes. */ if (walk_mode == WM_LEAVE_JOIN && (N_JOIN & get_mark(wnd->cur->link))) return true; - + cas_order_barrier(); - + if (unlink_from_pred(wnd, walk_mode, resizing)) { free_later(h, wnd->cur); @@ -1284,5 +1284,5 @@ *deleted_but_gc = true; } - + return true; } @@ -1293,16 +1293,16 @@ { assert(cur && cur != &sentinel); - + /* * Btw, we could loop here if the cas fails but let's not complicate * things and let's retry from the head of the bucket. */ - + cht_link_t *next = get_next(cur->link); - + if (walk_mode == WM_NORMAL) { /* Only mark clean/normal nodes - JF/JN is used only during resize. */ marked_ptr_t ret = cas_link(&cur->link, next, N_NORMAL, next, N_DELETED); - + if (ret != make_link(next, N_NORMAL)) { *resizing = (N_JOIN | N_JOIN_FOLLOWS) & get_mark(ret); @@ -1311,15 +1311,15 @@ } else { static_assert(N_JOIN == N_JOIN_FOLLOWS, ""); - + /* Keep the N_JOIN/N_JOIN_FOLLOWS mark but strip N_DELETED. */ mark_t cur_mark = get_mark(cur->link) & N_JOIN_FOLLOWS; - + marked_ptr_t ret = cas_link(&cur->link, next, cur_mark, next, cur_mark | N_DELETED); - + if (ret != make_link(next, cur_mark)) return false; } - + return true; } @@ -1331,7 +1331,7 @@ assert(wnd->cur != &sentinel); assert(wnd->cur && (N_DELETED & get_mark(wnd->cur->link))); - + cht_link_t *next = get_next(wnd->cur->link); - + if (walk_mode == WM_LEAVE_JOIN) { /* Never try to unlink join nodes. */ @@ -1341,8 +1341,8 @@ /* Succeed only if the predecessor is clean/normal or a join node. */ mark_t exp_pred_mark = (N_JOIN & pred_mark) ? pred_mark : N_NORMAL; - + marked_ptr_t pred_link = make_link(wnd->cur, exp_pred_mark); marked_ptr_t next_link = make_link(next, exp_pred_mark); - + if (pred_link != _cas_link(wnd->ppred, pred_link, next_link)) return false; @@ -1351,12 +1351,12 @@ /* Move the JF mark if set. Clear DEL mark. */ mark_t cur_mark = N_JOIN_FOLLOWS & get_mark(wnd->cur->link); - + /* The predecessor must be clean/normal. */ marked_ptr_t pred_link = make_link(wnd->cur, N_NORMAL); /* Link to cur's successor keeping/copying cur's JF mark. */ marked_ptr_t next_link = make_link(next, cur_mark); - + marked_ptr_t ret = _cas_link(wnd->ppred, pred_link, next_link); - + if (pred_link != ret) { /* If we're not resizing the table there are no JF/JN nodes. */ @@ -1366,5 +1366,5 @@ } } - + return true; } @@ -1399,8 +1399,8 @@ { assert(wnd->cur); - + if (wnd->cur == &sentinel) return true; - + /* * A read barrier is not needed here to bring up the most recent @@ -1408,13 +1408,13 @@ * an already deleted node; fail in delete_at(); and retry. */ - + size_t cur_hash; try_again: cur_hash = node_hash(h, wnd->cur); - + while (cur_hash <= hash) { assert(wnd->cur && wnd->cur != &sentinel); - + /* GC any deleted nodes on the way. */ if (N_DELETED & get_mark(wnd->cur->link)) { @@ -1427,11 +1427,11 @@ if (cur_hash == hash && pred(pred_arg, wnd->cur)) return true; - + next_wnd(wnd); } - + cur_hash = node_hash(h, wnd->cur); } - + if (cur_hash == h->invalid_hash) { next_wnd(wnd); @@ -1439,5 +1439,5 @@ goto try_again; } - + /* The searched for node is not in the current bucket. */ return true; @@ -1481,8 +1481,8 @@ next_wnd(wnd); } - + assert(wnd->cur); } - + if (node_hash(h, wnd->cur) == h->invalid_hash) { next_wnd(wnd); @@ -1520,5 +1520,5 @@ wnd->cur = get_next(wnd->cur->link); } - + return true; } @@ -1539,5 +1539,5 @@ * is visible and if not, make it visible to this cpu. */ - + /* * Resizer ensures h->b->order stays the same for the duration of this @@ -1548,21 +1548,21 @@ assert(h->b->order > h->new_b->order); assert(wnd->cur); - + /* Either we did not need the joining link or we have already followed it.*/ if (wnd->cur != &sentinel) return true; - + /* We have reached the end of a bucket. */ - + if (wnd->last != &sentinel) { size_t last_seen_hash = node_hash(h, wnd->last); - + if (last_seen_hash == h->invalid_hash) { last_seen_hash = calc_node_hash(h, wnd->last); } - + size_t last_old_idx = calc_bucket_idx(last_seen_hash, h->b->order); size_t move_src_idx = grow_idx(shrink_idx(last_old_idx)); - + /* * Last node seen was in the joining bucket - if the searched @@ -1572,5 +1572,5 @@ return true; } - + /* * Reached the end of the bucket but no nodes from the joining bucket @@ -1603,8 +1603,8 @@ size_t old_idx = calc_bucket_idx(hash, b->order); size_t new_idx = calc_bucket_idx(hash, h->new_b->order); - + marked_ptr_t *pold_head = &b->head[old_idx]; marked_ptr_t *pnew_head = &h->new_b->head[new_idx]; - + /* In any case, use the bucket in the new table. */ *phead = pnew_head; @@ -1614,8 +1614,8 @@ size_t move_dest_idx = grow_idx(old_idx); marked_ptr_t *pmoved_head = &h->new_b->head[move_dest_idx]; - + /* Complete moving the bucket from the old to the new table. */ help_head_move(pold_head, pmoved_head); - + /* The hash belongs to the moved bucket. */ if (move_dest_idx == new_idx) { @@ -1634,5 +1634,5 @@ * half of the split/old/moved bucket. */ - + /* The moved bucket has not yet been split. */ if (N_NORMAL != get_mark(*pnew_head)) { @@ -1645,12 +1645,12 @@ assert(N_NORMAL == get_mark(*pnew_head)); } - + *walk_mode = WM_LEAVE_JOIN; } } else if (h->new_b->order < b->order ) { /* Shrinking the table. */ - + size_t move_src_idx = grow_idx(new_idx); - + /* * Complete moving the bucket from the old to the new table. @@ -1658,5 +1658,5 @@ */ help_head_move(&b->head[move_src_idx], pnew_head); - + /* Hash belongs to the bucket to be joined with the moved bucket. */ if (move_src_idx != old_idx) { @@ -1666,5 +1666,5 @@ join_buckets(h, pold_head, pnew_head, split_hash); } - + /* * The resizer sets pold_head to &sentinel when all cpus are @@ -1673,5 +1673,5 @@ *join_finishing = (&sentinel != get_next(*pold_head)); } - + /* move_head() or join_buckets() makes it so or makes the mark visible.*/ assert(N_INVALID == get_mark(*pold_head)); @@ -1713,5 +1713,5 @@ /* Head move has to in progress already when calling this func. */ assert(N_CONST & get_mark(*psrc_head)); - + /* Head already moved. */ if (N_INVALID == get_mark(*psrc_head)) { @@ -1724,5 +1724,5 @@ complete_head_move(psrc_head, pdest_head); } - + assert(!(N_CONST & get_mark(*pdest_head))); } @@ -1742,10 +1742,10 @@ { marked_ptr_t ret, src_link; - + /* Mark src head immutable. */ do { cht_link_t *next = get_next(*psrc_head); src_link = make_link(next, N_NORMAL); - + /* Mark the normal/clean src link immutable/const. */ ret = cas_link(psrc_head, next, N_NORMAL, next, N_CONST); @@ -1758,5 +1758,5 @@ assert(N_JOIN_FOLLOWS != get_mark(*psrc_head)); assert(N_CONST & get_mark(*psrc_head)); - + cht_link_t *next = get_next(*psrc_head); @@ -1765,5 +1765,5 @@ assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); cas_order_barrier(); - + DBG(ret = ) cas_link(psrc_head, next, N_CONST, next, N_INVALID); @@ -1791,5 +1791,5 @@ if (N_NORMAL == get_mark(*pdest_head)) return; - + /* * L == Last node of the first part of the split bucket. That part @@ -1836,11 +1836,11 @@ */ wnd_t wnd; - + rcu_read_lock(); - + /* Mark the last node of the first part of the split bucket as JF. */ mark_join_follows(h, psrc_head, split_hash, &wnd); cas_order_barrier(); - + /* There are nodes in the dest bucket, ie the second part of the split. */ if (wnd.cur != &sentinel) { @@ -1857,5 +1857,5 @@ */ } - + /* Link the dest head to the second part of the split. */ DBG(marked_ptr_t ret = ) @@ -1863,5 +1863,5 @@ assert(ret == make_link(&sentinel, N_INVALID) || (N_NORMAL == get_mark(ret))); cas_order_barrier(); - + rcu_read_unlock(); } @@ -1888,5 +1888,5 @@ { /* See comment in split_bucket(). */ - + bool done = false; @@ -1895,5 +1895,5 @@ wnd->ppred = psrc_head; wnd->cur = get_next(*psrc_head); - + /* * Find the split window, ie the last node of the first part of @@ -1903,5 +1903,5 @@ if (!find_wnd_and_gc(h, split_hash, WM_MOVE_JOIN_FOLLOWS, wnd, &resizing)) continue; - + /* Must not report that the table is resizing if WM_MOVE_JOIN_FOLLOWS.*/ assert(!resizing); @@ -1926,10 +1926,10 @@ { /* See comment in split_bucket(). */ - + bool done; do { cht_link_t *next = get_next(join_node->link); mark_t mark = get_mark(join_node->link); - + /* * May already be marked as deleted, but it won't be unlinked @@ -1938,5 +1938,5 @@ 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)) @@ -2023,11 +2023,11 @@ * [src_head | Inv]-----------> [JN] -> .. */ - + rcu_read_lock(); - + /* Mark src_head immutable - signals updaters that bucket join started. */ mark_const(psrc_head); cas_order_barrier(); - + cht_link_t *join_node = get_next(*psrc_head); @@ -2035,14 +2035,14 @@ mark_join_node(join_node); cas_order_barrier(); - + link_to_join_node(h, pdest_head, join_node, split_hash); cas_order_barrier(); } - + DBG(marked_ptr_t ret = ) cas_link(psrc_head, join_node, N_CONST, join_node, N_INVALID); assert(ret == make_link(join_node, N_CONST) || (N_INVALID == get_mark(ret))); cas_order_barrier(); - + rcu_read_unlock(); } @@ -2067,12 +2067,12 @@ .cur = get_next(*pdest_head) }; - + bool resizing = false; - + if (!find_wnd_and_gc(h, split_hash, WM_LEAVE_JOIN, &wnd, &resizing)) continue; assert(!resizing); - + if (wnd.cur != &sentinel) { /* Must be from the new appended bucket. */ @@ -2081,9 +2081,9 @@ return; } - + /* 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); - + done = (ret == make_link(&sentinel, N_NORMAL)); } while (!done); @@ -2097,5 +2097,5 @@ { assert(item != &sentinel); - + /* * remove_callback only works as rcu_func_t because rcu_link is the first @@ -2103,5 +2103,5 @@ */ rcu_call(&item->rcu_link, (rcu_func_t)h->op->remove_callback); - + item_removed(h); } @@ -2116,8 +2116,8 @@ size_t items = (size_t) atomic_predec(&h->item_cnt); size_t bucket_cnt = (1 << h->b->order); - + bool need_shrink = (items == h->max_load * bucket_cnt / 4); bool missed_shrink = (items == h->max_load * bucket_cnt / 8); - + if ((need_shrink || missed_shrink) && h->b->order > h->min_order) { atomic_count_t resize_reqs = atomic_preinc(&h->resize_reqs); @@ -2137,8 +2137,8 @@ size_t items = (size_t) atomic_preinc(&h->item_cnt); size_t bucket_cnt = (1 << h->b->order); - + bool need_grow = (items == h->max_load * bucket_cnt); bool missed_grow = (items == 2 * h->max_load * bucket_cnt); - + if ((need_grow || missed_grow) && h->b->order < CHT_MAX_ORDER) { atomic_count_t resize_reqs = atomic_preinc(&h->resize_reqs); @@ -2154,5 +2154,5 @@ { cht_t *h = member_to_inst(arg, cht_t, resize_work); - + #ifdef CONFIG_DEBUG assert(h->b); @@ -2188,5 +2188,5 @@ if (h->b->order >= CHT_MAX_ORDER) return; - + h->new_b = alloc_buckets(h->b->order + 1, true, false); @@ -2198,5 +2198,5 @@ rcu_synchronize(); size_t old_bucket_cnt = (1 << h->b->order); - + /* * Give updaters a chance to help out with the resize. Do the minimum @@ -2206,8 +2206,8 @@ start_head_move(&h->b->head[idx]); } - + /* Order start_head_move() wrt complete_head_move(). */ cas_order_barrier(); - + /* Complete moving heads and split any buckets not yet split by updaters. */ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { @@ -2226,5 +2226,5 @@ split_bucket(h, move_dest_head, split_dest_head, split_hash); } - + /* * Wait for all updaters to notice the new heads. Once everyone sees @@ -2233,9 +2233,9 @@ */ rcu_synchronize(); - + /* Clear the JOIN_FOLLOWS mark and remove the link between the split buckets.*/ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { size_t new_idx = grow_idx(old_idx); - + cleanup_join_follows(h, &h->new_b->head[new_idx]); } @@ -2246,9 +2246,9 @@ */ rcu_synchronize(); - + /* Clear the JOIN mark and GC any deleted join nodes. */ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { size_t new_idx = grow_to_split_idx(old_idx); - + cleanup_join_node(h, &h->new_b->head[new_idx]); } @@ -2256,5 +2256,5 @@ /* Wait for everyone to see that the table is clear of any resize marks. */ rcu_synchronize(); - + cht_buckets_t *old_b = h->b; rcu_assign(h->b, h->new_b); @@ -2262,7 +2262,7 @@ /* Wait for everyone to start using the new table. */ rcu_synchronize(); - + free(old_b); - + /* Not needed; just for increased readability. */ h->new_b = NULL; @@ -2274,5 +2274,5 @@ if (h->b->order <= h->min_order) return; - + h->new_b = alloc_buckets(h->b->order - 1, true, false); @@ -2283,7 +2283,7 @@ /* Wait for all readers and updaters to see the initialized new table. */ rcu_synchronize(); - + size_t old_bucket_cnt = (1 << h->b->order); - + /* * Give updaters a chance to help out with the resize. Do the minimum @@ -2292,5 +2292,5 @@ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { size_t new_idx = shrink_idx(old_idx); - + /* This bucket should be moved. */ if (grow_idx(new_idx) == old_idx) { @@ -2300,13 +2300,13 @@ } } - + /* Order start_head_move() wrt to complete_head_move(). */ cas_order_barrier(); - + /* Complete moving heads and join buckets with the moved buckets. */ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { size_t new_idx = shrink_idx(old_idx); size_t move_src_idx = grow_idx(new_idx); - + /* This bucket should be moved. */ if (move_src_idx == old_idx) { @@ -2322,5 +2322,5 @@ } } - + /* * Wait for all updaters to notice the new heads. Once everyone sees @@ -2329,23 +2329,23 @@ */ rcu_synchronize(); - + /* Let everyone know joins are complete and fully visible. */ for (size_t old_idx = 0; old_idx < old_bucket_cnt; ++old_idx) { size_t move_src_idx = grow_idx(shrink_idx(old_idx)); - + /* Set the invalid joinee head to NULL. */ if (old_idx != move_src_idx) { assert(N_INVALID == get_mark(h->b->head[old_idx])); - + if (&sentinel != get_next(h->b->head[old_idx])) h->b->head[old_idx] = make_link(&sentinel, N_INVALID); } } - + /* todo comment join node vs reset joinee head*/ rcu_synchronize(); size_t new_bucket_cnt = (1 << h->new_b->order); - + /* Clear the JOIN mark and GC any deleted join nodes. */ for (size_t new_idx = 0; new_idx < new_bucket_cnt; ++new_idx) { @@ -2355,13 +2355,13 @@ /* Wait for everyone to see that the table is clear of any resize marks. */ rcu_synchronize(); - + cht_buckets_t *old_b = h->b; rcu_assign(h->b, h->new_b); - + /* Wait for everyone to start using the new table. */ rcu_synchronize(); - + free(old_b); - + /* Not needed; just for increased readability. */ h->new_b = NULL; @@ -2374,5 +2374,5 @@ cht_link_t *cur = get_next(*new_head); - + while (cur != &sentinel) { /* Clear the join node's JN mark - even if it is marked as deleted. */ @@ -2381,8 +2381,8 @@ break; } - + cur = get_next(cur->link); } - + rcu_read_unlock(); } @@ -2394,7 +2394,7 @@ assert(join_node != &sentinel); assert(join_node && (N_JOIN & get_mark(join_node->link))); - + bool done; - + /* Clear the JN mark. */ do { @@ -2411,5 +2411,5 @@ assert(ret == jn_link || (get_mark(ret) & N_JOIN)); } while (!done); - + if (!(N_DELETED & get_mark(join_node->link))) return; @@ -2419,17 +2419,17 @@ /* Clear the JOIN mark before trying to unlink the deleted join node.*/ cas_order_barrier(); - + size_t jn_hash = node_hash(h, join_node); do { bool resizing = false; - + wnd_t wnd = { .ppred = new_head, .cur = get_next(*new_head) }; - + done = find_wnd_and_gc_pred(h, jn_hash, WM_NORMAL, same_node_pred, join_node, &wnd, &resizing); - + assert(!resizing); } while (!done); @@ -2440,5 +2440,5 @@ { assert(new_head); - + rcu_read_lock(); @@ -2448,5 +2448,5 @@ }; marked_ptr_t *cur_link = new_head; - + /* * Find the non-deleted node with a JF mark and clear the JF mark. @@ -2461,5 +2461,5 @@ while (true) { bool is_jf_node = N_JOIN_FOLLOWS & get_mark(*cur_link); - + /* GC any deleted nodes on the way - even deleted JOIN_FOLLOWS. */ if (N_DELETED & get_mark(*cur_link)) { @@ -2483,5 +2483,5 @@ 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))); @@ -2508,5 +2508,5 @@ cur_link = &wnd.cur->link; } - + rcu_read_unlock(); } @@ -2561,5 +2561,5 @@ || item->hash == sentinel.hash || item->hash == calc_node_hash(h, item)); - + return item->hash; } @@ -2586,8 +2586,8 @@ { marked_ptr_t ptr = (marked_ptr_t) next; - + assert(!(ptr & N_MARK_MASK)); assert(!((unsigned)mark & ~N_MARK_MASK)); - + return ptr | mark; } @@ -2690,5 +2690,5 @@ */ void *expected = (void*)cur; - + /* * Use the acquire-release model, although we could probably @@ -2698,5 +2698,5 @@ __atomic_compare_exchange_n((void**)link, &expected, (void *)new, false, __ATOMIC_ACQ_REL, __ATOMIC_ACQUIRE); - + return (marked_ptr_t) expected; } Index: kernel/generic/src/adt/hash_table.c =================================================================== --- kernel/generic/src/adt/hash_table.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/hash_table.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -96,14 +96,14 @@ assert(h); assert(op && op->hash && op->key_hash && op->key_equal); - + /* Check for compulsory ops. */ if (!op || !op->hash || !op->key_hash || !op->key_equal) return false; - + h->bucket_cnt = round_up_size(init_size); - + if (!alloc_table(h->bucket_cnt, &h->bucket)) return false; - + h->max_load = (max_load == 0) ? HT_MAX_LOAD : max_load; h->item_cnt = 0; @@ -115,5 +115,5 @@ h->op->remove_callback = nop_remove_callback; } - + return true; } @@ -128,7 +128,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + clear_items(h); - + free(h->bucket); @@ -159,7 +159,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + clear_items(h); - + /* Shrink the table to its minimum size if possible. */ if (HT_MIN_BUCKETS < h->bucket_cnt) { @@ -173,15 +173,15 @@ if (h->item_cnt == 0) return; - + for (size_t idx = 0; idx < h->bucket_cnt; ++idx) { list_foreach_safe(h->bucket[idx], cur, next) { assert(cur); ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); - + list_remove(cur); h->op->remove_callback(cur_link); } } - + h->item_cnt = 0; } @@ -197,7 +197,7 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + size_t idx = h->op->hash(item) % h->bucket_cnt; - + list_append(&item->link, &h->bucket[idx]); ++h->item_cnt; @@ -220,7 +220,7 @@ assert(h->op && h->op->hash && h->op->equal); assert(!h->apply_ongoing); - + size_t idx = h->op->hash(item) % h->bucket_cnt; - + /* Check for duplicates. */ list_foreach(h->bucket[idx], link, ht_link_t, cur_link) { @@ -232,9 +232,9 @@ return false; } - + list_append(&item->link, &h->bucket[idx]); ++h->item_cnt; grow_if_needed(h); - + return true; } @@ -251,5 +251,5 @@ { assert(h && h->bucket); - + size_t idx = h->op->key_hash(key) % h->bucket_cnt; @@ -264,5 +264,5 @@ } } - + return NULL; } @@ -305,12 +305,12 @@ assert(h && h->bucket); assert(!h->apply_ongoing); - + size_t idx = h->op->key_hash(key) % h->bucket_cnt; size_t removed = 0; - + list_foreach_safe(h->bucket[idx], cur, next) { ht_link_t *cur_link = member_to_inst(cur, ht_link_t, link); - + if (h->op->key_equal(key, cur_link)) { ++removed; @@ -322,5 +322,5 @@ h->item_cnt -= removed; shrink_if_needed(h); - + return removed; } @@ -352,10 +352,10 @@ assert(f); assert(h && h->bucket); - + if (h->item_cnt == 0) return; - + h->apply_ongoing = true; - + for (size_t idx = 0; idx < h->bucket_cnt; ++idx) { list_foreach_safe(h->bucket[idx], cur, next) { @@ -371,5 +371,5 @@ out: h->apply_ongoing = false; - + shrink_if_needed(h); grow_if_needed(h); @@ -380,9 +380,9 @@ { size_t rounded_size = HT_MIN_BUCKETS; - + while (rounded_size < size) { rounded_size = 2 * rounded_size + 1; } - + return rounded_size; } @@ -392,9 +392,9 @@ { assert(pbuckets && HT_MIN_BUCKETS <= bucket_cnt); - + list_t *buckets = malloc(bucket_cnt * sizeof(list_t), FRAME_ATOMIC); if (!buckets) return false; - + for (size_t i = 0; i < bucket_cnt; i++) list_initialize(&buckets[i]); @@ -434,9 +434,9 @@ assert(h && h->bucket); assert(HT_MIN_BUCKETS <= new_bucket_cnt); - + /* We are traversing the table and resizing would mess up the buckets. */ if (h->apply_ongoing) return; - + list_t *new_buckets; @@ -444,5 +444,5 @@ if (!alloc_table(new_bucket_cnt, &new_buckets)) return; - + if (0 < h->item_cnt) { /* Rehash all the items to the new table. */ @@ -457,5 +457,5 @@ } } - + free(h->bucket); h->bucket = new_buckets; Index: kernel/generic/src/adt/list.c =================================================================== --- kernel/generic/src/adt/list.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/adt/list.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ bool found = false; link_t *hlp = list->head.next; - + while (hlp != &list->head) { if (hlp == link) { @@ -64,5 +64,5 @@ hlp = hlp->next; } - + return found; } @@ -80,13 +80,13 @@ if (list_empty(list)) return; - + /* Attach list to destination. */ list->head.next->prev = pos; list->head.prev->next = pos->next; - + /* Link destination list to the added list. */ pos->next->prev = list->head.prev; pos->next = list->head.next; - + list_initialize(list); } @@ -102,5 +102,5 @@ { unsigned long count = 0; - + link_t *link = list_first(list); while (link != NULL) { @@ -108,5 +108,5 @@ link = list_next(link, list); } - + return count; } Index: kernel/generic/src/console/chardev.c =================================================================== --- kernel/generic/src/console/chardev.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/console/chardev.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,5 +68,5 @@ { assert(indev); - + irq_spinlock_lock(&indev->lock, true); if (indev->counter == INDEV_BUFLEN - 1) { @@ -75,8 +75,8 @@ return; } - + indev->counter++; indev->buffer[indev->index++] = ch; - + /* Index modulo size of buffer */ indev->index = indev->index % INDEV_BUFLEN; @@ -102,17 +102,17 @@ if (check_poll(indev)) return indev->op->poll(indev); - + /* No other way of interacting with user */ interrupts_disable(); - + if (CPU) printf("cpu%u: ", CPU->id); else printf("cpu: "); - + printf("halted (no polling input)\n"); cpu_halt(); } - + waitq_sleep(&indev->wq); irq_spinlock_lock(&indev->lock, true); @@ -121,5 +121,5 @@ indev->counter--; irq_spinlock_unlock(&indev->lock, true); - + return ch; } @@ -158,8 +158,8 @@ if (indev == NULL) return false; - + if (indev->op == NULL) return false; - + return (indev->op->poll != NULL); } Index: kernel/generic/src/console/cmd.c =================================================================== --- kernel/generic/src/console/cmd.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/console/cmd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -686,5 +686,5 @@ { spinlock_lock(&cmd_lock); - + size_t len = 0; list_foreach(cmd_list, link, cmd_info_t, hlp) { @@ -694,5 +694,5 @@ spinlock_unlock(&hlp->lock); } - + unsigned int _len = (unsigned int) len; if ((_len != len) || (((int) _len) < 0)) { @@ -700,5 +700,5 @@ return 1; } - + list_foreach(cmd_list, link, cmd_info_t, hlp) { spinlock_lock(&hlp->lock); @@ -706,7 +706,7 @@ spinlock_unlock(&hlp->lock); } - + spinlock_unlock(&cmd_lock); - + return 1; } @@ -721,5 +721,5 @@ { uint8_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -729,13 +729,13 @@ ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE); - + const uint8_t val = pio_read_8(ptr); printf("read %" PRIxn ": %" PRIx8 "\n", argv[0].intval, val); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint8_t)); return 1; @@ -751,5 +751,5 @@ { uint16_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -759,13 +759,13 @@ ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE); - + const uint16_t val = pio_read_16(ptr); printf("read %" PRIxn ": %" PRIx16 "\n", argv[0].intval, val); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint16_t)); return 1; @@ -781,5 +781,5 @@ { uint32_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -789,13 +789,13 @@ ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE); - + const uint32_t val = pio_read_32(ptr); printf("read %" PRIxn ": %" PRIx32 "\n", argv[0].intval, val); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint32_t)); return 1; @@ -811,5 +811,5 @@ { uint8_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -819,14 +819,14 @@ ptr = (uint8_t *) km_map(argv[0].intval, sizeof(uint8_t), PAGE_NOT_CACHEABLE); - + printf("write %" PRIxn ": %" PRIx8 "\n", argv[0].intval, (uint8_t) argv[1].intval); pio_write_8(ptr, (uint8_t) argv[1].intval); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint8_t)); return 1; @@ -842,5 +842,5 @@ { uint16_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -850,14 +850,14 @@ ptr = (uint16_t *) km_map(argv[0].intval, sizeof(uint16_t), PAGE_NOT_CACHEABLE); - + printf("write %" PRIxn ": %" PRIx16 "\n", argv[0].intval, (uint16_t) argv[1].intval); pio_write_16(ptr, (uint16_t) argv[1].intval); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint16_t)); return 1; @@ -873,5 +873,5 @@ { uint32_t *ptr = NULL; - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) @@ -881,14 +881,14 @@ ptr = (uint32_t *) km_map(argv[0].intval, sizeof(uint32_t), PAGE_NOT_CACHEABLE); - + printf("write %" PRIxn ": %" PRIx32 "\n", argv[0].intval, (uint32_t) argv[1].intval); pio_write_32(ptr, (uint32_t) argv[1].intval); - + #ifdef IO_SPACE_BOUNDARY if ((void *) argv->intval < IO_SPACE_BOUNDARY) return 1; #endif - + km_unmap((uintptr_t) ptr, sizeof(uint32_t)); return 1; @@ -904,5 +904,5 @@ { reboot(); - + /* Not reached */ return 1; @@ -918,11 +918,11 @@ { assert(uptime); - + /* This doesn't have to be very accurate */ sysarg_t sec = uptime->seconds1; - + printf("Up %" PRIun " days, %" PRIun " hours, %" PRIun " minutes, %" PRIun " seconds\n", sec / 86400, (sec % 86400) / 3600, (sec % 3600) / 60, sec % 60); - + return 1; } @@ -937,8 +937,8 @@ { spinlock_lock(&cmd_lock); - + list_foreach(cmd_list, link, cmd_info_t, hlp) { spinlock_lock(&hlp->lock); - + if (str_lcmp(hlp->name, (const char *) argv->buffer, str_length(hlp->name)) == 0) { printf("%s - %s\n", hlp->name, hlp->description); @@ -948,10 +948,10 @@ break; } - + spinlock_unlock(&hlp->lock); } - + spinlock_unlock(&cmd_lock); - + return 1; } @@ -961,5 +961,5 @@ { symtab_print_search((char *) argv->buffer); - + return 1; } @@ -1004,10 +1004,10 @@ * call the function. */ - + unsigned int i; for (i = 0; i < config.cpu_count; i++) { if (!cpus[i].active) continue; - + thread_t *thread; if ((thread = thread_create((void (*)(void *)) cmd_call0, @@ -1021,5 +1021,5 @@ printf("Unable to create thread for cpu%u\n", i); } - + return 1; } @@ -1108,5 +1108,5 @@ fncptr_t fptr; errno_t rc; - + symbol = (char *) argv->buffer; rc = symtab_addr_lookup(symbol, &symaddr); @@ -1183,5 +1183,5 @@ bool pointer = false; errno_t rc; - + if (((char *) argv->buffer)[0] == '*') { rc = symtab_addr_lookup((char *) argv->buffer + 1, &addr); @@ -1195,5 +1195,5 @@ } else rc = symtab_addr_lookup((char *) argv->buffer, &addr); - + if (rc == ENOENT) printf("Symbol %s not found.\n", (char *) argv->buffer); @@ -1210,5 +1210,5 @@ } else printf("No symbol information available.\n"); - + return 1; } @@ -1252,5 +1252,5 @@ else printf("Unknown argument \"%s\".\n", flag_buf); - + return 1; } @@ -1270,5 +1270,5 @@ else printf("Unknown argument \"%s\".\n", flag_buf); - + return 1; } @@ -1412,5 +1412,5 @@ release_console(); indev_pop_character(stdin); - + return 1; } @@ -1420,5 +1420,5 @@ { printf("%s (%s)\n", test->name, test->desc); - + /* Update and read thread accounting for benchmarking */ @@ -1427,9 +1427,9 @@ task_get_accounting(TASK, &ucycles0, &kcycles0); irq_spinlock_unlock(&TASK->lock, true); - + /* Execute the test */ test_quiet = false; const char *ret = test->entry(); - + /* Update and read thread accounting */ uint64_t ucycles1, kcycles1; @@ -1437,18 +1437,18 @@ task_get_accounting(TASK, &ucycles1, &kcycles1); irq_spinlock_unlock(&TASK->lock, true); - + uint64_t ucycles, kcycles; char usuffix, ksuffix; order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix); order_suffix(kcycles1 - kcycles0, &kcycles, &ksuffix); - + printf("Time: %" PRIu64 "%c user cycles, %" PRIu64 "%c kernel cycles\n", ucycles, usuffix, kcycles, ksuffix); - + if (ret == NULL) { printf("Test passed\n"); return true; } - + printf("%s\n", ret); return false; @@ -1461,8 +1461,8 @@ uint64_t ucycles, kcycles; char usuffix, ksuffix; - + if (cnt < 1) return true; - + uint64_t *data = (uint64_t *) malloc(sizeof(uint64_t) * cnt, 0); if (data == NULL) { @@ -1470,8 +1470,8 @@ return false; } - + for (i = 0; i < cnt; i++) { printf("%s (%u/%u) ... ", test->name, i + 1, cnt); - + /* Update and read thread accounting for benchmarking */ @@ -1480,9 +1480,9 @@ task_get_accounting(TASK, &ucycles0, &kcycles0); irq_spinlock_unlock(&TASK->lock, true); - + /* Execute the test */ test_quiet = true; const char *test_ret = test->entry(); - + /* Update and read thread accounting */ irq_spinlock_lock(&TASK->lock, true); @@ -1490,5 +1490,5 @@ task_get_accounting(TASK, &ucycles1, &kcycles1); irq_spinlock_unlock(&TASK->lock, true); - + if (test_ret != NULL) { printf("%s\n", test_ret); @@ -1496,5 +1496,5 @@ break; } - + data[i] = ucycles1 - ucycles0 + kcycles1 - kcycles0; order_suffix(ucycles1 - ucycles0, &ucycles, &usuffix); @@ -1503,20 +1503,20 @@ ucycles, usuffix, kcycles, ksuffix); } - + if (ret) { printf("\n"); - + uint64_t sum = 0; - + for (i = 0; i < cnt; i++) { sum += data[i]; } - + order_suffix(sum / (uint64_t) cnt, &ucycles, &usuffix); printf("Average\t\t%" PRIu64 "%c\n", ucycles, usuffix); } - + free(data); - + return ret; } @@ -1526,10 +1526,10 @@ size_t len = 0; test_t *test; - + for (test = tests; test->name != NULL; test++) { if (str_length(test->name) > len) len = str_length(test->name); } - + unsigned int _len = (unsigned int) len; if ((_len != len) || (((int) _len) < 0)) { @@ -1537,9 +1537,9 @@ return; } - + for (test = tests; test->name != NULL; test++) printf("%-*s %s%s\n", _len, test->name, test->desc, (test->safe ? "" : " (unsafe)")); - + printf("%-*s Run all safe tests\n", _len, "*"); } @@ -1555,5 +1555,5 @@ { test_t *test; - + if (str_cmp((char *) argv->buffer, "*") == 0) { for (test = tests; test->name != NULL; test++) { @@ -1566,5 +1566,5 @@ } else if (str_cmp((char *) argv->buffer, "") != 0) { bool fnd = false; - + for (test = tests; test->name != NULL; test++) { if (str_cmp(test->name, (char *) argv->buffer) == 0) { @@ -1574,10 +1574,10 @@ } } - + if (!fnd) printf("Unknown test\n"); } else list_tests(); - + return 1; } @@ -1593,5 +1593,5 @@ test_t *test; uint32_t cnt = argv[1].intval; - + if (str_cmp((char *) argv->buffer, "*") == 0) { for (test = tests; test->name != NULL; test++) { @@ -1603,22 +1603,22 @@ } else { bool fnd = false; - + for (test = tests; test->name != NULL; test++) { if (str_cmp(test->name, (char *) argv->buffer) == 0) { fnd = true; - + if (test->safe) run_bench(test, cnt); else printf("Unsafe test\n"); - + break; } } - + if (!fnd) printf("Unknown test\n"); } - + return 1; } Index: kernel/generic/src/console/console.c =================================================================== --- kernel/generic/src/console/console.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/console/console.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -119,5 +119,5 @@ stdin = &stdin_sink; } - + return stdin; } @@ -143,5 +143,5 @@ stdout = &stdout_source; } - + list_append(&outdev->link, &stdout->list); } @@ -189,7 +189,7 @@ { void *faddr = (void *) KA2PA(kio); - + assert((uintptr_t) faddr % FRAME_SIZE == 0); - + kio_parea.pbase = (uintptr_t) faddr; kio_parea.frames = SIZE2FRAMES(sizeof(kio)); @@ -197,8 +197,8 @@ kio_parea.mapped = false; ddi_parea_register(&kio_parea); - + sysinfo_set_item_val("kio.faddr", NULL, (sysarg_t) faddr); sysinfo_set_item_val("kio.pages", NULL, KIO_PAGES); - + event_set_unmask_callback(EVENT_KIO, kio_update); atomic_set(&kio_inited, true); @@ -209,9 +209,9 @@ event_notify_1(EVENT_KCONSOLE, false, true); bool prev = console_override; - + console_override = true; if ((stdout) && (stdout->op->redraw)) stdout->op->redraw(stdout); - + if ((stdin) && (!prev)) { /* @@ -256,5 +256,5 @@ size_t count = 0; buf[offset] = 0; - + wchar_t ch; while ((ch = indev_pop_character(indev)) != '\n') { @@ -265,5 +265,5 @@ putchar(' '); putchar('\b'); - + count--; offset = str_lsize(buf, count); @@ -271,5 +271,5 @@ } } - + if (chr_encode(ch, buf, &offset, buflen - 1) == EOK) { putchar(ch); @@ -278,5 +278,5 @@ } } - + return count; } @@ -294,7 +294,7 @@ if (!atomic_get(&kio_inited)) return; - + spinlock_lock(&kio_lock); - + if (kio_uspace > 0) { if (event_notify_3(EVENT_KIO, true, kio_start, kio_len, @@ -302,5 +302,5 @@ kio_uspace = 0; } - + spinlock_unlock(&kio_lock); } @@ -312,5 +312,5 @@ { bool ordy = ((stdout) && (stdout->op->write)); - + if (!ordy) return; @@ -347,8 +347,8 @@ else kio_start = (kio_start + 1) % KIO_LENGTH; - + if (kio_stored < kio_len) kio_stored++; - + /* The character is stored for uspace */ if (kio_uspace < kio_len) @@ -359,12 +359,12 @@ { bool ordy = ((stdout) && (stdout->op->write)); - + spinlock_lock(&kio_lock); kio_push_char(ch); spinlock_unlock(&kio_lock); - + /* Output stored characters */ kio_flush(); - + if (!ordy) { /* @@ -380,5 +380,5 @@ early_putchar(ch); } - + /* Force notification on newline */ if (ch == '\n') @@ -409,10 +409,10 @@ if (size > PAGE_SIZE) return (sys_errno_t) ELIMIT; - + if (size > 0) { data = (char *) malloc(size + 1, 0); if (!data) return (sys_errno_t) ENOMEM; - + rc = copy_from_uspace(data, buf, size); if (rc) { @@ -421,5 +421,5 @@ } data[size] = 0; - + switch (cmd) { case KIO_WRITE: Index: kernel/generic/src/console/kconsole.c =================================================================== --- kernel/generic/src/console/kconsole.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/console/kconsole.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -98,5 +98,5 @@ { unsigned int i; - + cmd_init(); for (i = 0; i < KCONSOLE_HISTORY; i++) @@ -114,5 +114,5 @@ { spinlock_lock(&cmd_lock); - + /* * Make sure the command is not already listed. @@ -124,5 +124,5 @@ return false; } - + /* Avoid deadlock. */ if (hlp < cmd) { @@ -133,5 +133,5 @@ spinlock_lock(&hlp->lock); } - + if (str_cmp(hlp->name, cmd->name) == 0) { /* The command is already there. */ @@ -141,14 +141,14 @@ return false; } - + spinlock_unlock(&hlp->lock); spinlock_unlock(&cmd->lock); } - + /* * Now the command can be added. */ list_append(&cmd->link, &cmd_list); - + spinlock_unlock(&cmd_lock); return true; @@ -168,27 +168,27 @@ link_t **startpos = (link_t**) ctx; size_t namelen = str_length(name); - + spinlock_lock(&cmd_lock); - + if (*startpos == NULL) *startpos = cmd_list.head.next; - + for (; *startpos != &cmd_list.head; *startpos = (*startpos)->next) { cmd_info_t *hlp = list_get_instance(*startpos, cmd_info_t, link); - + const char *curname = hlp->name; if (str_length(curname) < namelen) continue; - + if (str_lcmp(curname, name, namelen) == 0) { *startpos = (*startpos)->next; if (h) *h = hlp->description; - + spinlock_unlock(&cmd_lock); return (curname + str_lsize(curname, namelen)); } } - + spinlock_unlock(&cmd_lock); return NULL; @@ -207,7 +207,7 @@ { const char *name = input; - + size_t found = 0; - + /* * Maximum Match Length: Length of longest matching common @@ -223,14 +223,14 @@ size_t total_hints_shown = 0; bool continue_showing_hints = true; - + output[0] = 0; - + while ((hint = hints_enum(name, NULL, &pos))) { if ((found == 0) || (str_length(hint) > str_length(output))) str_cpy(output, MAX_CMDLINE, hint); - + found++; } - + /* * If the number of possible completions is more than MAX_TAB_HINTS, @@ -242,10 +242,10 @@ console_prompt_display_all_hints(indev, found); } - + if ((found > 1) && (str_length(output) != 0)) { printf("\n"); pos = NULL; while ((hint = hints_enum(name, &help, &pos))) { - + if (continue_showing_hints) { if (help) @@ -253,8 +253,8 @@ else printf("%s%s\n", name, hint); - + --hints_to_show; ++total_hints_shown; - + if ((hints_to_show == 0) && (total_hints_shown != found)) { /* Ask user to continue */ @@ -263,20 +263,20 @@ } } - + for (max_match_len_tmp = 0; (output[max_match_len_tmp] == hint[max_match_len_tmp]) && (max_match_len_tmp < max_match_len); ++max_match_len_tmp); - + max_match_len = max_match_len_tmp; } - + /* Keep only the characters common in all completions */ output[max_match_len] = 0; } - + if (found > 0) str_cpy(input, size, output); - + free(output); return found; @@ -288,22 +288,22 @@ size_t end; char *tmp; - + while (isspace(cmdline[start])) start++; - + end = start + 1; - + while (!isspace(cmdline[end])) end++; - + tmp = malloc(STR_BOUNDS(end - start + 1), 0); - + wstr_to_str(tmp, end - start + 1, &cmdline[start]); - + spinlock_lock(&cmd_lock); - + list_foreach(cmd_list, link, cmd_info_t, hlp) { spinlock_lock(&hlp->lock); - + if (str_cmp(hlp->name, tmp) == 0) { spinlock_unlock(&hlp->lock); @@ -312,11 +312,11 @@ return hlp; } - + spinlock_unlock(&hlp->lock); } - + free(tmp); spinlock_unlock(&cmd_lock); - + return NULL; } @@ -325,13 +325,13 @@ { printf("%s> ", prompt); - + size_t position = 0; wchar_t *current = history[history_pos]; current[0] = 0; char *tmp = malloc(STR_BOUNDS(MAX_CMDLINE), 0); - + while (true) { wchar_t ch = indev_pop_character(indev); - + if (ch == '\n') { /* Enter */ @@ -339,10 +339,10 @@ break; } - + if (ch == '\b') { /* Backspace */ if (position == 0) continue; - + if (wstr_remove(current, position - 1)) { position--; @@ -353,14 +353,14 @@ } } - + if (ch == '\t') { /* Tab completion */ - + /* Move to the end of the word */ for (; (current[position] != 0) && (!isspace(current[position])); position++) putchar(current[position]); - - + + /* * Find the beginning of the word @@ -376,11 +376,11 @@ (beg > 0) && (!isspace(current[beg])); beg--); - + if (isspace(current[beg])) beg++; - + wstr_to_str(tmp, position - beg + 1, current + beg); } - + /* Count which argument number are we tabbing (narg=0 is cmd) */ bool sp = false; @@ -394,8 +394,8 @@ sp = false; } - + if (narg && isspace(current[0])) narg--; - + int found; if (narg == 0) { @@ -411,5 +411,5 @@ cmd->hints_enum); } - + if (found == 0) continue; @@ -424,8 +424,8 @@ if (!wstr_linsert(current, ch, position + i, MAX_CMDLINE)) break; - + i++; } - + if (found > 1) { /* No unique hint, list was printed */ @@ -436,11 +436,11 @@ continue; } - + /* We have a hint */ - + printf("%ls", current + position); position += str_length(tmp); print_cc('\b', wstr_length(current) - position); - + if (position == wstr_length(current)) { /* Insert a space after the last completed argument */ @@ -452,5 +452,5 @@ continue; } - + if (ch == U_LEFT_ARROW) { /* Left */ @@ -461,5 +461,5 @@ continue; } - + if (ch == U_RIGHT_ARROW) { /* Right */ @@ -470,5 +470,5 @@ continue; } - + if ((ch == U_UP_ARROW) || (ch == U_DOWN_ARROW)) { /* Up, down */ @@ -476,5 +476,5 @@ print_cc(' ', wstr_length(current)); print_cc('\b', wstr_length(current)); - + if (ch == U_UP_ARROW) { /* Up */ @@ -493,5 +493,5 @@ continue; } - + if (ch == U_HOME_ARROW) { /* Home */ @@ -500,5 +500,5 @@ continue; } - + if (ch == U_END_ARROW) { /* End */ @@ -507,10 +507,10 @@ continue; } - + if (ch == U_DELETE) { /* Delete */ if (position == wstr_length(current)) continue; - + if (wstr_remove(current, position)) { printf("%ls ", current + position); @@ -519,5 +519,5 @@ continue; } - + if (wstr_linsert(current, ch, position, MAX_CMDLINE)) { printf("%ls", current + position); @@ -526,10 +526,10 @@ } } - + if (wstr_length(current) > 0) { history_pos++; history_pos = history_pos % KCONSOLE_HISTORY; } - + free(tmp); return current; @@ -546,5 +546,5 @@ bool isaddr = false; bool isptr = false; - + /* If we get a name, try to find it in symbol table */ if (text[0] == '&') { @@ -557,9 +557,9 @@ len--; } - + if ((text[0] < '0') || (text[0] > '9')) { char symname[MAX_SYMBOL_NAME]; str_ncpy(symname, MAX_SYMBOL_NAME, text, len + 1); - + uintptr_t symaddr; errno_t rc = symtab_addr_lookup(symname, &symaddr); @@ -611,5 +611,5 @@ } } - + return true; } @@ -635,10 +635,10 @@ assert(start != NULL); assert(end != NULL); - + bool found_start = false; size_t offset = *start; size_t prev = *start; wchar_t ch; - + while ((ch = str_decode(cmdline, &offset, size)) != 0) { if (!found_start) { @@ -651,9 +651,9 @@ break; } - + prev = offset; } *end = prev; - + return found_start; } @@ -676,10 +676,10 @@ } spinlock_lock(&cmd_lock); - + cmd_info_t *cmd = NULL; - + list_foreach(cmd_list, link, cmd_info_t, hlp) { spinlock_lock(&hlp->lock); - + if (str_lcmp(hlp->name, cmdline + start, max(str_length(hlp->name), @@ -688,10 +688,10 @@ break; } - + spinlock_unlock(&hlp->lock); } - + spinlock_unlock(&cmd_lock); - + if (!cmd) { /* Unknown command. */ @@ -699,7 +699,7 @@ return NULL; } - + /* cmd == hlp is locked */ - + /* * The command line must be further analyzed and @@ -708,10 +708,10 @@ * structure. */ - + bool error = false; size_t i; for (i = 0; i < cmd->argc; i++) { char *buf; - + start = end; if (!parse_argument(cmdline, size, &start, &end)) { @@ -721,10 +721,10 @@ continue; } - + printf("Too few arguments.\n"); spinlock_unlock(&cmd->lock); return NULL; } - + switch (cmd->argv[i].type) { case ARG_TYPE_STRING: @@ -767,10 +767,10 @@ } } - + if (error) { spinlock_unlock(&cmd->lock); return NULL; } - + start = end; if (parse_argument(cmdline, size, &start, &end)) { @@ -779,5 +779,5 @@ return NULL; } - + spinlock_unlock(&cmd->lock); return cmd; @@ -798,13 +798,13 @@ return; } - + if (msg) printf("%s", msg); - + if (kcon) indev_pop_character(stdin); else printf("Type \"exit\" to leave the console.\n"); - + char *cmdline = malloc(STR_BOUNDS(MAX_CMDLINE), 0); while (true) { @@ -813,14 +813,14 @@ if (!len) continue; - + wstr_to_str(cmdline, STR_BOUNDS(MAX_CMDLINE), tmp); - + if ((!kcon) && (len == 4) && (str_lcmp(cmdline, "exit", 4) == 0)) break; - + cmd_info_t *cmd_info = parse_cmdline(cmdline, STR_BOUNDS(MAX_CMDLINE)); if (!cmd_info) continue; - + (void) cmd_info->func(cmd_info->argv); } Index: kernel/generic/src/console/prompt.c =================================================================== --- kernel/generic/src/console/prompt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/console/prompt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -52,15 +52,15 @@ assert(indev); assert(hints > 0); - + printf("Display all %zu possibilities? (y or n) ", hints); - + while (true) { wchar_t answer = indev_pop_character(indev); - + if ((answer == 'y') || (answer == 'Y')) { printf("y"); return true; } - + if ((answer == 'n') || (answer == 'N')) { printf("n"); @@ -84,5 +84,5 @@ assert(indev); assert(display_hints != NULL); - + printf("--More--"); while (true) { @@ -95,5 +95,5 @@ break; } - + /* Stop displaying hints? */ if ((continue_showing_hints == 'n') || @@ -104,5 +104,5 @@ break; } - + /* Show one more hint? */ if (continue_showing_hints == '\n') { @@ -111,8 +111,8 @@ } } - + /* Delete the --More-- option */ printf("\r \r"); - + return *display_hints > 0; } Index: kernel/generic/src/cpu/cpu.c =================================================================== --- kernel/generic/src/cpu/cpu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/cpu/cpu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,13 +63,13 @@ if (config.cpu_active == 1) { #endif /* CONFIG_SMP */ - + cpus = (cpu_t *) malloc(sizeof(cpu_t) * config.cpu_count, FRAME_ATOMIC); if (!cpus) panic("Cannot allocate CPU structures."); - + /* Initialize everything */ memsetb(cpus, sizeof(cpu_t) * config.cpu_count, 0); - + size_t i; for (i = 0; i < config.cpu_count; i++) { @@ -78,10 +78,10 @@ if (!stack_phys) panic("Cannot allocate CPU stack."); - + cpus[i].stack = (uint8_t *) PA2KA(stack_phys); cpus[i].id = i; - + irq_spinlock_initialize(&cpus[i].lock, "cpus[].lock"); - + for (unsigned int j = 0; j < RQ_COUNT; j++) { irq_spinlock_initialize(&cpus[i].rq[j].lock, "cpus[].rq[].lock"); @@ -89,19 +89,19 @@ } } - + #ifdef CONFIG_SMP } #endif /* CONFIG_SMP */ - + CPU = &cpus[config.cpu_active - 1]; - + CPU->active = true; CPU->tlb_active = true; - + CPU->idle = false; CPU->last_cycle = get_cycle(); CPU->idle_cycles = 0; CPU->busy_cycles = 0; - + cpu_identify(); cpu_arch_init(); @@ -113,5 +113,5 @@ { unsigned int i; - + for (i = 0; i < config.cpu_count; i++) { if (cpus[i].active) Index: kernel/generic/src/cpu/cpu_mask.c =================================================================== --- kernel/generic/src/cpu/cpu_mask.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/cpu/cpu_mask.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ assert(NULL != cpus); assert(cpu_cnt <= config.cpu_count); - + for (size_t active_word = 0; (active_word + 1) * word_bit_cnt <= cpu_cnt; @@ -62,5 +62,5 @@ cpus->mask[active_word] = -1; } - + size_t remaining_bits = (cpu_cnt % word_bit_cnt); if (0 < remaining_bits) { @@ -89,7 +89,7 @@ { assert(cpus); - + size_t word_cnt = cpu_mask_size() / word_size; - + for (size_t word = 0; word < word_cnt; ++word) { cpus->mask[word] = 0; @@ -102,5 +102,5 @@ size_t word = cpu_id / word_bit_cnt; size_t word_pos = cpu_id % word_bit_cnt; - + cpus->mask[word] |= (1U << word_pos); } @@ -111,5 +111,5 @@ size_t word = cpu_id / word_bit_cnt; size_t word_pos = cpu_id % word_bit_cnt; - + cpus->mask[word] &= ~(1U << word_pos); } @@ -120,5 +120,5 @@ size_t word = cpu_id / word_bit_cnt; size_t word_pos = cpu_id % word_bit_cnt; - + return 0 != (cpus->mask[word] & (1U << word_pos)); } @@ -133,5 +133,5 @@ return false; } - + return true; } Index: kernel/generic/src/ddi/ddi.c =================================================================== --- kernel/generic/src/ddi/ddi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ddi/ddi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -79,10 +79,10 @@ { mutex_lock(&parea_lock); - + /* * We don't check for overlaps here as the kernel is pretty sane. */ btree_insert(&parea_btree, (btree_key_t) parea->pbase, parea, NULL); - + mutex_unlock(&parea_lock); } @@ -108,8 +108,8 @@ { assert(TASK); - + if ((phys % FRAME_SIZE) != 0) return EBADMEM; - + /* * Unprivileged tasks are only allowed to map pareas @@ -118,20 +118,20 @@ bool priv = ((perm_get(TASK) & PERM_MEM_MANAGER) == PERM_MEM_MANAGER); - + mem_backend_data_t backend_data; backend_data.base = phys; backend_data.frames = pages; backend_data.anonymous = false; - + /* * Check if the memory region is explicitly enabled * for mapping by any parea structure. */ - + mutex_lock(&parea_lock); btree_node_t *nodep; parea_t *parea = (parea_t *) btree_search(&parea_btree, (btree_key_t) phys, &nodep); - + if ((parea != NULL) && (parea->frames >= pages)) { if ((!priv) && (!parea->unpriv)) { @@ -139,19 +139,19 @@ return EPERM; } - + goto map; } - + parea = NULL; mutex_unlock(&parea_lock); - + /* * Check if the memory region is part of physical * memory generally enabled for mapping. */ - + irq_spinlock_lock(&zones.lock, true); size_t znum = find_zone(ADDR2PFN(phys), pages, 0); - + if (znum == (size_t) -1) { /* @@ -161,11 +161,11 @@ */ irq_spinlock_unlock(&zones.lock, true); - + if (!priv) return EPERM; - + goto map; } - + if (zones.info[znum].flags & (ZONE_FIRMWARE | ZONE_RESERVED)) { /* @@ -174,14 +174,14 @@ */ irq_spinlock_unlock(&zones.lock, true); - + if (!priv) return EPERM; - + goto map; } - + irq_spinlock_unlock(&zones.lock, true); return ENOENT; - + map: if (!as_area_create(TASK->as, flags, FRAMES2SIZE(pages), @@ -191,20 +191,20 @@ * We report it using ENOMEM. */ - + if (parea != NULL) mutex_unlock(&parea_lock); - + return ENOMEM; } - + /* * Mapping is created on-demand during page fault. */ - + if (parea != NULL) { parea->mapped = true; mutex_unlock(&parea_lock); } - + return EOK; } @@ -235,10 +235,10 @@ if (rc != EOK) return rc; - + rc = physmem_map(ALIGN_DOWN(phys, FRAME_SIZE), pages, flags, &virt, bound); if (rc != EOK) return rc; - + rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt)); if (rc != EOK) { @@ -246,5 +246,5 @@ return rc; } - + return EOK; } @@ -273,9 +273,9 @@ if (!(perms & PERM_IO_MANAGER)) return EPERM; - + irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(id); - + if ((!task) || (!container_check(CONTAINER, task->container))) { /* @@ -287,5 +287,5 @@ return ENOENT; } - + /* Lock the task and release the lock protecting tasks_btree. */ irq_spinlock_exchange(&tasks_lock, &task->lock); @@ -314,9 +314,9 @@ if (!(perms & PERM_IO_MANAGER)) return EPERM; - + irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(id); - + if ((!task) || (!container_check(CONTAINER, task->container))) { /* @@ -328,10 +328,10 @@ return ENOENT; } - + /* Lock the task and release the lock protecting tasks_btree. */ irq_spinlock_exchange(&tasks_lock, &task->lock); errno_t rc = ddi_iospace_disable_arch(task, ioaddr, size); irq_spinlock_unlock(&task->lock, true); - + return rc; } @@ -350,5 +350,5 @@ if (rc != EOK) return (sys_errno_t) rc; - + return (sys_errno_t) iospace_enable((task_id_t) arg.task_id, (uintptr_t) arg.ioaddr, (size_t) arg.size); @@ -370,5 +370,5 @@ { assert(TASK); - + // TODO: implement locking of non-anonymous mapping return page_find_mapping(virt, phys); @@ -380,5 +380,5 @@ { assert(TASK); - + size_t frames = SIZE2FRAMES(size); if (frames == 0) @@ -388,10 +388,10 @@ if (*phys == 0) return ENOMEM; - + mem_backend_data_t backend_data; backend_data.base = *phys; backend_data.frames = frames; backend_data.anonymous = true; - + if (!as_area_create(TASK->as, map_flags, size, AS_AREA_ATTR_NONE, &phys_backend, &backend_data, virt, bound)) { @@ -399,5 +399,5 @@ return ENOMEM; } - + return EOK; } @@ -421,12 +421,12 @@ * Non-anonymous DMA mapping */ - + uintptr_t phys; errno_t rc = dmamem_map((uintptr_t) virt_ptr, size, map_flags, flags, &phys); - + if (rc != EOK) return rc; - + rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys)); if (rc != EOK) { @@ -438,5 +438,5 @@ * Anonymous DMA mapping */ - + uintptr_t constraint; errno_t rc = copy_from_uspace(&constraint, phys_ptr, @@ -444,10 +444,10 @@ if (rc != EOK) return rc; - + uintptr_t virt; rc = copy_from_uspace(&virt, virt_ptr, sizeof(virt)); if (rc != EOK) return rc; - + uintptr_t phys; rc = dmamem_map_anonymous(size, constraint, map_flags, flags, @@ -455,5 +455,5 @@ if (rc != EOK) return rc; - + rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys)); if (rc != EOK) { @@ -461,5 +461,5 @@ return rc; } - + rc = copy_to_uspace(virt_ptr, &virt, sizeof(virt)); if (rc != EOK) { @@ -468,5 +468,5 @@ } } - + return EOK; } Index: kernel/generic/src/ddi/irq.c =================================================================== --- kernel/generic/src/ddi/irq.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ddi/irq.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -115,5 +115,5 @@ irq_spinlock_initialize(&irq->lock, "irq.lock"); irq->inr = -1; - + irq_initialize_arch(irq); } @@ -153,5 +153,5 @@ } irq_spinlock_unlock(l, false); - + return NULL; } @@ -179,5 +179,5 @@ * In the usual case the uspace handlers have precedence. */ - + if (console_override) { irq_t *irq = irq_dispatch_and_lock_table(&irq_kernel_hash_table, @@ -185,14 +185,14 @@ if (irq) return irq; - + return irq_dispatch_and_lock_table(&irq_uspace_hash_table, &irq_uspace_hash_table_lock, inr); } - + irq_t *irq = irq_dispatch_and_lock_table(&irq_uspace_hash_table, &irq_uspace_hash_table_lock, inr); if (irq) return irq; - + return irq_dispatch_and_lock_table(&irq_kernel_hash_table, &irq_kernel_hash_table_lock, inr); Index: kernel/generic/src/debug/debug.c =================================================================== --- kernel/generic/src/debug/debug.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/debug/debug.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -46,8 +46,8 @@ { const char *fn_sym = symtab_fmt_name_lookup((uintptr_t) fn); - + const char *call_site_sym; uintptr_t call_site_off; - + if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym, &call_site_off) == EOK) @@ -61,8 +61,8 @@ { const char *fn_sym = symtab_fmt_name_lookup((uintptr_t) fn); - + const char *call_site_sym; uintptr_t call_site_off; - + if (symtab_name_lookup((uintptr_t) call_site, &call_site_sym, &call_site_off) == EOK) Index: kernel/generic/src/debug/panic.c =================================================================== --- kernel/generic/src/debug/panic.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/debug/panic.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -49,10 +49,10 @@ { console_override = true; - + printf("\n%s Kernel panic ", BANNER_LEFT); if (CPU) printf("on cpu%u ", CPU->id); printf("due to "); - + va_list args; va_start(args, fmt); @@ -91,7 +91,7 @@ } va_end(args); - + printf("\n"); - + printf("THE=%p: ", THE); if (THE != NULL) { @@ -99,18 +99,18 @@ " magic=%#" PRIx32 "\n", THE->preemption, THE->thread, THE->task, THE->cpu, THE->as, THE->magic); - + if (THE->thread != NULL) printf("thread=\"%s\"\n", THE->thread->name); - + if (THE->task != NULL) printf("task=\"%s\"\n", THE->task->name); } else printf("invalid\n"); - + if (istate) { istate_decode(istate); printf("\n"); } - + stack_trace(); halt(); Index: kernel/generic/src/debug/stacktrace.c =================================================================== --- kernel/generic/src/debug/stacktrace.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/debug/stacktrace.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -48,5 +48,5 @@ uintptr_t fp; uintptr_t pc; - + while ((cnt++ < STACK_FRAMES_MAX) && (ops->stack_trace_context_validate(ctx))) { @@ -60,11 +60,11 @@ } else printf("%p: %p()\n", (void *) ctx->fp, (void *) ctx->pc); - + if (!ops->return_address_get(ctx, &pc)) break; - + if (!ops->frame_pointer_prev(ctx, &fp)) break; - + ctx->fp = fp; ctx->pc = pc; @@ -96,5 +96,5 @@ .istate = istate }; - + if (istate_from_uspace(istate)) stack_trace_ctx(&ust_ops, &ctx); Index: kernel/generic/src/debug/symtab.c =================================================================== --- kernel/generic/src/debug/symtab.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/debug/symtab.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,10 +58,10 @@ #ifdef CONFIG_SYMTAB size_t i; - + for (i = 1; symbol_table[i].address_le; i++) { if (addr < uint64_t_le2host(symbol_table[i].address_le)) break; } - + if (addr >= uint64_t_le2host(symbol_table[i - 1].address_le)) { *name = symbol_table[i - 1].symbol_name; @@ -71,8 +71,8 @@ return EOK; } - + *name = NULL; return ENOENT; - + #else *name = NULL; @@ -97,5 +97,5 @@ const char *name; errno_t rc = symtab_name_lookup(addr, &name, NULL); - + switch (rc) { case EOK: @@ -121,17 +121,17 @@ { size_t namelen = str_length(name); - + size_t pos; for (pos = *startpos; symbol_table[pos].address_le; pos++) { const char *curname = symbol_table[pos].symbol_name; - + /* Find a ':' in curname */ const char *colon = str_chr(curname, ':'); if (colon == NULL) continue; - + if (str_length(curname) < namelen) continue; - + if (str_lcmp(name, curname, namelen) == 0) { *startpos = pos; @@ -139,5 +139,5 @@ } } - + return NULL; } @@ -162,5 +162,5 @@ size_t pos = 0; const char *hint; - + while ((hint = symtab_search_one(name, &pos))) { if (str_length(hint) == 0) { @@ -170,13 +170,13 @@ pos++; } - + if (found > 1) return EOVERFLOW; - + if (found < 1) return ENOENT; - + return EOK; - + #else return ENOTSUP; @@ -195,5 +195,5 @@ pos++; } - + #else printf("No symbol information available.\n"); @@ -208,19 +208,19 @@ size_t len = str_length(input); struct symtab_entry **entry = (struct symtab_entry**)ctx; - + if (*entry == NULL) *entry = symbol_table; - + for (; (*entry)->address_le; (*entry)++) { const char *curname = (*entry)->symbol_name; - + /* Find a ':' in curname */ const char *colon = str_chr(curname, ':'); if (colon == NULL) continue; - + if (str_length(curname) < len) continue; - + if (str_lcmp(input, curname, len) == 0) { (*entry)++; @@ -230,7 +230,7 @@ } } - + return NULL; - + #else return NULL; Index: kernel/generic/src/interrupt/interrupt.c =================================================================== --- kernel/generic/src/interrupt/interrupt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/interrupt/interrupt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -78,7 +78,7 @@ assert(n < IVT_ITEMS); #endif - + irq_spinlock_lock(&exctbl_lock, true); - + iroutine_t old = exc_table[n].handler; exc_table[n].handler = handler; @@ -87,7 +87,7 @@ exc_table[n].cycles = 0; exc_table[n].count = 0; - + irq_spinlock_unlock(&exctbl_lock, true); - + return old; } @@ -104,5 +104,5 @@ assert(n < IVT_ITEMS); #endif - + /* Account user cycles */ if (THREAD) { @@ -111,5 +111,5 @@ irq_spinlock_unlock(&THREAD->lock, false); } - + /* Account CPU usage if it woke up from sleep */ if (CPU && CPU->idle) { @@ -121,31 +121,31 @@ irq_spinlock_unlock(&CPU->lock, false); } - + uint64_t begin_cycle = get_cycle(); - + #ifdef CONFIG_UDEBUG if (THREAD) THREAD->udebug.uspace_state = istate; #endif - + exc_table[n].handler(n + IVT_FIRST, istate); - + #ifdef CONFIG_UDEBUG if (THREAD) THREAD->udebug.uspace_state = NULL; #endif - + /* This is a safe place to exit exiting thread */ if ((THREAD) && (THREAD->interrupted) && (istate_from_uspace(istate))) thread_exit(); - + /* Account exception handling */ uint64_t end_cycle = get_cycle(); - + irq_spinlock_lock(&exctbl_lock, false); exc_table[n].cycles += end_cycle - begin_cycle; exc_table[n].count++; irq_spinlock_unlock(&exctbl_lock, false); - + /* Do not charge THREAD for exception cycles */ if (THREAD) { @@ -171,12 +171,12 @@ "program counter %p.\n", TASK->name, TASK->taskid, (void *) istate_get_pc(istate)); - + istate_decode(istate); stack_trace_istate(istate); - + printf("Kill message: "); vprintf(fmt, args); printf("\n"); - + task_kill_self(true); } @@ -201,5 +201,5 @@ if (!istate_from_uspace(istate)) return; - + va_list args; va_start(args, fmt); @@ -236,5 +236,5 @@ { bool excs_all; - + if (str_cmp(flag_buf, "-a") == 0) excs_all = true; @@ -245,11 +245,11 @@ return 1; } - + #if (IVT_ITEMS > 0) unsigned int i; unsigned int rows; - + irq_spinlock_lock(&exctbl_lock, true); - + #ifdef __32_BITS__ printf("[exc ] [description ] [count ] [cycles ]" @@ -257,5 +257,5 @@ rows = 1; #endif - + #ifdef __64_BITS__ printf("[exc ] [description ] [count ] [cycles ]" @@ -264,31 +264,31 @@ rows = 2; #endif - + for (i = 0; i < IVT_ITEMS; i++) { if ((!excs_all) && (!exc_table[i].hot)) continue; - + uint64_t count; char count_suffix; - + order_suffix(exc_table[i].count, &count, &count_suffix); - + uint64_t cycles; char cycles_suffix; - + order_suffix(exc_table[i].cycles, &cycles, &cycles_suffix); - + const char *symbol = symtab_fmt_name_lookup((sysarg_t) exc_table[i].handler); - + #ifdef __32_BITS__ printf("%-8u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %10p %s\n", i + IVT_FIRST, exc_table[i].name, count, count_suffix, cycles, cycles_suffix, exc_table[i].handler, symbol); - + PAGING(rows, 1, irq_spinlock_unlock(&exctbl_lock, true), irq_spinlock_lock(&exctbl_lock, true)); #endif - + #ifdef __64_BITS__ printf("%-8u %-20s %9" PRIu64 "%c %9" PRIu64 "%c %18p\n", @@ -296,17 +296,17 @@ cycles, cycles_suffix, exc_table[i].handler); printf(" %s\n", symbol); - + PAGING(rows, 2, irq_spinlock_unlock(&exctbl_lock, true), irq_spinlock_lock(&exctbl_lock, true)); #endif } - + irq_spinlock_unlock(&exctbl_lock, true); #else /* (IVT_ITEMS > 0) */ - + printf("No exception table%s.\n", excs_all ? " (showing all exceptions)" : ""); - + #endif /* (IVT_ITEMS > 0) */ - + return 1; } @@ -335,12 +335,12 @@ { (void) exc_undef; - + #if (IVT_ITEMS > 0) unsigned int i; - + for (i = 0; i < IVT_ITEMS; i++) exc_register(i, "undef", false, (iroutine_t) exc_undef); #endif - + #ifdef CONFIG_KCONSOLE cmd_initialize(&exc_info); Index: kernel/generic/src/ipc/event.c =================================================================== --- kernel/generic/src/ipc/event.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/event.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -61,12 +61,12 @@ { assert(evno < EVENT_TASK_END); - + event_t *event; - + if (evno < EVENT_END) event = &events[(event_type_t) evno]; else event = &task->events[(event_task_type_t) evno - EVENT_END]; - + return event; } @@ -96,5 +96,5 @@ for (unsigned int i = 0; i < EVENT_END; i++) { spinlock_lock(&events[i].lock); - + if (events[i].answerbox == answerbox) { events[i].answerbox = NULL; @@ -103,5 +103,5 @@ events[i].masked = false; } - + spinlock_unlock(&events[i].lock); } @@ -125,5 +125,5 @@ { assert(evno < EVENT_END); - + _event_set_unmask_callback(evno2event(evno, NULL), callback); } @@ -134,5 +134,5 @@ assert(evno >= (int) EVENT_END); assert(evno < EVENT_TASK_END); - + _event_set_unmask_callback(evno2event(evno, task), callback); } @@ -144,13 +144,13 @@ spinlock_lock(&event->lock); - + if (event->answerbox != NULL) { if (!event->masked) { call_t *call = ipc_call_alloc(FRAME_ATOMIC); - + if (call) { call->flags |= IPC_CALL_NOTIF; call->priv = ++event->counter; - + IPC_SET_IMETHOD(call->data, event->imethod); IPC_SET_ARG1(call->data, a1); @@ -159,7 +159,7 @@ IPC_SET_ARG4(call->data, a4); IPC_SET_ARG5(call->data, a5); - + call->data.task_id = TASK ? TASK->taskid : 0; - + irq_spinlock_lock(&event->answerbox->irq_lock, true); @@ -168,11 +168,11 @@ irq_spinlock_unlock(&event->answerbox->irq_lock, true); - + waitq_wakeup(&event->answerbox->wq, WAKEUP_FIRST); - + if (mask) event->masked = true; - + res = EOK; } else @@ -182,5 +182,5 @@ } else res = ENOENT; - + spinlock_unlock(&event->lock); return res; @@ -210,5 +210,5 @@ { assert(evno < EVENT_END); - + return event_enqueue(evno2event(evno, NULL), mask, a1, a2, a3, a4, a5); } @@ -239,5 +239,5 @@ assert(evno >= (int) EVENT_END); assert(evno < EVENT_TASK_END); - + return event_enqueue(evno2event(evno, task), mask, a1, a2, a3, a4, a5); } @@ -259,7 +259,7 @@ { errno_t res; - - spinlock_lock(&event->lock); - + + spinlock_lock(&event->lock); + if (event->answerbox == NULL) { event->answerbox = answerbox; @@ -270,7 +270,7 @@ } else res = EEXIST; - - spinlock_unlock(&event->lock); - + + spinlock_unlock(&event->lock); + return res; } @@ -289,7 +289,7 @@ { errno_t res; - - spinlock_lock(&event->lock); - + + spinlock_lock(&event->lock); + if (event->answerbox == answerbox) { event->answerbox = NULL; @@ -300,7 +300,7 @@ } else res = ENOENT; - - spinlock_unlock(&event->lock); - + + spinlock_unlock(&event->lock); + return res; } @@ -317,5 +317,5 @@ event_callback_t callback = event->unmask_callback; spinlock_unlock(&event->lock); - + /* * Check if there is an unmask callback @@ -342,5 +342,5 @@ if (evno >= EVENT_TASK_END) return ELIMIT; - + return (sys_errno_t) event_subscribe(evno2event(evno, TASK), (sysarg_t) imethod, &TASK->answerbox); @@ -361,5 +361,5 @@ if (evno >= EVENT_TASK_END) return ELIMIT; - + return (sys_errno_t) event_unsubscribe(evno2event(evno, TASK), &TASK->answerbox); @@ -383,5 +383,5 @@ if (evno >= EVENT_TASK_END) return ELIMIT; - + event_unmask(evno2event(evno, TASK)); Index: kernel/generic/src/ipc/ipc.c =================================================================== --- kernel/generic/src/ipc/ipc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ipc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -127,5 +127,5 @@ kobject_initialize(kobj, KOBJECT_TYPE_CALL, call, &call_kobject_ops); call->kobject = kobj; - + return call; } @@ -212,8 +212,8 @@ answerbox_t *mybox = slab_alloc(answerbox_cache, 0); ipc_answerbox_init(mybox, TASK); - + /* We will receive data in a special box. */ request->callerbox = mybox; - + errno_t rc = ipc_call(phone, request); if (rc != EOK) { @@ -247,5 +247,5 @@ ipc_forget_call(request); /* releases locks */ rc = EINTR; - + } else { spinlock_unlock(&TASK->active_calls_lock); @@ -264,5 +264,5 @@ } assert(!answer || request == answer); - + slab_free(answerbox_cache, mybox); return rc; @@ -305,17 +305,17 @@ &call->sender->answerbox; bool do_lock = ((!selflocked) || (callerbox != &TASK->answerbox)); - + call->flags |= IPC_CALL_ANSWERED; - + call->data.task_id = TASK->taskid; - + if (do_lock) irq_spinlock_lock(&callerbox->lock, true); - + list_append(&call->ab_link, &callerbox->answers); - + if (do_lock) irq_spinlock_unlock(&callerbox->lock, true); - + waitq_wakeup(&callerbox->wq, WAKEUP_FIRST); } @@ -333,5 +333,5 @@ list_remove(&call->ab_link); irq_spinlock_unlock(&box->lock, true); - + /* Send back answer */ _ipc_answer_free_call(call, false); @@ -395,12 +395,12 @@ caller->ipc_info.call_sent++; irq_spinlock_unlock(&caller->lock, true); - + if (!(call->flags & IPC_CALL_FORWARDED)) _ipc_call_actions_internal(phone, call, preforget); - + irq_spinlock_lock(&box->lock, true); list_append(&call->ab_link, &box->calls); irq_spinlock_unlock(&box->lock, true); - + waitq_wakeup(&box->wq, WAKEUP_FIRST); } @@ -426,11 +426,11 @@ ipc_backsend_err(phone, call, ENOENT); } - + return ENOENT; } - + answerbox_t *box = phone->callee; _ipc_call(phone, box, call, false); - + mutex_unlock(&phone->lock); return 0; @@ -457,5 +457,5 @@ return EINVAL; } - + answerbox_t *box = phone->callee; if (phone->state != IPC_PHONE_SLAMMED) { @@ -467,5 +467,5 @@ /* Drop the answerbox reference */ kobject_put(phone->kobject); - + call_t *call = ipc_call_alloc(0); IPC_SET_IMETHOD(call->data, IPC_M_PHONE_HUNGUP); @@ -474,8 +474,8 @@ _ipc_call(phone, box, call, false); } - + phone->state = IPC_PHONE_HUNGUP; mutex_unlock(&phone->lock); - + return EOK; } @@ -504,10 +504,10 @@ list_remove(&call->ab_link); irq_spinlock_unlock(&oldbox->lock, true); - + if (mode & IPC_FF_ROUTE_FROM_ME) { call->data.phone = newphone; call->data.task_id = TASK->taskid; } - + return ipc_call(newphone, call); } @@ -536,26 +536,26 @@ uint64_t call_cnt = 0; errno_t rc; - + restart: rc = waitq_sleep_timeout(&box->wq, usec, flags, NULL); if (rc != EOK) return NULL; - + irq_spinlock_lock(&box->lock, true); if (!list_empty(&box->irq_notifs)) { /* Count received IRQ notification */ irq_cnt++; - + irq_spinlock_lock(&box->irq_lock, false); - + request = list_get_instance(list_first(&box->irq_notifs), call_t, ab_link); list_remove(&request->ab_link); - + irq_spinlock_unlock(&box->irq_lock, false); } else if (!list_empty(&box->answers)) { /* Count received answer */ answer_cnt++; - + /* Handle asynchronous answers */ request = list_get_instance(list_first(&box->answers), @@ -566,10 +566,10 @@ /* Count received call */ call_cnt++; - + /* Handle requests */ request = list_get_instance(list_first(&box->calls), call_t, ab_link); list_remove(&request->ab_link); - + /* Append request to dispatch queue */ list_append(&request->ab_link, &box->dispatched_calls); @@ -579,13 +579,13 @@ goto restart; } - + irq_spinlock_pass(&box->lock, &TASK->lock); - + TASK->ipc_info.irq_notif_received += irq_cnt; TASK->ipc_info.answer_received += answer_cnt; TASK->ipc_info.call_received += call_cnt; - + irq_spinlock_unlock(&TASK->lock, true); - + return request; } @@ -602,5 +602,5 @@ call_t *call = list_get_instance(list_first(lst), call_t, ab_link); - + list_remove(&call->ab_link); @@ -631,5 +631,5 @@ phone_t *phone; DEADLOCK_PROBE_INIT(p_phonelck); - + /* Disconnect all phones connected to our answerbox */ restart_phones: @@ -643,11 +643,11 @@ goto restart_phones; } - + /* Disconnect phone */ assert(phone->state == IPC_PHONE_CONNECTED); - + list_remove(&phone->link); phone->state = IPC_PHONE_SLAMMED; - + if (notify_box) { task_hold(phone->caller); @@ -671,13 +671,13 @@ kobject_put(phone->kobject); - + /* Must start again */ goto restart_phones; } - + mutex_unlock(&phone->lock); kobject_put(phone->kobject); } - + irq_spinlock_unlock(&box->lock, true); } @@ -727,5 +727,5 @@ return; } - + call = list_get_instance(list_first(&TASK->active_calls), call_t, ta_link); @@ -811,5 +811,5 @@ if (restart) goto restart; - + call = ipc_wait_for_call(&TASK->answerbox, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); @@ -872,15 +872,15 @@ caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_PHONE, phone_cap_cleanup_cb, NULL); - + /* Unsubscribe from any event notifications. */ event_cleanup_answerbox(&TASK->answerbox); - + /* Disconnect all connected IRQs */ caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_IRQ, irq_cap_cleanup_cb, NULL); - + /* Disconnect all phones connected to our regular answerbox */ ipc_answerbox_slam_phones(&TASK->answerbox, false); - + #ifdef CONFIG_UDEBUG /* Clean up kbox thread and communications */ @@ -891,10 +891,10 @@ caps_apply_to_kobject_type(TASK, KOBJECT_TYPE_CALL, call_cap_cleanup_cb, NULL); - + /* Answer all messages in 'calls' and 'dispatched_calls' queues */ ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.calls); ipc_cleanup_call_list(&TASK->answerbox, &TASK->answerbox.dispatched_calls); - + ipc_forget_all_active_calls(); ipc_wait_for_all_answered_calls(); @@ -921,9 +921,9 @@ printf("%10p ", call); #endif - + #ifdef __64_BITS__ printf("%18p ", call); #endif - + spinlock_lock(&call->forget_lock); @@ -954,5 +954,5 @@ printf("%-11d %7" PRIun " ", cap->handle, atomic_get(&phone->active_calls)); - + switch (phone->state) { case IPC_PHONE_CONNECTING: @@ -973,5 +973,5 @@ break; } - + printf("\n"); } @@ -996,23 +996,23 @@ task_hold(task); irq_spinlock_unlock(&tasks_lock, true); - + printf("[phone cap] [calls] [state\n"); - + caps_apply_to_kobject_type(task, KOBJECT_TYPE_PHONE, print_task_phone_cb, NULL); - + irq_spinlock_lock(&task->lock, true); irq_spinlock_lock(&task->answerbox.lock, false); - + #ifdef __32_BITS__ printf("[call id ] [method] [arg1] [arg2] [arg3] [arg4] [arg5]" " [flags] [sender\n"); #endif - + #ifdef __64_BITS__ printf("[call id ] [method] [arg1] [arg2] [arg3] [arg4]" " [arg5] [flags] [sender\n"); #endif - + printf(" --- incomming calls ---\n"); ipc_print_call_list(&task->answerbox.calls); @@ -1021,5 +1021,5 @@ printf(" --- incoming answers ---\n"); ipc_print_call_list(&task->answerbox.answers); - + irq_spinlock_unlock(&task->answerbox.lock, false); irq_spinlock_unlock(&task->lock, true); Index: kernel/generic/src/ipc/ipcrsc.c =================================================================== --- kernel/generic/src/ipc/ipcrsc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ipcrsc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -193,5 +193,5 @@ &phone_kobject_ops); phone->kobject = kobject; - + cap_publish(task, handle, kobject); @@ -213,8 +213,8 @@ if (!kobj) return; - + assert(kobj->phone); assert(kobj->phone->state == IPC_PHONE_CONNECTING); - + kobject_put(kobj); cap_free(TASK, handle); @@ -232,7 +232,7 @@ if (!phone_obj) return false; - + assert(phone_obj->phone->state == IPC_PHONE_CONNECTING); - + /* Hand over phone_obj reference to the answerbox */ return ipc_phone_connect(phone_obj->phone, box); Index: kernel/generic/src/ipc/irq.c =================================================================== --- kernel/generic/src/ipc/irq.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/irq.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -85,5 +85,5 @@ for (size_t i = 0; i < rangecount; i++) pbase[i] = ranges[i].base; - + /* Map the PIO ranges into the kernel virtual address space. */ for (size_t i = 0; i < rangecount; i++) { @@ -100,10 +100,10 @@ } } - + /* Rewrite the IRQ code addresses from physical to kernel virtual. */ for (size_t i = 0; i < cmdcount; i++) { uintptr_t addr; size_t size; - + /* Process only commands that use an address. */ switch (cmds[i].cmd) { @@ -127,7 +127,7 @@ continue; } - + addr = (uintptr_t) cmds[i].addr; - + size_t j; for (j = 0; j < rangecount; j++) { @@ -135,13 +135,13 @@ if (!iswithin(pbase[j], ranges[j].size, addr, size)) continue; - + /* Switch the command to a kernel virtual address. */ addr -= pbase[j]; addr += ranges[j].base; - + cmds[i].addr = (void *) addr; break; } - + if (j == rangecount) { /* @@ -154,5 +154,5 @@ } } - + free(pbase); return EOK; @@ -172,11 +172,11 @@ if (cmds[i].cmd >= CMD_LAST) return EINVAL; - + if (cmds[i].srcarg >= IPC_CALL_LEN) return EINVAL; - + if (cmds[i].dstarg >= IPC_CALL_LEN) return EINVAL; - + switch (cmds[i].cmd) { case CMD_PREDICATE: @@ -188,5 +188,5 @@ if (i + cmds[i].value > cmdcount) return EINVAL; - + break; default: @@ -194,5 +194,5 @@ } } - + return EOK; } @@ -224,14 +224,14 @@ irq_pio_range_t *ranges = NULL; irq_cmd_t *cmds = NULL; - + irq_code_t *code = malloc(sizeof(*code), 0); errno_t rc = copy_from_uspace(code, ucode, sizeof(*code)); if (rc != EOK) goto error; - + if ((code->rangecount > IRQ_MAX_RANGE_COUNT) || (code->cmdcount > IRQ_MAX_PROG_SIZE)) goto error; - + ranges = malloc(sizeof(code->ranges[0]) * code->rangecount, 0); rc = copy_from_uspace(ranges, code->ranges, @@ -239,5 +239,5 @@ if (rc != EOK) goto error; - + cmds = malloc(sizeof(code->cmds[0]) * code->cmdcount, 0); rc = copy_from_uspace(cmds, code->cmds, @@ -245,26 +245,26 @@ if (rc != EOK) goto error; - + rc = code_check(cmds, code->cmdcount); if (rc != EOK) goto error; - + rc = ranges_map_and_apply(ranges, code->rangecount, cmds, code->cmdcount); if (rc != EOK) goto error; - + code->ranges = ranges; code->cmds = cmds; - + return code; - + error: if (cmds) free(cmds); - + if (ranges) free(ranges); - + free(code); return NULL; @@ -275,5 +275,5 @@ irq_spinlock_lock(&irq_uspace_hash_table_lock, true); irq_spinlock_lock(&irq->lock, false); - + if (irq->notif_cfg.hashed_in) { /* Remove the IRQ from the uspace IRQ hash table. */ @@ -318,5 +318,5 @@ if ((inr < 0) || (inr > last_inr)) return ELIMIT; - + irq_code_t *code; if (ucode) { @@ -326,5 +326,5 @@ } else code = NULL; - + /* * Allocate and populate the IRQ kernel object. @@ -334,5 +334,5 @@ if (rc != EOK) return rc; - + rc = copy_to_uspace(uspace_handle, &handle, sizeof(cap_handle_t)); if (rc != EOK) { @@ -353,5 +353,5 @@ return ENOMEM; } - + irq_initialize(irq); irq->inr = inr; @@ -363,5 +363,5 @@ irq->notif_cfg.code = code; irq->notif_cfg.counter = 0; - + /* * Insert the IRQ structure into the uspace IRQ hash table. @@ -369,8 +369,8 @@ irq_spinlock_lock(&irq_uspace_hash_table_lock, true); irq_spinlock_lock(&irq->lock, false); - + irq->notif_cfg.hashed_in = true; hash_table_insert(&irq_uspace_hash_table, &irq->link); - + irq_spinlock_unlock(&irq->lock, false); irq_spinlock_unlock(&irq_uspace_hash_table_lock, true); @@ -378,5 +378,5 @@ kobject_initialize(kobject, KOBJECT_TYPE_IRQ, irq, &irq_kobject_ops); cap_publish(TASK, handle, kobject); - + return EOK; } @@ -395,5 +395,5 @@ if (!kobj) return ENOENT; - + assert(kobj->irq->notif_cfg.answerbox == box); @@ -402,5 +402,5 @@ kobject_put(kobj); cap_free(TASK, handle); - + return EOK; } @@ -419,5 +419,5 @@ list_append(&call->ab_link, &irq->notif_cfg.answerbox->irq_notifs); irq_spinlock_unlock(&irq->notif_cfg.answerbox->irq_lock, false); - + waitq_wakeup(&irq->notif_cfg.answerbox->wq, WAKEUP_FIRST); } @@ -435,15 +435,15 @@ irq_code_t *code = irq->notif_cfg.code; uint32_t *scratch = irq->notif_cfg.scratch; - + if (!irq->notif_cfg.notify) return IRQ_DECLINE; - + if (!code) return IRQ_DECLINE; - + for (size_t i = 0; i < code->cmdcount; i++) { uintptr_t srcarg = code->cmds[i].srcarg; uintptr_t dstarg = code->cmds[i].dstarg; - + switch (code->cmds[i].cmd) { case CMD_PIO_READ_8: @@ -493,5 +493,5 @@ if (scratch[srcarg] == 0) i += code->cmds[i].value; - + break; case CMD_ACCEPT: @@ -502,5 +502,5 @@ } } - + return IRQ_DECLINE; } @@ -516,17 +516,17 @@ { assert(irq); - + assert(interrupts_disabled()); assert(irq_spinlock_locked(&irq->lock)); - + if (irq->notif_cfg.answerbox) { call_t *call = ipc_call_alloc(FRAME_ATOMIC); if (!call) return; - + call->flags |= IPC_CALL_NOTIF; /* Put a counter to the message */ call->priv = ++irq->notif_cfg.counter; - + /* Set up args */ IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod); @@ -536,5 +536,5 @@ IPC_SET_ARG4(call->data, irq->notif_cfg.scratch[4]); IPC_SET_ARG5(call->data, irq->notif_cfg.scratch[5]); - + send_call(irq, call); } @@ -555,5 +555,5 @@ { irq_spinlock_lock(&irq->lock, true); - + if (irq->notif_cfg.answerbox) { call_t *call = ipc_call_alloc(FRAME_ATOMIC); @@ -562,9 +562,9 @@ return; } - + call->flags |= IPC_CALL_NOTIF; /* Put a counter to the message */ call->priv = ++irq->notif_cfg.counter; - + IPC_SET_IMETHOD(call->data, irq->notif_cfg.imethod); IPC_SET_ARG1(call->data, a1); @@ -573,8 +573,8 @@ IPC_SET_ARG4(call->data, a4); IPC_SET_ARG5(call->data, a5); - + send_call(irq, call); } - + irq_spinlock_unlock(&irq->lock, true); } Index: kernel/generic/src/ipc/kbox.c =================================================================== --- kernel/generic/src/ipc/kbox.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/kbox.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -63,12 +63,12 @@ TASK->kb.finished = true; mutex_unlock(&TASK->kb.cleanup_lock); - + bool have_kb_thread = (TASK->kb.thread != NULL); - + /* * From now on nobody will try to connect phones or attach * kbox threads */ - + /* * Disconnect all phones connected to our kbox. Passing true for @@ -78,5 +78,5 @@ */ ipc_answerbox_slam_phones(&TASK->kb.box, have_kb_thread); - + /* * If the task was being debugged, clean up debugging session. @@ -87,5 +87,5 @@ udebug_task_cleanup(TASK); mutex_unlock(&TASK->udebug.lock); - + if (have_kb_thread) { LOG("Join kb.thread."); @@ -95,5 +95,5 @@ TASK->kb.thread = NULL; } - + /* Answer all messages in 'calls' and 'dispatched_calls' queues. */ ipc_cleanup_call_list(&TASK->kb.box, &TASK->kb.box.calls); @@ -120,11 +120,11 @@ LOG("Was not debugger."); } - + LOG("Continue with hangup message."); IPC_SET_RETVAL(call->data, 0); ipc_answer(&TASK->kb.box, call); - + mutex_lock(&TASK->kb.cleanup_lock); - + irq_spinlock_lock(&TASK->lock, true); irq_spinlock_lock(&TASK->kb.box.lock, false); @@ -134,5 +134,5 @@ * gets freed and signal to the caller. */ - + /* Only detach kbox thread unless already terminating. */ if (TASK->kb.finished == false) { @@ -141,13 +141,13 @@ TASK->kb.thread = NULL; } - + LOG("Phone list is empty."); *last = true; } else *last = false; - + irq_spinlock_unlock(&TASK->kb.box.lock, false); irq_spinlock_unlock(&TASK->lock, true); - + mutex_unlock(&TASK->kb.cleanup_lock); } @@ -166,19 +166,19 @@ LOG("Starting."); bool done = false; - + while (!done) { call_t *call = ipc_wait_for_call(&TASK->kb.box, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); - + if (call == NULL) continue; /* Try again. */ - + switch (IPC_GET_IMETHOD(call->data)) { - + case IPC_M_DEBUG: /* Handle debug call. */ udebug_call_receive(call); break; - + case IPC_M_PHONE_HUNGUP: /* @@ -189,5 +189,5 @@ kbox_proc_phone_hungup(call, &done); break; - + default: /* Ignore */ @@ -195,5 +195,5 @@ } } - + LOG("Exiting."); } @@ -213,5 +213,5 @@ { irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(taskid); if (task == NULL) { @@ -219,11 +219,11 @@ return ENOENT; } - + atomic_inc(&task->refcount); - + irq_spinlock_unlock(&tasks_lock, true); - + mutex_lock(&task->kb.cleanup_lock); - + if (atomic_predec(&task->refcount) == 0) { mutex_unlock(&task->kb.cleanup_lock); @@ -231,24 +231,24 @@ return ENOENT; } - + if (task->kb.finished) { mutex_unlock(&task->kb.cleanup_lock); return EINVAL; } - + /* Create a kbox thread if necessary. */ if (task->kb.thread == NULL) { thread_t *kb_thread = thread_create(kbox_thread_proc, NULL, task, THREAD_FLAG_NONE, "kbox"); - + if (!kb_thread) { mutex_unlock(&task->kb.cleanup_lock); return ENOMEM; } - + task->kb.thread = kb_thread; thread_ready(kb_thread); } - + /* Allocate a new phone. */ cap_handle_t phone_handle; @@ -258,5 +258,5 @@ return rc; } - + kobject_t *phone_obj = kobject_get(TASK, phone_handle, KOBJECT_TYPE_PHONE); @@ -264,5 +264,5 @@ /* Hand over phone_obj's reference to ipc_phone_connect() */ (void) ipc_phone_connect(phone_obj->phone, &task->kb.box); - + mutex_unlock(&task->kb.cleanup_lock); *out_phone = phone_handle; Index: kernel/generic/src/ipc/ops/conctmeto.c =================================================================== --- kernel/generic/src/ipc/ops/conctmeto.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/conctmeto.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -108,5 +108,5 @@ IPC_SET_ARG5(answer->data, phone_handle); } - + return EOK; } Index: kernel/generic/src/ipc/ops/dataread.c =================================================================== --- kernel/generic/src/ipc/ops/dataread.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/dataread.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -74,5 +74,5 @@ */ IPC_SET_ARG1(answer->data, dst); - + answer->buffer = malloc(size, 0); errno_t rc = copy_from_uspace(answer->buffer, Index: kernel/generic/src/ipc/ops/datawrite.c =================================================================== --- kernel/generic/src/ipc/ops/datawrite.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/datawrite.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,5 +65,5 @@ return rc; } - + return EOK; } @@ -78,5 +78,5 @@ size_t size = (size_t)IPC_GET_ARG2(answer->data); size_t max_size = (size_t)IPC_GET_ARG2(*olddata); - + if (size <= max_size) { errno_t rc = copy_to_uspace((void *) dst, Index: kernel/generic/src/ipc/ops/pagein.c =================================================================== --- kernel/generic/src/ipc/ops/pagein.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/pagein.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -92,5 +92,5 @@ page_table_unlock(AS, true); } - + return EOK; } Index: kernel/generic/src/ipc/ops/sharein.c =================================================================== --- kernel/generic/src/ipc/ops/sharein.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/sharein.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -47,5 +47,5 @@ as_t *as = answer->sender->as; irq_spinlock_unlock(&answer->sender->lock, true); - + uintptr_t dst_base = (uintptr_t) -1; errno_t rc = as_area_share(AS, IPC_GET_ARG1(answer->data), @@ -55,5 +55,5 @@ IPC_SET_RETVAL(answer->data, rc); } - + return EOK; } Index: kernel/generic/src/ipc/ops/shareout.c =================================================================== --- kernel/generic/src/ipc/ops/shareout.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/ops/shareout.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -68,10 +68,10 @@ IPC_GET_ARG2(*olddata), AS, IPC_GET_ARG3(*olddata), &dst_base, IPC_GET_ARG1(answer->data)); - + if (rc == EOK) { rc = copy_to_uspace((void *) IPC_GET_ARG2(answer->data), &dst_base, sizeof(dst_base)); } - + IPC_SET_RETVAL(answer->data, rc); } Index: kernel/generic/src/ipc/sysipc.c =================================================================== --- kernel/generic/src/ipc/sysipc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/ipc/sysipc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -69,5 +69,5 @@ if (imethod <= IPC_M_LAST_SYSTEM) return true; - + return false; } @@ -207,5 +207,5 @@ mutex_unlock(&phone->lock); } - + if (!olddata) return rc; @@ -242,5 +242,5 @@ (call->flags & IPC_CALL_FORWARDED)) IPC_SET_RETVAL(call->data, EFORWARD); - + SYSIPC_OP(answer_process, call); } @@ -276,9 +276,9 @@ if (!kobj->phone) return ENOENT; - + call_t *call = ipc_call_alloc(0); call->priv = priv; memcpy(call->data.args, data->args, sizeof(data->args)); - + errno_t rc = request_preprocess(call, kobj->phone); if (!rc) { @@ -322,9 +322,9 @@ } else IPC_SET_RETVAL(call->data, rc); - + memcpy(data->args, call->data.args, sizeof(data->args)); kobject_put(call->kobject); kobject_put(kobj); - + return EOK; } @@ -342,5 +342,5 @@ if (atomic_get(&phone->active_calls) >= IPC_MAX_ASYNC_CALLS) return -1; - + return 0; } @@ -368,10 +368,10 @@ if (!kobj) return ENOENT; - + if (check_call_limit(kobj->phone)) { kobject_put(kobj); return ELIMIT; } - + call_t *call = ipc_call_alloc(0); IPC_SET_IMETHOD(call->data, imethod); @@ -379,5 +379,5 @@ IPC_SET_ARG2(call->data, arg2); IPC_SET_ARG3(call->data, arg3); - + /* * To achieve deterministic behavior, zero out arguments that are beyond @@ -388,12 +388,12 @@ /* Set the user-defined label */ call->data.label = label; - + errno_t res = request_preprocess(call, kobj->phone); - + if (!res) ipc_call(kobj->phone, call); else ipc_backsend_err(kobj->phone, call, res); - + kobject_put(kobj); return EOK; @@ -432,12 +432,12 @@ /* Set the user-defined label */ call->data.label = label; - + errno_t res = request_preprocess(call, kobj->phone); - + if (!res) ipc_call(kobj->phone, call); else ipc_backsend_err(kobj->phone, call, res); - + kobject_put(kobj); return EOK; @@ -473,5 +473,5 @@ if (!ckobj) return ENOENT; - + call_t *call = ckobj->call; @@ -480,5 +480,5 @@ if (need_old) old = call->data; - + bool after_forward = false; errno_t rc; @@ -489,12 +489,12 @@ goto error; } - + if (!method_is_forwardable(IPC_GET_IMETHOD(call->data))) { rc = EPERM; goto error; } - + call->flags |= IPC_CALL_FORWARDED; - + /* * User space is not allowed to change interface and method of system @@ -507,12 +507,12 @@ if (IPC_GET_IMETHOD(call->data) == IPC_M_CONNECT_TO_ME) phone_dealloc(IPC_GET_ARG5(call->data)); - + IPC_SET_ARG1(call->data, imethod); IPC_SET_ARG2(call->data, arg1); IPC_SET_ARG3(call->data, arg2); - + if (slow) IPC_SET_ARG4(call->data, arg3); - + /* * For system methods we deliberately don't @@ -530,5 +530,5 @@ } } - + rc = ipc_forward(call, pkobj->phone, &TASK->answerbox, mode); if (rc != EOK) { @@ -609,5 +609,5 @@ if (rc != EOK) return (sys_errno_t) rc; - + return sys_ipc_forward_common(chandle, phandle, IPC_GET_IMETHOD(newdata), IPC_GET_ARG1(newdata), @@ -637,10 +637,10 @@ if (!kobj) return ENOENT; - + call_t *call = kobj->call; ipc_data_t saved_data; bool saved; - + if (answer_need_old(call)) { memcpy(&saved_data, &call->data, sizeof(call->data)); @@ -648,5 +648,5 @@ } else saved = false; - + IPC_SET_RETVAL(call->data, retval); IPC_SET_ARG1(call->data, arg1); @@ -654,5 +654,5 @@ IPC_SET_ARG3(call->data, arg3); IPC_SET_ARG4(call->data, arg4); - + /* * To achieve deterministic behavior, zero out arguments that are beyond @@ -661,5 +661,5 @@ IPC_SET_ARG5(call->data, 0); errno_t rc = answer_preprocess(call, saved ? &saved_data : NULL); - + ipc_answer(&TASK->answerbox, call); @@ -683,10 +683,10 @@ if (!kobj) return ENOENT; - + call_t *call = kobj->call; ipc_data_t saved_data; bool saved; - + if (answer_need_old(call)) { memcpy(&saved_data, &call->data, sizeof(call->data)); @@ -694,5 +694,5 @@ } else saved = false; - + errno_t rc = copy_from_uspace(&call->data.args, &data->args, sizeof(call->data.args)); @@ -704,7 +704,7 @@ return rc; } - + rc = answer_preprocess(call, saved ? &saved_data : NULL); - + ipc_answer(&TASK->answerbox, call); @@ -727,5 +727,5 @@ if (!kobj) return ENOENT; - + errno_t rc = ipc_phone_hangup(kobj->phone); kobject_put(kobj); @@ -746,14 +746,14 @@ { call_t *call; - + restart: - + #ifdef CONFIG_UDEBUG udebug_stoppable_begin(); #endif - + call = ipc_wait_for_call(&TASK->answerbox, usec, flags | SYNCH_FLAGS_INTERRUPTIBLE); - + #ifdef CONFIG_UDEBUG udebug_stoppable_end(); @@ -766,21 +766,21 @@ return EOK; } - + call->data.flags = call->flags; if (call->flags & IPC_CALL_NOTIF) { /* Set in_phone_hash to the interrupt counter */ call->data.phone = (void *) call->priv; - + call->data.cap_handle = CAP_NIL; STRUCT_TO_USPACE(calldata, &call->data); kobject_put(call->kobject); - + return EOK; } - + if (call->flags & IPC_CALL_ANSWERED) { process_answer(call); - + if (call->flags & IPC_CALL_DISCARD_ANSWER) { kobject_put(call->kobject); @@ -789,14 +789,14 @@ call->data.cap_handle = CAP_NIL; - + STRUCT_TO_USPACE(calldata, &call->data); kobject_put(call->kobject); - + return EOK; } - + if (process_request(&TASK->answerbox, call)) goto restart; - + cap_handle_t handle; errno_t rc = cap_alloc(TASK, &handle); @@ -804,5 +804,5 @@ goto error; } - + call->data.cap_handle = handle; @@ -871,5 +871,5 @@ if (!(perm_get(TASK) & PERM_IRQ_REG)) return EPERM; - + return ipc_irq_subscribe(&TASK->answerbox, inr, imethod, ucode, uspace_handle); } @@ -887,7 +887,7 @@ if (!(perm_get(TASK) & PERM_IRQ_REG)) return EPERM; - + ipc_irq_unsubscribe(&TASK->answerbox, cap); - + return 0; } @@ -903,10 +903,10 @@ task_id_t taskid; cap_handle_t phone; - + errno_t rc = copy_from_uspace(&taskid, uspace_taskid, sizeof(task_id_t)); if (rc == EOK) { rc = ipc_connect_kbox((task_id_t) taskid, &phone); } - + if (rc == EOK) { rc = copy_to_uspace(uspace_phone, &phone, sizeof(cap_handle_t)); @@ -916,5 +916,5 @@ } } - + return (sys_errno_t) rc; #else Index: kernel/generic/src/lib/elf.c =================================================================== --- kernel/generic/src/lib/elf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/elf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -80,5 +80,5 @@ (header->e_ident[EI_MAG3] != ELFMAG3)) return EE_INVALID; - + /* Identify ELF compatibility */ if ((header->e_ident[EI_DATA] != ELF_DATA_ENCODING) || @@ -88,19 +88,19 @@ (header->e_ident[EI_CLASS] != ELF_CLASS)) return EE_INCOMPATIBLE; - + if (header->e_phentsize != sizeof(elf_segment_header_t)) return EE_INCOMPATIBLE; - + if (header->e_shentsize != sizeof(elf_section_header_t)) return EE_INCOMPATIBLE; - + /* Check if the object type is supported. */ if (header->e_type != ET_EXEC) return EE_UNSUPPORTED; - + /* Check if the ELF image starts on a page boundary */ if (ALIGN_UP((uintptr_t) header, PAGE_SIZE) != (uintptr_t) header) return EE_UNSUPPORTED; - + /* Walk through all segment headers and process them. */ elf_half i; @@ -109,10 +109,10 @@ &((elf_segment_header_t *)(((uint8_t *) header) + header->e_phoff))[i]; - + int rc = segment_header(seghdr, header, as, flags); if (rc != EE_OK) return rc; } - + /* Inspect all section headers and process them. */ for (i = 0; i < header->e_shnum; i++) { @@ -120,10 +120,10 @@ &((elf_section_header_t *)(((uint8_t *) header) + header->e_shoff))[i]; - + int rc = section_header(sechdr, header, as); if (rc != EE_OK) return rc; } - + return EE_OK; } @@ -139,5 +139,5 @@ { assert(rc < sizeof(error_codes) / sizeof(char *)); - + return error_codes[rc]; } @@ -199,5 +199,5 @@ backend_data.elf = elf; backend_data.segment = entry; - + if (entry->p_align > 1) { if ((entry->p_offset % entry->p_align) != @@ -205,18 +205,18 @@ return EE_INVALID; } - + unsigned int flags = 0; - + if (entry->p_flags & PF_X) flags |= AS_AREA_EXEC; - + if (entry->p_flags & PF_W) flags |= AS_AREA_WRITE; - + if (entry->p_flags & PF_R) flags |= AS_AREA_READ; - + flags |= AS_AREA_CACHEABLE; - + /* * Align vaddr down, inserting a little "gap" at the beginning. @@ -226,15 +226,15 @@ uintptr_t base = ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE); size_t mem_sz = entry->p_memsz + (entry->p_vaddr - base); - + as_area_t *area = as_area_create(as, flags, mem_sz, AS_AREA_ATTR_NONE, &elf_backend, &backend_data, &base, 0); if (!area) return EE_MEMORY; - + /* * The segment will be mapped on demand by elf_page_fault(). * */ - + return EE_OK; } @@ -266,5 +266,5 @@ break; } - + return EE_OK; } Index: kernel/generic/src/lib/gsort.c =================================================================== --- kernel/generic/src/lib/gsort.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/gsort.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ { size_t i = 0; - + while (i < cnt) { if ((i != 0) && @@ -109,5 +109,5 @@ uint8_t ibuf_slot[IBUF_SIZE]; void *slot; - + if (elem_size > IBUF_SIZE) { slot = (void *) malloc(elem_size, 0); @@ -116,10 +116,10 @@ } else slot = (void *) ibuf_slot; - + _gsort(data, cnt, elem_size, cmp, arg, slot); - + if (elem_size > IBUF_SIZE) free(slot); - + return true; } Index: kernel/generic/src/lib/halt.c =================================================================== --- kernel/generic/src/lib/halt.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/halt.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ #if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE)) bool rundebugger = false; - + if (!atomic_get(&haltstate)) { atomic_set(&haltstate, 1); @@ -63,17 +63,17 @@ atomic_set(&haltstate, 1); #endif - + interrupts_disable(); - + #if (defined(CONFIG_DEBUG)) && (defined(CONFIG_KCONSOLE)) if ((rundebugger) && (kconsole_check_poll())) kconsole("panic", "\nLast resort kernel console ready.\n", false); #endif - + if (CPU) log(LF_OTHER, LVL_NOTE, "cpu%u: halted", CPU->id); else log(LF_OTHER, LVL_NOTE, "cpu: halted"); - + cpu_halt(); } Index: kernel/generic/src/lib/mem.c =================================================================== --- kernel/generic/src/lib/mem.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/mem.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -72,5 +72,5 @@ size_t i; uint16_t *ptr = (uint16_t *) dst; - + for (i = 0; i < cnt; i++) ptr[i] = val; @@ -94,12 +94,12 @@ if (src == dst) return dst; - + /* Non-overlapping? */ if ((dst >= src + cnt) || (src >= dst + cnt)) return memcpy(dst, src, cnt); - + uint8_t *dp; const uint8_t *sp; - + /* Which direction? */ if (src > dst) { @@ -107,5 +107,5 @@ dp = dst; sp = src; - + while (cnt-- != 0) *dp++ = *sp++; @@ -114,9 +114,9 @@ dp = dst + (cnt - 1); sp = src + (cnt - 1); - + while (cnt-- != 0) *dp-- = *sp--; } - + return dst; } Index: kernel/generic/src/lib/memfnc.c =================================================================== --- kernel/generic/src/lib/memfnc.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/memfnc.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -57,8 +57,8 @@ { uint8_t *dp = (uint8_t *) dst; - + while (cnt-- != 0) *dp++ = val; - + return dst; } @@ -80,8 +80,8 @@ uint8_t *dp = (uint8_t *) dst; const uint8_t *sp = (uint8_t *) src; - + while (cnt-- != 0) *dp++ = *sp++; - + return dst; } Index: kernel/generic/src/lib/ra.c =================================================================== --- kernel/generic/src/lib/ra.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/ra.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -304,6 +304,6 @@ succ->flags |= RA_SEGMENT_FREE; } - - + + /* Put unneeded parts back. */ if (pred) { Index: kernel/generic/src/lib/rd.c =================================================================== --- kernel/generic/src/lib/rd.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/rd.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -58,5 +58,5 @@ uintptr_t base = (uintptr_t) data; assert((base % FRAME_SIZE) == 0); - + rd_parea.pbase = base; rd_parea.frames = SIZE2FRAMES(size); @@ -64,9 +64,9 @@ rd_parea.mapped = false; ddi_parea_register(&rd_parea); - + sysinfo_set_item_val("rd", NULL, true); sysinfo_set_item_val("rd.size", NULL, size); sysinfo_set_item_val("rd.address.physical", NULL, (sysarg_t) base); - + log(LF_OTHER, LVL_NOTE, "RAM disk at %p (size %zu bytes)", (void *) base, size); Index: kernel/generic/src/lib/str.c =================================================================== --- kernel/generic/src/lib/str.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/lib/str.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -151,13 +151,13 @@ if (*offset + 1 > size) return 0; - + /* First byte read from string */ uint8_t b0 = (uint8_t) str[(*offset)++]; - + /* Determine code length */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((b0 & 0x80) == 0) { /* 0xxxxxxx (Plain ASCII) */ @@ -180,23 +180,23 @@ return U_SPECIAL; } - + if (*offset + cbytes > size) return U_SPECIAL; - + wchar_t ch = b0 & LO_MASK_8(b0_bits); - + /* Decode continuation bytes */ while (cbytes > 0) { uint8_t b = (uint8_t) str[(*offset)++]; - + /* Must be 10xxxxxx */ if ((b & 0xc0) != 0x80) return U_SPECIAL; - + /* Shift data bits to ch */ ch = (ch << CONT_BITS) | (wchar_t) (b & LO_MASK_8(CONT_BITS)); cbytes--; } - + return ch; } @@ -221,17 +221,17 @@ if (*offset >= size) return EOVERFLOW; - + if (!chr_check(ch)) return EINVAL; - + /* Unsigned version of ch (bit operations should only be done on unsigned types). */ uint32_t cc = (uint32_t) ch; - + /* Determine how many continuation bytes are needed */ - + unsigned int b0_bits; /* Data bits in first byte */ unsigned int cbytes; /* Number of continuation bytes */ - + if ((cc & ~LO_MASK_32(7)) == 0) { b0_bits = 7; @@ -250,9 +250,9 @@ return EINVAL; } - + /* Check for available space in buffer */ if (*offset + cbytes >= size) return EOVERFLOW; - + /* Encode continuation bytes */ unsigned int i; @@ -261,11 +261,11 @@ cc = cc >> CONT_BITS; } - + /* Encode first byte */ str[*offset] = (cc & LO_MASK_32(b0_bits)) | HI_MASK_8(8 - b0_bits - 1); - + /* Advance offset */ *offset += cbytes + 1; - + return EOK; } @@ -284,8 +284,8 @@ { size_t size = 0; - + while (*str++ != 0) size++; - + return size; } @@ -323,12 +323,12 @@ size_t len = 0; size_t offset = 0; - + while (len < max_len) { if (str_decode(str, &offset, STR_NO_LIMIT) == 0) break; - + len++; } - + return offset; } @@ -363,8 +363,8 @@ size_t len = 0; size_t offset = 0; - + while (str_decode(str, &offset, STR_NO_LIMIT) != 0) len++; - + return len; } @@ -380,8 +380,8 @@ { size_t len = 0; - + while (*wstr++ != 0) len++; - + return len; } @@ -399,8 +399,8 @@ size_t len = 0; size_t offset = 0; - + while (str_decode(str, &offset, size) != 0) len++; - + return len; } @@ -419,10 +419,10 @@ size_t limit = ALIGN_DOWN(size, sizeof(wchar_t)); size_t offset = 0; - + while ((offset < limit) && (*str++ != 0)) { len++; offset += sizeof(wchar_t); } - + return len; } @@ -437,5 +437,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 127)) return true; - + return false; } @@ -450,5 +450,5 @@ if (WCHAR_SIGNED_CHECK(ch >= 0) && (ch <= 1114111)) return true; - + return false; } @@ -476,5 +476,5 @@ wchar_t c1 = 0; wchar_t c2 = 0; - + size_t off1 = 0; size_t off2 = 0; @@ -486,5 +486,5 @@ if (c1 < c2) return -1; - + if (c1 > c2) return 1; @@ -523,8 +523,8 @@ wchar_t c1 = 0; wchar_t c2 = 0; - + size_t off1 = 0; size_t off2 = 0; - + size_t len = 0; @@ -569,8 +569,8 @@ assert(size > 0); assert(src != NULL); - + size_t src_off = 0; size_t dest_off = 0; - + wchar_t ch; while ((ch = str_decode(src, &src_off, STR_NO_LIMIT)) != 0) { @@ -578,5 +578,5 @@ break; } - + dest[dest_off] = '\0'; } @@ -602,8 +602,8 @@ /* There must be space for a null terminator in the buffer. */ assert(size > 0); - + size_t src_off = 0; size_t dest_off = 0; - + wchar_t ch; while ((ch = str_decode(src, &src_off, n)) != 0) { @@ -611,5 +611,5 @@ break; } - + dest[dest_off] = '\0'; } @@ -636,5 +636,5 @@ char *dest = malloc(size, 0); assert(dest); - + str_cpy(dest, size, src); return dest; @@ -666,8 +666,8 @@ if (size > n) size = n; - + char *dest = malloc(size + 1, 0); assert(dest); - + str_ncpy(dest, size + 1, src, size); return dest; @@ -695,5 +695,5 @@ src_idx = 0; dest_off = 0; - + while ((ch = src[src_idx++]) != 0) { if (chr_encode(ch, dest, &dest_off, size - 1) != EOK) @@ -717,5 +717,5 @@ size_t off = 0; size_t last = 0; - + while ((acc = str_decode(str, &off, STR_NO_LIMIT)) != 0) { if (acc == ch) @@ -723,5 +723,5 @@ last = off; } - + return NULL; } @@ -744,14 +744,14 @@ { size_t len = wstr_length(str); - + if ((pos > len) || (pos + 1 > max_pos)) return false; - + size_t i; for (i = len; i + 1 > pos; i--) str[i + 1] = str[i]; - + str[pos] = ch; - + return true; } @@ -772,12 +772,12 @@ { size_t len = wstr_length(str); - + if (pos >= len) return false; - + size_t i; for (i = pos + 1; i <= len; i++) str[i - 1] = str[i]; - + return true; } @@ -800,12 +800,12 @@ assert(neg != NULL); assert(result != NULL); - + *neg = false; const char *str = nptr; - + /* Ignore leading whitespace */ while (isspace(*str)) str++; - + if (*str == '-') { *neg = true; @@ -813,13 +813,13 @@ } else if (*str == '+') str++; - + if (base == 0) { /* Decode base if not specified */ base = 10; - + if (*str == '0') { base = 8; str++; - + switch (*str) { case 'b': @@ -856,11 +856,11 @@ } } - + *result = 0; const char *startstr = str; - + while (*str != 0) { unsigned int digit; - + if ((*str >= 'a') && (*str <= 'z')) digit = *str - 'a' + 10; @@ -871,11 +871,11 @@ else break; - + if (digit >= base) break; - + uint64_t prev = *result; *result = (*result) * base + digit; - + if (*result < prev) { /* Overflow */ @@ -883,8 +883,8 @@ return EOVERFLOW; } - + str++; } - + if (str == startstr) { /* @@ -894,10 +894,10 @@ str = nptr; } - + *endptr = (char *) str; - + if (str == nptr) return EINVAL; - + return EOK; } @@ -919,24 +919,24 @@ { assert(result != NULL); - + bool neg; char *lendptr; errno_t ret = str_uint(nptr, &lendptr, base, &neg, result); - + if (endptr != NULL) *endptr = (char *) lendptr; - + if (ret != EOK) return ret; - + /* Do not allow negative values */ if (neg) return EINVAL; - + /* Check whether we are at the end of the string in strict mode */ if ((strict) && (*lendptr != 0)) return EINVAL; - + return EOK; } Index: kernel/generic/src/log/log.c =================================================================== --- kernel/generic/src/log/log.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/log/log.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -121,10 +121,10 @@ len = LOG_LENGTH - log_current_len; } - + if (len == 0) return; - + size_t log_free = LOG_LENGTH - log_used - log_current_len; - + /* Discard older entries to make space, if necessary */ while (len > log_free) { @@ -136,5 +136,5 @@ next_for_uspace -= entry_len; } - + size_t pos = (log_current_start + log_current_len) % LOG_LENGTH; log_copy_to(data, pos, len); @@ -151,8 +151,8 @@ spinlock_lock(&log_lock); spinlock_lock(&kio_lock); - + log_current_start = (log_start + log_used) % LOG_LENGTH; log_current_len = 0; - + /* Write header of the log entry, the length will be written in log_end() */ log_append((uint8_t *) &log_current_len, sizeof(size_t)); @@ -162,5 +162,5 @@ log_append((uint8_t *) &fac32, sizeof(uint32_t)); log_append((uint8_t *) &lvl32, sizeof(uint32_t)); - + log_counter++; } @@ -174,9 +174,9 @@ log_copy_to((uint8_t *) &log_current_len, log_current_start, sizeof(size_t)); log_used += log_current_len; - + kio_push_char('\n'); spinlock_unlock(&kio_lock); spinlock_unlock(&log_lock); - + /* This has to be called after we released the locks above */ kio_flush(); @@ -189,5 +189,5 @@ if (!atomic_get(&log_inited)) return; - + spinlock_lock(&log_lock); if (next_for_uspace < log_used) @@ -200,12 +200,12 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { kio_push_char(str_decode(str, &offset, size)); chars++; } - + log_append((const uint8_t *)str, size); - + return chars; } @@ -216,8 +216,8 @@ size_t offset = 0; size_t chars = 0; - + for (offset = 0; offset < size; offset += sizeof(wchar_t), chars++) { kio_push_char(wstr[chars]); - + size_t buffer_offset = 0; errno_t rc = chr_encode(wstr[chars], buffer, &buffer_offset, 16); @@ -225,8 +225,8 @@ return EOF; } - + log_append((const uint8_t *)buffer, buffer_offset); } - + return chars; } @@ -239,5 +239,5 @@ { int ret; - + printf_spec_t ps = { log_printf_str_write, @@ -245,8 +245,8 @@ NULL }; - - + + ret = printf_core(fmt, &ps, args); - + return ret; } @@ -260,9 +260,9 @@ int ret; va_list args; - + va_start(args, fmt); ret = log_vprintf(fmt, args); va_end(args); - + return ret; } @@ -278,13 +278,13 @@ int ret; va_list args; - + log_begin(fac, level); - + va_start(args, fmt); ret = log_vprintf(fmt, args); va_end(args); - + log_end(); - + return ret; } @@ -298,8 +298,8 @@ char *data; errno_t rc; - + if (size > PAGE_SIZE) return (sys_errno_t) ELIMIT; - + switch (operation) { case KLOG_WRITE: @@ -307,5 +307,5 @@ if (!data) return (sys_errno_t) ENOMEM; - + rc = copy_from_uspace(data, buf, size); if (rc) { @@ -314,10 +314,10 @@ } data[size] = 0; - + if (level >= LVL_LIMIT) level = LVL_NOTE; - + log(LF_USPACE, level, "%s", data); - + free(data); return EOK; @@ -326,16 +326,16 @@ if (!data) return (sys_errno_t) ENOMEM; - + size_t entry_len = 0; size_t copied = 0; - + rc = EOK; - + spinlock_lock(&log_lock); - + while (next_for_uspace < log_used) { size_t pos = (log_start + next_for_uspace) % LOG_LENGTH; log_copy_from((uint8_t *) &entry_len, pos, sizeof(size_t)); - + if (entry_len > PAGE_SIZE) { /* @@ -350,5 +350,5 @@ continue; } - + if (size < copied + entry_len) { if (copied == 0) @@ -356,24 +356,24 @@ break; } - + log_copy_from((uint8_t *) (data + copied), pos, entry_len); copied += entry_len; next_for_uspace += entry_len; } - + spinlock_unlock(&log_lock); - + if (rc != EOK) { free(data); return (sys_errno_t) rc; } - + rc = copy_to_uspace(buf, data, size); - + free(data); - + if (rc != EOK) return (sys_errno_t) rc; - + return copy_to_uspace(uspace_nread, &copied, sizeof(copied)); return EOK; Index: kernel/generic/src/main/kinit.c =================================================================== --- kernel/generic/src/main/kinit.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/main/kinit.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -102,5 +102,5 @@ { thread_t *thread; - + /* * Detach kinit as nobody will call thread_join_timeout() on it. @@ -109,17 +109,17 @@ interrupts_disable(); - + /* Start processing RCU callbacks. RCU is fully functional afterwards. */ rcu_kinit_init(); - + /* * Start processing work queue items. Some may have been queued during boot. */ workq_global_worker_init(); - + #ifdef CONFIG_SMP if (config.cpu_count > 1) { waitq_initialize(&ap_completion_wq); - + /* * Create the kmp thread and wait for its completion. @@ -135,13 +135,13 @@ } else panic("Unable to create kmp thread."); - + thread_join(thread); thread_detach(thread); - + /* * For each CPU, create its load balancing thread. */ unsigned int i; - + for (i = 0; i < config.cpu_count; i++) { thread = thread_create(kcpulb, NULL, TASK, @@ -156,10 +156,10 @@ } #endif /* CONFIG_SMP */ - + /* * At this point SMP, if present, is configured. */ ARCH_OP(post_smp_init); - + /* Start thread computing system load */ thread = thread_create(kload, NULL, TASK, THREAD_FLAG_NONE, @@ -169,5 +169,5 @@ else log(LF_OTHER, LVL_ERROR, "Unable to create kload thread"); - + #ifdef CONFIG_KCONSOLE if (stdin) { @@ -184,5 +184,5 @@ } #endif /* CONFIG_KCONSOLE */ - + /* * Store the default stack size in sysinfo so that uspace can create @@ -190,7 +190,7 @@ */ sysinfo_set_item_val("default.stack_size", NULL, STACK_SIZE_USER); - + interrupts_enable(); - + /* * Create user tasks, load RAM disk images. @@ -198,5 +198,5 @@ size_t i; program_t programs[CONFIG_INIT_TASKS]; - + // FIXME: do not propagate arguments through sysinfo // but pass them directly to the tasks @@ -228,21 +228,21 @@ continue; } - + /* * Construct task name from the 'init:' prefix and the * name stored in the init structure (if any). */ - + char namebuf[TASK_NAME_BUFLEN]; - + const char *name = init.tasks[i].name; if (name[0] == 0) name = ""; - + static_assert(TASK_NAME_BUFLEN >= INIT_PREFIX_LEN, ""); str_cpy(namebuf, TASK_NAME_BUFLEN, INIT_PREFIX); str_cpy(namebuf + INIT_PREFIX_LEN, TASK_NAME_BUFLEN - INIT_PREFIX_LEN, name); - + /* * Create virtual memory mappings for init task images. @@ -252,8 +252,8 @@ PAGE_READ | PAGE_WRITE | PAGE_CACHEABLE); assert(page); - + errno_t rc = program_create_from_image((void *) page, namebuf, &programs[i]); - + if (rc == 0) { if (programs[i].task != NULL) { @@ -264,5 +264,5 @@ PERM_PERM | PERM_MEM_MANAGER | PERM_IO_MANAGER | PERM_IRQ_REG); - + if (!ipc_phone_0) { ipc_phone_0 = &programs[i].task->answerbox; @@ -276,5 +276,5 @@ } } - + /* * If programs[i].task == NULL then it is @@ -293,5 +293,5 @@ str_error_name(rc), programs[i].loader_status); } - + /* * Run user tasks. @@ -301,10 +301,10 @@ program_ready(&programs[i]); } - + #ifdef CONFIG_KCONSOLE if (!stdin) { thread_sleep(10); printf("kinit: No stdin\nKernel alive: ."); - + unsigned int i = 0; while (true) { Index: kernel/generic/src/main/main.c =================================================================== --- kernel/generic/src/main/main.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/main/main.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -166,13 +166,13 @@ config.cpu_count = 1; config.cpu_active = 1; - + config.base = hardcoded_load_address; config.kernel_size = ALIGN_UP(hardcoded_ktext_size + hardcoded_kdata_size, PAGE_SIZE); config.stack_size = STACK_SIZE; - + /* Initialy the stack is placed just after the kernel */ config.stack_base = config.base + config.kernel_size; - + /* Avoid placing stack on top of init */ size_t i; @@ -190,5 +190,5 @@ } } - + /* Avoid placing stack on top of boot allocations. */ if (ballocs.size) { @@ -198,8 +198,8 @@ ballocs.size, PAGE_SIZE); } - + if (config.stack_base < stack_safe) config.stack_base = ALIGN_UP(stack_safe, PAGE_SIZE); - + context_save(&ctx); context_set(&ctx, FADDR(main_bsp_separated_stack), @@ -218,12 +218,12 @@ /* Keep this the first thing. */ the_initialize(THE); - + version_print(); - + LOG("\nconfig.base=%p config.kernel_size=%zu" "\nconfig.stack_base=%p config.stack_size=%zu", (void *) config.base, config.kernel_size, (void *) config.stack_base, config.stack_size); - + #ifdef CONFIG_KCONSOLE /* @@ -234,5 +234,5 @@ kconsole_init(); #endif - + /* * Exception handler initialization, before architecture @@ -240,5 +240,5 @@ */ exc_init(); - + /* * Memory management subsystems initialization. @@ -260,8 +260,8 @@ ARCH_OP(pre_smp_init); smp_init(); - + /* Slab must be initialized after we know the number of processors. */ slab_enable_cpucache(); - + uint64_t size; const char *size_suffix; @@ -269,5 +269,5 @@ printf("Detected %u CPU(s), %" PRIu64 " %s free memory\n", config.cpu_count, size, size_suffix); - + cpu_init(); calibrate_delay_loop(); @@ -293,5 +293,5 @@ } else printf("No init binaries found.\n"); - + ipc_init(); event_init(); @@ -299,5 +299,5 @@ log_init(); stats_init(); - + /* * Create kernel task. @@ -306,5 +306,5 @@ if (!kernel) panic("Cannot create kernel task."); - + /* * Create the first thread. @@ -315,5 +315,5 @@ panic("Cannot create kinit thread."); thread_ready(kinit_thread); - + /* * This call to scheduler() will return to kinit, @@ -344,10 +344,10 @@ */ config.cpu_active++; - + /* * The THE structure is well defined because ctx.sp is used as stack. */ the_initialize(THE); - + ARCH_OP(pre_mm_init); frame_init(); @@ -355,11 +355,11 @@ tlb_init(); ARCH_OP(post_mm_init); - + cpu_init(); calibrate_delay_loop(); ARCH_OP(post_cpu_init); - + the_copy(THE, (the_t *) CPU->stack); - + /* * If we woke kmp up before we left the kernel stack, we could @@ -382,10 +382,10 @@ { smp_call_init(); - + /* * Configure timeouts for this cpu. */ timeout_init(); - + waitq_wakeup(&ap_completion_wq, WAKEUP_FIRST); scheduler(); Index: kernel/generic/src/main/shutdown.c =================================================================== --- kernel/generic/src/main/shutdown.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/main/shutdown.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,9 +45,9 @@ { task_done(); - + #ifdef CONFIG_DEBUG log(LF_OTHER, LVL_DEBUG, "Rebooting the system"); #endif - + arch_reboot(); halt(); Index: kernel/generic/src/main/uinit.c =================================================================== --- kernel/generic/src/main/uinit.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/main/uinit.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,12 +65,12 @@ */ thread_detach(THREAD); - + #ifdef CONFIG_UDEBUG udebug_stoppable_end(); #endif - + uspace_arg_t *uarg = (uspace_arg_t *) arg; uspace_arg_t local_uarg; - + local_uarg.uspace_entry = uarg->uspace_entry; local_uarg.uspace_stack = uarg->uspace_stack; @@ -79,7 +79,7 @@ local_uarg.uspace_thread_function = NULL; local_uarg.uspace_thread_arg = NULL; - + free(uarg); - + userspace(&local_uarg); } Index: kernel/generic/src/mm/as.c =================================================================== --- kernel/generic/src/mm/as.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/as.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -114,8 +114,8 @@ { as_t *as = (as_t *) obj; - + link_initialize(&as->inactive_as_with_asid_link); mutex_initialize(&as->lock, MUTEX_PASSIVE); - + return as_constructor_arch(as, flags); } @@ -130,12 +130,12 @@ { as_arch_init(); - + as_cache = slab_cache_create("as_t", sizeof(as_t), 0, as_constructor, as_destructor, SLAB_CACHE_MAGDEFERRED); - + AS_KERNEL = as_create(FLAG_AS_KERNEL); if (!AS_KERNEL) panic("Cannot create kernel address space."); - + /* * Make sure the kernel address space @@ -155,15 +155,15 @@ as_t *as = (as_t *) slab_alloc(as_cache, 0); (void) as_create_arch(as, 0); - + btree_create(&as->as_area_btree); - + if (flags & FLAG_AS_KERNEL) as->asid = ASID_KERNEL; else as->asid = ASID_INVALID; - + atomic_set(&as->refcount, 0); as->cpu_refcount = 0; - + #ifdef AS_PAGE_TABLE as->genarch.page_table = page_table_create(flags); @@ -171,5 +171,5 @@ page_table_create(flags); #endif - + return as; } @@ -188,13 +188,13 @@ { DEADLOCK_PROBE_INIT(p_asidlock); - + assert(as != AS); assert(atomic_get(&as->refcount) == 0); - + /* * Since there is no reference to this address space, it is safe not to * lock its mutex. */ - + /* * We need to avoid deadlock between TLB shootdown and asidlock. @@ -206,5 +206,5 @@ preemption_disable(); ipl_t ipl = interrupts_read(); - + retry: interrupts_disable(); @@ -214,19 +214,19 @@ goto retry; } - + /* Interrupts disabled, enable preemption */ preemption_enable(); - + if ((as->asid != ASID_INVALID) && (as != AS_KERNEL)) { if (as->cpu_refcount == 0) list_remove(&as->inactive_as_with_asid_link); - + asid_put(as->asid); } - + spinlock_unlock(&asidlock); interrupts_restore(ipl); - - + + /* * Destroy address space areas of the address space. @@ -237,15 +237,15 @@ while (cond) { assert(!list_empty(&as->as_area_btree.leaf_list)); - + btree_node_t *node = list_get_instance(list_first(&as->as_area_btree.leaf_list), btree_node_t, leaf_link); - + if ((cond = node->keys)) as_area_destroy(as, node->key[0]); } - + btree_destroy(&as->as_area_btree); - + #ifdef AS_PAGE_TABLE page_table_destroy(as->genarch.page_table); @@ -253,5 +253,5 @@ page_table_destroy(NULL); #endif - + slab_free(as_cache, as); } @@ -307,5 +307,5 @@ if (overflows_into_positive(addr, P2SZ(count))) return false; - + /* * We don't want any area to have conflicts with NULL page. @@ -328,5 +328,5 @@ return false; } - + /* First, check the two border cases. */ btree_node_t *node = @@ -334,5 +334,5 @@ if (node) { area = (as_area_t *) node->value[node->keys - 1]; - + if (area != avoid) { mutex_lock(&area->lock); @@ -346,5 +346,5 @@ int const gp = (guarded || (area->flags & AS_AREA_GUARD)) ? 1 : 0; - + /* * The area comes from the left neighbour node, which @@ -358,13 +358,13 @@ return false; } - + mutex_unlock(&area->lock); } } - + node = btree_leaf_node_right_neighbour(&as->as_area_btree, leaf); if (node) { area = (as_area_t *) node->value[0]; - + if (area != avoid) { int gp; @@ -382,5 +382,5 @@ gp--; } - + if (overlaps(addr, P2SZ(count + gp), area->base, P2SZ(area->pages))) { @@ -388,9 +388,9 @@ return false; } - + mutex_unlock(&area->lock); } } - + /* Second, check the leaf node. */ btree_key_t i; @@ -399,8 +399,8 @@ int agp; int gp; - + if (area == avoid) continue; - + mutex_lock(&area->lock); @@ -421,8 +421,8 @@ return false; } - + mutex_unlock(&area->lock); } - + /* * So far, the area does not conflict with other areas. @@ -434,5 +434,5 @@ addr, P2SZ(count)); } - + return true; } @@ -456,8 +456,8 @@ { assert(mutex_locked(&as->lock)); - + if (size == 0) return (uintptr_t) -1; - + /* * Make sure we allocate from page-aligned @@ -465,12 +465,12 @@ * each step. */ - + size_t pages = SIZE2FRAMES(size); - + /* * Find the lowest unmapped address aligned on the size * boundary, not smaller than bound and of the required size. */ - + /* First check the bound address itself */ uintptr_t addr = ALIGN_UP(bound, PAGE_SIZE); @@ -486,13 +486,13 @@ return addr; } - + /* Eventually check the addresses behind each area */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { - + for (btree_key_t i = 0; i < node->keys; i++) { as_area_t *area = (as_area_t *) node->value[i]; - + mutex_lock(&area->lock); - + addr = ALIGN_UP(area->base + P2SZ(area->pages), PAGE_SIZE); @@ -508,12 +508,12 @@ ((addr >= bound) && (addr >= area->base) && (check_area_conflicts(as, addr, pages, guarded, area))); - + mutex_unlock(&area->lock); - + if (avail) return addr; } } - + /* No suitable address space area found */ return (uintptr_t) -1; @@ -530,11 +530,11 @@ { bool dealloc = false; - + mutex_lock(&sh_info->lock); assert(sh_info->refcount); - + if (--sh_info->refcount == 0) { dealloc = true; - + /* * Now walk carefully the pagemap B+tree and free/remove @@ -544,12 +544,12 @@ btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) frame_free((uintptr_t) node->value[i], 1); } - + } mutex_unlock(&sh_info->lock); - + if (dealloc) { if (sh_info->backend && sh_info->backend->destroy_shared_data) { @@ -588,10 +588,10 @@ if ((*base != (uintptr_t) AS_AREA_ANY) && !IS_ALIGNED(*base, PAGE_SIZE)) return NULL; - + if (size == 0) return NULL; size_t pages = SIZE2FRAMES(size); - + /* Writeable executable areas are not supported. */ if ((flags & AS_AREA_EXEC) && (flags & AS_AREA_WRITE)) @@ -599,7 +599,7 @@ bool const guarded = flags & AS_AREA_GUARD; - + mutex_lock(&as->lock); - + if (*base == (uintptr_t) AS_AREA_ANY) { *base = as_get_unmapped_area(as, bound, size, guarded); @@ -619,9 +619,9 @@ return NULL; } - + as_area_t *area = (as_area_t *) malloc(sizeof(as_area_t), 0); - + mutex_initialize(&area->lock, MUTEX_PASSIVE); - + area->as = as; area->flags = flags; @@ -632,5 +632,5 @@ area->backend = backend; area->sh_info = NULL; - + if (backend_data) area->backend_data = *backend_data; @@ -655,5 +655,5 @@ area->sh_info = si; - + if (area->backend && area->backend->create_shared_data) { if (!area->backend->create_shared_data(area)) { @@ -679,7 +679,7 @@ btree_insert(&as->as_area_btree, *base, (void *) area, NULL); - + mutex_unlock(&as->lock); - + return area; } @@ -697,5 +697,5 @@ { assert(mutex_locked(&as->lock)); - + btree_node_t *leaf; as_area_t *area = (as_area_t *) btree_search(&as->as_area_btree, va, @@ -706,5 +706,5 @@ return area; } - + /* * Search the leaf node and the rightmost record of its left neighbour @@ -712,11 +712,11 @@ * space area found there. */ - + /* First, search the leaf node itself. */ btree_key_t i; - + for (i = 0; i < leaf->keys; i++) { area = (as_area_t *) leaf->value[i]; - + mutex_lock(&area->lock); @@ -724,8 +724,8 @@ (va <= area->base + (P2SZ(area->pages) - 1))) return area; - + mutex_unlock(&area->lock); } - + /* * Second, locate the left neighbour and test its last record. @@ -736,13 +736,13 @@ if (lnode) { area = (as_area_t *) lnode->value[lnode->keys - 1]; - + mutex_lock(&area->lock); - + if (va <= area->base + (P2SZ(area->pages) - 1)) return area; - + mutex_unlock(&area->lock); } - + return NULL; } @@ -766,5 +766,5 @@ mutex_lock(&as->lock); - + /* * Locate the area. @@ -784,5 +784,5 @@ return ENOTSUP; } - + mutex_lock(&area->sh_info->lock); if (area->sh_info->shared) { @@ -797,5 +797,5 @@ } mutex_unlock(&area->sh_info->lock); - + size_t pages = SIZE2FRAMES((address - area->base) + size); if (!pages) { @@ -807,15 +807,15 @@ return EPERM; } - + if (pages < area->pages) { uintptr_t start_free = area->base + P2SZ(pages); - + /* * Shrinking the area. * No need to check for overlaps. */ - + page_table_lock(as, false); - + /* * Remove frames belonging to used space starting from @@ -828,9 +828,9 @@ while (cond) { assert(!list_empty(&area->used_space.leaf_list)); - + btree_node_t *node = list_get_instance(list_last(&area->used_space.leaf_list), btree_node_t, leaf_link); - + if ((cond = (node->keys != 0))) { uintptr_t ptr = node->key[node->keys - 1]; @@ -838,8 +838,8 @@ (size_t) node->value[node->keys - 1]; size_t i = 0; - + if (overlaps(ptr, P2SZ(node_size), area->base, P2SZ(pages))) { - + if (ptr + P2SZ(node_size) <= start_free) { /* @@ -850,5 +850,5 @@ break; } - + /* * Part of the interval corresponding @@ -856,5 +856,5 @@ * address space area. */ - + /* We are almost done */ cond = false; @@ -871,5 +871,5 @@ panic("Cannot remove used space."); } - + /* * Start TLB shootdown sequence. @@ -887,14 +887,14 @@ as->asid, area->base + P2SZ(pages), area->pages - pages); - + for (; i < node_size; i++) { pte_t pte; bool found = page_mapping_find(as, ptr + P2SZ(i), false, &pte); - + assert(found); assert(PTE_VALID(&pte)); assert(PTE_PRESENT(&pte)); - + if ((area->backend) && (area->backend->frame_free)) { @@ -903,16 +903,16 @@ PTE_GET_FRAME(&pte)); } - + page_mapping_remove(as, ptr + P2SZ(i)); } - + /* * Finish TLB shootdown sequence. */ - + tlb_invalidate_pages(as->asid, area->base + P2SZ(pages), area->pages - pages); - + /* * Invalidate software translation caches @@ -944,5 +944,5 @@ } } - + if (area->backend && area->backend->resize) { if (!area->backend->resize(area, pages)) { @@ -952,10 +952,10 @@ } } - + area->pages = pages; - + mutex_unlock(&area->lock); mutex_unlock(&as->lock); - + return 0; } @@ -972,5 +972,5 @@ { mutex_lock(&as->lock); - + as_area_t *area = find_area_and_lock(as, address); if (!area) { @@ -981,9 +981,9 @@ if (area->backend && area->backend->destroy) area->backend->destroy(area); - + uintptr_t base = area->base; - + page_table_lock(as, false); - + /* * Start TLB shootdown sequence. @@ -991,5 +991,5 @@ ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages); - + /* * Visit only the pages mapped by used_space B+tree. @@ -998,18 +998,18 @@ node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) { uintptr_t ptr = node->key[i]; size_t size; - + for (size = 0; size < (size_t) node->value[i]; size++) { pte_t pte; bool found = page_mapping_find(as, ptr + P2SZ(size), false, &pte); - + assert(found); assert(PTE_VALID(&pte)); assert(PTE_PRESENT(&pte)); - + if ((area->backend) && (area->backend->frame_free)) { @@ -1018,16 +1018,16 @@ PTE_GET_FRAME(&pte)); } - + page_mapping_remove(as, ptr + P2SZ(size)); } } } - + /* * Finish TLB shootdown sequence. */ - + tlb_invalidate_pages(as->asid, area->base, area->pages); - + /* * Invalidate potential software translation caches @@ -1036,22 +1036,22 @@ as_invalidate_translation_cache(as, area->base, area->pages); tlb_shootdown_finalize(ipl); - + page_table_unlock(as, false); - + btree_destroy(&area->used_space); - + area->attributes |= AS_AREA_ATTR_PARTIAL; - + sh_info_remove_reference(area->sh_info); - + mutex_unlock(&area->lock); - + /* * Remove the empty area from address space. */ btree_remove(&as->as_area_btree, base, NULL); - + free(area); - + mutex_unlock(&as->lock); return 0; @@ -1098,5 +1098,5 @@ return ENOENT; } - + if (!src_area->backend->is_shareable(src_area)) { /* @@ -1107,14 +1107,14 @@ return ENOTSUP; } - + size_t src_size = P2SZ(src_area->pages); unsigned int src_flags = src_area->flags; mem_backend_t *src_backend = src_area->backend; mem_backend_data_t src_backend_data = src_area->backend_data; - + /* Share the cacheable flag from the original mapping */ if (src_flags & AS_AREA_CACHEABLE) dst_flags_mask |= AS_AREA_CACHEABLE; - + if ((src_size != acc_size) || ((src_flags & dst_flags_mask) != dst_flags_mask)) { @@ -1123,5 +1123,5 @@ return EPERM; } - + /* * Now we are committed to sharing the area. @@ -1130,5 +1130,5 @@ */ share_info_t *sh_info = src_area->sh_info; - + mutex_lock(&sh_info->lock); sh_info->refcount++; @@ -1144,8 +1144,8 @@ src_area->backend->share(src_area); } - + mutex_unlock(&src_area->lock); mutex_unlock(&src_as->lock); - + /* * Create copy of the source address space area. @@ -1164,8 +1164,8 @@ */ sh_info_remove_reference(sh_info); - + return ENOMEM; } - + /* * Now the destination address space area has been @@ -1179,5 +1179,5 @@ mutex_unlock(&dst_area->lock); mutex_unlock(&dst_as->lock); - + return 0; } @@ -1195,5 +1195,5 @@ { assert(mutex_locked(&area->lock)); - + int flagmap[] = { [PF_ACCESS_READ] = AS_AREA_READ, @@ -1201,8 +1201,8 @@ [PF_ACCESS_EXEC] = AS_AREA_EXEC }; - + if (!(area->flags & flagmap[access])) return false; - + return true; } @@ -1218,17 +1218,17 @@ { unsigned int flags = PAGE_USER | PAGE_PRESENT; - + if (aflags & AS_AREA_READ) flags |= PAGE_READ; - + if (aflags & AS_AREA_WRITE) flags |= PAGE_WRITE; - + if (aflags & AS_AREA_EXEC) flags |= PAGE_EXEC; - + if (aflags & AS_AREA_CACHEABLE) flags |= PAGE_CACHEABLE; - + return flags; } @@ -1252,7 +1252,7 @@ /* Flags for the new memory mapping */ unsigned int page_flags = area_flags_to_page_flags(flags); - + mutex_lock(&as->lock); - + as_area_t *area = find_area_and_lock(as, address); if (!area) { @@ -1260,5 +1260,5 @@ return ENOENT; } - + if (area->backend != &anon_backend) { /* Copying non-anonymous memory not supported yet */ @@ -1277,23 +1277,23 @@ } mutex_unlock(&area->sh_info->lock); - + /* * Compute total number of used pages in the used_space B+tree */ size_t used_pages = 0; - + list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) used_pages += (size_t) node->value[i]; } - + /* An array for storing frame numbers */ uintptr_t *old_frame = malloc(used_pages * sizeof(uintptr_t), 0); - + page_table_lock(as, false); - + /* * Start TLB shootdown sequence. @@ -1301,5 +1301,5 @@ ipl_t ipl = tlb_shootdown_start(TLB_INVL_PAGES, as->asid, area->base, area->pages); - + /* * Remove used pages from page tables and remember their frame @@ -1307,24 +1307,24 @@ */ size_t frame_idx = 0; - + list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) { uintptr_t ptr = node->key[i]; size_t size; - + for (size = 0; size < (size_t) node->value[i]; size++) { pte_t pte; bool found = page_mapping_find(as, ptr + P2SZ(size), false, &pte); - + assert(found); assert(PTE_VALID(&pte)); assert(PTE_PRESENT(&pte)); - + old_frame[frame_idx++] = PTE_GET_FRAME(&pte); - + /* Remove old mapping */ page_mapping_remove(as, ptr + P2SZ(size)); @@ -1332,11 +1332,11 @@ } } - + /* * Finish TLB shootdown sequence. */ - + tlb_invalidate_pages(as->asid, area->base, area->pages); - + /* * Invalidate potential software translation caches @@ -1345,12 +1345,12 @@ as_invalidate_translation_cache(as, area->base, area->pages); tlb_shootdown_finalize(ipl); - + page_table_unlock(as, false); - + /* * Set the new flags. */ area->flags = flags; - + /* * Map pages back in with new flags. This step is kept separate @@ -1359,30 +1359,30 @@ */ frame_idx = 0; - + list_foreach(area->used_space.leaf_list, leaf_link, btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) { uintptr_t ptr = node->key[i]; size_t size; - + for (size = 0; size < (size_t) node->value[i]; size++) { page_table_lock(as, false); - + /* Insert the new mapping */ page_mapping_insert(as, ptr + P2SZ(size), old_frame[frame_idx++], page_flags); - + page_table_unlock(as, false); } } } - + free(old_frame); - + mutex_unlock(&area->lock); mutex_unlock(&as->lock); - + return 0; } @@ -1414,8 +1414,8 @@ if (!THREAD) goto page_fault; - + if (!AS) goto page_fault; - + mutex_lock(&AS->lock); as_area_t *area = find_area_and_lock(AS, page); @@ -1428,5 +1428,5 @@ goto page_fault; } - + if (area->attributes & AS_AREA_ATTR_PARTIAL) { /* @@ -1438,5 +1438,5 @@ goto page_fault; } - + if ((!area->backend) || (!area->backend->page_fault)) { /* @@ -1448,7 +1448,7 @@ goto page_fault; } - + page_table_lock(AS, false); - + /* * To avoid race condition between two page faults on the same address, @@ -1467,5 +1467,5 @@ } } - + /* * Resort to the backend page fault handler. @@ -1478,10 +1478,10 @@ goto page_fault; } - + page_table_unlock(AS, false); mutex_unlock(&area->lock); mutex_unlock(&AS->lock); return AS_PF_OK; - + page_fault: if (THREAD->in_copy_from_uspace) { @@ -1501,5 +1501,5 @@ panic_memtrap(istate, access, address, NULL); } - + return AS_PF_DEFER; } @@ -1521,5 +1521,5 @@ DEADLOCK_PROBE_INIT(p_asidlock); preemption_disable(); - + retry: (void) interrupts_disable(); @@ -1536,5 +1536,5 @@ } preemption_enable(); - + /* * First, take care of the old address space. @@ -1542,5 +1542,5 @@ if (old_as) { assert(old_as->cpu_refcount); - + if ((--old_as->cpu_refcount == 0) && (old_as != AS_KERNEL)) { /* @@ -1551,9 +1551,9 @@ */ assert(old_as->asid != ASID_INVALID); - + list_append(&old_as->inactive_as_with_asid_link, &inactive_as_with_asid_list); } - + /* * Perform architecture-specific tasks when the address space @@ -1562,5 +1562,5 @@ as_deinstall_arch(old_as); } - + /* * Second, prepare the new address space. @@ -1572,9 +1572,9 @@ new_as->asid = asid_get(); } - + #ifdef AS_PAGE_TABLE SET_PTL0_ADDRESS(new_as->genarch.page_table); #endif - + /* * Perform architecture-specific steps. @@ -1582,7 +1582,7 @@ */ as_install_arch(new_as); - + spinlock_unlock(&asidlock); - + AS = new_as; } @@ -1598,5 +1598,5 @@ { assert(mutex_locked(&area->lock)); - + return area_flags_to_page_flags(area->flags); } @@ -1617,5 +1617,5 @@ assert(as_operations); assert(as_operations->page_table_create); - + return as_operations->page_table_create(flags); } @@ -1632,5 +1632,5 @@ assert(as_operations); assert(as_operations->page_table_destroy); - + as_operations->page_table_destroy(page_table); } @@ -1653,5 +1653,5 @@ assert(as_operations); assert(as_operations->page_table_lock); - + as_operations->page_table_lock(as, lock); } @@ -1667,5 +1667,5 @@ assert(as_operations); assert(as_operations->page_table_unlock); - + as_operations->page_table_unlock(as, unlock); } @@ -1697,8 +1697,8 @@ { size_t size; - + page_table_lock(AS, true); as_area_t *src_area = find_area_and_lock(AS, base); - + if (src_area) { size = P2SZ(src_area->pages); @@ -1706,5 +1706,5 @@ } else size = 0; - + page_table_unlock(AS, true); return size; @@ -1727,5 +1727,5 @@ assert(IS_ALIGNED(page, PAGE_SIZE)); assert(count); - + btree_node_t *leaf = NULL; size_t pages = (size_t) btree_search(&area->used_space, page, &leaf); @@ -1738,10 +1738,10 @@ assert(leaf != NULL); - + if (!leaf->keys) { btree_insert(&area->used_space, page, (void *) count, leaf); goto success; } - + btree_node_t *node = btree_leaf_node_left_neighbour(&area->used_space, leaf); if (node) { @@ -1750,5 +1750,5 @@ size_t left_cnt = (size_t) node->value[node->keys - 1]; size_t right_cnt = (size_t) leaf->value[0]; - + /* * Examine the possibility that the interval fits @@ -1756,5 +1756,5 @@ * the left neigbour and the first interval of the leaf. */ - + if (page >= right_pg) { /* Do nothing. */ @@ -1804,10 +1804,10 @@ uintptr_t right_pg = leaf->key[0]; size_t right_cnt = (size_t) leaf->value[0]; - + /* * Investigate the border case in which the left neighbour does * not exist but the interval fits from the left. */ - + if (overlaps(page, P2SZ(count), right_pg, P2SZ(right_cnt))) { /* The interval intersects with the right interval. */ @@ -1832,5 +1832,5 @@ } } - + node = btree_leaf_node_right_neighbour(&area->used_space, leaf); if (node) { @@ -1839,5 +1839,5 @@ size_t left_cnt = (size_t) leaf->value[leaf->keys - 1]; size_t right_cnt = (size_t) node->value[0]; - + /* * Examine the possibility that the interval fits @@ -1845,5 +1845,5 @@ * the right neigbour and the last interval of the leaf. */ - + if (page < left_pg) { /* Do nothing. */ @@ -1893,10 +1893,10 @@ uintptr_t left_pg = leaf->key[leaf->keys - 1]; size_t left_cnt = (size_t) leaf->value[leaf->keys - 1]; - + /* * Investigate the border case in which the right neighbour * does not exist but the interval fits from the right. */ - + if (overlaps(page, P2SZ(count), left_pg, P2SZ(left_cnt))) { /* The interval intersects with the left interval. */ @@ -1919,5 +1919,5 @@ } } - + /* * Note that if the algorithm made it thus far, the interval can fit @@ -1932,9 +1932,9 @@ size_t left_cnt = (size_t) leaf->value[i - 1]; size_t right_cnt = (size_t) leaf->value[i]; - + /* * The interval fits between left_pg and right_pg. */ - + if (overlaps(page, P2SZ(count), left_pg, P2SZ(left_cnt))) { @@ -1988,8 +1988,8 @@ } } - + panic("Inconsistency detected while adding %zu pages of used " "space at %p.", count, (void *) page); - + success: area->resident += count; @@ -2013,5 +2013,5 @@ assert(IS_ALIGNED(page, PAGE_SIZE)); assert(count); - + btree_node_t *leaf; size_t pages = (size_t) btree_search(&area->used_space, page, &leaf); @@ -2038,9 +2038,9 @@ } } - + goto error; } } - + btree_node_t *node = btree_leaf_node_left_neighbour(&area->used_space, leaf); @@ -2048,5 +2048,5 @@ uintptr_t left_pg = node->key[node->keys - 1]; size_t left_cnt = (size_t) node->value[node->keys - 1]; - + if (overlaps(left_pg, P2SZ(left_cnt), page, P2SZ(count))) { if (page + P2SZ(count) == left_pg + P2SZ(left_cnt)) { @@ -2078,13 +2078,13 @@ } } - + return false; } else if (page < leaf->key[0]) return false; - + if (page > leaf->key[leaf->keys - 1]) { uintptr_t left_pg = leaf->key[leaf->keys - 1]; size_t left_cnt = (size_t) leaf->value[leaf->keys - 1]; - + if (overlaps(left_pg, P2SZ(left_cnt), page, P2SZ(count))) { if (page + P2SZ(count) == left_pg + P2SZ(left_cnt)) { @@ -2115,8 +2115,8 @@ } } - + return false; } - + /* * The border cases have been already resolved. @@ -2128,5 +2128,5 @@ uintptr_t left_pg = leaf->key[i - 1]; size_t left_cnt = (size_t) leaf->value[i - 1]; - + /* * Now the interval is between intervals corresponding @@ -2166,13 +2166,13 @@ } } - + return false; } } - + error: panic("Inconsistency detected while removing %zu pages of used " "space from %p.", count, (void *) page); - + success: area->resident -= count; @@ -2204,5 +2204,5 @@ if (area == NULL) return (sysarg_t) AS_MAP_FAILED; - + return (sysarg_t) virt; } @@ -2233,42 +2233,42 @@ { mutex_lock(&as->lock); - + /* First pass, count number of areas. */ - + size_t area_cnt = 0; - + list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { area_cnt += node->keys; } - + size_t isize = area_cnt * sizeof(as_area_info_t); as_area_info_t *info = malloc(isize, 0); - + /* Second pass, record data. */ - + size_t area_idx = 0; - + list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + assert(area_idx < area_cnt); mutex_lock(&area->lock); - + info[area_idx].start_addr = area->base; info[area_idx].size = P2SZ(area->pages); info[area_idx].flags = area->flags; ++area_idx; - + mutex_unlock(&area->lock); } } - + mutex_unlock(&as->lock); - + *obuf = info; *osize = isize; @@ -2283,13 +2283,13 @@ { mutex_lock(&as->lock); - + /* Print out info about address space areas */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { btree_key_t i; - + for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + mutex_lock(&area->lock); printf("as_area: %p, base=%p, pages=%zu" @@ -2300,5 +2300,5 @@ } } - + mutex_unlock(&as->lock); } Index: kernel/generic/src/mm/backend_anon.c =================================================================== --- kernel/generic/src/mm/backend_anon.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/backend_anon.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -125,14 +125,14 @@ node) { unsigned int i; - + for (i = 0; i < node->keys; i++) { uintptr_t base = node->key[i]; size_t count = (size_t) node->value[i]; unsigned int j; - + for (j = 0; j < count; j++) { pte_t pte; bool found; - + page_table_lock(area->as, false); found = page_mapping_find(area->as, @@ -201,5 +201,5 @@ if (area->sh_info->shared) { btree_node_t *leaf; - + /* * The area is shared, chances are that the mapping can be found @@ -214,5 +214,5 @@ bool allocate = true; unsigned int i; - + /* * Zero can be returned as a valid frame address. @@ -230,5 +230,5 @@ memsetb((void *) kpage, PAGE_SIZE, 0); km_temporary_page_put(kpage); - + /* * Insert the address of the newly allocated @@ -272,5 +272,5 @@ } mutex_unlock(&area->sh_info->lock); - + /* * Map 'upage' to 'frame'. @@ -281,5 +281,5 @@ if (!used_space_insert(area, upage, 1)) panic("Cannot insert used space."); - + return AS_PF_OK; } Index: kernel/generic/src/mm/backend_elf.c =================================================================== --- kernel/generic/src/mm/backend_elf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/backend_elf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -102,5 +102,5 @@ if (area->pages <= nonanon_pages) return true; - + return reserve_try_alloc(area->pages - nonanon_pages); } @@ -123,5 +123,5 @@ reserve_free(nonanon_pages - new_pages); } - + return true; } @@ -166,12 +166,12 @@ cur = cur->next) { unsigned int i; - + node = list_get_instance(cur, btree_node_t, leaf_link); - + for (i = 0; i < node->keys; i++) { uintptr_t base = node->key[i]; size_t count = (size_t) node->value[i]; unsigned int j; - + /* * Skip read-only areas of used space that are backed @@ -182,9 +182,9 @@ base + P2SZ(count) <= start_anon) continue; - + for (j = 0; j < count; j++) { pte_t pte; bool found; - + /* * Skip read-only pages that are backed by the @@ -195,5 +195,5 @@ base + P2SZ(j + 1) <= start_anon) continue; - + page_table_lock(area->as, false); found = page_mapping_find(area->as, @@ -212,5 +212,5 @@ frame_reference_add(pfn); } - + } } @@ -267,11 +267,11 @@ if (!as_area_check_access(area, access)) return AS_PF_FAULT; - + if (upage < ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) return AS_PF_FAULT; - + if (upage >= entry->p_vaddr + entry->p_memsz) return AS_PF_FAULT; - + i = (upage - ALIGN_DOWN(entry->p_vaddr, PAGE_SIZE)) >> PAGE_WIDTH; base = (uintptr_t) @@ -288,5 +288,5 @@ * The address space area is shared. */ - + frame = (uintptr_t) btree_search(&area->sh_info->pagemap, upage - area->base, &leaf); Index: kernel/generic/src/mm/backend_phys.c =================================================================== --- kernel/generic/src/mm/backend_phys.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/backend_phys.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ .page_fault = phys_page_fault, .frame_free = NULL, - + .create_shared_data = phys_create_shared_data, .destroy_shared_data = phys_destroy_shared_data @@ -145,5 +145,5 @@ page_mapping_insert(AS, upage, base + (upage - area->base), as_area_get_flags(area)); - + if (!used_space_insert(area, upage, 1)) panic("Cannot insert used space."); Index: kernel/generic/src/mm/backend_user.c =================================================================== --- kernel/generic/src/mm/backend_user.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/backend_user.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -172,5 +172,5 @@ /* Nothing to do */ } - + } Index: kernel/generic/src/mm/frame.c =================================================================== --- kernel/generic/src/mm/frame.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/frame.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -108,5 +108,5 @@ return (size_t) -1; } - + size_t i; for (i = 0; i < zones.count; i++) { @@ -114,5 +114,5 @@ if (overlaps(zones.info[i].base, zones.info[i].count, base, count)) { - + /* * If the overlaping zones are of the same type @@ -121,5 +121,5 @@ * */ - + if ((zones.info[i].flags != flags) || (!iswithin(zones.info[i].base, zones.info[i].count, @@ -132,5 +132,5 @@ (void *) PFN2ADDR(zones.info[i].count)); } - + return (size_t) -1; } @@ -138,11 +138,11 @@ break; } - + /* Move other zones up */ for (size_t j = zones.count; j > i; j--) zones.info[j] = zones.info[j - 1]; - + zones.count++; - + return i; } @@ -163,5 +163,5 @@ for (i = 0; i < zones.count; i++) total += zones.info[i].free_count; - + return total; } @@ -195,5 +195,5 @@ if (hint >= zones.count) hint = 0; - + size_t i = hint; do { @@ -201,11 +201,11 @@ && (zones.info[i].base + zones.info[i].count >= frame + count)) return i; - + i++; if (i >= zones.count) i = 0; - + } while (i != hint); - + return (size_t) -1; } @@ -219,5 +219,5 @@ * the bitmap if the last argument is NULL. */ - + return ((zone->flags & ZONE_AVAILABLE) && bitmap_allocate_range(&zone->bitmap, count, zone->base, @@ -245,14 +245,14 @@ for (size_t pos = 0; pos < zones.count; pos++) { size_t i = (pos + hint) % zones.count; - + /* Check whether the zone meets the search criteria. */ if (!ZONE_FLAGS_MATCH(zones.info[i].flags, flags)) continue; - + /* Check if the zone can satisfy the allocation request. */ if (zone_can_alloc(&zones.info[i], count, constraint)) return i; } - + return (size_t) -1; } @@ -291,18 +291,18 @@ for (size_t pos = 0; pos < zones.count; pos++) { size_t i = (pos + hint) % zones.count; - + /* Skip zones containing only high-priority memory. */ if (is_high_priority(zones.info[i].base, zones.info[i].count)) continue; - + /* Check whether the zone meets the search criteria. */ if (!ZONE_FLAGS_MATCH(zones.info[i].flags, flags)) continue; - + /* Check if the zone can satisfy the allocation request. */ if (zone_can_alloc(&zones.info[i], count, constraint)) return i; } - + return (size_t) -1; } @@ -328,14 +328,14 @@ if (hint >= zones.count) hint = 0; - + /* * Prefer zones with low-priority memory over * zones with high-priority memory. */ - + size_t znum = find_free_zone_lowprio(count, flags, constraint, hint); if (znum != (size_t) -1) return znum; - + /* Take all zones into account */ return find_free_zone_all(count, flags, constraint, hint); @@ -350,5 +350,5 @@ { assert(index < zone->count); - + return &zone->frames[index]; } @@ -371,25 +371,25 @@ { assert(zone->flags & ZONE_AVAILABLE); - + /* Allocate frames from zone */ size_t index = (size_t) -1; int avail = bitmap_allocate_range(&zone->bitmap, count, zone->base, FRAME_LOWPRIO, constraint, &index); - + assert(avail); assert(index != (size_t) -1); - + /* Update frame reference count */ for (size_t i = 0; i < count; i++) { frame_t *frame = zone_get_frame(zone, index + i); - + assert(frame->refcount == 0); frame->refcount = 1; } - + /* Update zone information. */ zone->free_count -= count; zone->busy_count += count; - + return index; } @@ -408,19 +408,19 @@ { assert(zone->flags & ZONE_AVAILABLE); - + frame_t *frame = zone_get_frame(zone, index); - + assert(frame->refcount > 0); - + if (!--frame->refcount) { bitmap_set(&zone->bitmap, index, 0); - + /* Update zone information. */ zone->free_count++; zone->busy_count--; - + return 1; } - + return 0; } @@ -430,12 +430,12 @@ { assert(zone->flags & ZONE_AVAILABLE); - + frame_t *frame = zone_get_frame(zone, index); if (frame->refcount > 0) return; - + frame->refcount = 1; bitmap_set_range(&zone->bitmap, index, 1); - + zone->free_count--; reserve_force_alloc(1); @@ -462,22 +462,22 @@ assert(!overlaps(zones.info[z1].base, zones.info[z1].count, zones.info[z2].base, zones.info[z2].count)); - + /* Difference between zone bases */ pfn_t base_diff = zones.info[z2].base - zones.info[z1].base; - + zones.info[z1].count = base_diff + zones.info[z2].count; zones.info[z1].free_count += zones.info[z2].free_count; zones.info[z1].busy_count += zones.info[z2].busy_count; - + bitmap_initialize(&zones.info[z1].bitmap, zones.info[z1].count, confdata + (sizeof(frame_t) * zones.info[z1].count)); bitmap_clear_range(&zones.info[z1].bitmap, 0, zones.info[z1].count); - + zones.info[z1].frames = (frame_t *) confdata; - + /* * Copy frames and bits from both zones to preserve parents, etc. */ - + for (size_t i = 0; i < old_z1->count; i++) { bitmap_set(&zones.info[z1].bitmap, i, @@ -485,5 +485,5 @@ zones.info[z1].frames[i] = old_z1->frames[i]; } - + for (size_t i = 0; i < zones.info[z2].count; i++) { bitmap_set(&zones.info[z1].bitmap, base_diff + i, @@ -510,11 +510,11 @@ { assert(zones.info[znum].flags & ZONE_AVAILABLE); - + size_t cframes = SIZE2FRAMES(zone_conf_size(count)); - + if ((pfn < zones.info[znum].base) || (pfn >= zones.info[znum].base + zones.info[znum].count)) return; - + for (size_t i = 0; i < cframes; i++) (void) zone_frame_free(&zones.info[znum], @@ -536,7 +536,7 @@ { irq_spinlock_lock(&zones.lock, true); - + bool ret = true; - + /* * We can join only 2 zones with none existing inbetween, @@ -549,9 +549,9 @@ goto errout; } - + pfn_t cframes = SIZE2FRAMES(zone_conf_size( zones.info[z2].base - zones.info[z1].base + zones.info[z2].count)); - + /* Allocate merged zone data inside one of the zones */ pfn_t pfn; @@ -566,14 +566,14 @@ goto errout; } - + /* Preserve original data from z1 */ zone_t old_z1 = zones.info[z1]; - + /* Do zone merging */ zone_merge_internal(z1, z2, &old_z1, (void *) PA2KA(PFN2ADDR(pfn))); - + /* Subtract zone information from busy frames */ zones.info[z1].busy_count -= cframes; - + /* Free old zone information */ return_config_frames(z1, @@ -582,14 +582,14 @@ ADDR2PFN(KA2PA((uintptr_t) zones.info[z2].frames)), zones.info[z2].count); - + /* Move zones down */ for (size_t i = z2 + 1; i < zones.count; i++) zones.info[i - 1] = zones.info[i]; - + zones.count--; - + errout: irq_spinlock_unlock(&zones.lock, true); - + return ret; } @@ -605,5 +605,5 @@ { size_t i = 1; - + while (i < zones.count) { if (!zone_merge(i - 1, i)) @@ -631,5 +631,5 @@ zone->free_count = count; zone->busy_count = 0; - + if (flags & ZONE_AVAILABLE) { /* @@ -637,15 +637,15 @@ * frame_t structures in the configuration space). */ - + bitmap_initialize(&zone->bitmap, count, confdata + (sizeof(frame_t) * count)); bitmap_clear_range(&zone->bitmap, 0, count); - + /* * Initialize the array of frame_t structures. */ - + zone->frames = (frame_t *) confdata; - + for (size_t i = 0; i < count; i++) frame_initialize(&zone->frames[i]); @@ -672,5 +672,5 @@ { size_t frames = SIZE2FRAMES(zone_conf_size(count)); - + return ADDR2PFN((uintptr_t) frame_alloc(frames, FRAME_LOWMEM | FRAME_ATOMIC, 0)); @@ -697,5 +697,5 @@ { irq_spinlock_lock(&zones.lock, true); - + if (flags & ZONE_AVAILABLE) { /* Create available zone */ /* @@ -705,8 +705,8 @@ */ assert(confframe != ADDR2PFN((uintptr_t ) NULL)); - + /* Update the known end of physical memory. */ config.physmem_end = max(config.physmem_end, PFN2ADDR(start + count)); - + /* * If confframe is supposed to be inside our zone, then make sure @@ -714,5 +714,5 @@ */ size_t confcount = SIZE2FRAMES(zone_conf_size(count)); - + if ((confframe >= start) && (confframe < start + count)) { for (; confframe < start + count; confframe++) { @@ -721,9 +721,9 @@ KA2PA(config.base), config.kernel_size)) continue; - + if (overlaps(addr, PFN2ADDR(confcount), KA2PA(config.stack_base), config.stack_size)) continue; - + bool overlap = false; for (size_t i = 0; i < init.cnt; i++) { @@ -735,15 +735,15 @@ } } - + if (overlap) continue; - + break; } - + if (confframe >= start + count) panic("Cannot find configuration data for zone."); } - + size_t znum = zones_insert_zone(start, count, flags); if (znum == (size_t) -1) { @@ -751,8 +751,8 @@ return (size_t) -1; } - + void *confdata = (void *) PA2KA(PFN2ADDR(confframe)); zone_construct(&zones.info[znum], start, count, flags, confdata); - + /* If confdata in zone, mark as unavailable */ if ((confframe >= start) && (confframe < start + count)) { @@ -761,10 +761,10 @@ i - zones.info[znum].base); } - + irq_spinlock_unlock(&zones.lock, true); - + return znum; } - + /* Non-available zone */ size_t znum = zones_insert_zone(start, count, flags); @@ -773,9 +773,9 @@ return (size_t) -1; } - + zone_construct(&zones.info[znum], start, count, flags, NULL); - + irq_spinlock_unlock(&zones.lock, true); - + return znum; } @@ -789,12 +789,12 @@ { irq_spinlock_lock(&zones.lock, true); - + size_t znum = find_zone(pfn, 1, hint); - + assert(znum != (size_t) -1); - + zone_get_frame(&zones.info[znum], pfn - zones.info[znum].base)->parent = data; - + irq_spinlock_unlock(&zones.lock, true); } @@ -803,14 +803,14 @@ { irq_spinlock_lock(&zones.lock, true); - + size_t znum = find_zone(pfn, 1, hint); - + assert(znum != (size_t) -1); - + void *res = zone_get_frame(&zones.info[znum], pfn - zones.info[znum].base)->parent; - + irq_spinlock_unlock(&zones.lock, true); - + return res; } @@ -831,8 +831,8 @@ { assert(count > 0); - + size_t hint = pzone ? (*pzone) : 0; pfn_t frame_constraint = ADDR2PFN(constraint); - + /* * If not told otherwise, we must first reserve the memory. @@ -840,8 +840,8 @@ if (!(flags & FRAME_NO_RESERVE)) reserve_force_alloc(count); - + loop: irq_spinlock_lock(&zones.lock, true); - + /* * First, find suitable frame zone. @@ -849,5 +849,5 @@ size_t znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags), frame_constraint, hint); - + /* * If no memory, reclaim some slab memory, @@ -858,14 +858,14 @@ size_t freed = slab_reclaim(0); irq_spinlock_lock(&zones.lock, true); - + if (freed > 0) znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags), frame_constraint, hint); - + if (znum == (size_t) -1) { irq_spinlock_unlock(&zones.lock, true); freed = slab_reclaim(SLAB_RECLAIM_ALL); irq_spinlock_lock(&zones.lock, true); - + if (freed > 0) znum = find_free_zone(count, FRAME_TO_ZONE_FLAGS(flags), @@ -873,27 +873,27 @@ } } - + if (znum == (size_t) -1) { if (flags & FRAME_ATOMIC) { irq_spinlock_unlock(&zones.lock, true); - + if (!(flags & FRAME_NO_RESERVE)) reserve_free(count); - + return 0; } - + size_t avail = frame_total_free_get_internal(); - + irq_spinlock_unlock(&zones.lock, true); - + if (!THREAD) panic("Cannot wait for %zu frames to become available " "(%zu available).", count, avail); - + /* * Sleep until some frames are available again. */ - + #ifdef CONFIG_DEBUG log(LF_OTHER, LVL_DEBUG, @@ -901,5 +901,5 @@ "%zu available.", THREAD->tid, count, avail); #endif - + /* * Since the mem_avail_mtx is an active mutex, we need to @@ -908,34 +908,34 @@ ipl_t ipl = interrupts_disable(); mutex_lock(&mem_avail_mtx); - + if (mem_avail_req > 0) mem_avail_req = min(mem_avail_req, count); else mem_avail_req = count; - + size_t gen = mem_avail_gen; - + while (gen == mem_avail_gen) condvar_wait(&mem_avail_cv, &mem_avail_mtx); - + mutex_unlock(&mem_avail_mtx); interrupts_restore(ipl); - + #ifdef CONFIG_DEBUG log(LF_OTHER, LVL_DEBUG, "Thread %" PRIu64 " woken up.", THREAD->tid); #endif - + goto loop; } - + pfn_t pfn = zone_frame_alloc(&zones.info[znum], count, frame_constraint) + zones.info[znum].base; - + irq_spinlock_unlock(&zones.lock, true); - + if (pzone) *pzone = znum; - + return PFN2ADDR(pfn); } @@ -960,7 +960,7 @@ { size_t freed = 0; - + irq_spinlock_lock(&zones.lock, true); - + for (size_t i = 0; i < count; i++) { /* @@ -969,13 +969,13 @@ pfn_t pfn = ADDR2PFN(start) + i; size_t znum = find_zone(pfn, 1, 0); - + assert(znum != (size_t) -1); - + freed += zone_frame_free(&zones.info[znum], pfn - zones.info[znum].base); } - + irq_spinlock_unlock(&zones.lock, true); - + /* * Signal that some memory has been freed. @@ -984,19 +984,19 @@ * with TLB shootdown. */ - + ipl_t ipl = interrupts_disable(); mutex_lock(&mem_avail_mtx); - + if (mem_avail_req > 0) mem_avail_req -= min(mem_avail_req, freed); - + if (mem_avail_req == 0) { mem_avail_gen++; condvar_broadcast(&mem_avail_cv); } - + mutex_unlock(&mem_avail_mtx); interrupts_restore(ipl); - + if (!(flags & FRAME_NO_RESERVE)) reserve_free(freed); @@ -1024,14 +1024,14 @@ { irq_spinlock_lock(&zones.lock, true); - + /* * First, find host frame zone for addr. */ size_t znum = find_zone(pfn, 1, 0); - + assert(znum != (size_t) -1); - + zones.info[znum].frames[pfn - zones.info[znum].base].refcount++; - + irq_spinlock_unlock(&zones.lock, true); } @@ -1043,15 +1043,15 @@ { irq_spinlock_lock(&zones.lock, true); - + for (size_t i = 0; i < count; i++) { size_t znum = find_zone(start + i, 1, 0); - + if (znum == (size_t) -1) /* PFN not found */ continue; - + zone_mark_unavailable(&zones.info[znum], start + i - zones.info[znum].base); } - + irq_spinlock_unlock(&zones.lock, true); } @@ -1068,8 +1068,8 @@ condvar_initialize(&mem_avail_cv); } - + /* Tell the architecture to create some memory */ frame_low_arch_init(); - + if (config.cpu_active == 1) { frame_mark_unavailable(ADDR2PFN(KA2PA(config.base)), @@ -1077,13 +1077,13 @@ frame_mark_unavailable(ADDR2PFN(KA2PA(config.stack_base)), SIZE2FRAMES(config.stack_size)); - + for (size_t i = 0; i < init.cnt; i++) frame_mark_unavailable(ADDR2PFN(init.tasks[i].paddr), SIZE2FRAMES(init.tasks[i].size)); - + if (ballocs.size) frame_mark_unavailable(ADDR2PFN(KA2PA(ballocs.base)), SIZE2FRAMES(ballocs.size)); - + /* * Blacklist first frame, as allocating NULL would @@ -1092,5 +1092,5 @@ frame_mark_unavailable(0, 1); } - + frame_high_arch_init(); } @@ -1113,9 +1113,9 @@ { uintptr_t limit = KA2PA(config.identity_base) + config.identity_size; - + if (low) { if (*basep > limit) return false; - + if (*basep + *sizep > limit) *sizep = limit - *basep; @@ -1123,5 +1123,5 @@ if (*basep + *sizep <= limit) return false; - + if (*basep <= limit) { *sizep -= limit - *basep; @@ -1129,5 +1129,5 @@ } } - + return true; } @@ -1139,12 +1139,12 @@ { irq_spinlock_lock(&zones.lock, true); - + uint64_t total = 0; - + for (size_t i = 0; i < zones.count; i++) total += (uint64_t) FRAMES2SIZE(zones.info[i].count); - + irq_spinlock_unlock(&zones.lock, true); - + return total; } @@ -1157,15 +1157,15 @@ assert(busy != NULL); assert(free != NULL); - + irq_spinlock_lock(&zones.lock, true); - + *total = 0; *unavail = 0; *busy = 0; *free = 0; - + for (size_t i = 0; i < zones.count; i++) { *total += (uint64_t) FRAMES2SIZE(zones.info[i].count); - + if (zones.info[i].flags & ZONE_AVAILABLE) { *busy += (uint64_t) FRAMES2SIZE(zones.info[i].busy_count); @@ -1174,5 +1174,5 @@ *unavail += (uint64_t) FRAMES2SIZE(zones.info[i].count); } - + irq_spinlock_unlock(&zones.lock, true); } @@ -1190,5 +1190,5 @@ printf("[nr] [base address ] [frames ] [flags ] [free frames ] [busy frames ]\n"); #endif - + /* * Because printing may require allocation of memory, we may not hold @@ -1201,17 +1201,17 @@ * the listing). */ - + size_t free_lowmem = 0; size_t free_highmem = 0; size_t free_highprio = 0; - + for (size_t i = 0;; i++) { irq_spinlock_lock(&zones.lock, true); - + if (i >= zones.count) { irq_spinlock_unlock(&zones.lock, true); break; } - + pfn_t fbase = zones.info[i].base; uintptr_t base = PFN2ADDR(fbase); @@ -1220,17 +1220,17 @@ size_t free_count = zones.info[i].free_count; size_t busy_count = zones.info[i].busy_count; - + bool available = ((flags & ZONE_AVAILABLE) != 0); bool lowmem = ((flags & ZONE_LOWMEM) != 0); bool highmem = ((flags & ZONE_HIGHMEM) != 0); bool highprio = is_high_priority(fbase, count); - + if (available) { if (lowmem) free_lowmem += free_count; - + if (highmem) free_highmem += free_count; - + if (highprio) { free_highprio += free_count; @@ -1241,5 +1241,5 @@ * statistics. */ - + for (size_t index = 0; index < count; index++) { if (is_high_priority(fbase + index, 0)) { @@ -1251,17 +1251,17 @@ } } - + irq_spinlock_unlock(&zones.lock, true); - + printf("%-4zu", i); - + #ifdef __32_BITS__ printf(" %p", (void *) base); #endif - + #ifdef __64_BITS__ printf(" %p", (void *) base); #endif - + printf(" %12zu %c%c%c%c%c ", count, available ? 'A' : '-', @@ -1270,27 +1270,27 @@ (flags & ZONE_LOWMEM) ? 'L' : '-', (flags & ZONE_HIGHMEM) ? 'H' : '-'); - + if (available) printf("%14zu %14zu", free_count, busy_count); - + printf("\n"); } - + printf("\n"); - + uint64_t size; const char *size_suffix; - + bin_order_suffix(FRAMES2SIZE(free_lowmem), &size, &size_suffix, false); printf("Available low memory: %zu frames (%" PRIu64 " %s)\n", free_lowmem, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_highmem), &size, &size_suffix, false); printf("Available high memory: %zu frames (%" PRIu64 " %s)\n", free_highmem, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_highprio), &size, &size_suffix, false); @@ -1308,5 +1308,5 @@ irq_spinlock_lock(&zones.lock, true); size_t znum = (size_t) -1; - + for (size_t i = 0; i < zones.count; i++) { if ((i == num) || (PFN2ADDR(zones.info[i].base) == num)) { @@ -1315,5 +1315,5 @@ } } - + if (znum == (size_t) -1) { irq_spinlock_unlock(&zones.lock, true); @@ -1321,9 +1321,9 @@ return; } - + size_t free_lowmem = 0; size_t free_highmem = 0; size_t free_highprio = 0; - + pfn_t fbase = zones.info[znum].base; uintptr_t base = PFN2ADDR(fbase); @@ -1332,17 +1332,17 @@ size_t free_count = zones.info[znum].free_count; size_t busy_count = zones.info[znum].busy_count; - + bool available = ((flags & ZONE_AVAILABLE) != 0); bool lowmem = ((flags & ZONE_LOWMEM) != 0); bool highmem = ((flags & ZONE_HIGHMEM) != 0); bool highprio = is_high_priority(fbase, count); - + if (available) { if (lowmem) free_lowmem = free_count; - + if (highmem) free_highmem = free_count; - + if (highprio) { free_highprio = free_count; @@ -1353,5 +1353,5 @@ * statistics. */ - + for (size_t index = 0; index < count; index++) { if (is_high_priority(fbase + index, 0)) { @@ -1363,12 +1363,12 @@ } } - + irq_spinlock_unlock(&zones.lock, true); - + uint64_t size; const char *size_suffix; - + bin_order_suffix(FRAMES2SIZE(count), &size, &size_suffix, false); - + printf("Zone number: %zu\n", znum); printf("Zone base address: %p\n", (void *) base); @@ -1381,5 +1381,5 @@ (flags & ZONE_LOWMEM) ? 'L' : '-', (flags & ZONE_HIGHMEM) ? 'H' : '-'); - + if (available) { bin_order_suffix(FRAMES2SIZE(busy_count), &size, &size_suffix, @@ -1387,20 +1387,20 @@ printf("Allocated space: %zu frames (%" PRIu64 " %s)\n", busy_count, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_count), &size, &size_suffix, false); printf("Available space: %zu frames (%" PRIu64 " %s)\n", free_count, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_lowmem), &size, &size_suffix, false); printf("Available low memory: %zu frames (%" PRIu64 " %s)\n", free_lowmem, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_highmem), &size, &size_suffix, false); printf("Available high memory: %zu frames (%" PRIu64 " %s)\n", free_highmem, size, size_suffix); - + bin_order_suffix(FRAMES2SIZE(free_highprio), &size, &size_suffix, false); Index: kernel/generic/src/mm/km.c =================================================================== --- kernel/generic/src/mm/km.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/km.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -149,5 +149,5 @@ } page_table_unlock(AS_KERNEL, true); - + return vaddr; } @@ -247,5 +247,5 @@ assert(framep); assert(!(flags & ~(FRAME_NO_RESERVE | FRAME_ATOMIC))); - + /* * Allocate a frame, preferably from high memory. @@ -267,8 +267,8 @@ if (!frame) return (uintptr_t) NULL; - + page = PA2KA(frame); } - + *framep = frame; return page; Index: kernel/generic/src/mm/page.c =================================================================== --- kernel/generic/src/mm/page.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/page.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -99,5 +99,5 @@ { assert(page_table_locked(as)); - + assert(page_mapping_operations); assert(page_mapping_operations->mapping_insert); @@ -105,5 +105,5 @@ page_mapping_operations->mapping_insert(as, ALIGN_DOWN(page, PAGE_SIZE), ALIGN_DOWN(frame, FRAME_SIZE), flags); - + /* Repel prefetched accesses to the old mapping. */ memory_barrier(); @@ -123,11 +123,11 @@ { assert(page_table_locked(as)); - + assert(page_mapping_operations); assert(page_mapping_operations->mapping_remove); - + page_mapping_operations->mapping_remove(as, ALIGN_DOWN(page, PAGE_SIZE)); - + /* Repel prefetched accesses to the old mapping. */ memory_barrier(); @@ -148,8 +148,8 @@ { assert(nolock || page_table_locked(as)); - + assert(page_mapping_operations); assert(page_mapping_operations->mapping_find); - + return page_mapping_operations->mapping_find(as, ALIGN_DOWN(page, PAGE_SIZE), nolock, pte); @@ -169,8 +169,8 @@ { assert(nolock || page_table_locked(as)); - + assert(page_mapping_operations); assert(page_mapping_operations->mapping_find); - + page_mapping_operations->mapping_update(as, ALIGN_DOWN(page, PAGE_SIZE), nolock, pte); @@ -186,5 +186,5 @@ assert(page_mapping_operations); assert(page_mapping_operations->mapping_make_global); - + return page_mapping_operations->mapping_make_global(base, size); } @@ -193,5 +193,5 @@ { page_table_lock(AS, true); - + pte_t pte; bool found = page_mapping_find(AS, virt, false, &pte); @@ -200,10 +200,10 @@ return ENOENT; } - + *phys = PTE_GET_FRAME(&pte) + (virt - ALIGN_DOWN(virt, PAGE_SIZE)); - + page_table_unlock(AS, true); - + return EOK; } @@ -221,5 +221,5 @@ if (rc != EOK) return rc; - + rc = copy_to_uspace(phys_ptr, &phys, sizeof(phys)); return (sys_errno_t) rc; Index: kernel/generic/src/mm/slab.c =================================================================== --- kernel/generic/src/mm/slab.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/slab.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -186,15 +186,15 @@ { size_t zone = 0; - + uintptr_t data_phys = frame_alloc_generic(cache->frames, flags, 0, &zone); if (!data_phys) return NULL; - + void *data = (void *) PA2KA(data_phys); - + slab_t *slab; size_t fsize; - + if (!(cache->flags & SLAB_CACHE_SLINSIDE)) { slab = slab_alloc(slab_extern_cache, flags); @@ -207,18 +207,18 @@ slab = data + fsize - sizeof(*slab); } - + /* Fill in slab structures */ size_t i; for (i = 0; i < cache->frames; i++) frame_set_parent(ADDR2PFN(KA2PA(data)) + i, slab, zone); - + slab->start = data; slab->available = cache->objects; slab->nextavail = 0; slab->cache = cache; - + for (i = 0; i < cache->objects; i++) *((size_t *) (slab->start + i * cache->size)) = i + 1; - + atomic_inc(&cache->allocated_slabs); return slab; @@ -235,7 +235,7 @@ if (!(cache->flags & SLAB_CACHE_SLINSIDE)) slab_free(slab_extern_cache, slab); - + atomic_dec(&cache->allocated_slabs); - + return cache->frames; } @@ -263,19 +263,19 @@ if (!slab) slab = obj2slab(obj); - + assert(slab->cache == cache); - + size_t freed = 0; - + if (cache->destructor) freed = cache->destructor(obj); - + irq_spinlock_lock(&cache->slablock, true); assert(slab->available < cache->objects); - + *((size_t *) obj) = slab->nextavail; slab->nextavail = (obj - slab->start) / cache->size; slab->available++; - + /* Move it to correct list */ if (slab->available == cache->objects) { @@ -283,5 +283,5 @@ list_remove(&slab->link); irq_spinlock_unlock(&cache->slablock, true); - + return freed + slab_space_free(cache, slab); } else if (slab->available == 1) { @@ -290,5 +290,5 @@ list_prepend(&slab->link, &cache->partial_slabs); } - + irq_spinlock_unlock(&cache->slablock, true); return freed; @@ -303,7 +303,7 @@ { irq_spinlock_lock(&cache->slablock, true); - + slab_t *slab; - + if (list_empty(&cache->partial_slabs)) { /* @@ -319,5 +319,5 @@ if (!slab) return NULL; - + irq_spinlock_lock(&cache->slablock, true); } else { @@ -326,16 +326,16 @@ list_remove(&slab->link); } - + void *obj = slab->start + slab->nextavail * cache->size; slab->nextavail = *((size_t *) obj); slab->available--; - + if (!slab->available) list_prepend(&slab->link, &cache->full_slabs); else list_prepend(&slab->link, &cache->partial_slabs); - + irq_spinlock_unlock(&cache->slablock, true); - + if ((cache->constructor) && (cache->constructor(obj, flags) != EOK)) { /* Bad, bad, construction failed */ @@ -343,5 +343,5 @@ return NULL; } - + return obj; } @@ -361,5 +361,5 @@ slab_magazine_t *mag = NULL; link_t *cur; - + irq_spinlock_lock(&cache->maglock, true); if (!list_empty(&cache->magazines)) { @@ -368,5 +368,5 @@ else cur = list_last(&cache->magazines); - + mag = list_get_instance(cur, slab_magazine_t, link); list_remove(&mag->link); @@ -385,8 +385,8 @@ { irq_spinlock_lock(&cache->maglock, true); - + list_prepend(&mag->link, &cache->magazines); atomic_inc(&cache->magazine_counter); - + irq_spinlock_unlock(&cache->maglock, true); } @@ -402,12 +402,12 @@ size_t i; size_t frames = 0; - + for (i = 0; i < mag->busy; i++) { frames += slab_obj_destroy(cache, mag->objs[i], NULL); atomic_dec(&cache->cached_objs); } - + slab_free(&mag_cache, mag); - + return frames; } @@ -420,11 +420,11 @@ slab_magazine_t *cmag = cache->mag_cache[CPU->id].current; slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last; - + assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); - + if (cmag) { /* First try local CPU magazines */ if (cmag->busy) return cmag; - + if ((lastmag) && (lastmag->busy)) { cache->mag_cache[CPU->id].current = lastmag; @@ -433,16 +433,16 @@ } } - + /* Local magazines are empty, import one from magazine list */ slab_magazine_t *newmag = get_mag_from_cache(cache, 1); if (!newmag) return NULL; - + if (lastmag) magazine_destroy(cache, lastmag); - + cache->mag_cache[CPU->id].last = cmag; cache->mag_cache[CPU->id].current = newmag; - + return newmag; } @@ -457,7 +457,7 @@ if (!CPU) return NULL; - + irq_spinlock_lock(&cache->mag_cache[CPU->id].lock, true); - + slab_magazine_t *mag = get_full_current_mag(cache); if (!mag) { @@ -465,10 +465,10 @@ return NULL; } - + void *obj = mag->objs[--mag->busy]; irq_spinlock_unlock(&cache->mag_cache[CPU->id].lock, true); - + atomic_dec(&cache->cached_objs); - + return obj; } @@ -487,11 +487,11 @@ slab_magazine_t *cmag = cache->mag_cache[CPU->id].current; slab_magazine_t *lastmag = cache->mag_cache[CPU->id].last; - + assert(irq_spinlock_locked(&cache->mag_cache[CPU->id].lock)); - + if (cmag) { if (cmag->busy < cmag->size) return cmag; - + if ((lastmag) && (lastmag->busy < lastmag->size)) { cache->mag_cache[CPU->id].last = cmag; @@ -500,7 +500,7 @@ } } - + /* current | last are full | nonexistent, allocate new */ - + /* * We do not want to sleep just because of caching, @@ -513,16 +513,16 @@ if (!newmag) return NULL; - + newmag->size = SLAB_MAG_SIZE; newmag->busy = 0; - + /* Flush last to magazine list */ if (lastmag) put_mag_to_cache(cache, lastmag); - + /* Move current as last, save new as current */ cache->mag_cache[CPU->id].last = cmag; cache->mag_cache[CPU->id].current = newmag; - + return newmag; } @@ -537,7 +537,7 @@ if (!CPU) return -1; - + irq_spinlock_lock(&cache->mag_cache[CPU->id].lock, true); - + slab_magazine_t *mag = make_empty_current_mag(cache); if (!mag) { @@ -545,11 +545,11 @@ return -1; } - + mag->objs[mag->busy++] = obj; - + irq_spinlock_unlock(&cache->mag_cache[CPU->id].lock, true); - + atomic_inc(&cache->cached_objs); - + return 0; } @@ -578,8 +578,8 @@ size_t objects = comp_objects(cache); size_t ssize = FRAMES2SIZE(cache->frames); - + if (cache->flags & SLAB_CACHE_SLINSIDE) ssize -= sizeof(slab_t); - + return ssize - objects * cache->size; } @@ -591,9 +591,9 @@ { assert(_slab_initialized >= 2); - + cache->mag_cache = slab_alloc(&slab_mag_cache, FRAME_ATOMIC); if (!cache->mag_cache) return false; - + size_t i; for (i = 0; i < config.cpu_count; i++) { @@ -602,5 +602,5 @@ "slab.cache.mag_cache[].lock"); } - + return true; } @@ -614,44 +614,44 @@ { assert(size > 0); - + memsetb(cache, sizeof(*cache), 0); cache->name = name; - + if (align < sizeof(sysarg_t)) align = sizeof(sysarg_t); - + size = ALIGN_UP(size, align); - + cache->size = size; cache->constructor = constructor; cache->destructor = destructor; cache->flags = flags; - + list_initialize(&cache->full_slabs); list_initialize(&cache->partial_slabs); list_initialize(&cache->magazines); - + irq_spinlock_initialize(&cache->slablock, "slab.cache.slablock"); irq_spinlock_initialize(&cache->maglock, "slab.cache.maglock"); - + if (!(cache->flags & SLAB_CACHE_NOMAGAZINE)) (void) make_magcache(cache); - + /* Compute slab sizes, object counts in slabs etc. */ if (cache->size < SLAB_INSIDE_SIZE) cache->flags |= SLAB_CACHE_SLINSIDE; - + /* Minimum slab frames */ cache->frames = SIZE2FRAMES(cache->size); - + while (badness(cache) > SLAB_MAX_BADNESS(cache)) cache->frames <<= 1; - + cache->objects = comp_objects(cache); - + /* If info fits in, put it inside */ if (badness(cache) > sizeof(slab_t)) cache->flags |= SLAB_CACHE_SLINSIDE; - + /* Add cache to cache list */ irq_spinlock_lock(&slab_cache_lock, true); @@ -670,5 +670,5 @@ _slab_cache_create(cache, name, size, align, constructor, destructor, flags); - + return cache; } @@ -685,5 +685,5 @@ if (cache->flags & SLAB_CACHE_NOMAGAZINE) return 0; /* Nothing to do */ - + /* * We count up to original magazine count to avoid @@ -691,8 +691,8 @@ */ atomic_count_t magcount = atomic_get(&cache->magazine_counter); - + slab_magazine_t *mag; size_t frames = 0; - + while ((magcount--) && (mag = get_mag_from_cache(cache, 0))) { frames += magazine_destroy(cache, mag); @@ -700,5 +700,5 @@ break; } - + if (flags & SLAB_RECLAIM_ALL) { /* Free cpu-bound magazines */ @@ -707,19 +707,19 @@ for (i = 0; i < config.cpu_count; i++) { irq_spinlock_lock(&cache->mag_cache[i].lock, true); - + mag = cache->mag_cache[i].current; if (mag) frames += magazine_destroy(cache, mag); cache->mag_cache[i].current = NULL; - + mag = cache->mag_cache[i].last; if (mag) frames += magazine_destroy(cache, mag); cache->mag_cache[i].last = NULL; - + irq_spinlock_unlock(&cache->mag_cache[i].lock, true); } } - + return frames; } @@ -731,9 +731,9 @@ { ipl_t ipl = interrupts_disable(); - + if ((cache->flags & SLAB_CACHE_NOMAGAZINE) || (magazine_obj_put(cache, obj))) slab_obj_destroy(cache, obj, slab); - + interrupts_restore(ipl); atomic_dec(&cache->allocated_objs); @@ -753,5 +753,5 @@ list_remove(&cache->link); irq_spinlock_unlock(&slab_cache_lock, true); - + /* * Do not lock anything, we assume the software is correct and @@ -759,18 +759,18 @@ * */ - + /* Destroy all magazines */ _slab_reclaim(cache, SLAB_RECLAIM_ALL); - + /* All slabs must be empty */ if ((!list_empty(&cache->full_slabs)) || (!list_empty(&cache->partial_slabs))) panic("Destroying cache that is not empty."); - + if (!(cache->flags & SLAB_CACHE_NOMAGAZINE)) { slab_t *mag_slab = obj2slab(cache->mag_cache); _slab_free(mag_slab->cache, cache->mag_cache, mag_slab); } - + slab_free(&slab_cache_cache, cache); } @@ -783,18 +783,18 @@ /* Disable interrupts to avoid deadlocks with interrupt handlers */ ipl_t ipl = interrupts_disable(); - + void *result = NULL; - + if (!(cache->flags & SLAB_CACHE_NOMAGAZINE)) result = magazine_obj_get(cache); - + if (!result) result = slab_obj_create(cache, flags); - + interrupts_restore(ipl); - + if (result) atomic_inc(&cache->allocated_objs); - + return result; } @@ -812,12 +812,12 @@ { irq_spinlock_lock(&slab_cache_lock, true); - + size_t frames = 0; list_foreach(slab_cache_list, link, slab_cache_t, cache) { frames += _slab_reclaim(cache, flags); } - + irq_spinlock_unlock(&slab_cache_lock, true); - + return frames; } @@ -828,5 +828,5 @@ printf("[cache name ] [size ] [pages ] [obj/pg] [slabs ]" " [cached] [alloc ] [ctl]\n"); - + size_t skip = 0; while (true) { @@ -853,7 +853,7 @@ * statistics. */ - + irq_spinlock_lock(&slab_cache_lock, true); - + link_t *cur; size_t i; @@ -861,14 +861,14 @@ (i < skip) && (cur != &slab_cache_list.head); i++, cur = cur->next); - + if (cur == &slab_cache_list.head) { irq_spinlock_unlock(&slab_cache_lock, true); break; } - + skip++; - + slab_cache_t *cache = list_get_instance(cur, slab_cache_t, link); - + const char *name = cache->name; size_t frames = cache->frames; @@ -879,7 +879,7 @@ long allocated_objs = atomic_get(&cache->allocated_objs); unsigned int flags = cache->flags; - + irq_spinlock_unlock(&slab_cache_lock, true); - + printf("%-18s %8zu %8zu %8zu %8ld %8ld %8ld %-5s\n", name, size, frames, objects, allocated_slabs, @@ -896,18 +896,18 @@ sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE); - + /* Initialize slab_cache cache */ _slab_cache_create(&slab_cache_cache, "slab_cache_cache", sizeof(slab_cache_cache), sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE); - + /* Initialize external slab cache */ slab_extern_cache = slab_cache_create("slab_t", sizeof(slab_t), 0, NULL, NULL, SLAB_CACHE_SLINSIDE | SLAB_CACHE_MAGDEFERRED); - + /* Initialize structures for malloc */ size_t i; size_t size; - + for (i = 0, size = (1 << SLAB_MIN_MALLOC_W); i < (SLAB_MAX_MALLOC_W - SLAB_MIN_MALLOC_W + 1); @@ -916,5 +916,5 @@ NULL, NULL, SLAB_CACHE_MAGDEFERRED); } - + #ifdef CONFIG_DEBUG _slab_initialized = 1; @@ -934,20 +934,20 @@ _slab_initialized = 2; #endif - + _slab_cache_create(&slab_mag_cache, "slab_mag_cache", sizeof(slab_mag_cache_t) * config.cpu_count, sizeof(uintptr_t), NULL, NULL, SLAB_CACHE_NOMAGAZINE | SLAB_CACHE_SLINSIDE); - + irq_spinlock_lock(&slab_cache_lock, false); - + list_foreach(slab_cache_list, link, slab_cache_t, slab) { if ((slab->flags & SLAB_CACHE_MAGDEFERRED) != SLAB_CACHE_MAGDEFERRED) continue; - + (void) make_magcache(slab); slab->flags &= ~SLAB_CACHE_MAGDEFERRED; } - + irq_spinlock_unlock(&slab_cache_lock, false); } @@ -957,10 +957,10 @@ assert(_slab_initialized); assert(size <= (1 << SLAB_MAX_MALLOC_W)); - + if (size < (1 << SLAB_MIN_MALLOC_W)) size = (1 << SLAB_MIN_MALLOC_W); - + uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1; - + return slab_alloc(malloc_caches[idx], flags); } @@ -970,24 +970,24 @@ assert(_slab_initialized); assert(size <= (1 << SLAB_MAX_MALLOC_W)); - + void *new_ptr; - + if (size > 0) { if (size < (1 << SLAB_MIN_MALLOC_W)) size = (1 << SLAB_MIN_MALLOC_W); uint8_t idx = fnzb(size - 1) - SLAB_MIN_MALLOC_W + 1; - + new_ptr = slab_alloc(malloc_caches[idx], flags); } else new_ptr = NULL; - + if ((new_ptr != NULL) && (ptr != NULL)) { slab_t *slab = obj2slab(ptr); memcpy(new_ptr, ptr, min(size, slab->cache->size)); } - + if (ptr != NULL) free(ptr); - + return new_ptr; } @@ -997,5 +997,5 @@ if (!ptr) return; - + slab_t *slab = obj2slab(ptr); _slab_free(slab->cache, ptr, slab); Index: kernel/generic/src/mm/tlb.c =================================================================== --- kernel/generic/src/mm/tlb.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/mm/tlb.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -87,12 +87,12 @@ CPU->tlb_active = false; irq_spinlock_lock(&tlblock, false); - + size_t i; for (i = 0; i < config.cpu_count; i++) { if (i == CPU->id) continue; - + cpu_t *cpu = &cpus[i]; - + irq_spinlock_lock(&cpu->lock, false); if (cpu->tlb_messages_count == TLB_MESSAGE_QUEUE_LEN) { @@ -118,7 +118,7 @@ irq_spinlock_unlock(&cpu->lock, false); } - + tlb_shootdown_ipi_send(); - + busy_wait: for (i = 0; i < config.cpu_count; i++) { @@ -126,5 +126,5 @@ goto busy_wait; } - + return ipl; } @@ -153,12 +153,12 @@ { assert(CPU); - + CPU->tlb_active = false; irq_spinlock_lock(&tlblock, false); irq_spinlock_unlock(&tlblock, false); - + irq_spinlock_lock(&CPU->lock, false); assert(CPU->tlb_messages_count <= TLB_MESSAGE_QUEUE_LEN); - + size_t i; for (i = 0; i < CPU->tlb_messages_count; i++) { @@ -167,5 +167,5 @@ uintptr_t page = CPU->tlb_messages[i].page; size_t count = CPU->tlb_messages[i].count; - + switch (type) { case TLB_INVL_ALL: @@ -183,9 +183,9 @@ break; } - + if (type == TLB_INVL_ALL) break; } - + CPU->tlb_messages_count = 0; irq_spinlock_unlock(&CPU->lock, false); Index: kernel/generic/src/printf/printf.c =================================================================== --- kernel/generic/src/printf/printf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/printf/printf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,11 +40,11 @@ int ret; va_list args; - + va_start(args, fmt); - + ret = vprintf(fmt, args); - + va_end(args); - + return ret; } Index: kernel/generic/src/printf/printf_core.c =================================================================== --- kernel/generic/src/printf/printf_core.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/printf/printf_core.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -157,5 +157,5 @@ if (str == NULL) return printf_putnchars(nullstr, str_size(nullstr), ps); - + return ps->str_write((void *) str, str_size(str), ps->data); } @@ -173,5 +173,5 @@ if (!ascii_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->str_write(&ch, 1, ps->data); } @@ -189,5 +189,5 @@ if (!chr_check(ch)) return ps->str_write((void *) &invalch, 1, ps->data); - + return ps->wstr_write(&ch, sizeof(wchar_t), ps->data); } @@ -215,8 +215,8 @@ } } - + if (printf_putchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -227,5 +227,5 @@ counter++; } - + return (int) (counter); } @@ -253,8 +253,8 @@ } } - + if (printf_putwchar(ch, ps) > 0) counter++; - + while (--width > 0) { /* @@ -265,5 +265,5 @@ counter++; } - + return (int) (counter); } @@ -283,10 +283,10 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + /* Print leading spaces. */ size_t strw = str_length(str); if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -298,5 +298,5 @@ } } - + /* Part of @a str fitting into the alloted space. */ int retval; @@ -331,10 +331,10 @@ if (str == NULL) return printf_putstr(nullstr, ps); - + /* Print leading spaces. */ size_t strw = wstr_length(str); if ((precision == 0) || (precision > strw)) precision = strw; - + /* Left padding */ size_t counter = 0; @@ -346,5 +346,5 @@ } } - + /* Part of @a wstr fitting into the alloted space. */ int retval; @@ -352,7 +352,7 @@ if ((retval = printf_wputnchars(str, size, ps)) < 0) return -counter; - + counter += retval; - + /* Right padding */ while (width-- > 0) { @@ -385,14 +385,14 @@ else digits = digits_small; - + char data[PRINT_NUMBER_BUFFER_SIZE]; char *ptr = &data[PRINT_NUMBER_BUFFER_SIZE - 1]; - + /* Size of number with all prefixes and signs */ int size = 0; - + /* Put zero at end of string */ *ptr-- = 0; - + if (num == 0) { *ptr-- = '0'; @@ -404,8 +404,8 @@ } while (num /= base); } - + /* Size of plain number */ int number_size = size; - + /* * Collect the sum of all prefixes/signs/etc. to calculate padding and @@ -426,5 +426,5 @@ } } - + char sgn = 0; if (flags & __PRINTF_FLAG_SIGNED) { @@ -440,8 +440,8 @@ } } - + if (flags & __PRINTF_FLAG_LEFTALIGNED) flags &= ~__PRINTF_FLAG_ZEROPADDED; - + /* * If the number is left-aligned or precision is specified then @@ -452,5 +452,5 @@ precision = width - size + number_size; } - + /* Print leading spaces */ if (number_size > precision) { @@ -458,8 +458,8 @@ precision = number_size; } - + width -= precision + size - number_size; size_t counter = 0; - + if (!(flags & __PRINTF_FLAG_LEFTALIGNED)) { while (width-- > 0) { @@ -468,5 +468,5 @@ } } - + /* Print sign */ if (sgn) { @@ -474,5 +474,5 @@ counter++; } - + /* Print prefix */ if (flags & __PRINTF_FLAG_PREFIX) { @@ -507,5 +507,5 @@ } } - + /* Print leading zeroes */ precision -= number_size; @@ -514,17 +514,17 @@ counter++; } - + /* Print the number itself */ int retval; if ((retval = printf_putstr(++ptr, ps)) > 0) counter += retval; - + /* Print trailing spaces */ - + while (width-- > 0) { if (printf_putchar(' ', ps) == 1) counter++; } - + return ((int) counter); } @@ -624,15 +624,15 @@ size_t nxt = 0; /* Index of the next character from fmt */ size_t j = 0; /* Index to the first not printed nonformating character */ - + size_t counter = 0; /* Number of characters printed */ int retval; /* Return values from nested functions */ - + while (true) { i = nxt; wchar_t uc = str_decode(fmt, &nxt, STR_NO_LIMIT); - + if (uc == 0) break; - + /* Control character */ if (uc == '%') { @@ -646,11 +646,11 @@ counter += retval; } - + j = i; - + /* Parse modifiers */ uint32_t flags = 0; bool end = false; - + do { i = nxt; @@ -676,5 +676,5 @@ }; } while (!end); - + /* Width & '*' operator */ int width = 0; @@ -683,5 +683,5 @@ width *= 10; width += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -702,5 +702,5 @@ } } - + /* Precision and '*' operator */ int precision = 0; @@ -712,5 +712,5 @@ precision *= 10; precision += uc - '0'; - + i = nxt; uc = str_decode(fmt, &nxt, STR_NO_LIMIT); @@ -731,7 +731,7 @@ } } - + qualifier_t qualifier; - + switch (uc) { case 't': @@ -780,7 +780,7 @@ qualifier = PrintfQualifierInt; } - + unsigned int base = 10; - + switch (uc) { /* @@ -792,10 +792,10 @@ else retval = print_str(va_arg(ap, char *), width, precision, flags, ps); - + if (retval < 0) { counter = -counter; goto out; } - + counter += retval; j = nxt; @@ -806,14 +806,14 @@ else retval = print_char(va_arg(ap, unsigned int), width, flags, ps); - + if (retval < 0) { counter = -counter; goto out; }; - + counter += retval; j = nxt; goto next_char; - + /* * Integer values @@ -847,10 +847,10 @@ base = 16; break; - + /* Percentile itself */ case '%': j = i; goto next_char; - + /* * Bad formatting. @@ -863,9 +863,9 @@ goto next_char; } - + /* Print integers */ size_t size; uint64_t number; - + switch (qualifier) { case PrintfQualifierByte: @@ -907,5 +907,5 @@ goto out; } - + if ((retval = print_number(number, width, precision, base, flags, ps)) < 0) { @@ -913,5 +913,5 @@ goto out; } - + counter += retval; j = nxt; @@ -920,5 +920,5 @@ ; } - + if (i > j) { if ((retval = printf_putnchars(&fmt[j], i - j, ps)) < 0) { @@ -929,5 +929,5 @@ counter += retval; } - + out: return ((int) counter); Index: kernel/generic/src/printf/snprintf.c =================================================================== --- kernel/generic/src/printf/snprintf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/printf/snprintf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -40,10 +40,10 @@ int ret; va_list args; - + va_start(args, fmt); ret = vsnprintf(str, size, fmt, args); - + va_end(args); - + return ret; } Index: kernel/generic/src/printf/vprintf.c =================================================================== --- kernel/generic/src/printf/vprintf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/printf/vprintf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -45,10 +45,10 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { putchar(str_decode(str, &offset, size)); chars++; } - + return chars; } @@ -58,5 +58,5 @@ size_t offset = 0; size_t chars = 0; - + while (offset < size) { putchar(str[chars]); @@ -64,5 +64,5 @@ offset += sizeof(wchar_t); } - + return chars; } @@ -73,10 +73,10 @@ size_t chars = 0; wchar_t uc; - + while ((uc = str_decode(str, &offset, STR_NO_LIMIT)) != 0) { putchar(uc); chars++; } - + return chars; } @@ -89,5 +89,5 @@ NULL }; - + return printf_core(fmt, &ps, ap); } Index: kernel/generic/src/printf/vsnprintf.c =================================================================== --- kernel/generic/src/printf/vsnprintf.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/printf/vsnprintf.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -65,8 +65,8 @@ { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -77,5 +77,5 @@ return ((int) size); } - + if (left <= size) { /* We do not have enough space for the whole string @@ -84,29 +84,29 @@ */ size_t index = 0; - + while (index < size) { wchar_t uc = str_decode(str, &index, size); - + if (chr_encode(uc, data->dst, &data->len, data->size - 1) != EOK) break; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } - + /* Buffer is big enough to print the whole string */ memcpy((void *)(data->dst + data->len), (void *) str, size); data->len += size; - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -132,11 +132,11 @@ { size_t index = 0; - + while (index < (size / sizeof(wchar_t))) { size_t left = data->size - data->len; - + if (left == 0) return ((int) size); - + if (left == 1) { /* We have only one free byte left in buffer @@ -147,16 +147,16 @@ return ((int) size); } - + if (chr_encode(str[index], data->dst, &data->len, data->size - 1) != EOK) break; - + index++; } - + /* Put trailing zero at end, but not count it * into data->len so it could be rewritten next time */ data->dst[data->len] = 0; - + return ((int) size); } @@ -174,9 +174,9 @@ &data }; - + /* Print 0 at end of string - fix the case that nothing will be printed */ if (size > 0) str[0] = 0; - + /* vsnprintf_write ensures that str will be terminated by zero. */ return printf_core(fmt, &ps, ap); Index: kernel/generic/src/proc/program.c =================================================================== --- kernel/generic/src/proc/program.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/proc/program.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -75,5 +75,5 @@ if (!prg->task) return ELIMIT; - + /* * Create the stack address space area. @@ -94,8 +94,8 @@ return ENOMEM; } - + uspace_arg_t *kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); - + kernel_uarg->uspace_entry = (void *) entry_addr; kernel_uarg->uspace_stack = (void *) virt; @@ -104,5 +104,5 @@ kernel_uarg->uspace_thread_arg = NULL; kernel_uarg->uspace_uarg = NULL; - + /* * Create the main thread. @@ -117,5 +117,5 @@ return ELIMIT; } - + return EOK; } @@ -142,5 +142,5 @@ if (!as) return ENOMEM; - + prg->loader_status = elf_load((elf_header_t *) image_addr, as, 0); if (prg->loader_status != EE_OK) { @@ -148,18 +148,18 @@ prg->task = NULL; prg->main_thread = NULL; - + if (prg->loader_status != EE_LOADER) return ENOTSUP; - + /* Register image as the program loader */ if (program_loader != NULL) return ELIMIT; - + program_loader = image_addr; log(LF_OTHER, LVL_NOTE, "Program loader at %p", (void *) image_addr); - + return EOK; } - + return program_create(as, ((elf_header_t *) image_addr)->e_entry, name, prg); @@ -179,5 +179,5 @@ if (!as) return ENOMEM; - + void *loader = program_loader; if (!loader) { @@ -187,5 +187,5 @@ return ENOENT; } - + prg->loader_status = elf_load((elf_header_t *) program_loader, as, ELD_F_LOADER); @@ -196,5 +196,5 @@ return ENOENT; } - + return program_create(as, ((elf_header_t *) program_loader)->e_entry, name, prg); @@ -230,12 +230,12 @@ if (name_len > TASK_NAME_BUFLEN - 1) name_len = TASK_NAME_BUFLEN - 1; - + char namebuf[TASK_NAME_BUFLEN]; errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len); if (rc != EOK) return (sys_errno_t) rc; - + namebuf[name_len] = 0; - + /* Spawn the new task. */ program_t prg; @@ -243,9 +243,9 @@ if (rc != EOK) return rc; - + // FIXME: control the permissions perm_set(prg.task, perm_get(TASK)); program_ready(&prg); - + return EOK; } Index: kernel/generic/src/proc/scheduler.c =================================================================== --- kernel/generic/src/proc/scheduler.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/proc/scheduler.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -90,5 +90,5 @@ before_thread_runs_arch(); rcu_before_thread_runs(); - + #ifdef CONFIG_FPU_LAZY if (THREAD == CPU->fpu_owner) @@ -105,5 +105,5 @@ } #endif - + #ifdef CONFIG_UDEBUG if (THREAD->btrace) { @@ -113,5 +113,5 @@ stack_trace_istate(istate); } - + THREAD->btrace = false; } @@ -141,10 +141,10 @@ fpu_enable(); irq_spinlock_lock(&CPU->lock, false); - + /* Save old context */ if (CPU->fpu_owner != NULL) { irq_spinlock_lock(&CPU->fpu_owner->lock, false); fpu_context_save(CPU->fpu_owner->saved_fpu_context); - + /* Don't prevent migration */ CPU->fpu_owner->fpu_context_engaged = false; @@ -152,5 +152,5 @@ CPU->fpu_owner = NULL; } - + irq_spinlock_lock(&THREAD->lock, false); if (THREAD->fpu_context_exists) { @@ -164,5 +164,5 @@ THREAD->saved_fpu_context = (fpu_context_t *) slab_alloc(fpu_context_cache, 0); - + /* We may have switched CPUs during slab_alloc */ goto restart; @@ -171,9 +171,9 @@ THREAD->fpu_context_exists = true; } - + CPU->fpu_owner = THREAD; THREAD->fpu_context_engaged = true; irq_spinlock_unlock(&THREAD->lock, false); - + irq_spinlock_unlock(&CPU->lock, false); } @@ -201,7 +201,7 @@ { assert(CPU != NULL); - + loop: - + if (atomic_get(&CPU->nrdy) == 0) { /* @@ -214,5 +214,5 @@ irq_spinlock_unlock(&CPU->lock, false); interrupts_enable(); - + /* * An interrupt might occur right now and wake up a thread. @@ -226,5 +226,5 @@ assert(!CPU->idle); - + unsigned int i; for (i = 0; i < RQ_COUNT; i++) { @@ -237,9 +237,9 @@ continue; } - + atomic_dec(&CPU->nrdy); atomic_dec(&nrdy); CPU->rq[i].n--; - + /* * Take the first thread from the queue. @@ -248,11 +248,11 @@ list_first(&CPU->rq[i].rq), thread_t, rq_link); list_remove(&thread->rq_link); - + irq_spinlock_pass(&(CPU->rq[i].lock), &thread->lock); - + thread->cpu = CPU; thread->ticks = us2ticks((i + 1) * 10000); thread->priority = i; /* Correct rq index */ - + /* * Clear the stolen flag so that it can be migrated @@ -261,8 +261,8 @@ thread->stolen = false; irq_spinlock_unlock(&thread->lock, false); - + return thread; } - + goto loop; } @@ -282,13 +282,13 @@ { list_t list; - + list_initialize(&list); irq_spinlock_lock(&CPU->lock, false); - + if (CPU->needs_relink > NEEDS_RELINK_MAX) { int i; for (i = start; i < RQ_COUNT - 1; i++) { /* Remember and empty rq[i + 1] */ - + irq_spinlock_lock(&CPU->rq[i + 1].lock, false); list_concat(&list, &CPU->rq[i + 1].rq); @@ -296,7 +296,7 @@ CPU->rq[i + 1].n = 0; irq_spinlock_unlock(&CPU->rq[i + 1].lock, false); - + /* Append rq[i + 1] to rq[i] */ - + irq_spinlock_lock(&CPU->rq[i].lock, false); list_concat(&CPU->rq[i].rq, &list); @@ -304,8 +304,8 @@ irq_spinlock_unlock(&CPU->rq[i].lock, false); } - + CPU->needs_relink = 0; } - + irq_spinlock_unlock(&CPU->lock, false); } @@ -321,18 +321,18 @@ { volatile ipl_t ipl; - + assert(CPU != NULL); - + ipl = interrupts_disable(); - + if (atomic_get(&haltstate)) halt(); - + if (THREAD) { irq_spinlock_lock(&THREAD->lock, false); - + /* Update thread kernel accounting */ THREAD->kcycles += get_cycle() - THREAD->last_cycle; - + #if (defined CONFIG_FPU) && (!defined CONFIG_FPU_LAZY) fpu_context_save(THREAD->saved_fpu_context); @@ -342,14 +342,14 @@ * This is the place where threads leave scheduler(); */ - + /* Save current CPU cycle */ THREAD->last_cycle = get_cycle(); - + irq_spinlock_unlock(&THREAD->lock, false); interrupts_restore(THREAD->saved_context.ipl); - + return; } - + /* * Interrupt priority level of preempted thread is recorded @@ -360,5 +360,5 @@ THREAD->saved_context.ipl = ipl; } - + /* * Through the 'THE' structure, we keep track of THREAD, TASK, CPU, AS @@ -368,5 +368,5 @@ */ the_copy(THE, (the_t *) CPU->stack); - + /* * We may not keep the old stack. @@ -386,5 +386,5 @@ (uintptr_t) CPU->stack, STACK_SIZE); context_restore(&CPU->saved_context); - + /* Not reached */ } @@ -402,9 +402,9 @@ task_t *old_task = TASK; as_t *old_as = AS; - + assert((!THREAD) || (irq_spinlock_locked(&THREAD->lock))); assert(CPU != NULL); assert(interrupts_disabled()); - + /* * Hold the current task and the address space to prevent their @@ -414,12 +414,12 @@ if (old_task) task_hold(old_task); - + if (old_as) as_hold(old_as); - + if (THREAD) { /* Must be run after the switch to scheduler stack */ after_thread_ran(); - + switch (THREAD->state) { case Running: @@ -427,5 +427,5 @@ thread_ready(THREAD); break; - + case Exiting: rcu_thread_exiting(); @@ -452,10 +452,10 @@ WAKEUP_FIRST); irq_spinlock_unlock(&THREAD->join_wq.lock, false); - + THREAD->state = Lingering; irq_spinlock_unlock(&THREAD->lock, false); } break; - + case Sleeping: /* @@ -463,5 +463,5 @@ */ THREAD->priority = -1; - + /* * We need to release wq->lock which we locked in @@ -470,8 +470,8 @@ */ irq_spinlock_unlock(&THREAD->sleep_queue->lock, false); - + irq_spinlock_unlock(&THREAD->lock, false); break; - + default: /* @@ -482,16 +482,16 @@ break; } - + THREAD = NULL; } - + THREAD = find_best_thread(); - + irq_spinlock_lock(&THREAD->lock, false); int priority = THREAD->priority; irq_spinlock_unlock(&THREAD->lock, false); - + relink_rq(priority); - + /* * If both the old and the new task are the same, @@ -500,5 +500,5 @@ if (TASK != THREAD->task) { as_t *new_as = THREAD->task->as; - + /* * Note that it is possible for two tasks @@ -512,18 +512,18 @@ as_switch(old_as, new_as); } - + TASK = THREAD->task; before_task_runs(); } - + if (old_task) task_release(old_task); - + if (old_as) as_release(old_as); - + irq_spinlock_lock(&THREAD->lock, false); THREAD->state = Running; - + #ifdef SCHEDULER_VERBOSE log(LF_OTHER, LVL_DEBUG, @@ -532,5 +532,5 @@ THREAD->ticks, atomic_get(&CPU->nrdy)); #endif - + /* * Some architectures provide late kernel PA2KA(identity) @@ -542,5 +542,5 @@ */ before_thread_runs(); - + /* * Copy the knowledge of CPU, TASK, THREAD and preemption counter to @@ -548,7 +548,7 @@ */ the_copy(THE, (the_t *) THREAD->kstack); - + context_restore(&THREAD->saved_context); - + /* Not reached */ } @@ -567,10 +567,10 @@ atomic_count_t average; atomic_count_t rdy; - + /* * Detach kcpulb as nobody will call thread_join_timeout() on it. */ thread_detach(THREAD); - + loop: /* @@ -578,5 +578,5 @@ */ thread_sleep(1); - + not_satisfied: /* @@ -588,10 +588,10 @@ average = atomic_get(&nrdy) / config.cpu_active + 1; rdy = atomic_get(&CPU->nrdy); - + if (average <= rdy) goto satisfied; - + atomic_count_t count = average - rdy; - + /* * Searching least priority queues on all CPU's first and most priority @@ -601,9 +601,9 @@ size_t acpu_bias = 0; int rq; - + for (rq = RQ_COUNT - 1; rq >= 0; rq--) { for (acpu = 0; acpu < config.cpu_active; acpu++) { cpu_t *cpu = &cpus[(acpu + acpu_bias) % config.cpu_active]; - + /* * Not interested in ourselves. @@ -614,8 +614,8 @@ if (CPU == cpu) continue; - + if (atomic_get(&cpu->nrdy) <= average) continue; - + irq_spinlock_lock(&(cpu->rq[rq].lock), true); if (cpu->rq[rq].n == 0) { @@ -623,14 +623,14 @@ continue; } - + thread_t *thread = NULL; - + /* Search rq from the back */ link_t *link = cpu->rq[rq].rq.head.prev; - + while (link != &(cpu->rq[rq].rq.head)) { thread = (thread_t *) list_get_instance(link, thread_t, rq_link); - + /* * Do not steal CPU-wired threads, threads @@ -640,5 +640,5 @@ */ irq_spinlock_lock(&thread->lock, false); - + if ((!thread->wired) && (!thread->stolen) && (!thread->nomigrate) && @@ -649,28 +649,28 @@ irq_spinlock_unlock(&thread->lock, false); - + atomic_dec(&cpu->nrdy); atomic_dec(&nrdy); - + cpu->rq[rq].n--; list_remove(&thread->rq_link); - + break; } - + irq_spinlock_unlock(&thread->lock, false); - + link = link->prev; thread = NULL; } - + if (thread) { /* * Ready thread on local CPU */ - + irq_spinlock_pass(&(cpu->rq[rq].lock), &thread->lock); - + #ifdef KCPULB_VERBOSE log(LF_OTHER, LVL_DEBUG, @@ -680,14 +680,14 @@ atomic_get(&nrdy) / config.cpu_active); #endif - + thread->stolen = true; thread->state = Entering; - + irq_spinlock_unlock(&thread->lock, true); thread_ready(thread); - + if (--count == 0) goto satisfied; - + /* * We are not satisfied yet, focus on another @@ -696,12 +696,12 @@ */ acpu_bias++; - + continue; } else irq_spinlock_unlock(&(cpu->rq[rq].lock), true); - - } - } - + + } + } + if (atomic_get(&CPU->nrdy)) { /* @@ -718,7 +718,7 @@ goto loop; } - + goto not_satisfied; - + satisfied: goto loop; @@ -735,11 +735,11 @@ if (!cpus[cpu].active) continue; - + irq_spinlock_lock(&cpus[cpu].lock, true); - + printf("cpu%u: address=%p, nrdy=%" PRIua ", needs_relink=%zu\n", cpus[cpu].id, &cpus[cpu], atomic_get(&cpus[cpu].nrdy), cpus[cpu].needs_relink); - + unsigned int i; for (i = 0; i < RQ_COUNT; i++) { @@ -749,5 +749,5 @@ continue; } - + printf("\trq[%u]: ", i); list_foreach(cpus[cpu].rq[i].rq, rq_link, thread_t, @@ -757,8 +757,8 @@ } printf("\n"); - + irq_spinlock_unlock(&(cpus[cpu].rq[i].lock), false); } - + irq_spinlock_unlock(&cpus[cpu].lock, true); } Index: kernel/generic/src/proc/task.c =================================================================== --- kernel/generic/src/proc/task.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/proc/task.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -107,15 +107,15 @@ task_t *task = avltree_get_instance(node, task_t, tasks_tree_node); size_t *cnt = (size_t *) arg; - + if (task != TASK) { (*cnt)++; - + #ifdef CONFIG_DEBUG printf("[%"PRIu64"] ", task->taskid); #endif - + task_kill_internal(task); } - + /* Continue the walk */ return true; @@ -138,5 +138,5 @@ task_release(task_0); } - + /* Repeat until there are any tasks except TASK */ do { @@ -144,12 +144,12 @@ printf("Killing tasks... "); #endif - + irq_spinlock_lock(&tasks_lock, true); tasks_left = 0; avltree_walk(&tasks_tree, task_done_walker, &tasks_left); irq_spinlock_unlock(&tasks_lock, true); - + thread_sleep(1); - + #ifdef CONFIG_DEBUG printf("\n"); @@ -165,17 +165,17 @@ if (rc != EOK) return rc; - + atomic_set(&task->refcount, 0); atomic_set(&task->lifecount, 0); - + irq_spinlock_initialize(&task->lock, "task_t_lock"); - + list_initialize(&task->threads); - + ipc_answerbox_init(&task->answerbox, task); - + spinlock_initialize(&task->active_calls_lock, "active_calls_lock"); list_initialize(&task->active_calls); - + #ifdef CONFIG_UDEBUG /* Init kbox stuff */ @@ -184,5 +184,5 @@ mutex_initialize(&task->kb.cleanup_lock, MUTEX_PASSIVE); #endif - + return EOK; } @@ -191,5 +191,5 @@ { task_t *task = (task_t *) obj; - + caps_task_free(task); return 0; @@ -210,10 +210,10 @@ return NULL; } - + task_create_arch(task); - + task->as = as; str_cpy(task->name, TASK_NAME_BUFLEN, name); - + task->container = CONTAINER; task->perms = 0; @@ -231,5 +231,5 @@ event_task_init(task); - + task->answerbox.active = true; @@ -237,10 +237,10 @@ /* Init debugging stuff */ udebug_task_init(&task->udebug); - + /* Init kbox stuff */ task->kb.box.active = true; task->kb.finished = false; #endif - + if ((ipc_phone_0) && (container_check(ipc_phone_0->task->container, task->container))) { @@ -253,26 +253,26 @@ return NULL; } - + kobject_t *phone_obj = kobject_get(task, phone_handle, KOBJECT_TYPE_PHONE); (void) ipc_phone_connect(phone_obj->phone, ipc_phone_0); } - + futex_task_init(task); - + /* * Get a reference to the address space. */ as_hold(task->as); - + irq_spinlock_lock(&tasks_lock, true); - + task->taskid = ++task_counter; avltree_node_initialize(&task->tasks_tree_node); task->tasks_tree_node.key = task->taskid; avltree_insert(&tasks_tree, &task->tasks_tree_node); - + irq_spinlock_unlock(&tasks_lock, true); - + return task; } @@ -291,20 +291,20 @@ avltree_delete(&tasks_tree, &task->tasks_tree_node); irq_spinlock_unlock(&tasks_lock, true); - + /* * Perform architecture specific task destruction. */ task_destroy_arch(task); - + /* * Free up dynamically allocated state. */ futex_task_deinit(task); - + /* * Drop our reference to the address space. */ as_release(task->as); - + slab_free(task_cache, task); } @@ -388,15 +388,15 @@ { char namebuf[TASK_NAME_BUFLEN]; - + /* Cap length of name and copy it from userspace. */ if (name_len > TASK_NAME_BUFLEN - 1) name_len = TASK_NAME_BUFLEN - 1; - + errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len); if (rc != EOK) return (sys_errno_t) rc; - + namebuf[name_len] = '\0'; - + /* * As the task name is referenced also from the @@ -404,16 +404,16 @@ * of the update. */ - + irq_spinlock_lock(&tasks_lock, true); irq_spinlock_lock(&TASK->lock, false); irq_spinlock_lock(&threads_lock, false); - + /* Set task name */ str_cpy(TASK->name, TASK_NAME_BUFLEN, namebuf); - + irq_spinlock_unlock(&threads_lock, false); irq_spinlock_unlock(&TASK->lock, false); irq_spinlock_unlock(&tasks_lock, true); - + return EOK; } @@ -432,5 +432,5 @@ if (rc != EOK) return (sys_errno_t) rc; - + return (sys_errno_t) task_kill(taskid); } @@ -453,8 +453,8 @@ avltree_node_t *node = avltree_search(&tasks_tree, (avltree_key_t) id); - + if (node) return avltree_get_instance(node, task_t, tasks_tree_node); - + return NULL; } @@ -478,9 +478,9 @@ uint64_t uret = task->ucycles; uint64_t kret = task->kcycles; - + /* Current values of threads */ list_foreach(task->threads, th_link, thread_t, thread) { irq_spinlock_lock(&thread->lock, false); - + /* Process only counted threads */ if (!thread->uncounted) { @@ -489,12 +489,12 @@ thread_update_accounting(false); } - + uret += thread->ucycles; kret += thread->kcycles; } - + irq_spinlock_unlock(&thread->lock, false); } - + *ucycles = uret; *kcycles = kret; @@ -505,24 +505,24 @@ irq_spinlock_lock(&task->lock, false); irq_spinlock_lock(&threads_lock, false); - + /* * Interrupt all threads. */ - + list_foreach(task->threads, th_link, thread_t, thread) { bool sleeping = false; - + irq_spinlock_lock(&thread->lock, false); - + thread->interrupted = true; if (thread->state == Sleeping) sleeping = true; - + irq_spinlock_unlock(&thread->lock, false); - + if (sleeping) waitq_interrupt_sleep(thread); } - + irq_spinlock_unlock(&threads_lock, false); irq_spinlock_unlock(&task->lock, false); @@ -543,7 +543,7 @@ if (id == 1) return EPERM; - + irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(id); if (!task) { @@ -551,8 +551,8 @@ return ENOENT; } - + task_kill_internal(task); irq_spinlock_unlock(&tasks_lock, true); - + return EOK; } @@ -583,9 +583,9 @@ } } - + irq_spinlock_lock(&tasks_lock, true); task_kill_internal(TASK); irq_spinlock_unlock(&tasks_lock, true); - + thread_exit(); } @@ -599,5 +599,5 @@ { task_kill_self(notify); - + /* Unreachable */ return EOK; @@ -609,5 +609,5 @@ task_t *task = avltree_get_instance(node, task_t, tasks_tree_node); irq_spinlock_lock(&task->lock, false); - + uint64_t ucycles; uint64_t kcycles; @@ -616,5 +616,5 @@ order_suffix(ucycles, &ucycles, &usuffix); order_suffix(kcycles, &kcycles, &ksuffix); - + #ifdef __32_BITS__ if (*additional) @@ -627,5 +627,5 @@ ucycles, usuffix, kcycles, ksuffix); #endif - + #ifdef __64_BITS__ if (*additional) @@ -637,5 +637,5 @@ task->taskid, task->name, task->container, task, task->as); #endif - + irq_spinlock_unlock(&task->lock, false); return true; @@ -651,5 +651,5 @@ /* Messing with task structures, avoid deadlock */ irq_spinlock_lock(&tasks_lock, true); - + #ifdef __32_BITS__ if (additional) @@ -659,5 +659,5 @@ " [ucycles ] [kcycles ]\n"); #endif - + #ifdef __64_BITS__ if (additional) @@ -668,7 +668,7 @@ " [as ]\n"); #endif - + avltree_walk(&tasks_tree, task_print_walker, &additional); - + irq_spinlock_unlock(&tasks_lock, true); } Index: kernel/generic/src/proc/thread.c =================================================================== --- kernel/generic/src/proc/thread.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/proc/thread.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -122,11 +122,11 @@ void *arg = THREAD->thread_arg; THREAD->last_cycle = get_cycle(); - + /* This is where each thread wakes up after its creation */ irq_spinlock_unlock(&THREAD->lock, false); interrupts_enable(); - + f(arg); - + /* Accumulate accounting to the task */ irq_spinlock_lock(&THREAD->lock, true); @@ -137,5 +137,5 @@ uint64_t kcycles = THREAD->kcycles; THREAD->kcycles = 0; - + irq_spinlock_pass(&THREAD->lock, &TASK->lock); TASK->ucycles += ucycles; @@ -144,7 +144,7 @@ } else irq_spinlock_unlock(&THREAD->lock, true); - + thread_exit(); - + /* Not reached */ } @@ -156,13 +156,13 @@ { thread_t *thread = (thread_t *) obj; - + irq_spinlock_initialize(&thread->lock, "thread_t_lock"); link_initialize(&thread->rq_link); link_initialize(&thread->wq_link); link_initialize(&thread->th_link); - + /* call the architecture-specific part of the constructor */ thr_constructor_arch(thread); - + #ifdef CONFIG_FPU #ifdef CONFIG_FPU_LAZY @@ -174,5 +174,5 @@ #endif /* CONFIG_FPU_LAZY */ #endif /* CONFIG_FPU */ - + /* * Allocate the kernel stack from the low-memory to prevent an infinite @@ -193,5 +193,5 @@ kmflags |= FRAME_LOWMEM; kmflags &= ~FRAME_HIGHMEM; - + uintptr_t stack_phys = frame_alloc(STACK_FRAMES, kmflags, STACK_SIZE - 1); @@ -203,11 +203,11 @@ return ENOMEM; } - + thread->kstack = (uint8_t *) PA2KA(stack_phys); - + #ifdef CONFIG_UDEBUG mutex_initialize(&thread->udebug.lock, MUTEX_PASSIVE); #endif - + return EOK; } @@ -217,15 +217,15 @@ { thread_t *thread = (thread_t *) obj; - + /* call the architecture-specific part of the destructor */ thr_destructor_arch(thread); - + frame_free(KA2PA(thread->kstack), STACK_FRAMES); - + #ifdef CONFIG_FPU if (thread->saved_fpu_context) slab_free(fpu_context_cache, thread->saved_fpu_context); #endif - + return STACK_FRAMES; /* number of frames freed */ } @@ -239,14 +239,14 @@ { THREAD = NULL; - + atomic_set(&nrdy, 0); thread_cache = slab_cache_create("thread_t", sizeof(thread_t), 0, thr_constructor, thr_destructor, 0); - + #ifdef CONFIG_FPU fpu_context_cache = slab_cache_create("fpu_context_t", sizeof(fpu_context_t), FPU_CONTEXT_ALIGN, NULL, NULL, 0); #endif - + avltree_create(&threads_tree); } @@ -282,9 +282,9 @@ { irq_spinlock_lock(&thread->lock, true); - + assert(thread->state != Ready); before_thread_is_ready(thread); - + int i = (thread->priority < RQ_COUNT - 1) ? ++thread->priority : thread->priority; @@ -305,18 +305,18 @@ cpu = CPU; } - + thread->state = Ready; - + irq_spinlock_pass(&thread->lock, &(cpu->rq[i].lock)); - + /* * Append thread to respective ready queue * on respective processor. */ - + list_append(&thread->rq_link, &cpu->rq[i].rq); cpu->rq[i].n++; irq_spinlock_unlock(&(cpu->rq[i].lock), true); - + atomic_inc(&nrdy); atomic_inc(&cpu->nrdy); @@ -344,24 +344,24 @@ if (!thread) return NULL; - + /* Not needed, but good for debugging */ memsetb(thread->kstack, STACK_SIZE, 0); - + irq_spinlock_lock(&tidlock, true); thread->tid = ++last_tid; irq_spinlock_unlock(&tidlock, true); - + context_save(&thread->saved_context); context_set(&thread->saved_context, FADDR(cushion), (uintptr_t) thread->kstack, STACK_SIZE); - + the_initialize((the_t *) thread->kstack); - + ipl_t ipl = interrupts_disable(); thread->saved_context.ipl = interrupts_read(); interrupts_restore(ipl); - + str_cpy(thread->name, THREAD_NAME_BUFLEN, name); - + thread->thread_code = func; thread->thread_arg = arg; @@ -377,30 +377,30 @@ thread->uspace = ((flags & THREAD_FLAG_USPACE) == THREAD_FLAG_USPACE); - + thread->nomigrate = 0; thread->state = Entering; - + timeout_initialize(&thread->sleep_timeout); thread->sleep_interruptible = false; thread->sleep_queue = NULL; thread->timeout_pending = false; - + thread->in_copy_from_uspace = false; thread->in_copy_to_uspace = false; - + thread->interrupted = false; thread->detached = false; waitq_initialize(&thread->join_wq); - + thread->task = task; - + thread->workq = NULL; - + thread->fpu_context_exists = false; thread->fpu_context_engaged = false; - + avltree_node_initialize(&thread->threads_tree_node); thread->threads_tree_node.key = (uintptr_t) thread; - + #ifdef CONFIG_UDEBUG /* Initialize debugging stuff */ @@ -408,13 +408,13 @@ udebug_thread_initialize(&thread->udebug); #endif - + /* Might depend on previous initialization */ thread_create_arch(thread); - + rcu_thread_init(thread); - + if ((flags & THREAD_FLAG_NOATTACH) != THREAD_FLAG_NOATTACH) thread_attach(thread, task); - + return thread; } @@ -435,16 +435,16 @@ assert(thread->task); assert(thread->cpu); - + irq_spinlock_lock(&thread->cpu->lock, false); if (thread->cpu->fpu_owner == thread) thread->cpu->fpu_owner = NULL; irq_spinlock_unlock(&thread->cpu->lock, false); - + irq_spinlock_pass(&thread->lock, &threads_lock); - + avltree_delete(&threads_tree, &thread->threads_tree_node); - + irq_spinlock_pass(&threads_lock, &thread->task->lock); - + /* * Detach from the containing task. @@ -452,5 +452,5 @@ list_remove(&thread->th_link); irq_spinlock_unlock(&thread->task->lock, irq_res); - + /* * Drop the reference to the containing task. @@ -475,16 +475,16 @@ */ irq_spinlock_lock(&task->lock, true); - + /* Hold a reference to the task. */ task_hold(task); - + /* Must not count kbox thread into lifecount */ if (thread->uspace) atomic_inc(&task->lifecount); - + list_append(&thread->th_link, &task->threads); - + irq_spinlock_pass(&task->lock, &threads_lock); - + /* * Register this thread in the system-wide list. @@ -506,5 +506,5 @@ /* Generate udebug THREAD_E event */ udebug_thread_e_event(); - + /* * This thread will not execute any code or system calls from @@ -527,5 +527,5 @@ } } - + restart: irq_spinlock_lock(&THREAD->lock, true); @@ -535,10 +535,10 @@ goto restart; } - + THREAD->state = Exiting; irq_spinlock_unlock(&THREAD->lock, true); - + scheduler(); - + /* Not reached */ while (true); @@ -562,12 +562,12 @@ { assert(thread != NULL); - + irq_spinlock_lock(&thread->lock, true); - + thread->interrupted = true; bool sleeping = (thread->state == Sleeping); - + irq_spinlock_unlock(&thread->lock, true); - + if (sleeping) waitq_interrupt_sleep(thread); @@ -583,11 +583,11 @@ { assert(thread != NULL); - + bool interrupted; - + irq_spinlock_lock(&thread->lock, true); interrupted = thread->interrupted; irq_spinlock_unlock(&thread->lock, true); - + return interrupted; } @@ -597,5 +597,5 @@ { assert(THREAD); - + THREAD->nomigrate++; } @@ -606,5 +606,5 @@ assert(THREAD); assert(THREAD->nomigrate > 0); - + if (THREAD->nomigrate > 0) THREAD->nomigrate--; @@ -624,5 +624,5 @@ while (sec > 0) { uint32_t period = (sec > 1000) ? 1000 : sec; - + thread_usleep(period * 1000000); sec -= period; @@ -643,14 +643,14 @@ if (thread == THREAD) return EINVAL; - + /* * Since thread join can only be called once on an undetached thread, * the thread pointer is guaranteed to be still valid. */ - + irq_spinlock_lock(&thread->lock, true); assert(!thread->detached); irq_spinlock_unlock(&thread->lock, true); - + return waitq_sleep_timeout(&thread->join_wq, usec, flags, NULL); } @@ -672,5 +672,5 @@ irq_spinlock_lock(&thread->lock, true); assert(!thread->detached); - + if (thread->state == Lingering) { /* @@ -683,5 +683,5 @@ thread->detached = true; } - + irq_spinlock_unlock(&thread->lock, true); } @@ -697,7 +697,7 @@ { waitq_t wq; - + waitq_initialize(&wq); - + (void) waitq_sleep_timeout(&wq, usec, SYNCH_FLAGS_NON_BLOCKING, NULL); } @@ -707,10 +707,10 @@ bool *additional = (bool *) arg; thread_t *thread = avltree_get_instance(node, thread_t, threads_tree_node); - + uint64_t ucycles, kcycles; char usuffix, ksuffix; order_suffix(thread->ucycles, &ucycles, &usuffix); order_suffix(thread->kcycles, &kcycles, &ksuffix); - + char *name; if (str_cmp(thread->name, "uinit") == 0) @@ -718,5 +718,5 @@ else name = thread->name; - + #ifdef __32_BITS__ if (*additional) @@ -729,5 +729,5 @@ thread->task, thread->task->container); #endif - + #ifdef __64_BITS__ if (*additional) @@ -741,5 +741,5 @@ thread->task, thread->task->container); #endif - + if (*additional) { if (thread->cpu) @@ -747,18 +747,18 @@ else printf("none "); - + if (thread->state == Sleeping) { #ifdef __32_BITS__ printf(" %10p", thread->sleep_queue); #endif - + #ifdef __64_BITS__ printf(" %18p", thread->sleep_queue); #endif } - + printf("\n"); } - + return true; } @@ -773,5 +773,5 @@ /* Messing with thread structures, avoid deadlock */ irq_spinlock_lock(&threads_lock, true); - + #ifdef __32_BITS__ if (additional) @@ -782,5 +782,5 @@ " [ctn]\n"); #endif - + #ifdef __64_BITS__ if (additional) { @@ -791,7 +791,7 @@ " [task ] [ctn]\n"); #endif - + avltree_walk(&threads_tree, thread_walker, &additional); - + irq_spinlock_unlock(&threads_lock, true); } @@ -814,5 +814,5 @@ avltree_node_t *node = avltree_search(&threads_tree, (avltree_key_t) ((uintptr_t) thread)); - + return node != NULL; } @@ -832,10 +832,10 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&THREAD->lock)); - + if (user) THREAD->ucycles += time - THREAD->last_cycle; else THREAD->kcycles += time - THREAD->last_cycle; - + THREAD->last_cycle = time; } @@ -846,10 +846,10 @@ (thread_t *) avltree_get_instance(node, thread_t, threads_tree_node); thread_iterator_t *iterator = (thread_iterator_t *) arg; - + if (thread->tid == iterator->thread_id) { iterator->thread = thread; return false; } - + return true; } @@ -869,12 +869,12 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&threads_lock)); - + thread_iterator_t iterator; - + iterator.thread_id = thread_id; iterator.thread = NULL; - + avltree_walk(&threads_tree, thread_search_walker, (void *) &iterator); - + return iterator.thread; } @@ -885,5 +885,5 @@ { irq_spinlock_lock(&threads_lock, true); - + thread_t *thread = thread_find_by_id(thread_id); if (thread == NULL) { @@ -892,7 +892,7 @@ return; } - + irq_spinlock_lock(&thread->lock, false); - + /* * Schedule a stack trace to be printed @@ -906,5 +906,5 @@ * is probably justifiable. */ - + bool sleeping = false; istate_t *istate = thread->udebug.uspace_state; @@ -916,10 +916,10 @@ } else printf("Thread interrupt state not available.\n"); - + irq_spinlock_unlock(&thread->lock, false); - + if (sleeping) waitq_interrupt_sleep(thread); - + irq_spinlock_unlock(&threads_lock, true); } @@ -935,12 +935,12 @@ if (name_len > THREAD_NAME_BUFLEN - 1) name_len = THREAD_NAME_BUFLEN - 1; - + char namebuf[THREAD_NAME_BUFLEN]; errno_t rc = copy_from_uspace(namebuf, uspace_name, name_len); if (rc != EOK) return (sys_errno_t) rc; - + namebuf[name_len] = 0; - + /* * In case of failure, kernel_uarg will be deallocated in this function. @@ -949,5 +949,5 @@ uspace_arg_t *kernel_uarg = (uspace_arg_t *) malloc(sizeof(uspace_arg_t), 0); - + rc = copy_from_uspace(kernel_uarg, uspace_uarg, sizeof(uspace_arg_t)); if (rc != EOK) { @@ -955,5 +955,5 @@ return (sys_errno_t) rc; } - + thread_t *thread = thread_create(uinit, kernel_uarg, TASK, THREAD_FLAG_USPACE | THREAD_FLAG_NOATTACH, namebuf); @@ -968,5 +968,5 @@ * creation now. */ - + /* * The new thread structure is initialized, but @@ -976,9 +976,9 @@ slab_free(thread_cache, thread); free(kernel_uarg); - + return (sys_errno_t) rc; } } - + #ifdef CONFIG_UDEBUG /* @@ -994,9 +994,9 @@ #endif thread_ready(thread); - + return 0; } else free(kernel_uarg); - + return (sys_errno_t) ENOMEM; } Index: kernel/generic/src/security/perm.c =================================================================== --- kernel/generic/src/security/perm.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/security/perm.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -70,5 +70,5 @@ perm_t perms = task->perms; irq_spinlock_unlock(&task->lock, true); - + return perms; } @@ -88,17 +88,17 @@ if (!(perm_get(TASK) & PERM_PERM)) return EPERM; - + irq_spinlock_lock(&tasks_lock, true); task_t *task = task_find_by_id(taskid); - + if ((!task) || (!container_check(CONTAINER, task->container))) { irq_spinlock_unlock(&tasks_lock, true); return ENOENT; } - + irq_spinlock_lock(&task->lock, false); task->perms |= perms; irq_spinlock_unlock(&task->lock, false); - + irq_spinlock_unlock(&tasks_lock, true); return EOK; @@ -119,5 +119,5 @@ { irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(taskid); if ((!task) || (!container_check(CONTAINER, task->container))) { @@ -125,5 +125,5 @@ return ENOENT; } - + /* * Revoking permissions is different from granting them in that @@ -132,5 +132,5 @@ */ irq_spinlock_unlock(&TASK->lock, false); - + if ((!(TASK->perms & PERM_PERM)) || (task != TASK)) { irq_spinlock_unlock(&TASK->lock, false); @@ -138,8 +138,8 @@ return EPERM; } - + task->perms &= ~perms; irq_spinlock_unlock(&TASK->lock, false); - + irq_spinlock_unlock(&tasks_lock, true); return EOK; @@ -164,5 +164,5 @@ if (rc != EOK) return (sys_errno_t) rc; - + return perm_grant((task_id_t) taskid, perms); } @@ -185,5 +185,5 @@ if (rc != EOK) return (sys_errno_t) rc; - + return perm_revoke((task_id_t) taskid, perms); } Index: kernel/generic/src/smp/ipi.c =================================================================== --- kernel/generic/src/smp/ipi.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/smp/ipi.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ * - if there is only one CPU but the kernel was compiled with CONFIG_SMP */ - + if (config.cpu_count > 1) ipi_broadcast_arch(ipi); Index: kernel/generic/src/smp/smp.c =================================================================== --- kernel/generic/src/smp/smp.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/smp/smp.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -34,5 +34,5 @@ * @file */ - + #include Index: kernel/generic/src/smp/smp_call.c =================================================================== --- kernel/generic/src/smp/smp_call.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/smp/smp_call.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -55,5 +55,5 @@ assert(CPU); assert(PREEMPTION_DISABLED || interrupts_disabled()); - + spinlock_initialize(&CPU->smp_calls_lock, "cpu[].smp_calls_lock"); list_initialize(&CPU->smp_pending_calls); @@ -133,5 +133,5 @@ assert(!interrupts_disabled()); assert(call_info != NULL); - + /* Discard invalid calls. */ if (config.cpu_count <= cpu_id || !cpus[cpu_id].active) { @@ -140,10 +140,10 @@ return; } - + /* Protect cpu->id against migration. */ preemption_disable(); call_start(call_info, func, arg); - + if (cpu_id != CPU->id) { #ifdef CONFIG_SMP @@ -169,8 +169,8 @@ func(arg); interrupts_restore(ipl); - + call_done(call_info); } - + preemption_enable(); } @@ -209,8 +209,8 @@ assert(interrupts_disabled()); assert(CPU); - + list_t calls_list; list_initialize(&calls_list); - + /* * Acts as a load memory barrier. Any changes made by the cpu that @@ -224,8 +224,8 @@ for (link_t *cur = calls_list.head.next, *next = cur->next; !list_empty(&calls_list); cur = next, next = cur->next) { - + smp_call_t *call_info = list_get_instance(cur, smp_call_t, calls_link); list_remove(cur); - + call_info->func(call_info->arg); call_done(call_info); @@ -240,5 +240,5 @@ call_info->func = func; call_info->arg = arg; - + /* * We can't use standard spinlocks here because we want to lock @@ -247,5 +247,5 @@ */ atomic_set(&call_info->pending, 1); - + /* Let initialization complete before continuing. */ memory_barrier(); Index: kernel/generic/src/synch/condvar.c =================================================================== --- kernel/generic/src/synch/condvar.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/condvar.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -143,5 +143,5 @@ /* Lock only after releasing the waitq to avoid a possible deadlock. */ spinlock_lock(lock); - + return rc; } @@ -168,7 +168,7 @@ ipl_t ipl = irq_lock->ipl; bool guard = irq_lock->guard; - + irq_lock->guard = false; - + /* * waitq_prepare() restores interrupts to the current state, @@ -182,8 +182,8 @@ */ rc = _condvar_wait_timeout_spinlock(cv, &irq_lock->lock, usec, flags); - + irq_lock->guard = guard; irq_lock->ipl = ipl; - + return rc; } Index: kernel/generic/src/synch/futex.c =================================================================== --- kernel/generic/src/synch/futex.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/futex.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -157,7 +157,7 @@ { task->futexes = malloc(sizeof(struct futex_cache), 0); - + cht_create(&task->futexes->ht, 0, 0, 0, true, &task_futex_ht_ops); - + list_initialize(&task->futexes->list); spinlock_initialize(&task->futexes->list_lock, "futex-list-lock"); @@ -183,5 +183,5 @@ struct futex_cache *cache = member_to_inst(work, struct futex_cache, destroy_work); - + /* * Destroy the cache before manually freeing items of the cache in case @@ -189,5 +189,5 @@ */ cht_destroy_unsafe(&cache->ht); - + /* Manually free futex_ptr cache items. */ list_foreach_safe(cache->list, cur_link, next_link) { @@ -197,5 +197,5 @@ free(fut_ptr); } - + free(cache); } @@ -205,8 +205,8 @@ { struct futex_cache *futexes = TASK->futexes; - + /* All threads of this task have terminated. This is the last thread. */ spinlock_lock(&futexes->list_lock); - + list_foreach_safe(futexes->list, cur_link, next_link) { futex_ptr_t *fut_ptr = member_to_inst(cur_link, futex_ptr_t, all_link); @@ -222,5 +222,5 @@ futex_release_ref_locked(fut_ptr->futex); } - + spinlock_unlock(&futexes->list_lock); } @@ -252,7 +252,7 @@ assert(spinlock_locked(&futex_ht_lock)); assert(0 < futex->refcount); - + --futex->refcount; - + if (0 == futex->refcount) { hash_table_remove(&futex_ht, &futex->paddr); @@ -272,5 +272,5 @@ { futex_t *futex = find_cached_futex(uaddr); - + if (futex) return futex; @@ -303,8 +303,8 @@ (uaddr - ALIGN_DOWN(uaddr, PAGE_SIZE)); } - + spinlock_unlock(&futex_ht_lock); page_table_unlock(AS, false); - + return success; } @@ -314,5 +314,5 @@ { cht_read_lock(); - + futex_t *futex; cht_link_t *futex_ptr_link = cht_find_lazy(&TASK->futexes->ht, &uaddr); @@ -321,12 +321,12 @@ futex_ptr_t *futex_ptr = member_to_inst(futex_ptr_link, futex_ptr_t, cht_link); - + futex = futex_ptr->futex; } else { futex = NULL; } - + cht_read_unlock(); - + return futex; } @@ -340,5 +340,5 @@ { futex_t *futex = malloc(sizeof(futex_t), 0); - + /* * Find the futex object in the global futex table (or insert it @@ -346,7 +346,7 @@ */ spinlock_lock(&futex_ht_lock); - + ht_link_t *fut_link = hash_table_find(&futex_ht, &phys_addr); - + if (fut_link) { free(futex); @@ -357,7 +357,7 @@ hash_table_insert(&futex_ht, &futex->ht_link); } - + spinlock_unlock(&futex_ht_lock); - + /* * Cache the link to the futex object for this task. @@ -365,10 +365,10 @@ futex_ptr_t *fut_ptr = malloc(sizeof(futex_ptr_t), 0); cht_link_t *dup_link; - + fut_ptr->futex = futex; fut_ptr->uaddr = uaddr; - + cht_read_lock(); - + /* Cache the mapping from the virtual address to the futex for this task. */ if (cht_insert_unique(&TASK->futexes->ht, &fut_ptr->cht_link, &dup_link)) { @@ -380,5 +380,5 @@ free(fut_ptr); futex_release_ref_locked(futex); - + futex_ptr_t *dup = member_to_inst(dup_link, futex_ptr_t, cht_link); futex = dup->futex; @@ -386,5 +386,5 @@ cht_read_unlock(); - + return futex; } @@ -401,5 +401,5 @@ { futex_t *futex = get_futex(uaddr); - + if (!futex) return (sys_errno_t) ENOENT; @@ -428,5 +428,5 @@ { futex_t *futex = get_futex(uaddr); - + if (futex) { waitq_wakeup(&futex->wq, WAKEUP_FIRST); @@ -492,5 +492,5 @@ const futex_ptr_t *fut_ptr1 = member_to_inst(item1, futex_ptr_t, cht_link); const futex_ptr_t *fut_ptr2 = member_to_inst(item2, futex_ptr_t, cht_link); - + return fut_ptr1->uaddr == fut_ptr2->uaddr; } @@ -500,5 +500,5 @@ const futex_ptr_t *fut_ptr = member_to_inst(item, futex_ptr_t, cht_link); uintptr_t uaddr = *(uintptr_t*)key; - + return fut_ptr->uaddr == uaddr; } Index: kernel/generic/src/synch/mutex.c =================================================================== --- kernel/generic/src/synch/mutex.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/mutex.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -108,5 +108,5 @@ assert(usec == SYNCH_NO_TIMEOUT); assert(!(flags & SYNCH_FLAGS_INTERRUPTIBLE)); - + unsigned int cnt = 0; bool deadlock_reported = false; Index: kernel/generic/src/synch/rcu.c =================================================================== --- kernel/generic/src/synch/rcu.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/rcu.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -26,6 +26,6 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - - + + /** @addtogroup sync * @{ @@ -182,5 +182,5 @@ */ rcu_gp_t completed_gp; - + /** Protects the following 3 fields. */ IRQ_SPINLOCK_DECLARE(preempt_lock); @@ -195,7 +195,7 @@ */ bool preempt_blocking_det; - + #ifdef RCU_PREEMPT_A - + /** * The detector waits on this semaphore for any preempted readers @@ -205,5 +205,5 @@ #elif defined(RCU_PREEMPT_PODZIMEK) - + /** Reclaimers notify the detector when they request more grace periods.*/ condvar_t req_gp_changed; @@ -228,5 +228,5 @@ semaphore_t remaining_readers; #endif - + /** Excludes simultaneous rcu_barrier() calls. */ mutex_t barrier_mtx; @@ -235,8 +235,8 @@ /** rcu_barrier() waits for the completion of barrier callbacks on this wq.*/ waitq_t barrier_wq; - + /** Interruptible attached detector thread pointer. */ thread_t *detector_thr; - + /* Some statistics. */ size_t stat_expedited_cnt; @@ -305,10 +305,10 @@ _rcu_cur_gp = 0; rcu.completed_gp = 0; - + irq_spinlock_initialize(&rcu.preempt_lock, "rcu.preempt_lock"); list_initialize(&rcu.cur_preempted); list_initialize(&rcu.next_preempted); rcu.preempt_blocking_det = false; - + mutex_initialize(&rcu.barrier_mtx, MUTEX_PASSIVE); atomic_set(&rcu.barrier_wait_cnt, 0); @@ -316,15 +316,15 @@ semaphore_initialize(&rcu.remaining_readers, 0); - + #ifdef RCU_PREEMPT_PODZIMEK condvar_initialize(&rcu.req_gp_changed); - + rcu.req_gp_end_cnt = 0; rcu.req_expedited_cnt = 0; atomic_set(&rcu.delaying_cpu_cnt, 0); #endif - + rcu.detector_thr = NULL; - + rcu.stat_expedited_cnt = 0; rcu.stat_delayed_cnt = 0; @@ -347,5 +347,5 @@ CPU->rcu.signal_unlock = false; #endif - + CPU->rcu.cur_cbs = NULL; CPU->rcu.cur_cbs_cnt = 0; @@ -358,5 +358,5 @@ CPU->rcu.cur_cbs_gp = 0; CPU->rcu.next_cbs_gp = 0; - + semaphore_initialize(&CPU->rcu.arrived_flag, 0); @@ -364,5 +364,5 @@ if (config.cpu_active == 1) CPU->rcu.reclaimer_thr = NULL; - + CPU->rcu.stat_max_cbs = 0; CPU->rcu.stat_avg_cbs = 0; @@ -379,5 +379,5 @@ start_detector(); #endif - + start_reclaimers(); } @@ -391,5 +391,5 @@ thread->rcu.was_preempted = false; #endif - + link_initialize(&thread->rcu.preempt_link); } @@ -406,5 +406,5 @@ for (unsigned int cpu_id = 0; cpu_id < config.cpu_active; ++cpu_id) { assert(cpus[cpu_id].rcu.reclaimer_thr != NULL); - + if (cpus[cpu_id].rcu.reclaimer_thr) { thread_interrupt(cpus[cpu_id].rcu.reclaimer_thr); @@ -432,5 +432,5 @@ uint64_t completed = rcu.completed_gp; spinlock_unlock(&rcu.gp_lock); - + return completed; } @@ -441,7 +441,7 @@ for (unsigned int cpu_id = 0; cpu_id < config.cpu_count; ++cpu_id) { char name[THREAD_NAME_BUFLEN] = {0}; - + snprintf(name, THREAD_NAME_BUFLEN - 1, "rcu-rec/%u", cpu_id); - + cpus[cpu_id].rcu.reclaimer_thr = thread_create(reclaimer, NULL, TASK, THREAD_FLAG_NONE, name); @@ -462,8 +462,8 @@ rcu.detector_thr = thread_create(detector, NULL, TASK, THREAD_FLAG_NONE, "rcu-det"); - + if (!rcu.detector_thr) panic("Failed to create RCU detector thread."); - + thread_ready(rcu.detector_thr); } @@ -475,5 +475,5 @@ bool locked = 0 < CPU->rcu.nesting_cnt; preemption_enable(); - + return locked; } @@ -489,8 +489,8 @@ { assert(PREEMPTION_DISABLED || interrupts_disabled()); - + if (0 == --(*pnesting_cnt)) { _rcu_record_qs(); - + /* * The thread was preempted while in a critical section or @@ -511,5 +511,5 @@ { assert(PREEMPTION_DISABLED || interrupts_disabled()); - + /* * If an interrupt occurs here (even a NMI) it may beat us to @@ -517,5 +517,5 @@ * for us. */ - + /* * If the detector is eagerly waiting for this cpu's reader to unlock, @@ -525,5 +525,5 @@ semaphore_up(&rcu.remaining_readers); } - + /* * This reader was preempted while in a reader section. @@ -536,5 +536,5 @@ rm_preempted_reader(); } - + /* If there was something to signal to the detector we have done so. */ CPU->rcu.signal_unlock = false; @@ -565,5 +565,5 @@ /* Calling from a reader section will deadlock. */ assert(!rcu_read_locked()); - + synch_item_t completion; @@ -589,5 +589,5 @@ */ mutex_lock(&rcu.barrier_mtx); - + /* * Ensure we queue a barrier callback on all cpus before the already @@ -598,13 +598,13 @@ DEFINE_CPU_MASK(cpu_mask); cpu_mask_active(cpu_mask); - + cpu_mask_for_each(*cpu_mask, cpu_id) { smp_call(cpu_id, add_barrier_cb, NULL); } - + if (0 < atomic_predec(&rcu.barrier_wait_cnt)) { waitq_sleep(&rcu.barrier_wq); } - + mutex_unlock(&rcu.barrier_mtx); } @@ -659,8 +659,8 @@ { assert(rcu_item); - + rcu_item->func = func; rcu_item->next = NULL; - + preemption_disable(); @@ -670,19 +670,19 @@ = local_atomic_exchange(&r->parriving_cbs_tail, &rcu_item->next); *prev_tail = rcu_item; - + /* Approximate the number of callbacks present. */ ++r->arriving_cbs_cnt; - + if (expedite) { r->expedite_arriving = true; } - + bool first_cb = (prev_tail == &CPU->rcu.arriving_cbs); - + /* Added first callback - notify the reclaimer. */ if (first_cb && !semaphore_count_get(&r->arrived_flag)) { semaphore_up(&r->arrived_flag); } - + preemption_enable(); } @@ -725,12 +725,12 @@ rcu_gp_t last_compl_gp = 0; bool ok = true; - + while (ok && wait_for_pending_cbs()) { assert(CPU->rcu.reclaimer_thr == THREAD); - + exec_completed_cbs(last_compl_gp); bool expedite = advance_cbs(); - + ok = wait_for_cur_cbs_gp_end(expedite, &last_compl_gp); } @@ -744,9 +744,9 @@ bool ok = true; - + while (arriving_cbs_empty() && ok) { ok = semaphore_down_interruptable(&CPU->rcu.arrived_flag); } - + return ok; } @@ -763,11 +763,11 @@ { upd_stat_missed_gp(last_completed_gp); - + /* Both next_cbs and cur_cbs GP elapsed. */ if (CPU->rcu.next_cbs_gp <= last_completed_gp) { assert(CPU->rcu.cur_cbs_gp <= CPU->rcu.next_cbs_gp); - + size_t exec_cnt = CPU->rcu.cur_cbs_cnt + CPU->rcu.next_cbs_cnt; - + if (exec_cnt < CRITICAL_THRESHOLD) { exec_cbs(&CPU->rcu.cur_cbs); @@ -784,5 +784,5 @@ preemption_enable(); } - + CPU->rcu.cur_cbs_cnt = 0; CPU->rcu.next_cbs_cnt = 0; @@ -815,10 +815,10 @@ rcu_item_t *next = rcu_item->next; rcu_func_t func = rcu_item->func; - + func(rcu_item); - + rcu_item = next; } - + *phead = NULL; } @@ -843,10 +843,10 @@ CPU->rcu.cur_cbs_cnt = CPU->rcu.next_cbs_cnt; CPU->rcu.cur_cbs_gp = CPU->rcu.next_cbs_gp; - + /* Move arriving_cbs to next_cbs. */ - + CPU->rcu.next_cbs_cnt = CPU->rcu.arriving_cbs_cnt; CPU->rcu.arriving_cbs_cnt = 0; - + /* * Too many callbacks queued. Better speed up the detection @@ -859,5 +859,5 @@ /* Start moving the arriving_cbs list to next_cbs. */ CPU->rcu.next_cbs = CPU->rcu.arriving_cbs; - + /* * At least one callback arrived. The tail therefore does not point @@ -866,5 +866,5 @@ if (CPU->rcu.next_cbs) { assert(CPU->rcu.parriving_cbs_tail != &CPU->rcu.arriving_cbs); - + CPU->rcu.arriving_cbs = NULL; /* Reset arriving_cbs before updating the tail pointer. */ @@ -883,5 +883,5 @@ /* Update statistics of arrived callbacks. */ upd_stat_cb_cnts(CPU->rcu.next_cbs_cnt); - + /* * Make changes prior to queuing next_cbs visible to readers. @@ -891,11 +891,11 @@ /* At the end of next_cbs_gp, exec next_cbs. Determine what GP that is. */ - + if (!next_cbs_empty()) { spinlock_lock(&rcu.gp_lock); - + /* Exec next_cbs at the end of the next GP. */ CPU->rcu.next_cbs_gp = _rcu_cur_gp + 1; - + /* * There are no callbacks to invoke before next_cbs. Instruct @@ -908,12 +908,12 @@ CPU->rcu.cur_cbs_gp = rcu.completed_gp + 1; } - + spinlock_unlock(&rcu.gp_lock); } else { CPU->rcu.next_cbs_gp = CPU->rcu.cur_cbs_gp; } - + assert(CPU->rcu.cur_cbs_gp <= CPU->rcu.next_cbs_gp); - + return expedite; } @@ -936,5 +936,5 @@ assert(CPU->rcu.cur_cbs_gp <= CPU->rcu.next_cbs_gp); assert(CPU->rcu.cur_cbs_gp <= _rcu_cur_gp + 1); - + while (rcu.completed_gp < CPU->rcu.cur_cbs_gp) { /* GP has not yet started - start a new one. */ @@ -952,12 +952,12 @@ } else { /* GP detection is in progress.*/ - + if (expedite) condvar_signal(&rcu.expedite_now); - + /* Wait for the GP to complete. */ errno_t ret = _condvar_wait_timeout_spinlock(&rcu.gp_ended, &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE); - + if (ret == EINTR) { spinlock_unlock(&rcu.gp_lock); @@ -966,10 +966,10 @@ } } - + upd_missed_gp_in_wait(rcu.completed_gp); - + *completed_gp = rcu.completed_gp; spinlock_unlock(&rcu.gp_lock); - + return true; } @@ -978,22 +978,22 @@ { DEFINE_CPU_MASK(reader_cpus); - + cpu_mask_active(reader_cpus); rm_quiescent_cpus(reader_cpus); - + while (!cpu_mask_is_none(reader_cpus)) { /* Give cpus a chance to context switch (a QS) and batch callbacks. */ if(!gp_sleep(&expedite)) return false; - + rm_quiescent_cpus(reader_cpus); sample_cpus(reader_cpus, reader_cpus); } - + /* Update statistic. */ if (expedite) { ++rcu.stat_expedited_cnt; } - + /* * All cpus have passed through a QS and see the most recent _rcu_cur_gp. @@ -1032,9 +1032,9 @@ assert(interrupts_disabled()); cpu_mask_t *reader_cpus = (cpu_mask_t *)arg; - + bool locked = RCU_CNT_INC <= THE->rcu_nesting; /* smp_call machinery makes the most current _rcu_cur_gp visible. */ bool passed_qs = (CPU->rcu.last_seen_gp == _rcu_cur_gp); - + if (locked && !passed_qs) { /* @@ -1062,5 +1062,5 @@ */ size_t nesting_cnt = local_atomic_exchange(&THE->rcu_nesting, 0); - + /* * Ensures NMIs see .rcu_nesting without the WAS_PREEMPTED mark and @@ -1068,5 +1068,5 @@ */ compiler_barrier(); - + /* Preempted a reader critical section for the first time. */ if (RCU_CNT_INC <= nesting_cnt && !(nesting_cnt & RCU_WAS_PREEMPTED)) { @@ -1074,5 +1074,5 @@ note_preempted_reader(); } - + /* Save the thread's nesting count when it is not running. */ THREAD->rcu.nesting_cnt = nesting_cnt; @@ -1110,5 +1110,5 @@ THREAD->priority = -1; } - + upd_max_cbs_in_slice(CPU->rcu.arriving_cbs_cnt); } @@ -1118,5 +1118,5 @@ { assert(!rcu_read_locked()); - + /* Load the thread's saved nesting count from before it was preempted. */ THE->rcu_nesting = THREAD->rcu.nesting_cnt; @@ -1131,5 +1131,5 @@ { assert(THE->rcu_nesting == 0); - + /* * The thread forgot to exit its reader critical section. @@ -1159,5 +1159,5 @@ { assert(0 == THE->rcu_nesting || RCU_WAS_PREEMPTED == THE->rcu_nesting); - + size_t prev = local_atomic_exchange(&THE->rcu_nesting, 0); if (prev == RCU_WAS_PREEMPTED) { @@ -1212,7 +1212,7 @@ return true; } - + spinlock_lock(&rcu.gp_lock); - + if (CPU->rcu.cur_cbs_gp <= rcu.completed_gp) { *completed_gp = rcu.completed_gp; @@ -1220,8 +1220,8 @@ return true; } - + assert(CPU->rcu.cur_cbs_gp <= CPU->rcu.next_cbs_gp); assert(_rcu_cur_gp <= CPU->rcu.cur_cbs_gp); - + /* * Notify the detector of how many GP ends we intend to wait for, so @@ -1231,5 +1231,5 @@ size_t remaining_gp_ends = (size_t) (CPU->rcu.next_cbs_gp - _rcu_cur_gp); req_detection(remaining_gp_ends + (arriving_cbs_empty() ? 0 : 1)); - + /* * Ask the detector to speed up GP detection if there are too many @@ -1239,5 +1239,5 @@ if(0 == rcu.req_expedited_cnt) condvar_signal(&rcu.expedite_now); - + /* * Expedite only cub_cbs. If there really is a surge of callbacks @@ -1250,11 +1250,11 @@ /* Wait for cur_cbs_gp to end. */ bool interrupted = cv_wait_for_gp(CPU->rcu.cur_cbs_gp); - + *completed_gp = rcu.completed_gp; spinlock_unlock(&rcu.gp_lock); - + if (!interrupted) upd_missed_gp_in_wait(*completed_gp); - + return !interrupted; } @@ -1264,7 +1264,7 @@ { assert(spinlock_locked(&rcu.gp_lock)); - + bool interrupted = false; - + /* Wait until wait_on_gp ends. */ while (rcu.completed_gp < wait_on_gp && !interrupted) { @@ -1273,5 +1273,5 @@ interrupted = (ret == EINTR); } - + return interrupted; } @@ -1296,5 +1296,5 @@ { spinlock_lock(&rcu.gp_lock); - + while (wait_for_detect_req()) { /* @@ -1303,10 +1303,10 @@ */ start_new_gp(); - + spinlock_unlock(&rcu.gp_lock); - + if (!wait_for_readers()) goto unlocked_out; - + spinlock_lock(&rcu.gp_lock); @@ -1314,7 +1314,7 @@ end_cur_gp(); } - + spinlock_unlock(&rcu.gp_lock); - + unlocked_out: return; @@ -1325,14 +1325,14 @@ { assert(spinlock_locked(&rcu.gp_lock)); - + bool interrupted = false; - + while (0 == rcu.req_gp_end_cnt && !interrupted) { int ret = _condvar_wait_timeout_spinlock(&rcu.req_gp_changed, &rcu.gp_lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_INTERRUPTIBLE); - + interrupted = (ret == EINTR); } - + return !interrupted; } @@ -1342,8 +1342,8 @@ { assert(spinlock_locked(&rcu.gp_lock)); - + rcu.completed_gp = _rcu_cur_gp; --rcu.req_gp_end_cnt; - + condvar_broadcast(&rcu.gp_ended); } @@ -1353,5 +1353,5 @@ { DEFINE_CPU_MASK(reading_cpus); - + /* All running cpus have potential readers. */ cpu_mask_active(reading_cpus); @@ -1363,11 +1363,11 @@ if (!gp_sleep()) return false; - + /* Non-intrusively determine which cpus have yet to pass a QS. */ rm_quiescent_cpus(reading_cpus); - + /* Actively interrupt cpus delaying the current GP and demand a QS. */ interrupt_delaying_cpus(reading_cpus); - + /* Wait for the interrupted cpus to notify us that they reached a QS. */ if (!wait_for_delaying_cpus()) @@ -1378,9 +1378,9 @@ * monotonically descreases. */ - + /* Wait for the last reader in cur_preempted to notify us it is done. */ if (!wait_for_preempt_reader()) return false; - + return true; } @@ -1397,5 +1397,5 @@ DETECT_SLEEP_MS * 1000, SYNCH_FLAGS_INTERRUPTIBLE); } - + if (0 < rcu.req_expedited_cnt) { --rcu.req_expedited_cnt; @@ -1403,7 +1403,7 @@ ++rcu.stat_expedited_cnt; } - + spinlock_unlock(&rcu.gp_lock); - + return (ret != EINTR); } @@ -1413,5 +1413,5 @@ { atomic_set(&rcu.delaying_cpu_cnt, 0); - + sample_cpus(cpu_mask, NULL); } @@ -1426,5 +1426,5 @@ assert(interrupts_disabled()); assert(!CPU->rcu.is_delaying_gp); - + /* Cpu did not pass a quiescent state yet. */ if (CPU->rcu.last_seen_gp != _rcu_cur_gp) { @@ -1440,5 +1440,5 @@ ACCESS_ONCE(CPU->rcu.is_delaying_gp) = true; CPU->rcu.signal_unlock = true; - + atomic_inc(&rcu.delaying_cpu_cnt); } else { @@ -1466,5 +1466,5 @@ */ } - + /* * smp_call() makes sure any changes propagate back to the caller. @@ -1483,8 +1483,8 @@ return false; } - + /* Update statistic. */ rcu.stat_delayed_cnt += delaying_cpu_cnt; - + return true; } @@ -1506,8 +1506,8 @@ */ compiler_barrier(); - + /* Save the thread's nesting count when it is not running. */ THREAD->rcu.nesting_cnt = CPU->rcu.nesting_cnt; - + /* Preempted a reader critical section for the first time. */ if (0 < THREAD->rcu.nesting_cnt && !THREAD->rcu.was_preempted) { @@ -1515,5 +1515,5 @@ note_preempted_reader(); } - + /* * The preempted reader has been noted globally. There are therefore @@ -1528,5 +1528,5 @@ */ CPU->rcu.nesting_cnt = 0; - + /* * This cpu is holding up the current GP. Let the detector know @@ -1553,5 +1553,5 @@ THREAD->priority = -1; } - + upd_max_cbs_in_slice(CPU->rcu.arriving_cbs_cnt); } @@ -1562,8 +1562,8 @@ assert(PREEMPTION_DISABLED || interrupts_disabled()); assert(0 == CPU->rcu.nesting_cnt); - + /* Load the thread's saved nesting count from before it was preempted. */ CPU->rcu.nesting_cnt = THREAD->rcu.nesting_cnt; - + /* * Ensures NMI see the proper nesting count before .signal_unlock. @@ -1572,5 +1572,5 @@ */ compiler_barrier(); - + /* * In the unlikely event that a NMI occurs between the loading of the @@ -1594,5 +1594,5 @@ assert(THREAD->state == Exiting); assert(PREEMPTION_DISABLED || interrupts_disabled()); - + /* * The thread forgot to exit its reader critical section. @@ -1617,10 +1617,10 @@ { assert(spinlock_locked(&rcu.gp_lock)); - + irq_spinlock_lock(&rcu.preempt_lock, true); - + /* Start a new GP. Announce to readers that a quiescent state is needed. */ ++_rcu_cur_gp; - + /* * Readers preempted before the start of this GP (next_preempted) @@ -1632,5 +1632,5 @@ */ list_concat(&rcu.cur_preempted, &rcu.next_preempted); - + irq_spinlock_unlock(&rcu.preempt_lock, true); } @@ -1694,5 +1694,5 @@ */ memory_barrier(); /* MB C */ - + cpu_mask_for_each(*cpu_mask, cpu_id) { /* @@ -1707,5 +1707,5 @@ */ bool cpu_acked_gp = (cpus[cpu_id].rcu.last_seen_gp == _rcu_cur_gp); - + /* * Either the cpu is idle or it is exiting away from idle mode @@ -1714,5 +1714,5 @@ */ bool cpu_idle = cpus[cpu_id].idle; - + if (cpu_acked_gp || cpu_idle) { cpu_mask_reset(cpu_mask, cpu_id); @@ -1736,5 +1736,5 @@ { assert(CPU->rcu.cur_cbs_gp <= completed_gp); - + size_t delta = (size_t)(completed_gp - CPU->rcu.cur_cbs_gp); CPU->rcu.stat_missed_gp_in_wait += delta; @@ -1764,5 +1764,5 @@ { irq_spinlock_lock(&rcu.preempt_lock, true); - + assert(link_used(&THREAD->rcu.preempt_link)); @@ -1793,14 +1793,14 @@ bool reader_exists = !list_empty(&rcu.cur_preempted); rcu.preempt_blocking_det = reader_exists; - + irq_spinlock_unlock(&rcu.preempt_lock, true); - + if (reader_exists) { /* Update statistic. */ ++rcu.stat_preempt_blocking_cnt; - + return semaphore_down_interruptable(&rcu.remaining_readers); } - + return true; } @@ -1809,10 +1809,10 @@ { rcu_cpu_data_t *cr = &CPU->rcu; - + if (arriving_cbs_cnt > cr->last_arriving_cnt) { size_t arrived_cnt = arriving_cbs_cnt - cr->last_arriving_cnt; cr->stat_max_slice_cbs = max(arrived_cnt, cr->stat_max_slice_cbs); } - + cr->last_arriving_cnt = arriving_cbs_cnt; } @@ -1826,5 +1826,5 @@ * are no locks to lock in order to get up-to-date values. */ - + #ifdef RCU_PREEMPT_PODZIMEK const char *algo = "podzimek-preempt-rcu"; @@ -1832,5 +1832,5 @@ const char *algo = "a-preempt-rcu"; #endif - + printf("Config: expedite_threshold=%d, critical_threshold=%d," " detect_sleep=%dms, %s\n", @@ -1843,5 +1843,5 @@ "running or not)\n", rcu.stat_preempt_blocking_cnt); printf("Smp calls: %zu\n", rcu.stat_smp_call_cnt); - + printf("Max arrived callbacks per GP and CPU:\n"); for (unsigned int i = 0; i < config.cpu_count; ++i) { @@ -1853,5 +1853,5 @@ printf(" %zu", cpus[i].rcu.stat_avg_cbs); } - + printf("\nMax arrived callbacks per time slice and CPU:\n"); for (unsigned int i = 0; i < config.cpu_count; ++i) { Index: kernel/generic/src/synch/smp_memory_barrier.c =================================================================== --- kernel/generic/src/synch/smp_memory_barrier.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/smp_memory_barrier.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -56,5 +56,5 @@ smp_call(cpu_id, issue_mem_bar, NULL); } - + return 0; } Index: kernel/generic/src/synch/spinlock.c =================================================================== --- kernel/generic/src/synch/spinlock.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/spinlock.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -77,5 +77,5 @@ size_t i = 0; bool deadlock_reported = false; - + preemption_disable(); while (test_and_set(&lock->val)) { @@ -101,5 +101,5 @@ if (lock->name[0] == '*') continue; - + if (i++ > DEADLOCK_THRESHOLD) { printf("cpu%u: looping on spinlock %p:%s, " @@ -107,13 +107,13 @@ (void *) CALLER, symtab_fmt_name_lookup(CALLER)); stack_trace(); - + i = 0; deadlock_reported = true; } } - + if (deadlock_reported) printf("cpu%u: not deadlocked\n", CPU->id); - + /* * Prevent critical section code from bleeding out this way up. @@ -131,10 +131,10 @@ { ASSERT_SPINLOCK(spinlock_locked(lock), lock); - + /* * Prevent critical section code from bleeding out this way down. */ CS_LEAVE_BARRIER(); - + atomic_set(&lock->val, 0); preemption_enable(); @@ -157,13 +157,13 @@ preemption_disable(); bool ret = !test_and_set(&lock->val); - + /* * Prevent critical section code from bleeding out this way up. */ CS_ENTER_BARRIER(); - + if (!ret) preemption_enable(); - + return ret; } @@ -208,10 +208,10 @@ ipl_t ipl = interrupts_disable(); spinlock_lock(&(lock->lock)); - + lock->guard = true; lock->ipl = ipl; } else { ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock); - + spinlock_lock(&(lock->lock)); ASSERT_IRQ_SPINLOCK(!lock->guard, lock); @@ -231,11 +231,11 @@ { ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock); - + if (irq_res) { ASSERT_IRQ_SPINLOCK(lock->guard, lock); - + lock->guard = false; ipl_t ipl = lock->ipl; - + spinlock_unlock(&(lock->lock)); interrupts_restore(ipl); @@ -261,5 +261,5 @@ ASSERT_IRQ_SPINLOCK(interrupts_disabled(), lock); bool ret = spinlock_trylock(&(lock->lock)); - + ASSERT_IRQ_SPINLOCK((!ret) || (!lock->guard), lock); return ret; @@ -280,15 +280,15 @@ { ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock); - + /* Pass guard from unlock to lock */ bool guard = unlock->guard; ipl_t ipl = unlock->ipl; unlock->guard = false; - + spinlock_unlock(&(unlock->lock)); spinlock_lock(&(lock->lock)); - + ASSERT_IRQ_SPINLOCK(!lock->guard, lock); - + if (guard) { lock->guard = true; @@ -311,8 +311,8 @@ { ASSERT_IRQ_SPINLOCK(interrupts_disabled(), unlock); - + spinlock_lock(&(lock->lock)); ASSERT_IRQ_SPINLOCK(!lock->guard, lock); - + /* Pass guard from unlock to lock */ if (unlock->guard) { @@ -321,5 +321,5 @@ unlock->guard = false; } - + spinlock_unlock(&(unlock->lock)); } Index: kernel/generic/src/synch/waitq.c =================================================================== --- kernel/generic/src/synch/waitq.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/waitq.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -94,12 +94,12 @@ bool do_wakeup = false; DEADLOCK_PROBE_INIT(p_wqlock); - + irq_spinlock_lock(&threads_lock, false); if (!thread_exists(thread)) goto out; - + grab_locks: irq_spinlock_lock(&thread->lock, false); - + waitq_t *wq; if ((wq = thread->sleep_queue)) { /* Assignment */ @@ -110,5 +110,5 @@ goto grab_locks; } - + list_remove(&thread->wq_link); thread->saved_context = thread->sleep_timeout_context; @@ -117,11 +117,11 @@ irq_spinlock_unlock(&wq->lock, false); } - + thread->timeout_pending = false; irq_spinlock_unlock(&thread->lock, false); - + if (do_wakeup) thread_ready(thread); - + out: irq_spinlock_unlock(&threads_lock, false); @@ -144,13 +144,13 @@ bool do_wakeup = false; DEADLOCK_PROBE_INIT(p_wqlock); - + /* * The thread is quaranteed to exist because * threads_lock is held. */ - + grab_locks: irq_spinlock_lock(&thread->lock, false); - + waitq_t *wq; if ((wq = thread->sleep_queue)) { /* Assignment */ @@ -162,5 +162,5 @@ return; } - + if (!irq_spinlock_trylock(&wq->lock)) { /* Avoid deadlock */ @@ -169,9 +169,9 @@ goto grab_locks; } - + if ((thread->timeout_pending) && (timeout_unregister(&thread->sleep_timeout))) thread->timeout_pending = false; - + list_remove(&thread->wq_link); thread->saved_context = thread->sleep_interruption_context; @@ -180,7 +180,7 @@ irq_spinlock_unlock(&wq->lock, false); } - + irq_spinlock_unlock(&thread->lock, false); - + if (do_wakeup) thread_ready(thread); @@ -198,25 +198,25 @@ { irq_spinlock_lock(&wq->lock, true); - + if (!list_empty(&wq->sleepers)) { thread_t *thread = list_get_instance(list_first(&wq->sleepers), thread_t, wq_link); - + irq_spinlock_lock(&thread->lock, false); - + assert(thread->sleep_interruptible); - + if ((thread->timeout_pending) && (timeout_unregister(&thread->sleep_timeout))) thread->timeout_pending = false; - + list_remove(&thread->wq_link); thread->saved_context = thread->sleep_interruption_context; thread->sleep_queue = NULL; - + irq_spinlock_unlock(&thread->lock, false); thread_ready(thread); } - + irq_spinlock_unlock(&wq->lock, true); } @@ -271,5 +271,5 @@ { assert((!PREEMPTION_DISABLED) || (PARAM_NON_BLOCKING(flags, usec))); - + ipl_t ipl = waitq_sleep_prepare(wq); bool nblocked; @@ -296,8 +296,8 @@ { ipl_t ipl; - + restart: ipl = interrupts_disable(); - + if (THREAD) { /* Needed during system initiailzation */ /* @@ -310,5 +310,5 @@ */ irq_spinlock_lock(&THREAD->lock, false); - + if (THREAD->timeout_pending) { irq_spinlock_unlock(&THREAD->lock, false); @@ -316,8 +316,8 @@ goto restart; } - + irq_spinlock_unlock(&THREAD->lock, false); } - + irq_spinlock_lock(&wq->lock, false); return ipl; @@ -354,5 +354,5 @@ irq_spinlock_unlock(&wq->lock, false); } - + interrupts_restore(ipl); } @@ -387,5 +387,5 @@ } } - + /* * Now we are firmly decided to go to sleep. @@ -393,5 +393,5 @@ */ irq_spinlock_lock(&THREAD->lock, false); - + if (flags & SYNCH_FLAGS_INTERRUPTIBLE) { /* @@ -403,5 +403,5 @@ return EINTR; } - + /* * Set context that will be restored if the sleep @@ -417,5 +417,5 @@ } else THREAD->sleep_interruptible = false; - + if (usec) { /* We use the timeout variant. */ @@ -426,12 +426,12 @@ return ETIMEOUT; } - + THREAD->timeout_pending = true; timeout_register(&THREAD->sleep_timeout, (uint64_t) usec, waitq_sleep_timed_out, THREAD); } - + list_append(&THREAD->wq_link, &wq->sleepers); - + /* * Suspend execution. @@ -440,15 +440,15 @@ THREAD->state = Sleeping; THREAD->sleep_queue = wq; - + /* Must be before entry to scheduler, because there are multiple * return vectors. */ *blocked = true; - + irq_spinlock_unlock(&THREAD->lock, false); - + /* wq->lock is released in scheduler_separated_stack() */ scheduler(); - + return EOK; } @@ -511,5 +511,5 @@ { assert(interrupts_disabled()); - + irq_spinlock_lock(&wq->lock, false); irq_spinlock_unlock(&wq->lock, false); @@ -536,5 +536,5 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&wq->lock)); - + loop: if (list_empty(&wq->sleepers)) { @@ -542,12 +542,12 @@ if ((count) && (mode == WAKEUP_ALL)) wq->missed_wakeups--; - + return; } - + count++; thread_t *thread = list_get_instance(list_first(&wq->sleepers), thread_t, wq_link); - + /* * Lock the thread prior to removing it from the wq. @@ -569,14 +569,14 @@ irq_spinlock_lock(&thread->lock, false); list_remove(&thread->wq_link); - + if ((thread->timeout_pending) && (timeout_unregister(&thread->sleep_timeout))) thread->timeout_pending = false; - + thread->sleep_queue = NULL; irq_spinlock_unlock(&thread->lock, false); - + thread_ready(thread); - + if (mode == WAKEUP_ALL) goto loop; Index: kernel/generic/src/synch/workqueue.c =================================================================== --- kernel/generic/src/synch/workqueue.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/synch/workqueue.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -59,17 +59,17 @@ */ IRQ_SPINLOCK_DECLARE(lock); - + /* Activates a worker if new work arrives or if shutting down the queue. */ condvar_t activate_worker; - + /* Queue of work_items ready to be dispatched. */ list_t queue; - + /* List of worker threads. */ list_t workers; - + /* Number of work items queued. */ size_t item_cnt; - + /* Indicates the work queue is shutting down. */ bool stopping; @@ -84,10 +84,10 @@ /* Number of blocked workers sleeping in work func() (ie not idle). */ size_t blocked_worker_cnt; - + /* Number of pending signal_worker_op() operations. */ size_t pending_op_cnt; - + link_t nb_link; - + #ifdef CONFIG_DEBUG /* Magic cookie for integrity checks. Immutable. Accessed without lock. */ @@ -105,5 +105,5 @@ /** Max number of work items per active worker before a new worker is activated.*/ static const size_t max_items_per_worker = 8; - + /** System wide work queue. */ static struct work_queue g_work_queue; @@ -157,10 +157,10 @@ */ booting = false; - + nonblock_init(); - + if (!add_worker(&g_work_queue)) panic("Could not create a single global work queue worker!\n"); - + } @@ -174,5 +174,5 @@ /* Maximum concurrency without slowing down the system. */ max_concurrent_workers = max(2, config.cpu_count); - + workq_preinit(&g_work_queue, "kworkq"); } @@ -188,5 +188,5 @@ { struct work_queue *workq = malloc(sizeof(struct work_queue), 0); - + if (workq) { if (workq_init(workq, name)) { @@ -194,8 +194,8 @@ return workq; } - + free(workq); } - + return NULL; } @@ -205,5 +205,5 @@ { assert(!workq_corrupted(workq)); - + irq_spinlock_lock(&workq->lock, true); bool stopped = workq->stopping; @@ -212,5 +212,5 @@ #endif irq_spinlock_unlock(&workq->lock, true); - + if (!stopped) { workq_stop(workq); @@ -218,9 +218,9 @@ assert(0 == running_workers); } - + #ifdef CONFIG_DEBUG workq->cookie = 0; #endif - + free(workq); } @@ -232,20 +232,20 @@ workq->cookie = WORKQ_MAGIC; #endif - + irq_spinlock_initialize(&workq->lock, name); condvar_initialize(&workq->activate_worker); - + list_initialize(&workq->queue); list_initialize(&workq->workers); - + workq->item_cnt = 0; workq->stopping = false; workq->name = name; - + workq->cur_worker_cnt = 1; workq->idle_worker_cnt = 0; workq->activate_pending = 0; workq->blocked_worker_cnt = 0; - + workq->pending_op_cnt = 0; link_initialize(&workq->nb_link); @@ -270,16 +270,16 @@ thread_t *thread = thread_create(worker_thread, workq, TASK, THREAD_FLAG_NONE, workq->name); - + if (!thread) { irq_spinlock_lock(&workq->lock, true); - + /* cur_worker_cnt proactively increased in signal_worker_logic() .*/ assert(0 < workq->cur_worker_cnt); --workq->cur_worker_cnt; - + irq_spinlock_unlock(&workq->lock, true); return false; } - + /* Respect lock ordering. */ irq_spinlock_lock(&thread->lock, true); @@ -290,8 +290,8 @@ if (!workq->stopping) { success = true; - + /* Try to distribute workers among cpus right away. */ unsigned int cpu_id = (workq->cur_worker_cnt) % config.cpu_active; - + if (!cpus[cpu_id].active) cpu_id = CPU->id; @@ -312,10 +312,10 @@ */ success = false; - + /* cur_worker_cnt proactively increased in signal_worker() .*/ assert(0 < workq->cur_worker_cnt); --workq->cur_worker_cnt; } - + irq_spinlock_unlock(&workq->lock, false); irq_spinlock_unlock(&thread->lock, true); @@ -324,7 +324,7 @@ thread_interrupt(thread); } - + thread_ready(thread); - + return success; } @@ -337,5 +337,5 @@ { assert(!workq_corrupted(workq)); - + interrupt_workers(workq); wait_for_workers(workq); @@ -350,8 +350,8 @@ assert(!workq->stopping); workq->stopping = true; - + /* Respect lock ordering - do not hold workq->lock during broadcast. */ irq_spinlock_unlock(&workq->lock, true); - + condvar_broadcast(&workq->activate_worker); } @@ -361,7 +361,7 @@ { assert(!PREEMPTION_DISABLED); - + irq_spinlock_lock(&workq->lock, true); - + list_foreach_safe(workq->workers, cur_worker, next_worker) { thread_t *worker = list_get_instance(cur_worker, thread_t, workq_link); @@ -370,22 +370,22 @@ /* Wait without the lock. */ irq_spinlock_unlock(&workq->lock, true); - + thread_join(worker); thread_detach(worker); - + irq_spinlock_lock(&workq->lock, true); } - + assert(list_empty(&workq->workers)); - + /* Wait for deferred add_worker_op(), signal_worker_op() to finish. */ while (0 < workq->cur_worker_cnt || 0 < workq->pending_op_cnt) { irq_spinlock_unlock(&workq->lock, true); - + scheduler(); - + irq_spinlock_lock(&workq->lock, true); } - + irq_spinlock_unlock(&workq->lock, true); } @@ -422,5 +422,5 @@ * until func() is entered. * @param func User supplied function to invoke in a worker thread. - + * @return false if work queue is shutting down; function is not * queued for further processing. @@ -442,5 +442,5 @@ * until func() is entered. * @param func User supplied function to invoke in a worker thread. - + * @return false if work queue is shutting down; function is not * queued for further processing. @@ -467,5 +467,5 @@ * @param func User supplied function to invoke in a worker thread. * @param can_block May adding this work item block? - + * @return false if work queue is shutting down; function is not * queued for further processing. @@ -476,10 +476,10 @@ { assert(!workq_corrupted(workq)); - + bool success = true; signal_op_t signal_op = NULL; - + irq_spinlock_lock(&workq->lock, true); - + if (workq->stopping) { success = false; @@ -489,5 +489,5 @@ ++workq->item_cnt; success = true; - + if (!booting) { signal_op = signal_worker_logic(workq, can_block); @@ -499,5 +499,5 @@ } } - + irq_spinlock_unlock(&workq->lock, true); @@ -505,5 +505,5 @@ signal_op(workq); } - + return success; } @@ -515,5 +515,5 @@ work_item->cookie = WORK_ITEM_MAGIC; #endif - + link_initialize(&work_item->queue_link); work_item->func = func; @@ -524,17 +524,17 @@ { assert(irq_spinlock_locked(&workq->lock)); - + /* Workers blocked are sleeping in the work function (ie not idle). */ assert(workq->blocked_worker_cnt <= workq->cur_worker_cnt); /* Idle workers are waiting for more work to arrive in condvar_wait. */ assert(workq->idle_worker_cnt <= workq->cur_worker_cnt); - + /* Idle + blocked workers == sleeping worker threads. */ size_t sleeping_workers = workq->blocked_worker_cnt + workq->idle_worker_cnt; - + assert(sleeping_workers <= workq->cur_worker_cnt); /* Workers pending activation are idle workers not yet given a time slice. */ assert(workq->activate_pending <= workq->idle_worker_cnt); - + /* * Workers actively running the work func() this very moment and @@ -553,5 +553,5 @@ { assert(irq_spinlock_locked(&workq->lock)); - + /* * Workers actively running the work func() and are neither blocked nor @@ -578,5 +578,5 @@ condvar_signal(&workq->activate_worker); - + irq_spinlock_lock(&workq->lock, true); assert(0 < workq->pending_op_cnt); @@ -597,5 +597,5 @@ assert(!workq_corrupted(workq)); assert(irq_spinlock_locked(&workq->lock)); - + /* Only signal workers if really necessary. */ signal_op_t signal_op = NULL; @@ -630,5 +630,5 @@ bool need_worker = (active < max_concurrent_workers) && (workq->cur_worker_cnt < max_worker_cnt); - + if (need_worker && can_block) { signal_op = add_worker_op; @@ -641,5 +641,5 @@ ++workq->cur_worker_cnt; } - + /* * We cannot create a new worker but we need one desperately @@ -648,5 +648,5 @@ if (need_worker && !can_block && 0 == active) { assert(0 == workq->idle_worker_cnt); - + irq_spinlock_lock(&nonblock_adder.lock, true); @@ -667,5 +667,5 @@ signal_op = NULL; } - + return signal_op; } @@ -682,10 +682,10 @@ return; } - + assert(arg != NULL); - + struct work_queue *workq = arg; work_t *work_item; - + while (dequeue_work(workq, &work_item)) { /* Copy the func field so func() can safely free work_item. */ @@ -700,7 +700,7 @@ { assert(!workq_corrupted(workq)); - + irq_spinlock_lock(&workq->lock, true); - + /* Check if we should exit if load is low. */ if (!workq->stopping && worker_unnecessary(workq)) { @@ -710,15 +710,15 @@ list_remove(&THREAD->workq_link); irq_spinlock_unlock(&workq->lock, true); - + thread_detach(THREAD); return false; } - + bool stop = false; - + /* Wait for work to arrive. */ while (list_empty(&workq->queue) && !workq->stopping) { cv_wait(workq); - + if (0 < workq->activate_pending) --workq->activate_pending; @@ -729,5 +729,5 @@ link_t *work_link = list_first(&workq->queue); *pwork_item = list_get_instance(work_link, work_t, queue_link); - + #ifdef CONFIG_DEBUG assert(!work_item_corrupted(*pwork_item)); @@ -736,5 +736,5 @@ list_remove(work_link); --workq->item_cnt; - + stop = false; } else { @@ -744,7 +744,7 @@ stop = true; } - + irq_spinlock_unlock(&workq->lock, true); - + return !stop; } @@ -754,5 +754,5 @@ { assert(irq_spinlock_locked(&workq->lock)); - + /* No work is pending. We don't need too many idle threads. */ if (list_empty(&workq->queue)) { @@ -775,8 +775,8 @@ ++workq->idle_worker_cnt; THREAD->workq_idling = true; - + /* Ignore lock ordering just here. */ assert(irq_spinlock_locked(&workq->lock)); - + _condvar_wait_timeout_irq_spinlock(&workq->activate_worker, &workq->lock, SYNCH_NO_TIMEOUT, SYNCH_FLAGS_NONE); @@ -784,5 +784,5 @@ assert(!workq_corrupted(workq)); assert(irq_spinlock_locked(&workq->lock)); - + THREAD->workq_idling = false; --workq->idle_worker_cnt; @@ -803,8 +803,8 @@ assert(THREAD != thread); assert(!workq_corrupted(thread->workq)); - + /* Protected by thread->lock */ thread->workq_blocked = false; - + irq_spinlock_lock(&thread->workq->lock, true); --thread->workq->blocked_worker_cnt; @@ -823,16 +823,16 @@ assert(!THREAD->workq_blocked); assert(!workq_corrupted(THREAD->workq)); - + THREAD->workq_blocked = true; - + irq_spinlock_lock(&THREAD->workq->lock, false); ++THREAD->workq->blocked_worker_cnt; - + bool can_block = false; signal_op_t op = signal_worker_logic(THREAD->workq, can_block); - + irq_spinlock_unlock(&THREAD->workq->lock, false); - + if (op) { assert(add_worker_noblock_op == op || signal_worker_op == op); @@ -856,7 +856,7 @@ const char *load_str = worker_surplus ? "decreasing" : (0 < workq->activate_pending) ? "increasing" : "stable"; - + irq_spinlock_unlock(&workq->lock, true); - + printf( "Configuration: max_worker_cnt=%zu, min_worker_cnt=%zu,\n" @@ -893,12 +893,12 @@ irq_spinlock_lock(&info->lock, true); - + 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); - + stop = (ret == EINTR); } - + if (!stop) { *pworkq = list_get_instance(list_first(&info->work_queues), @@ -906,10 +906,10 @@ assert(!workq_corrupted(*pworkq)); - + list_remove(&(*pworkq)->nb_link); } - + irq_spinlock_unlock(&info->lock, true); - + return !stop; } @@ -919,5 +919,5 @@ nonblock_adder_t *info = arg; struct work_queue *workq; - + while (dequeue_add_req(info, &workq)) { add_worker(workq); @@ -931,8 +931,8 @@ condvar_initialize(&nonblock_adder.req_cv); list_initialize(&nonblock_adder.work_queues); - + nonblock_adder.thread = thread_create(thr_nonblock_add_worker, &nonblock_adder, TASK, THREAD_FLAG_NONE, "kworkq-nb"); - + if (nonblock_adder.thread) { thread_ready(nonblock_adder.thread); Index: kernel/generic/src/syscall/copy.c =================================================================== --- kernel/generic/src/syscall/copy.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/syscall/copy.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -26,5 +26,5 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ - + /** @addtogroup generic * @{ @@ -63,8 +63,8 @@ ipl_t ipl; errno_t rc; - + assert(THREAD); assert(!THREAD->in_copy_from_uspace); - + if (!KERNEL_ADDRESS_SPACE_SHADOWED) { if (overlaps((uintptr_t) uspace_src, size, @@ -86,8 +86,8 @@ return EPERM; #endif - + ipl = interrupts_disable(); THREAD->in_copy_from_uspace = true; - + rc = memcpy_from_uspace(dst, uspace_src, size); @@ -114,8 +114,8 @@ ipl_t ipl; errno_t rc; - + assert(THREAD); assert(!THREAD->in_copy_to_uspace); - + if (!KERNEL_ADDRESS_SPACE_SHADOWED) { if (overlaps((uintptr_t) uspace_dst, size, @@ -137,8 +137,8 @@ return EPERM; #endif - + ipl = interrupts_disable(); THREAD->in_copy_to_uspace = true; - + rc = memcpy_to_uspace(uspace_dst, src, size); Index: kernel/generic/src/syscall/syscall.c =================================================================== --- kernel/generic/src/syscall/syscall.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/syscall/syscall.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -66,5 +66,5 @@ thread_update_accounting(true); irq_spinlock_unlock(&THREAD->lock, true); - + #ifdef CONFIG_UDEBUG /* @@ -82,5 +82,5 @@ udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, 0, false); #endif - + sysarg_t rc; if (id < SYSCALL_END) { @@ -91,12 +91,12 @@ task_kill_self(true); } - + if (THREAD->interrupted) thread_exit(); - + #ifdef CONFIG_UDEBUG if (THREAD->udebug.active) { udebug_syscall_event(a1, a2, a3, a4, a5, a6, id, rc, true); - + /* * Stopping point needed for tasks that only invoke @@ -111,10 +111,10 @@ THREAD->udebug.uspace_state = NULL; #endif - + /* Do kernel accounting */ irq_spinlock_lock(&THREAD->lock, true); thread_update_accounting(false); irq_spinlock_unlock(&THREAD->lock, true); - + return rc; } @@ -123,5 +123,5 @@ /* System management syscalls. */ [SYS_KIO] = (syshandler_t) sys_kio, - + /* Thread and task related syscalls. */ [SYS_THREAD_CREATE] = (syshandler_t) sys_thread_create, @@ -130,5 +130,5 @@ [SYS_THREAD_USLEEP] = (syshandler_t) sys_thread_usleep, [SYS_THREAD_UDELAY] = (syshandler_t) sys_thread_udelay, - + [SYS_TASK_GET_ID] = (syshandler_t) sys_task_get_id, [SYS_TASK_SET_NAME] = (syshandler_t) sys_task_set_name, @@ -136,5 +136,5 @@ [SYS_TASK_EXIT] = (syshandler_t) sys_task_exit, [SYS_PROGRAM_SPAWN_LOADER] = (syshandler_t) sys_program_spawn_loader, - + /* Synchronization related syscalls. */ [SYS_FUTEX_SLEEP] = (syshandler_t) sys_futex_sleep, @@ -142,5 +142,5 @@ [SYS_SMC_COHERENCE] = (syshandler_t) sys_smc_coherence, [SYS_SMP_MEMORY_BARRIER] = (syshandler_t) sys_smp_memory_barrier, - + /* Address space related syscalls. */ [SYS_AS_AREA_CREATE] = (syshandler_t) sys_as_area_create, @@ -148,8 +148,8 @@ [SYS_AS_AREA_CHANGE_FLAGS] = (syshandler_t) sys_as_area_change_flags, [SYS_AS_AREA_DESTROY] = (syshandler_t) sys_as_area_destroy, - + /* Page mapping related syscalls. */ [SYS_PAGE_FIND_MAPPING] = (syshandler_t) sys_page_find_mapping, - + /* IPC related syscalls. */ [SYS_IPC_CALL_ASYNC_FAST] = (syshandler_t) sys_ipc_call_async_fast, @@ -163,14 +163,14 @@ [SYS_IPC_HANGUP] = (syshandler_t) sys_ipc_hangup, [SYS_IPC_CONNECT_KBOX] = (syshandler_t) sys_ipc_connect_kbox, - + /* Event notification syscalls. */ [SYS_IPC_EVENT_SUBSCRIBE] = (syshandler_t) sys_ipc_event_subscribe, [SYS_IPC_EVENT_UNSUBSCRIBE] = (syshandler_t) sys_ipc_event_unsubscribe, [SYS_IPC_EVENT_UNMASK] = (syshandler_t) sys_ipc_event_unmask, - + /* Permission related syscalls. */ [SYS_PERM_GRANT] = (syshandler_t) sys_perm_grant, [SYS_PERM_REVOKE] = (syshandler_t) sys_perm_revoke, - + /* DDI related syscalls. */ [SYS_PHYSMEM_MAP] = (syshandler_t) sys_physmem_map, @@ -180,8 +180,8 @@ [SYS_IOSPACE_ENABLE] = (syshandler_t) sys_iospace_enable, [SYS_IOSPACE_DISABLE] = (syshandler_t) sys_iospace_disable, - + [SYS_IPC_IRQ_SUBSCRIBE] = (syshandler_t) sys_ipc_irq_subscribe, [SYS_IPC_IRQ_UNSUBSCRIBE] = (syshandler_t) sys_ipc_irq_unsubscribe, - + /* Sysinfo syscalls. */ [SYS_SYSINFO_GET_KEYS_SIZE] = (syshandler_t) sys_sysinfo_get_keys_size, @@ -191,8 +191,8 @@ [SYS_SYSINFO_GET_DATA_SIZE] = (syshandler_t) sys_sysinfo_get_data_size, [SYS_SYSINFO_GET_DATA] = (syshandler_t) sys_sysinfo_get_data, - + /* Kernel console syscalls. */ [SYS_DEBUG_CONSOLE] = (syshandler_t) sys_debug_console, - + [SYS_KLOG] = (syshandler_t) sys_klog, }; Index: kernel/generic/src/sysinfo/stats.c =================================================================== --- kernel/generic/src/sysinfo/stats.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/sysinfo/stats.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -99,5 +99,5 @@ if (dry_run) return NULL; - + /* Assumption: config.cpu_count is constant */ stats_cpu_t *stats_cpus = (stats_cpu_t *) malloc(*size, FRAME_ATOMIC); @@ -106,9 +106,9 @@ return NULL; } - + size_t i; for (i = 0; i < config.cpu_count; i++) { irq_spinlock_lock(&cpus[i].lock, true); - + stats_cpus[i].id = cpus[i].id; stats_cpus[i].active = cpus[i].active; @@ -116,8 +116,8 @@ stats_cpus[i].busy_cycles = cpus[i].busy_cycles; stats_cpus[i].idle_cycles = cpus[i].idle_cycles; - + irq_spinlock_unlock(&cpus[i].lock, true); } - + return ((void *) stats_cpus); } @@ -137,5 +137,5 @@ size_t *count = (size_t *) arg; (*count)++; - + return true; } @@ -156,10 +156,10 @@ * object, return inexact statistics by skipping the respective object. */ - + if (mutex_trylock(&as->lock) != EOK) return 0; - + size_t pages = 0; - + /* Walk the B+ tree and count pages */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, @@ -168,15 +168,15 @@ for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + if (mutex_trylock(&area->lock) != EOK) continue; - + pages += area->pages; mutex_unlock(&area->lock); } } - + mutex_unlock(&as->lock); - + return (pages << PAGE_WIDTH); } @@ -197,10 +197,10 @@ * object, return inexact statistics by skipping the respective object. */ - + if (mutex_trylock(&as->lock) != EOK) return 0; - + size_t pages = 0; - + /* Walk the B+ tree and count pages */ list_foreach(as->as_area_btree.leaf_list, leaf_link, btree_node_t, node) { @@ -208,15 +208,15 @@ for (i = 0; i < node->keys; i++) { as_area_t *area = node->value[i]; - + if (mutex_trylock(&area->lock) != EOK) continue; - + pages += area->resident; mutex_unlock(&area->lock); } } - + mutex_unlock(&as->lock); - + return (pages << PAGE_WIDTH); } @@ -234,5 +234,5 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&task->lock)); - + stats_task->task_id = task->taskid; str_cpy(stats_task->name, TASK_NAME_BUFLEN, task->name); @@ -260,14 +260,14 @@ stats_task_t **iterator = (stats_task_t **) arg; task_t *task = avltree_get_instance(node, task_t, tasks_tree_node); - + /* Interrupts are already disabled */ irq_spinlock_lock(&(task->lock), false); - + /* Record the statistics and increment the iterator */ produce_stats_task(task, *iterator); (*iterator)++; - + irq_spinlock_unlock(&(task->lock), false); - + return true; } @@ -289,9 +289,9 @@ /* Messing with task structures, avoid deadlock */ irq_spinlock_lock(&tasks_lock, true); - + /* First walk the task tree to count the tasks */ size_t count = 0; avltree_walk(&tasks_tree, avl_count_walker, (void *) &count); - + if (count == 0) { /* No tasks found (strange) */ @@ -300,5 +300,5 @@ return NULL; } - + *size = sizeof(stats_task_t) * count; if (dry_run) { @@ -306,5 +306,5 @@ return NULL; } - + stats_task_t *stats_tasks = (stats_task_t *) malloc(*size, FRAME_ATOMIC); if (stats_tasks == NULL) { @@ -314,11 +314,11 @@ return NULL; } - + /* Walk tha task tree again to gather the statistics */ stats_task_t *iterator = stats_tasks; avltree_walk(&tasks_tree, task_serialize_walker, (void *) &iterator); - + irq_spinlock_unlock(&tasks_lock, true); - + return ((void *) stats_tasks); } @@ -336,5 +336,5 @@ assert(interrupts_disabled()); assert(irq_spinlock_locked(&thread->lock)); - + stats_thread->thread_id = thread->tid; stats_thread->task_id = thread->task->taskid; @@ -343,5 +343,5 @@ stats_thread->ucycles = thread->ucycles; stats_thread->kcycles = thread->kcycles; - + if (thread->cpu != NULL) { stats_thread->on_cpu = true; @@ -366,14 +366,14 @@ stats_thread_t **iterator = (stats_thread_t **) arg; thread_t *thread = avltree_get_instance(node, thread_t, threads_tree_node); - + /* Interrupts are already disabled */ irq_spinlock_lock(&thread->lock, false); - + /* Record the statistics and increment the iterator */ produce_stats_thread(thread, *iterator); (*iterator)++; - + irq_spinlock_unlock(&thread->lock, false); - + return true; } @@ -395,9 +395,9 @@ /* Messing with threads structures, avoid deadlock */ irq_spinlock_lock(&threads_lock, true); - + /* First walk the thread tree to count the threads */ size_t count = 0; avltree_walk(&threads_tree, avl_count_walker, (void *) &count); - + if (count == 0) { /* No threads found (strange) */ @@ -406,5 +406,5 @@ return NULL; } - + *size = sizeof(stats_thread_t) * count; if (dry_run) { @@ -412,5 +412,5 @@ return NULL; } - + stats_thread_t *stats_threads = (stats_thread_t *) malloc(*size, FRAME_ATOMIC); if (stats_threads == NULL) { @@ -420,11 +420,11 @@ return NULL; } - + /* Walk tha thread tree again to gather the statistics */ stats_thread_t *iterator = stats_threads; avltree_walk(&threads_tree, thread_serialize_walker, (void *) &iterator); - + irq_spinlock_unlock(&threads_lock, true); - + return ((void *) stats_threads); } @@ -454,13 +454,13 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the task ID */ task_id_t task_id; if (str_uint64_t(name, NULL, 0, true, &task_id) != EOK) return ret; - + /* Messing with task structures, avoid deadlock */ irq_spinlock_lock(&tasks_lock, true); - + task_t *task = task_find_by_id(task_id); if (task == NULL) { @@ -469,10 +469,10 @@ return ret; } - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = NULL; ret.data.size = sizeof(stats_task_t); - + irq_spinlock_unlock(&tasks_lock, true); } else { @@ -484,18 +484,18 @@ return ret; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_task; ret.data.size = sizeof(stats_task_t); - + /* Hand-over-hand locking */ irq_spinlock_exchange(&tasks_lock, &task->lock); - + produce_stats_task(task, stats_task); - + irq_spinlock_unlock(&task->lock, true); } - + return ret; } @@ -525,13 +525,13 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the thread ID */ thread_id_t thread_id; if (str_uint64_t(name, NULL, 0, true, &thread_id) != EOK) return ret; - + /* Messing with threads structures, avoid deadlock */ irq_spinlock_lock(&threads_lock, true); - + thread_t *thread = thread_find_by_id(thread_id); if (thread == NULL) { @@ -540,10 +540,10 @@ return ret; } - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = NULL; ret.data.size = sizeof(stats_thread_t); - + irq_spinlock_unlock(&threads_lock, true); } else { @@ -555,18 +555,18 @@ return ret; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_thread; ret.data.size = sizeof(stats_thread_t); - + /* Hand-over-hand locking */ irq_spinlock_exchange(&threads_lock, &thread->lock); - + produce_stats_thread(thread, stats_thread); - + irq_spinlock_unlock(&thread->lock, true); } - + return ret; } @@ -587,8 +587,8 @@ { *size = sizeof(stats_exc_t) * IVT_ITEMS; - + if ((dry_run) || (IVT_ITEMS == 0)) return NULL; - + stats_exc_t *stats_exceptions = (stats_exc_t *) malloc(*size, FRAME_ATOMIC); @@ -598,9 +598,9 @@ return NULL; } - + #if (IVT_ITEMS > 0) /* Messing with exception table, avoid deadlock */ irq_spinlock_lock(&exctbl_lock, true); - + unsigned int i; for (i = 0; i < IVT_ITEMS; i++) { @@ -611,8 +611,8 @@ stats_exceptions[i].count = exc_table[i].count; } - + irq_spinlock_unlock(&exctbl_lock, true); #endif - + return ((void *) stats_exceptions); } @@ -642,15 +642,15 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + /* Parse the exception number */ uint64_t excn; if (str_uint64_t(name, NULL, 0, true, &excn) != EOK) return ret; - + #if (IVT_FIRST > 0) if (excn < IVT_FIRST) return ret; #endif - + #if (IVT_ITEMS + IVT_FIRST == 0) return ret; @@ -659,5 +659,5 @@ return ret; #endif - + if (dry_run) { ret.tag = SYSINFO_VAL_FUNCTION_DATA; @@ -667,5 +667,5 @@ /* Update excn index for accessing exc_table */ excn -= IVT_FIRST; - + /* Allocate stats_exc_t structure */ stats_exc_t *stats_exception = @@ -673,13 +673,13 @@ if (stats_exception == NULL) return ret; - + /* Messing with exception table, avoid deadlock */ irq_spinlock_lock(&exctbl_lock, true); - + /* Correct return value */ ret.tag = SYSINFO_VAL_FUNCTION_DATA; ret.data.data = (void *) stats_exception; ret.data.size = sizeof(stats_exc_t); - + stats_exception->id = excn; str_cpy(stats_exception->desc, EXC_NAME_BUFLEN, exc_table[excn].name); @@ -687,8 +687,8 @@ stats_exception->cycles = exc_table[excn].cycles; stats_exception->count = exc_table[excn].count; - + irq_spinlock_unlock(&exctbl_lock, true); } - + return ret; } @@ -711,5 +711,5 @@ if (dry_run) return NULL; - + stats_physmem_t *stats_physmem = (stats_physmem_t *) malloc(*size, FRAME_ATOMIC); @@ -718,8 +718,8 @@ return NULL; } - + zones_stats(&(stats_physmem->total), &(stats_physmem->unavail), &(stats_physmem->used), &(stats_physmem->free)); - + return ((void *) stats_physmem); } @@ -742,5 +742,5 @@ if (dry_run) return NULL; - + load_t *stats_load = (load_t *) malloc(*size, FRAME_ATOMIC); if (stats_load == NULL) { @@ -748,14 +748,14 @@ return NULL; } - + /* To always get consistent values acquire the mutex */ mutex_lock(&load_lock); - + unsigned int i; for (i = 0; i < LOAD_STEPS; i++) stats_load[i] = avenrdy[i] << LOAD_KERNEL_SHIFT; - + mutex_unlock(&load_lock); - + return ((void *) stats_load); } @@ -768,5 +768,5 @@ load *= exp; load += (ready << LOAD_FIXED_SHIFT) * (LOAD_FIXED_1 - exp); - + return (load >> LOAD_FIXED_SHIFT); } @@ -782,17 +782,17 @@ { thread_detach(THREAD); - + while (true) { atomic_count_t ready = atomic_get(&nrdy); - + /* Mutually exclude with get_stats_load() */ mutex_lock(&load_lock); - + unsigned int i; for (i = 0; i < LOAD_STEPS; i++) avenrdy[i] = load_calc(avenrdy[i], load_exp[i], ready); - + mutex_unlock(&load_lock); - + thread_sleep(LOAD_INTERVAL); } @@ -805,5 +805,5 @@ { mutex_initialize(&load_lock, MUTEX_PASSIVE); - + sysinfo_set_item_gen_data("system.cpus", NULL, get_stats_cpus, NULL); sysinfo_set_item_gen_data("system.physmem", NULL, get_stats_physmem, NULL); Index: kernel/generic/src/sysinfo/sysinfo.c =================================================================== --- kernel/generic/src/sysinfo/sysinfo.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/sysinfo/sysinfo.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -64,5 +64,5 @@ { sysinfo_item_t *item = (sysinfo_item_t *) obj; - + item->name = NULL; item->val_type = SYSINFO_VAL_UNDEFINED; @@ -70,5 +70,5 @@ item->subtree.table = NULL; item->next = NULL; - + return EOK; } @@ -84,8 +84,8 @@ { sysinfo_item_t *item = (sysinfo_item_t *) obj; - + if (item->name != NULL) free(item->name); - + return 0; } @@ -101,5 +101,5 @@ sizeof(sysinfo_item_t), 0, sysinfo_item_constructor, sysinfo_item_destructor, SLAB_CACHE_MAGDEFERRED); - + mutex_initialize(&sysinfo_lock, MUTEX_ACTIVE); } @@ -127,19 +127,19 @@ { assert(subtree != NULL); - + sysinfo_item_t *cur = subtree; - + /* Walk all siblings */ while (cur != NULL) { size_t i = 0; - + /* Compare name with path */ while ((cur->name[i] != 0) && (name[i] == cur->name[i])) i++; - + /* Check for perfect name and path match */ if ((name[i] == 0) && (cur->name[i] == 0)) return cur; - + /* Partial match up to the delimiter */ if ((name[i] == '.') && (cur->name[i] == 0)) { @@ -155,5 +155,5 @@ **ret = cur->subtree.generator.fn(name + i + 1, dry_run, cur->subtree.generator.data); - + return NULL; default: @@ -161,16 +161,16 @@ if (ret != NULL) *ret = NULL; - + return NULL; } } - + cur = cur->next; } - + /* Not found, no data generated */ if (ret != NULL) *ret = NULL; - + return NULL; } @@ -193,22 +193,22 @@ { assert(psubtree != NULL); - + if (*psubtree == NULL) { /* No parent */ - + size_t i = 0; - + /* Find the first delimiter in name */ while ((name[i] != 0) && (name[i] != '.')) i++; - + *psubtree = (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0); assert(*psubtree); - + /* Fill in item name up to the delimiter */ (*psubtree)->name = str_ndup(name, i); assert((*psubtree)->name); - + /* Create subtree items */ if (name[i] == '.') { @@ -217,19 +217,19 @@ &((*psubtree)->subtree.table)); } - + /* No subtree needs to be created */ return *psubtree; } - + sysinfo_item_t *cur = *psubtree; - + /* Walk all siblings */ while (cur != NULL) { size_t i = 0; - + /* Compare name with path */ while ((cur->name[i] != 0) && (name[i] == cur->name[i])) i++; - + /* Check for perfect name and path match * -> item is already present. @@ -237,5 +237,5 @@ if ((name[i] == 0) && (cur->name[i] == 0)) return cur; - + /* Partial match up to the delimiter */ if ((name[i] == '.') && (cur->name[i] == 0)) { @@ -257,5 +257,5 @@ } } - + /* No match and no more siblings to check * -> create a new sibling item. @@ -266,15 +266,15 @@ while ((name[i] != 0) && (name[i] != '.')) i++; - + sysinfo_item_t *item = (sysinfo_item_t *) slab_alloc(sysinfo_item_cache, 0); assert(item); - + cur->next = item; - + /* Fill in item name up to the delimiter */ item->name = str_ndup(name, i); assert(item->name); - + /* Create subtree items */ if (name[i] == '.') { @@ -283,12 +283,12 @@ &(item->subtree.table)); } - + /* No subtree needs to be created */ return item; } - + cur = cur->next; } - + /* Unreachable */ assert(false); @@ -309,8 +309,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -318,5 +318,5 @@ item->val.val = val; } - + mutex_unlock(&sysinfo_lock); } @@ -340,8 +340,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -350,5 +350,5 @@ item->val.data.size = size; } - + mutex_unlock(&sysinfo_lock); } @@ -368,8 +368,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -378,5 +378,5 @@ item->val.gen_val.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -401,8 +401,8 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) { @@ -411,5 +411,5 @@ item->val.gen_data.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -426,12 +426,12 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); if (item != NULL) item->val_type = SYSINFO_VAL_UNDEFINED; - + mutex_unlock(&sysinfo_lock); } @@ -451,10 +451,10 @@ /* Protect sysinfo tree consistency */ mutex_lock(&sysinfo_lock); - + if (root == NULL) root = &global_root; - + sysinfo_item_t *item = sysinfo_create_path(name, root); - + /* Change the type of the subtree only if it is not already a fixed subtree */ @@ -464,5 +464,5 @@ item->subtree.generator.data = data; } - + mutex_unlock(&sysinfo_lock); } @@ -492,5 +492,5 @@ for (sysinfo_item_t *cur = root; cur; cur = cur->next) { size_t length; - + if (spaces == 0) { printf("%s", cur->name); @@ -501,8 +501,8 @@ length = str_length(cur->name) + 1; } - + sysarg_t val; size_t size; - + /* Display node value and type */ switch (cur->val_type) { @@ -531,5 +531,5 @@ printf("+ %s [unknown]\n", cur->name); } - + /* Recursivelly nest into the subtree */ switch (cur->subtree_type) { @@ -562,10 +562,10 @@ while we are dumping it */ mutex_lock(&sysinfo_lock); - + if (root == NULL) sysinfo_dump_internal(global_root, 0); else sysinfo_dump_internal(root, 0); - + mutex_unlock(&sysinfo_lock); } @@ -590,5 +590,5 @@ if (root == NULL) root = &global_root; - + /* Try to find the item or generate data */ sysinfo_return_t ret; @@ -596,8 +596,8 @@ sysinfo_item_t *item = sysinfo_find_item(name, *root, &ret_ptr, dry_run); - + if (item != NULL) { /* Item found in the fixed sysinfo tree */ - + ret.tag = item->val_type; switch (item->val_type) { @@ -625,5 +625,5 @@ } } - + return ret; } @@ -645,11 +645,11 @@ sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + if (size > SYSINFO_MAX_PATH) return ret; - + char *path = (char *) malloc(size + 1, 0); assert(path); - + if ((copy_from_uspace(path, ptr, size + 1) == 0) && (path[size] == 0)) { @@ -662,5 +662,5 @@ mutex_unlock(&sysinfo_lock); } - + free(path); return ret; @@ -686,7 +686,7 @@ if (root == NULL) root = &global_root; - + sysinfo_item_t *subtree = NULL; - + if (name[0] != 0) { /* Try to find the item */ @@ -698,8 +698,8 @@ } else subtree = *root; - + sysinfo_return_t ret; ret.tag = SYSINFO_VAL_UNDEFINED; - + if (subtree != NULL) { /* @@ -709,5 +709,5 @@ for (sysinfo_item_t *cur = subtree; cur; cur = cur->next) size += str_size(cur->name) + 1; - + if (dry_run) { ret.tag = SYSINFO_VAL_DATA; @@ -719,5 +719,5 @@ if (names == NULL) return ret; - + size_t pos = 0; for (sysinfo_item_t *cur = subtree; cur; cur = cur->next) { @@ -725,5 +725,5 @@ pos += str_size(cur->name) + 1; } - + /* Correct return value */ ret.tag = SYSINFO_VAL_DATA; @@ -732,5 +732,5 @@ } } - + return ret; } @@ -754,11 +754,11 @@ ret.data.data = NULL; ret.data.size = 0; - + if (size > SYSINFO_MAX_PATH) return ret; - + char *path = (char *) malloc(size + 1, 0); assert(path); - + if ((copy_from_uspace(path, ptr, size + 1) == 0) && (path[size] == 0)) { @@ -771,5 +771,5 @@ mutex_unlock(&sysinfo_lock); } - + free(path); return ret; @@ -794,5 +794,5 @@ { errno_t rc; - + /* * Get the keys. @@ -803,5 +803,5 @@ sysinfo_return_t ret = sysinfo_get_keys_uspace(path_ptr, path_size, true); - + /* Check return data tag */ if (ret.tag == SYSINFO_VAL_DATA) @@ -810,5 +810,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -842,9 +842,9 @@ { errno_t rc; - + /* Get the keys */ sysinfo_return_t ret = sysinfo_get_keys_uspace(path_ptr, path_size, false); - + /* Check return data tag */ if (ret.tag == SYSINFO_VAL_DATA) { @@ -853,9 +853,9 @@ if (rc == EOK) rc = copy_to_uspace(size_ptr, &size, sizeof(size)); - + free(ret.data.data); } else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -882,5 +882,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* * Map generated value types to constant types (user space does @@ -891,5 +891,5 @@ else if (ret.tag == SYSINFO_VAL_FUNCTION_DATA) ret.tag = SYSINFO_VAL_DATA; - + return (sysarg_t) ret.tag; } @@ -913,5 +913,5 @@ { errno_t rc; - + /* * Get the item. @@ -921,5 +921,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* Only constant or generated numerical value is returned */ if ((ret.tag == SYSINFO_VAL_VAL) || (ret.tag == SYSINFO_VAL_FUNCTION_VAL)) @@ -927,5 +927,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -949,5 +949,5 @@ { errno_t rc; - + /* * Get the item. @@ -957,5 +957,5 @@ */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, true); - + /* Only the size of constant or generated binary data is considered */ if ((ret.tag == SYSINFO_VAL_DATA) || (ret.tag == SYSINFO_VAL_FUNCTION_DATA)) @@ -964,5 +964,5 @@ else rc = EINVAL; - + return (sys_errno_t) rc; } @@ -999,9 +999,9 @@ { errno_t rc; - + /* Get the item */ sysinfo_return_t ret = sysinfo_get_item_uspace(path_ptr, path_size, false); - + /* Only constant or generated binary data is considered */ if ((ret.tag == SYSINFO_VAL_DATA) || @@ -1013,9 +1013,9 @@ } else rc = EINVAL; - + /* N.B.: The generated binary data should be freed */ if ((ret.tag == SYSINFO_VAL_FUNCTION_DATA) && (ret.data.data != NULL)) free(ret.data.data); - + return (sys_errno_t) rc; } Index: kernel/generic/src/time/clock.c =================================================================== --- kernel/generic/src/time/clock.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/time/clock.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -84,11 +84,11 @@ if (faddr == 0) panic("Cannot allocate page for clock."); - + uptime = (uptime_t *) PA2KA(faddr); - + uptime->seconds1 = 0; uptime->seconds2 = 0; uptime->useconds = 0; - + clock_parea.pbase = faddr; clock_parea.frames = 1; @@ -96,5 +96,5 @@ clock_parea.mapped = false; ddi_parea_register(&clock_parea); - + /* * Prepare information for the userspace so that it can successfully @@ -146,8 +146,8 @@ { size_t missed_clock_ticks = CPU->missed_clock_ticks; - + /* Account CPU usage */ cpu_update_accounting(); - + /* * To avoid lock ordering problems, @@ -160,12 +160,12 @@ clock_update_counters(); cpu_update_accounting(); - + irq_spinlock_lock(&CPU->timeoutlock, false); - + link_t *cur; while ((cur = list_first(&CPU->timeout_active_list)) != NULL) { timeout_t *timeout = list_get_instance(cur, timeout_t, link); - + irq_spinlock_lock(&timeout->lock, false); if (timeout->ticks-- != 0) { @@ -173,34 +173,34 @@ break; } - + list_remove(cur); timeout_handler_t handler = timeout->handler; void *arg = timeout->arg; timeout_reinitialize(timeout); - + irq_spinlock_unlock(&timeout->lock, false); irq_spinlock_unlock(&CPU->timeoutlock, false); - + handler(arg); - + irq_spinlock_lock(&CPU->timeoutlock, false); } - + irq_spinlock_unlock(&CPU->timeoutlock, false); } CPU->missed_clock_ticks = 0; - + /* * Do CPU usage accounting and find out whether to preempt THREAD. * */ - + if (THREAD) { uint64_t ticks; - + irq_spinlock_lock(&CPU->lock, false); CPU->needs_relink += 1 + missed_clock_ticks; irq_spinlock_unlock(&CPU->lock, false); - + irq_spinlock_lock(&THREAD->lock, false); if ((ticks = THREAD->ticks)) { @@ -211,5 +211,5 @@ } irq_spinlock_unlock(&THREAD->lock, false); - + if (ticks == 0 && PREEMPTION_ENABLED) { scheduler(); Index: kernel/generic/src/time/delay.c =================================================================== --- kernel/generic/src/time/delay.c (revision 3061bc129a855122d429fbba1e623a521aaa164c) +++ kernel/generic/src/time/delay.c (revision a35b458e9db1ca95e679799dc7c1b12c83359ca3) @@ -35,5 +35,5 @@ * @brief Active delay function. */ - + #include