Merge pull request #10 from albertarielw/v2

V2
albertarielw · Jul 9, 2023 · fd7e984 · fd7e984
2 parents 9f8bbe9 + 9721f24
commit fd7e984
Show file tree

Hide file tree

Showing 16 changed files with 24 additions and 14 deletions.
diff --git a/.DS_Store b/.DS_Store
diff --git a/.gitignore b/.gitignore
@@ -1 +0,0 @@
-build/**

diff --git a/Makefile b/Makefile
@@ -1,18 +1,29 @@
 ASM = nasm
 CC = gcc
+
+SRC_DIR = src
+BUILD_DIR = build
+
 BOOTSTRAP_FILE = bootstrap.asm 
 INIT_KERNEL_FILES = starter.asm
 KERNEL_FILES = main.c
 KERNEL_FLAGS = -Wall -m32 -c -ffreestanding -fno-asynchronous-unwind-tables -fno-pie
-KERNEL_OBJECT = -o kernel.elf
+KERNEL_OBJECT = kernel.elf
+
+.PHONY: build link run clean
+
+build: $(SRC_DIR)/$(BOOTSTRAP_FILE) $(BUILD_DIR)/$(KERNEL_FILE)
+	$(ASM) -f bin $(SRC_DIR)/$(BOOTSTRAP_FILE) -o $(BUILD_DIR)/bootstrap.o
+	$(ASM) -f elf32 $(SRC_DIR)/$(INIT_KERNEL_FILES) -o $(BUILD_DIR)/starter.o 
+	$(CC) $(KERNEL_FLAGS) $(SRC_DIR)/$(KERNEL_FILES) -o $(BUILD_DIR)/$(KERNEL_OBJECT)
+	ld -melf_i386 -Tlinker.ld $(BUILD_DIR)/starter.o $(BUILD_DIR)/kernel.elf -o $(BUILD_DIR)/minios.elf
+	objcopy -O binary $(BUILD_DIR)/minios.elf $(BUILD_DIR)/minios.bin
+	dd if=$(BUILD_DIR)/bootstrap.o of=$(BUILD_DIR)/kernel.img
+	dd seek=1 conv=sync if=$(BUILD_DIR)/minios.bin of=$(BUILD_DIR)/kernel.img bs=512 count=5
+	dd seek=6 conv=sync if=/dev/zero of=$(BUILD_DIR)/kernel.img bs=512 count=2046
+
+run:
+	qemu-system-x86_64 -s $(BUILD_DIR)/kernel.img
 
-build: $(BOOTSTRAP_FILE) $(KERNEL_FILE)
-	$(ASM) -f bin $(BOOTSTRAP_FILE) -o bootstrap.o
-	$(ASM) -f elf32 $(INIT_KERNEL_FILES) -o starter.o 
-	$(CC) $(KERNEL_FLAGS) $(KERNEL_FILES) $(KERNEL_OBJECT)
-	ld -melf_i386 -Tlinker.ld starter.o kernel.elf -o minios.elf
-	objcopy -O binary minios.elf minios.bin
-	dd if=bootstrap.o of=kernel.img
-	dd seek=1 conv=sync if=minios.bin of=kernel.img bs=512 count=5
-	dd seek=6 conv=sync if=/dev/zero of=kernel.img bs=512 count=2046
-	qemu-system-x86_64 -s kernel.img
+clean:
+	rm -rf $(BUILD_DIR)/*.o $(BUILD_DIR)/*.img $(BUILD_DIR)/*.bin $(BUILD_DIR)/*.elf
diff --git a/asset/v2.png b/asset/v2.png
diff --git a/bootstrap.o → build/bootstrap.o b/bootstrap.o → build/bootstrap.o
diff --git a/kernel.elf → build/kernel.elf b/kernel.elf → build/kernel.elf
diff --git a/kernel.img → build/kernel.img b/kernel.img → build/kernel.img
diff --git a/minios.bin → build/minios.bin b/minios.bin → build/minios.bin
diff --git a/minios.elf → build/minios.elf b/minios.elf → build/minios.elf
diff --git a/build/starter.o b/build/starter.o
diff --git a/bootstrap.asm → src/bootstrap.asm b/bootstrap.asm → src/bootstrap.asm
diff --git a/gdt.asm → src/gdt.asm b/gdt.asm → src/gdt.asm
diff --git a/idt.asm → src/idt.asm b/idt.asm → src/idt.asm
diff --git a/main.c → src/main.c b/main.c → src/main.c
diff --git a/starter.asm → src/starter.asm b/starter.asm → src/starter.asm
@@ -136,5 +136,5 @@ start_kernel:
 	
 	call kernel_main
 	
-%include "gdt.asm"
-%include "idt.asm"
+%include "src/gdt.asm"
+%include "src/idt.asm"
diff --git a/starter.o b/starter.o