From ba6f8a3498b57a2d334e961ac5a161328469358d Mon Sep 17 00:00:00 2001
From: vanten-s <vanten-s@vanten-s.com>
Date: Mon, 15 Jul 2024 20:14:00 +0200
Subject: [PATCH] Build updates

---
 Makefile                  |  66 +++++++++++++++++++++++---------------
 isodir/boot/grub/grub.cfg |   3 ++
 isodir/boot/myos.bin      | Bin 0 -> 10400 bytes
 3 files changed, 44 insertions(+), 25 deletions(-)
 create mode 100644 isodir/boot/grub/grub.cfg
 create mode 100755 isodir/boot/myos.bin

diff --git a/Makefile b/Makefile
index 0783759..53bc287 100644
--- a/Makefile
+++ b/Makefile
@@ -1,50 +1,66 @@
-ARCHDIR=../arch/i686
+ARCHDIR=arch/i686
 
+CFLAGS?=
 
-CFLAGS=-O2 \
+INCLUDEDIR=include
+
+CFLAGS:=-O2 \
 -std=gnu99 \
 -ffreestanding \
 -Wall -Wextra \
--I $(INCLUDEDIR)
+-I$(INCLUDEDIR) \
+$(CFLAGS)
 
 
-KERNEL_OBJS=kernel.o
-LIB_OBJS=bootstrap.o \
-tty.o\
-strlib.o\
-interrupt.o
+KERNEL_OBJS=kernel/kernel.o
+LIB_OBJS=\
+$(ARCHDIR)/bootstrap.o \
+$(ARCHDIR)/tty.o\
+$(ARCHDIR)/strlib.o\
+$(ARCHDIR)/interrupt.o\
+
 OBJS=$(KERNEL_OBJS) $(LIB_OBJS)
+
 LDFLAGS=$(OBJS) \
 -ffreestanding \
 -O2 \
 -nostdlib \
 -lgcc
 
-
-INCLUDEDIR=../include
-
+.SUFFIXES: .c .o .s
 
 all:
+	$(MAKE) run-grub-qemu
+
+clean:
+	rm -f $(OBJS)
+	rm myos.bin
+	rm myos.iso
+
+debug:
 	mkdir build || true
 	cp Makefile build
-	$(MAKE) -C build test-kernel-qemu
+	cp -r isodir build
+	CFLAGS=-g $(MAKE) -C build debug-grub-qemu
 
-architecture:
-	i686-elf-as $(ARCHDIR)/bootstrap.s -o bootstrap.o
+.c.o:
+	i686-elf-gcc -c $< -o $@ $(CFLAGS)
 
-	i686-elf-gcc -c $(ARCHDIR)/tty.c -o tty.o $(CFLAGS)
-	i686-elf-gcc -c $(ARCHDIR)/interrupt.c -o interrupt.o $(CFLAGS)
-	i686-elf-gcc -c $(ARCHDIR)/strlib.c -o strlib.o $(CFLAGS)
+.s.o:
+	i686-elf-as $< -o $@
 
-kernel:
-	i686-elf-gcc -c ../kernel/kernel.c -o kernel.o $(CFLAGS)
-
-
-myos-bin: architecture kernel
+myos.bin: $(OBJS)
 	i686-elf-gcc -T $(ARCHDIR)/linker.ld -o myos.bin $(LDFLAGS)
-	
 	grub-file --is-x86-multiboot myos.bin
 
-test-kernel-qemu: myos-bin
-	qemu-system-i386 -kernel myos.bin
+run-grub-qemu: myos.bin
+	cp myos.bin isodir/boot/myos.bin
+	grub-mkrescue -o myos.iso isodir
+	qemu-system-i386 myos.iso
+
+debug-grub-qemu: myos.bin
+	cp myos.bin isodir/boot/myos.bin
+	grub-mkrescue -o myos.iso isodir
+	qemu-system-i386 -S -gdb tcp::9000 myos.iso
+
 
diff --git a/isodir/boot/grub/grub.cfg b/isodir/boot/grub/grub.cfg
new file mode 100644
index 0000000..b2f8404
--- /dev/null
+++ b/isodir/boot/grub/grub.cfg
@@ -0,0 +1,3 @@
+menuentry "myos" {
+	multiboot /boot/myos.bin
+}
diff --git a/isodir/boot/myos.bin b/isodir/boot/myos.bin
new file mode 100755
index 0000000000000000000000000000000000000000..f8fdc9afa35baae6490b7fc857052ca2445e4209
GIT binary patch
literal 10400
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
DvSIE+

literal 0
HcmV?d00001