diff options
author | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-31 18:31:38 +0200 |
---|---|---|
committer | Andreas Baumann <mail@andreasbaumann.cc> | 2017-05-31 18:31:38 +0200 |
commit | d081f5449b3e84d571ad3f8907bd7ab57d3d63a4 (patch) | |
tree | c66a08aa9a53a928a7c221df8a25b34c9be6a8c8 /src/Makefile | |
parent | 3d2b8fb9dbc73e303b54f1517ee5f4feca364265 (diff) | |
download | abaos-d081f5449b3e84d571ad3f8907bd7ab57d3d63a4.tar.gz abaos-d081f5449b3e84d571ad3f8907bd7ab57d3d63a4.tar.bz2 |
added a setjmp implementation
kernel_panic uses a longjmp to terminate the kernel entry function
some segfault in scroll_screen
Diffstat (limited to 'src/Makefile')
-rw-r--r-- | src/Makefile | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/src/Makefile b/src/Makefile index 01a61de..3e89a74 100644 --- a/src/Makefile +++ b/src/Makefile @@ -28,10 +28,11 @@ kernel.bin: kernel.elf kernel.sym: kernel.elf $(OBJCOPY) --only-keep-debug kernel.elf kernel.sym -kernel.elf: kernel.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o string.o stdlib.o stdio.o +kernel.elf: kernel.o console.o vga.o serial.o port.o port_asm.o interrupts.o interrupts_asm.o string.o stdlib.o stdio.o setjmp.o $(LD) -o kernel.elf -N -n -Ttext 0x8400 --oformat elf32-i386 \ kernel.o console.o vga.o serial.o port.o port_asm.o \ - interrupts.o interrupts_asm.o string.o stdlib.o stdio.o + interrupts.o interrupts_asm.o string.o stdlib.o stdio.o \ + setjmp.o magic.bin: magic.asm $(NASM) magic.asm -DMAGIC='"$(MAGIC)"' -f bin -o magic.bin @@ -69,6 +70,9 @@ stdlib.o: stdlib.c stdlib.h stdio.o: stdio.c stdio.h $(CC) $(CFLAGS) -c -o stdio.o stdio.c +setjmp.o: setjmp.asm + $(NASM) setjmp.asm $(NASMFLAGS) -o setjmp.o + clean: -rm -f boot.bin kernel.bin kernel.sym kernel.elf image.bin magic.bin *.o boot.map image.tmp |