diff options
| -rw-r--r-- | kc/boot/kc_main.c | 2 | ||||
| -rw-r--r-- | kc/core/cpu/exceptions.S | 8 | ||||
| -rw-r--r-- | kc/core/kstdio.c | 2 | ||||
| -rw-r--r-- | kc/core/memory.h | 2 | ||||
| -rw-r--r-- | kc/core/vm_tree.c | 2 | ||||
| -rw-r--r-- | lib/kstdio.h | 2 | ||||
| -rw-r--r-- | lib/sophialib.h (renamed from lib/lib.h) | 0 | ||||
| -rw-r--r-- | lib/string.c | 2 | ||||
| -rw-r--r-- | loader/Makefile | 2 |
9 files changed, 9 insertions, 13 deletions
diff --git a/kc/boot/kc_main.c b/kc/boot/kc_main.c index 650b342..ca4ba8b 100644 --- a/kc/boot/kc_main.c +++ b/kc/boot/kc_main.c @@ -7,7 +7,7 @@ #include <loader/efi/shim.h> #include <kernel/entry.h> #include <kernel/memory/range.h> -#include <lib.h> +#include <sophialib.h> #include <stdbool.h> diff --git a/kc/core/cpu/exceptions.S b/kc/core/cpu/exceptions.S index 8aa109e..989eee0 100644 --- a/kc/core/cpu/exceptions.S +++ b/kc/core/cpu/exceptions.S @@ -15,7 +15,7 @@ ISR_STORE_CALLEE_REGS .endm -.macro EXCEPTION_END vec:req, code +.macro EXCEPTION_END // restore all the registers ISR_RESTORE_CALLEE_REGS ISR_RESTORE_CALLER_REGS @@ -33,11 +33,7 @@ .endif movq %rsp, %rdi ISR_CALL \name\()_handler - .if \vec > 9 && \vec < 15 || \vec == 17 || \vec == 21 || \vec > 28 && \vec < 31 - EXCEPTION_END \vec, 1 - .else - EXCEPTION_END \vec - .endif + EXCEPTION_END .size \name\()_isr, . - \name\()_isr .endm diff --git a/kc/core/kstdio.c b/kc/core/kstdio.c index 2971b18..fdb52b7 100644 --- a/kc/core/kstdio.c +++ b/kc/core/kstdio.c @@ -1,7 +1,7 @@ #include "kprint.h" #include "serial.h" -#include <lib.h> +#include <sophialib.h> #include <stdint.h> #include <stdbool.h> diff --git a/kc/core/memory.h b/kc/core/memory.h index 6b7a816..a587d56 100644 --- a/kc/core/memory.h +++ b/kc/core/memory.h @@ -4,7 +4,7 @@ #include <kernel/memory/paging.h> #include <kernel/memory/range.h> -#include <lib.h> +#include <sophialib.h> #include <core/memory.h> diff --git a/kc/core/vm_tree.c b/kc/core/vm_tree.c index cca32bb..88a4be1 100644 --- a/kc/core/vm_tree.c +++ b/kc/core/vm_tree.c @@ -32,7 +32,7 @@ #include "panic.h" #include "kprint.h" -#include <lib.h> +#include <sophialib.h> #define assert(expr) diff --git a/lib/kstdio.h b/lib/kstdio.h index 79ed357..d3615f1 100644 --- a/lib/kstdio.h +++ b/lib/kstdio.h @@ -1,6 +1,6 @@ #pragma once -#include <lib.h> +#include <sophialib.h> #include <stdarg.h> diff --git a/lib/lib.h b/lib/sophialib.h index c28e17c..c28e17c 100644 --- a/lib/lib.h +++ b/lib/sophialib.h diff --git a/lib/string.c b/lib/string.c index c4764ce..3d3f4a1 100644 --- a/lib/string.c +++ b/lib/string.c @@ -1,4 +1,4 @@ -#include <lib.h> +#include <sophialib.h> size_t strlen(const char *s) { diff --git a/loader/Makefile b/loader/Makefile index add25e7..9ac52f7 100644 --- a/loader/Makefile +++ b/loader/Makefile @@ -5,7 +5,7 @@ VPATH := ../lib IMAGE := loader.efi -CPPFLAGS += -I../api -I../lib +CPPFLAGS += -I../api -I../lib -I$(EFIAPIDIR) CFLAGS += --target=$(GNUEFIARCH)-unknown-windows -fshort-wchar -mno-avx \ -mno-sse -mno-mmx -funsigned-char -Wno-pointer-sign -ggdb \ |