diff options
Diffstat (limited to '')
-rw-r--r-- | kernel/core/init.c | 26 | ||||
-rw-r--r-- | kernel/core/kprintf.c (renamed from kernel/libk/io.c) | 27 | ||||
-rw-r--r-- | kernel/core/panic.c | 26 | ||||
-rw-r--r-- | kernel/core/stack_protector.c | 28 | ||||
-rw-r--r-- | kernel/core/string.c (renamed from kernel/libk/string.c) | 21 |
5 files changed, 119 insertions, 9 deletions
diff --git a/kernel/core/init.c b/kernel/core/init.c new file mode 100644 index 0000000..d999a50 --- /dev/null +++ b/kernel/core/init.c @@ -0,0 +1,26 @@ +/* + * Copyright (C) 2025 Danny Holman <dholman@gymli.org> + * + * This file is part of BoxOS, a free and open-source Unix-like operating + * system. + * + * BoxOS is free software; you can redistribute it and/or modify under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * BoxOS; if not, see <https://www.gnu.org/licenses/>. + */ + +#include <sys/paging.h> +#include <sys/kmalloc.h> +#include <sys/kprintf.h> + +void kernel_main(int argc, char* argv[]) { + kprintf("BoxOS - version %s\n", VERSION); +} diff --git a/kernel/libk/io.c b/kernel/core/kprintf.c index eedc171..c12a01f 100644 --- a/kernel/libk/io.c +++ b/kernel/core/kprintf.c @@ -1,7 +1,25 @@ -#include <libk/io.h> -#include <libk/string.h> -#include <kernel/video/framebuffer.h> -#include <kernel/tty/tty_vga.h> +/* + * Copyright (C) 2025 Danny Holman <dholman@gymli.org> + * + * This file is part of BoxOS, a free and open-source Unix-like operating + * system. + * + * BoxOS is free software; you can redistribute it and/or modify under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * BoxOS; if not, see <https://www.gnu.org/licenses/>. + */ + +#include <sys/kprintf.h> +#include <sys/serial.h> +#include <string.h> char* convert(unsigned int num, int base) { static char rep[] = "0123456789ABCDEF"; @@ -61,7 +79,6 @@ int vkprintf(const char *fmt, va_list args) { } } //tty_write(buffer, strlen(buffer)); - fb_write(buffer, strlen(buffer)); memset(buffer, 0, 4096); return 0; } diff --git a/kernel/core/panic.c b/kernel/core/panic.c index a44a73c..742e71e 100644 --- a/kernel/core/panic.c +++ b/kernel/core/panic.c @@ -1,6 +1,26 @@ -#include <kernel/panic.h> -#include <kernel/spinlock.h> -#include <libk/io.h> +/* + * Copyright (C) 2025 Danny Holman <dholman@gymli.org> + * + * This file is part of BoxOS, a free and open-source Unix-like operating + * system. + * + * BoxOS is free software; you can redistribute it and/or modify under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * BoxOS; if not, see <https://www.gnu.org/licenses/>. + */ + +#include <sys/panic.h> +#include <sys/kprintf.h> +#include <sys/spinlock.h> +#include <sys/asm.h> #include <stdint.h> #include <stddef.h> diff --git a/kernel/core/stack_protector.c b/kernel/core/stack_protector.c new file mode 100644 index 0000000..cb15a15 --- /dev/null +++ b/kernel/core/stack_protector.c @@ -0,0 +1,28 @@ +/* + * Copyright (C) 2025 Danny Holman <dholman@gymli.org> + * + * This file is part of BoxOS, a free and open-source Unix-like operating + * system. + * + * BoxOS is free software; you can redistribute it and/or modify under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * BoxOS; if not, see <https://www.gnu.org/licenses/>. + */ + +#include <sys/panic.h> +#include <stdint.h> + +uintptr_t __stack_chk_guard; + +__attribute__((noreturn)) void __stack_chk_fail(void) { + panic("Detected attempted stack manipulation in kernel"); + while(1); +} diff --git a/kernel/libk/string.c b/kernel/core/string.c index be59397..5502051 100644 --- a/kernel/libk/string.c +++ b/kernel/core/string.c @@ -1,4 +1,23 @@ -#include <libk/string.h> +/* + * Copyright (C) 2025 Danny Holman <dholman@gymli.org> + * + * This file is part of BoxOS, a free and open-source Unix-like operating + * system. + * + * BoxOS is free software; you can redistribute it and/or modify under the + * terms of the GNU General Public License as published by the Free Software + * Foundation; either version 2 of the License, or (at your option) any later + * version. + * + * BoxOS is distributed in the hope it will be useful, but WITHOUT ANY WARRANTY; + * without even the implied warranty of MERCHANTABILITY or FITNESS FOR A + * PARTICULAR PURPOSE. See the GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along with + * BoxOS; if not, see <https://www.gnu.org/licenses/>. + */ + +#include <string.h> int memcmp(const void *str1, const void *str2, size_t n) { unsigned char const *p1 = str1; |