diff options
Diffstat (limited to 'src/kernel')
| -rw-r--r-- | src/kernel/Makefile | 46 | ||||
| -rw-r--r-- | src/kernel/core/sys.c | 2 |
2 files changed, 12 insertions, 36 deletions
diff --git a/src/kernel/Makefile b/src/kernel/Makefile index d7a6a57..eb69cfc 100644 --- a/src/kernel/Makefile +++ b/src/kernel/Makefile @@ -1,39 +1,15 @@ -.PHONY: clean, mrproper +Out = kernel.elf +Obj = core/loader_.o core/kmain.o core/sys.o \ + core/monitor.o task/timer.o \ + task/idt.o task/idt_.o task/task.o task/task_.o task/syscall.o \ + lib/stdlib.o lib/bitset.o lib/mutex.o \ + mem/mem.o mem/paging.o mem/gdt.o mem/heap.o mem/seg.o \ + ipc/shm.o ipc/object.o ipc/request.o \ + linker/elf.o -CC = gcc -CFLAGS = -nostdlib -nostartfiles -nodefaultlibs -fno-builtin -fno-stack-protector -Wall -Wextra -I . -I ./lib -g +include ../common.make -LD = ld -LDFLAGS = -T link.ld +CFLAGS += -I . -I ./lib -g -ASM = nasm -AFLAGS = -f elf +LDFLAGS += -T link.ld -Map kernel.map -OBJECTS = core/loader_.o core/kmain.o core/sys.o \ - core/monitor.o task/timer.o \ - task/idt.o task/idt_.o task/task.o task/task_.o task/syscall.o \ - lib/stdlib.o lib/bitset.o lib/mutex.o \ - mem/mem.o mem/paging.o mem/gdt.o mem/heap.o mem/seg.o \ - ipc/shm.o ipc/object.o ipc/request.o \ - linker/elf.o -OUT = kernel.elf - -all: $(OBJECTS) - echo "* Linking $(OUT)..." - $(LD) $(LDFLAGS) $(OBJECTS) -o $(OUT) -Map kernel.map - -clean: - rm $(OBJECTS) || exit 0 - rm *.o */*.o || exit 0 - rm *.map || exit 0 - -mrproper: clean - rm $(OUT) || exit 0 - -%.o: %.asm - echo "* Compiling $<..." - $(ASM) $(AFLAGS) -o $@ $< - -%.o: %.c - echo "* Compiling $<..." - $(CC) -c $< -o $@ $(CFLAGS) diff --git a/src/kernel/core/sys.c b/src/kernel/core/sys.c index 1045cff..1e07f7c 100644 --- a/src/kernel/core/sys.c +++ b/src/kernel/core/sys.c @@ -25,7 +25,7 @@ void panic(char* message, char* file, int line) { monitor_write("\n>> PANIC: >>"); monitor_write(message); monitor_write("<< at "); monitor_write(file); monitor_write(":"); monitor_writeDec(line); - monitor_write("\nSystem halted T_T"); + monitor_write("\nSystem halted -_-'"); asm volatile("cli; hlt"); } |