Index: kernel/arch/arm32/src/arm32.c =================================================================== --- kernel/arch/arm32/src/arm32.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/arm32/src/arm32.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -63,5 +63,5 @@ init.tasks[i].addr = bootinfo->tasks[i].addr; init.tasks[i].size = bootinfo->tasks[i].size; - strncpy(init.tasks[i].name, bootinfo->tasks[i].name, + str_ncpy(init.tasks[i].name, bootinfo->tasks[i].name, CONFIG_TASK_NAME_BUFLEN); } Index: kernel/arch/arm32/src/asm.S =================================================================== --- kernel/arch/arm32/src/asm.S (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/arm32/src/asm.S (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -31,4 +31,5 @@ .global memsetb +.global memsetw .global memcpy .global memcpy_from_uspace @@ -39,4 +40,7 @@ memsetb: b _memsetb + +memsetw: + b _memsetw memcpy: Index: kernel/arch/ia64/src/cpu/cpu.c =================================================================== --- kernel/arch/ia64/src/cpu/cpu.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ia64/src/cpu/cpu.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -56,5 +56,5 @@ *((uint64_t *) &vendor[0 * sizeof(uint64_t)]) = CPU->arch.cpuid0; *((uint64_t *) &vendor[1 * sizeof(uint64_t)]) = CPU->arch.cpuid1; - vendor[sizeof(vendor) - 1] = '\0'; + vendor[sizeof(vendor) - 1] = 0; switch(m->arch.cpuid3.family) { Index: kernel/arch/ia64/src/ia64.c =================================================================== --- kernel/arch/ia64/src/ia64.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ia64/src/ia64.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -88,5 +88,5 @@ VRN_MASK; init.tasks[i].size = bootinfo->taskmap.tasks[i].size; - strncpy(init.tasks[i].name, bootinfo->taskmap.tasks[i].name, + str_ncpy(init.tasks[i].name, bootinfo->taskmap.tasks[i].name, CONFIG_TASK_NAME_BUFLEN); } Index: kernel/arch/ia64/src/interrupt.c =================================================================== --- kernel/arch/ia64/src/interrupt.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ia64/src/interrupt.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -55,4 +55,5 @@ #include #include +#include #define VECTORS_64_BUNDLE 20 Index: kernel/arch/ia64/src/ski/ski.c =================================================================== --- kernel/arch/ia64/src/ski/ski.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ia64/src/ski/ski.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -42,4 +42,5 @@ #include #include +#include #include @@ -49,4 +50,16 @@ static bool kbd_disabled; +static void ski_do_putchar(const wchar_t ch) +{ + asm volatile ( + "mov r15 = %[cmd]\n" + "mov r32 = %[ch]\n" /* r32 is in0 */ + "break 0x80000\n" /* modifies r8 */ + : + : [cmd] "i" (SKI_PUTCHAR), [ch] "r" (ch) + : "r15", "in0", "r8" + ); +} + /** Display character on debug console * @@ -57,18 +70,14 @@ * @param ch Character to be printed. */ -static void ski_putchar(outdev_t *d, const char ch, bool silent) +static void ski_putchar(outdev_t *d, const wchar_t ch, bool silent) { if (!silent) { - asm volatile ( - "mov r15 = %0\n" - "mov r32 = %1\n" /* r32 is in0 */ - "break 0x80000\n" /* modifies r8 */ - : - : "i" (SKI_PUTCHAR), "r" (ch) - : "r15", "in0", "r8" - ); - - if (ch == '\n') - ski_putchar(d, '\r', false); + if (ascii_check(ch)) { + if (ch == '\n') + ski_do_putchar('\r'); + + ski_do_putchar(ch); + } else + ski_do_putchar(invalch); } } Index: kernel/arch/mips32/src/asm.S =================================================================== --- kernel/arch/mips32/src/asm.S (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/mips32/src/asm.S (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -61,4 +61,10 @@ memsetb: j _memsetb + nop + + +.global memsetw +memsetw: + j _memsetw nop Index: kernel/arch/mips32/src/mips32.c =================================================================== --- kernel/arch/mips32/src/mips32.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/mips32/src/mips32.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -92,5 +92,5 @@ init.tasks[i].addr = bootinfo->tasks[i].addr; init.tasks[i].size = bootinfo->tasks[i].size; - strncpy(init.tasks[i].name, bootinfo->tasks[i].name, + str_ncpy(init.tasks[i].name, bootinfo->tasks[i].name, CONFIG_TASK_NAME_BUFLEN); } Index: kernel/arch/ppc32/src/asm.S =================================================================== --- kernel/arch/ppc32/src/asm.S (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ppc32/src/asm.S (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -35,4 +35,5 @@ .global iret_syscall .global memsetb +.global memsetw .global memcpy .global memcpy_from_uspace @@ -202,7 +203,10 @@ rfi - + memsetb: b _memsetb + +memsetw: + b _memsetw memcpy: Index: kernel/arch/ppc32/src/ppc32.c =================================================================== --- kernel/arch/ppc32/src/ppc32.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/ppc32/src/ppc32.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -62,5 +62,5 @@ init.tasks[i].addr = PA2KA(bootinfo.taskmap.tasks[i].addr); init.tasks[i].size = bootinfo.taskmap.tasks[i].size; - strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name, + str_ncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name, CONFIG_TASK_NAME_BUFLEN); } Index: kernel/arch/sparc64/include/drivers/sgcn.h =================================================================== --- kernel/arch/sparc64/include/drivers/sgcn.h (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/include/drivers/sgcn.h (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -39,8 +39,8 @@ #include -/* number of bytes in the TOC magic, including the terminating '\0' */ +/* number of bytes in the TOC magic, including the NULL-terminator */ #define TOC_MAGIC_BYTES 8 -/* number of bytes in the TOC key, including the terminating '\0' */ +/* number of bytes in the TOC key, including the NULL-terminator */ #define TOC_KEY_SIZE 8 @@ -48,5 +48,5 @@ #define MAX_TOC_ENTRIES 32 -/* number of bytes in the SGCN buffer magic, including the terminating '\0' */ +/* number of bytes in the SGCN buffer magic, including the NULL-terminator */ #define SGCN_MAGIC_BYTES 4 Index: kernel/arch/sparc64/src/console.c =================================================================== --- kernel/arch/sparc64/src/console.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/console.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -119,5 +119,5 @@ prop = ofw_tree_getprop(aliases, "def-cn"); - if ((!prop) || (!prop->value) || (strcmp(prop->value, "/sgcn") != 0)) { + if ((!prop) || (!prop->value) || (str_cmp(prop->value, "/sgcn") != 0)) { standard_console_init(aliases); } else { Index: kernel/arch/sparc64/src/drivers/kbd.c =================================================================== --- kernel/arch/sparc64/src/drivers/kbd.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/drivers/kbd.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -87,7 +87,7 @@ * Determine keyboard serial controller type. */ - if (strcmp(name, "zs") == 0) + if (str_cmp(name, "zs") == 0) kbd_type = KBD_Z8530; - else if (strcmp(name, "su") == 0) + else if (str_cmp(name, "su") == 0) kbd_type = KBD_NS16550; Index: kernel/arch/sparc64/src/drivers/pci.c =================================================================== --- kernel/arch/sparc64/src/drivers/pci.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/drivers/pci.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -184,5 +184,5 @@ * First, verify this is a PCI node. */ - ASSERT(strcmp(ofw_tree_node_name(node), "pci") == 0); + ASSERT(str_cmp(ofw_tree_node_name(node), "pci") == 0); /* @@ -193,5 +193,5 @@ return NULL; - if (strcmp(prop->value, "SUNW,sabre") == 0) { + if (str_cmp(prop->value, "SUNW,sabre") == 0) { /* * PCI controller Sabre. @@ -199,5 +199,5 @@ */ return pci_sabre_init(node); - } else if (strcmp(prop->value, "SUNW,psycho") == 0) { + } else if (str_cmp(prop->value, "SUNW,psycho") == 0) { /* * PCI controller Psycho. Index: kernel/arch/sparc64/src/drivers/scr.c =================================================================== --- kernel/arch/sparc64/src/drivers/scr.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/drivers/scr.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -64,11 +64,11 @@ name = ofw_tree_node_name(node); - if (strcmp(name, "SUNW,m64B") == 0) + if (str_cmp(name, "SUNW,m64B") == 0) scr_type = SCR_ATYFB; - else if (strcmp(name, "SUNW,XVR-100") == 0) + else if (str_cmp(name, "SUNW,XVR-100") == 0) scr_type = SCR_XVR; - else if (strcmp(name, "SUNW,ffb") == 0) + else if (str_cmp(name, "SUNW,ffb") == 0) scr_type = SCR_FFB; - else if (strcmp(name, "cgsix") == 0) + else if (str_cmp(name, "cgsix") == 0) scr_type = SCR_CGSIX; Index: kernel/arch/sparc64/src/drivers/sgcn.c =================================================================== --- kernel/arch/sparc64/src/drivers/sgcn.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/drivers/sgcn.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -208,10 +208,10 @@ init_sram_begin(); - ASSERT(strcmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0); + ASSERT(str_cmp(SRAM_TOC->magic, SRAM_TOC_MAGIC) == 0); /* lookup TOC entry with the correct key */ uint32_t i; for (i = 0; i < MAX_TOC_ENTRIES; i++) { - if (strcmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0) + if (str_cmp(SRAM_TOC->keys[i].key, CONSOLE_KEY) == 0) break; } Index: kernel/arch/sparc64/src/mm/page.c =================================================================== --- kernel/arch/sparc64/src/mm/page.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/mm/page.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -63,5 +63,17 @@ uintptr_t hw_map(uintptr_t physaddr, size_t size) { - return PA2KA(physaddr); + if (last_frame + ALIGN_UP(size, PAGE_SIZE) > KA2PA(KERNEL_ADDRESS_SPACE_END_ARCH)) + panic("Unable to map physical memory %p (%d bytes).", physaddr, size) + + uintptr_t virtaddr = PA2KA(last_frame); + pfn_t i; + for (i = 0; i < ADDR2PFN(ALIGN_UP(size, PAGE_SIZE)); i++) { + uintptr_t addr = PFN2ADDR(i); + page_mapping_insert(AS_KERNEL, virtaddr + addr, physaddr + addr, PAGE_NOT_CACHEABLE | PAGE_WRITE); + } + + last_frame = ALIGN_UP(last_frame + size, FRAME_SIZE); + + return virtaddr; } Index: kernel/arch/sparc64/src/sparc64.c =================================================================== --- kernel/arch/sparc64/src/sparc64.c (revision b4c46666922667b8ff6484f133293a5cd5acd0fd) +++ kernel/arch/sparc64/src/sparc64.c (revision b60c582d0cf4f0476a720c8e05bd742fbffc87ce) @@ -62,5 +62,5 @@ init.tasks[i].addr = (uintptr_t) bootinfo.taskmap.tasks[i].addr; init.tasks[i].size = bootinfo.taskmap.tasks[i].size; - strncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name, + str_ncpy(init.tasks[i].name, bootinfo.taskmap.tasks[i].name, CONFIG_TASK_NAME_BUFLEN); }