Merge pull request #26 from lvntky/dev

Dev to Master V0.2.2-ALPHA

Author: lvntky

Makefile

@@ -1,53 +1,46 @@
-FILES = ./build/kernel.asm.o ./build/kernel.o ./build/tty.o ./build/stdio.o ./build/string.o ./build/idt.asm.o ./build/idt.o ./build/cpu_info.o ./build/io_port.o ./build/vga_driver.o
-INCLUDES = -I./src
-FLAGS = -g -ffreestanding -falign-jumps -falign-functions -falign-labels -falign-loops -fstrength-reduce -fomit-frame-pointer -finline-functions -Wno-unused-function -fno-builtin -Werror -Wno-unused-label -Wno-cpp -Wno-unused-parameter -nostdlib -nostartfiles -nodefaultlibs -Wall -O0 -Iinc
+CFLAGS = -m32 -ffreestanding -falign-jumps -falign-functions -falign-labels -falign-loops -fstrength-reduce -fomit-frame-pointer -finline-functions -Wno-unused-function -fno-builtin -Werror -Wno-unused-label -Wno-cpp -Wno-unused-parameter -nostdlib -nostartfiles -nodefaultlibs -Wall -O0 -Iinc
+ASPARAMS = --32
+LDPARAMS = -melf_i386
 
-all: ./bin/boot.bin ./bin/kernel.bin
-	rm -rf ./bin/artilleryos.bin
-	dd if=./bin/boot.bin >> ./bin/artilleryos.bin
-	dd if=./bin/kernel.bin >> ./bin/artilleryos.bin
-	dd if=/dev/zero bs=512 count=100 >> ./bin/artilleryos.bin
+objects = build/loader.o build/kernel.o build/tty.o build/stdio.o build/cpu_info.o build/string.o build/io_port.o ./build/vga_driver.o
 
-./bin/kernel.bin: $(FILES)
-	i686-elf-ld -g -relocatable $(FILES) -o ./build/kernel_bootloader_combined.o
-	i686-elf-gcc $(FLAGS) -T ./kernel/linker.ld -o ./bin/kernel.bin -ffreestanding -O0 -nostdlib ./build/kernel_bootloader_combined.o
 
-./bin/boot.bin: ./boot/boot.asm
-	nasm -f bin ./boot/boot.asm -o ./bin/boot.bin
 
-./build/kernel.asm.o: ./boot/kernel_entry.asm
-	nasm -f elf -g ./boot/kernel_entry.asm -o ./build/kernel.asm.o
+build/%.o: kernel/src/%.c
+	i686-elf-gcc $(CFLAGS) -c -o $@ $<
 
-./build/kernel.o: ./kernel/src/kernel.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/src/kernel.c -o ./build/kernel.o
+build/%.o: kernel/libc/%.c
+	i686-elf-gcc $(CFLAGS) -c -o $@ $<
 
-./build/tty.o: ./kernel/src/tty.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/src/tty.c -o ./build/tty.o
+build/%.o: kernel/driver/%.c
+	i686-elf-gcc $(CFLAGS) -c -o $@ $<
 
-./build/stdio.o: ./kernel/libc/stdio.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/libc/stdio.c -o ./build/stdio.o
+build/%.o: boot/%.s
+	i686-elf-as $(ASPARAMS) -o $@ $<
 
-./build/string.o: ./kernel/libc/string.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/libc/string.c -o ./build/string.o
+kernel.bin: linker.ld $(objects)
+	i686-elf-ld $(LDPARAMS) -T $< -o $@ $(objects)
 
-./build/idt.asm.o: ./kernel/idt/idt.asm
-	nasm -f elf -g ./kernel/idt/idt.asm -o ./build/idt.asm.o
+all: kernel.bin
+	mkdir iso
+	mkdir iso/boot
+	mkdir iso/boot/grub
+	cp kernel.bin iso/boot/kernel.bin
+	echo 'set timeout=10'                      > iso/boot/grub/grub.cfg
+	echo 'set default=0'                     >> iso/boot/grub/grub.cfg
+	echo ''                                  >> iso/boot/grub/grub.cfg
+	echo 'menuentry "Artillery OS" {' >> iso/boot/grub/grub.cfg
+	echo '  multiboot /boot/kernel.bin'    >> iso/boot/grub/grub.cfg
+	echo '  boot'                            >> iso/boot/grub/grub.cfg
+	echo '}'                                 >> iso/boot/grub/grub.cfg
+	grub-mkrescue --output=artillery.iso iso
+	rm -rf iso
 
-./build/idt.o: ./kernel/idt/idt.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/idt/idt.c -o ./build/idt.o
-
-./build/cpu_info.o: ./kernel/src/cpu_info.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/src/cpu_info.c -o ./build/cpu_info.o
-
-./build/io_port.o: ./kernel/src/io_port.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/src/io_port.c -o ./build/io_port.o
-
-./build/vga_driver.o: ./kernel/driver/vga_driver.c
-	i686-elf-gcc $(INCLUDES) $(FLAGS) -std=gnu99 -c ./kernel/driver/vga_driver.c -o ./build/vga_driver.o
+install: kernel.bin
+	sudo cp $< /boot/mykernel.bin
 
 clean:
-	rm -rf ./bin/boot.bin
-	rm -rf ./bin/kernel.bin
-	rm -rf ./bin/artilleryos.bin
-	rm -rf ${FILES}
-	rm -rf ./build/kernel_bootloader_combined.o
+	sudo rm -r ./build/*
+	sudo rm -r kernel.bin
+	sudo rm -r artillery.iso
+

boot/boot.asm

@@ -0,0 +1,33 @@
+.set MAGIC, 0x1badb002
+.set FLAGS, (1<<0 | 1<<1)
+.set CHECKSUM, -(MAGIC + FLAGS)
+
+.section .multiboot
+    .long MAGIC
+    .long FLAGS
+    .long CHECKSUM
+
+
+.section .text
+.extern kernel_main
+.extern call_constructors
+.global loader
+
+
+loader:
+    mov $kernel_stack, %esp
+    call call_constructors
+    push %eax
+    push %ebx
+    call kernel_main
+
+
+_stop:
+    cli
+    hlt
+    jmp _stop
+
+
+.section .bss
+.space 2*1024*1024; # 2 MiB
+kernel_stack:

boot/kernel_entry.asm

@@ -34,5 +34,6 @@ uint8_t get_color_index(uint8_t, uint8_t, uint8_t);
 void put_pixel_rgb(uint32_t, uint32_t, uint8_t, uint8_t, uint8_t);
 void clear_screen();
 void color_demo();
+void clear_screen_withcolor(uint8_t);
 
 #endif

boot/loader.s

@@ -145,7 +145,7 @@ void color_demo()
 		if (i > 16) {
 			i = i % 16;
 		}
-		for (size_t i = 0; i < 99999900; i++) {
+		for (size_t i = 0; i < 99999; i++) {
 			/* code */
 		}