From e6f4200ae9931b62839266040143a5cbc0a0ce8e Mon Sep 17 00:00:00 2001 From: xamidev Date: Sun, 21 Dec 2025 15:59:14 +0100 Subject: [PATCH] rename stuff + add GDB debug rule --- .gitignore | 1 + Makefile | 18 +++++++++++------- debug.gdb | 1 + limine.conf | 2 +- 4 files changed, 14 insertions(+), 8 deletions(-) create mode 100644 debug.gdb diff --git a/.gitignore b/.gitignore index 5755fde..0739782 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ limine kernel +pepperk iso_root *.o *.iso diff --git a/Makefile b/Makefile index 3a995ce..a0f315c 100644 --- a/Makefile +++ b/Makefile @@ -1,8 +1,8 @@ build: rm -f *.o - x86_64-elf-gcc -c -I src src/io/term.c src/io/printf.c src/kmain.c -Wall -Wextra -std=gnu99 -nostdlib -ffreestanding -fno-stack-protector -fno-stack-check -fno-PIC -ffunction-sections -fdata-sections -mcmodel=kernel + x86_64-elf-gcc -g -c -I src src/io/term.c src/io/printf.c src/kmain.c -Wall -Wextra -std=gnu99 -nostdlib -ffreestanding -fno-stack-protector -fno-stack-check -fno-PIC -ffunction-sections -fdata-sections -mcmodel=kernel objcopy -O elf64-x86-64 -B i386 -I binary zap-light16.psf zap-light16.o - x86_64-elf-ld -o kernel -T linker.ld *.o + x86_64-elf-ld -o pepperk -T linker.ld *.o limine/limine: rm -rf limine @@ -12,7 +12,7 @@ limine/limine: build-iso: limine/limine build rm -rf iso_root mkdir -p iso_root/boot - cp -v kernel iso_root/boot + cp -v pepperk iso_root/boot mkdir -p iso_root/boot/limine cp -v limine.conf iso_root/boot/limine mkdir -p iso_root/EFI/BOOT @@ -23,11 +23,15 @@ build-iso: limine/limine build -no-emul-boot -boot-load-size 4 -boot-info-table -hfsplus \ -apm-block-size 2048 --efi-boot boot/limine/limine-uefi-cd.bin \ -efi-boot-part --efi-boot-image --protective-msdos-label \ - iso_root -o kernel.iso - ./limine/limine bios-install kernel.iso + iso_root -o pepper.iso + ./limine/limine bios-install pepper.iso + +debug: + qemu-system-x86_64 -drive file=pepper.iso -s -S & + gdb pepperk --command=debug.gdb run: build-iso - qemu-system-x86_64 -cdrom kernel.iso + qemu-system-x86_64 -cdrom pepper.iso clean: - rm -rf *.o kernel iso_root kernel.iso limine + rm -rf *.o pepperk iso_root pepper.iso limine diff --git a/debug.gdb b/debug.gdb new file mode 100644 index 0000000..1042ec7 --- /dev/null +++ b/debug.gdb @@ -0,0 +1 @@ +target remote localhost:1234 \ No newline at end of file diff --git a/limine.conf b/limine.conf index c4a7be7..3849b94 100644 --- a/limine.conf +++ b/limine.conf @@ -3,4 +3,4 @@ timeout: 3 /PepperOS protocol: limine - path: boot():/boot/kernel + path: boot():/boot/pepperk