diff options
| -rw-r--r-- | Makefile | 2 | ||||
| -rw-r--r-- | src/kernel/boot.asm | 9 | ||||
| -rw-r--r-- | src/kernel/kernel.c | 6 | ||||
| -rw-r--r-- | src/kernel/syscall/actions/sys_write.c | 1 | ||||
| -rw-r--r-- | src/userspace/main.c | 4 | ||||
| -rw-r--r-- | src/userspace/mlibc/stdio/readline.c | 4 | ||||
| -rw-r--r-- | src/userspace/mlibc/stdio/vprintf.c | 6 | ||||
| -rw-r--r-- | src/userspace/mlibc/stdlib.h | 6 | ||||
| -rw-r--r-- | src/userspace/mlibc/string/strlen.c | 32 |
9 files changed, 52 insertions, 18 deletions
@@ -45,7 +45,7 @@ build: clean i686-elf-gcc -c ./"$${line}" -o ./build/userspace/"$${stripped}" -I ./src/userspace -std=gnu99 -ffreestanding -O3 -Wall -Wextra -Wno-unused-parameter || exit; \ done <./build/tmp; \ rm ./build/tmp; \ - i686-elf-gcc -I ./src/userspace -o ./build/user.o -std=gnu99 -ffreestanding -O2 -nostdlib ./build/userspace/*.o|| exit; \ + i686-elf-gcc -I ./src/userspace -o ./build/user.o -std=gnu99 -ffreestanding -O2 -nostdlib ./build/userspace/*.o || exit; \ i686-elf-objcopy -O binary ./build/user.o ./build/user.bin; \ # Create ISO diff --git a/src/kernel/boot.asm b/src/kernel/boot.asm index 8241786..2180069 100644 --- a/src/kernel/boot.asm +++ b/src/kernel/boot.asm @@ -38,7 +38,10 @@ section .text global jump_userspace jump_userspace: - mov ebx, dword [esp+4] + push ebp + mov ebp, esp + mov edx, DWORD[ebp + 0xC] + mov esp, edx mov ax, 0x23 mov ds, ax @@ -56,8 +59,8 @@ section .text push eax push 0x1B - push ebx - mov ebp, ebx + push DWORD[ebp + 0x8] + iret pop ebp ret diff --git a/src/kernel/kernel.c b/src/kernel/kernel.c index 27f5ad9..196b44e 100644 --- a/src/kernel/kernel.c +++ b/src/kernel/kernel.c @@ -18,7 +18,7 @@ #include <kernel/pci/pci.h> #include <kernel/net/network.h> -extern void jump_userspace(); +extern void jump_userspace(uintptr_t location, uintptr_t stack); void kernel_main() { @@ -66,10 +66,10 @@ void kernel_main() if (!user_e) panic("Userspace binary not found!"); ATAPI_granular_read(1 + (user_e->length / 2048), user_e->lba, (uint8_t *) (userspace + 4096)); kfree(user_e); - jump_userspace(userspace + 4096); + jump_userspace(userspace + 4096, (uintptr_t) umalloc(4096)); } else { marfs_read_whole_file(4, (uint8_t *) (userspace + 4096)); - jump_userspace(userspace + 4096); + jump_userspace(userspace + 4096, (uintptr_t) umalloc(4096)); } panic("This should NOT happen!"); diff --git a/src/kernel/syscall/actions/sys_write.c b/src/kernel/syscall/actions/sys_write.c index 6377473..d395384 100644 --- a/src/kernel/syscall/actions/sys_write.c +++ b/src/kernel/syscall/actions/sys_write.c @@ -11,6 +11,7 @@ uint32_t sys_write(char *buf) uint32_t sys_writec(char ch) { + serial_write_hex(ch); writec((char) ch); return 0; }
\ No newline at end of file diff --git a/src/userspace/main.c b/src/userspace/main.c index 63ce8f4..982a5ff 100644 --- a/src/userspace/main.c +++ b/src/userspace/main.c @@ -11,10 +11,10 @@ int32_t starts_with(const char *a, const char *b) void user_main() { - char hello[] = "> Successfully switched to usermode!\n"; - syscall_write(hello); + printf("> Successfully switched to usermode!"); // init_framebuffer(); + writec((char) strlen("aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa")); while (1) { char *input = readline(); diff --git a/src/userspace/mlibc/stdio/readline.c b/src/userspace/mlibc/stdio/readline.c index b948884..91b5da0 100644 --- a/src/userspace/mlibc/stdio/readline.c +++ b/src/userspace/mlibc/stdio/readline.c @@ -9,8 +9,8 @@ char *readline() while (buf != '\n') { buf = getch(); writec(buf); - strcpy(ret, buf); + strcpy(ret, &buf); } - strcpy(ret, buf); + strcpy(ret, &buf); return ret; }
\ No newline at end of file diff --git a/src/userspace/mlibc/stdio/vprintf.c b/src/userspace/mlibc/stdio/vprintf.c index 92999b6..1d43c77 100644 --- a/src/userspace/mlibc/stdio/vprintf.c +++ b/src/userspace/mlibc/stdio/vprintf.c @@ -1,8 +1,6 @@ #include <stdarg.h> #include <stdint.h> #include <mlibc/stdio.h> -#include <mlibc/string.h> -#include <mlibc/stdlib.h> #include <mlibc/stdlib.h> void __writes(const char *data) @@ -32,12 +30,12 @@ void vprintf(const char *fmt, va_list args) } else if (buff == 'x') { char *p = htoa((uint32_t) va_arg(args, int)); __writes(p); - // kfree(p); + free(p); readyToFormat = 0; } else if (buff == 'd') { char *p = itoa(va_arg(args, int)); __writes(p); - // kfree(p); + free(p); readyToFormat = 0; } else if (buff == 'c') { writec((char) va_arg(args, int)); diff --git a/src/userspace/mlibc/stdlib.h b/src/userspace/mlibc/stdlib.h index ff8603c..36a3b5f 100644 --- a/src/userspace/mlibc/stdlib.h +++ b/src/userspace/mlibc/stdlib.h @@ -3,6 +3,12 @@ #include <stdint.h> +#ifndef MELVIX_ALLOC_H + +#include <mlibc/stdlib/liballoc.h> + +#endif + #ifndef MELVIX_STRING_H #include <mlibc/string.h> diff --git a/src/userspace/mlibc/string/strlen.c b/src/userspace/mlibc/string/strlen.c index 133ee3d..f6a06a4 100644 --- a/src/userspace/mlibc/string/strlen.c +++ b/src/userspace/mlibc/string/strlen.c @@ -2,7 +2,33 @@ size_t strlen(const char *str) { - size_t len = 0; - while (str[len]) len++; - return len; + const char *char_ptr; + const unsigned long int *longword_ptr; + unsigned long int longword, himagic, lomagic; + + for (char_ptr = str; ((unsigned long int) char_ptr & (sizeof(longword) - 1)) != 0; ++char_ptr) + if (*char_ptr == '\0') + return char_ptr - str; + + longword_ptr = (unsigned long int *) char_ptr; + + himagic = 0x80808080L; + lomagic = 0x01010101L; + + for (;;) { + longword = *longword_ptr++; + + if (((longword - lomagic) & himagic) != 0) { + const char *cp = (const char *) (longword_ptr - 1); + + if (cp[0] == 0) + return cp - str; + if (cp[1] == 0) + return cp - str + 1; + if (cp[2] == 0) + return cp - str + 2; + if (cp[3] == 0) + return cp - str + 3; + } + } }
\ No newline at end of file |