diff options
| author | Alex Auvolat <alex.auvolat@ens.fr> | 2015-02-14 19:34:49 +0100 |
|---|---|---|
| committer | Alex Auvolat <alex.auvolat@ens.fr> | 2015-02-14 19:34:49 +0100 |
| commit | 8336422c8ad72b98e3af9c038468b62a9eafac3c (patch) | |
| tree | b35e74136b0263e6efbba41de8d1b118c2239b9b /src/kernel | |
| parent | 1ca147f9e08202dfbc78692e204adac280f8238b (diff) | |
| download | kogata-8336422c8ad72b98e3af9c038468b62a9eafac3c.tar.gz kogata-8336422c8ad72b98e3af9c038468b62a9eafac3c.zip | |
Add first btree test ; fix first btree test.
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/Makefile | 4 | ||||
| -rw-r--r-- | src/kernel/core/kmain.c | 2 | ||||
| -rw-r--r-- | src/kernel/core/sys.c | 4 |
3 files changed, 5 insertions, 5 deletions
diff --git a/src/kernel/Makefile b/src/kernel/Makefile index cbd6a96..a6f9a1b 100644 --- a/src/kernel/Makefile +++ b/src/kernel/Makefile @@ -1,5 +1,5 @@ -OBJ = core/loader.o core/dbglog.o core/sys.o \ +OBJ = core/loader.o core/dbglog.o \ core/gdt.o core/idt.o core/interrupt.o core/context_switch.o core/thread.o \ core/frame.o core/paging.o core/region.o core/kmalloc.o \ user/vfs.o user/nullfs.o user/process.o user/elf.o user/syscall.o @@ -14,7 +14,7 @@ OUT = kernel.lib include ../rules.make -kernel.bin: kernel.lib core/kmain.o +kernel.bin: kernel.lib core/kmain.o core/sys.o $(LD) $(LDFLAGS) -o $@ $^ all: $(OUT) kernel.bin diff --git a/src/kernel/core/kmain.c b/src/kernel/core/kmain.c index 2e8991e..f5d2ace 100644 --- a/src/kernel/core/kmain.c +++ b/src/kernel/core/kmain.c @@ -28,7 +28,7 @@ #define TEST_PLACEHOLDER_AFTER_KMALLOC #define TEST_PLACEHOLDER_AFTER_TASKING #define TEST_PLACEHOLDER_AFTER_DEVFS -#ifdef IS_A_TEST +#ifdef BUILD_KERNEL_TEST #define BEGIN_TEST(n) dbg_printf("(BEGIN-TEST %s)\n", n); #define TEST_OK { dbg_printf("(TEST-OK)\n"); asm volatile("cli; hlt"); } #include <test.c> diff --git a/src/kernel/core/sys.c b/src/kernel/core/sys.c index b1e69ad..fceada7 100644 --- a/src/kernel/core/sys.c +++ b/src/kernel/core/sys.c @@ -11,8 +11,8 @@ static void panic_do(const char* type, const char *msg, const char* file, int li dbg_printf("| System halted -_-'\n"); dbg_printf("\\---------------------------------------------------------/"); BOCHS_BREAKPOINT; -#ifdef IS_A_TEST - dbg_printf("(TEST-FAIL)\n"); +#ifdef BUILD_KERNEL_TEST + dbg_printf("\n(TEST-FAIL)\n"); #endif asm volatile("hlt"); } |