From 4b67b84146ac5a2e5621ef5e4a85e91e1e908769 Mon Sep 17 00:00:00 2001 From: rick <rick@gnous.eu> Date: Wed, 13 Sep 2023 20:31:19 +0200 Subject: [PATCH] fix bad tabulations --- Makefile | 20 ++++++++++---------- loader.s | 13 +++++++------ 2 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Makefile b/Makefile index 31d3179..8a1d063 100644 --- a/Makefile +++ b/Makefile @@ -2,8 +2,8 @@ OBJECTS = loader.o framebuffer.o io.o kmain.o CC = gcc CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector \ - -nostartfiles -nodefaultlibs -Iinclude -Wall -Wextra -Werror -c \ - -ansi -pedantic + -nostartfiles -nodefaultlibs -Iinclude -Wall -Wextra -Werror -c \ + -ansi -pedantic LDFLAGS = -T link.ld -melf_i386 @@ -29,15 +29,15 @@ kernel.elf: $(OBJECTS) os.iso: kernel.elf cp kernel.elf iso/boot/kernel.elf - mkisofs -R \ + mkisofs -R \ -b boot/grub/stage2_eltorito \ - -no-emul-boot \ - -boot-load-size 4 \ - -A os \ - -input-charset UTF-8 \ - -quiet \ - -boot-info-table \ - -o os.iso \ + -no-emul-boot \ + -boot-load-size 4 \ + -A os \ + -input-charset UTF-8 \ + -quiet \ + -boot-info-table \ + -o os.iso \ iso run: os.iso diff --git a/loader.s b/loader.s index f56eb50..7fe7274 100644 --- a/loader.s +++ b/loader.s @@ -1,11 +1,12 @@ -global loader ; symbole d'entrée pour le format ELF +global loader ; symbole d'entrée pour le format ELF -; valeurs pour l'entête de multiboot (https://www.gnu.org/software/grub/manual/multiboot/html_node/Header-magic-fields.html#Header-magic-fields) -MAGIC_NUMBER equ 0x1BADB002 ; obligatoire -FLAGS equ 0x0 ; configuration de multiboot -CHECKSUM equ -MAGIC_NUMBER ; cf. documentation +; valeurs pour l'entête de multiboot +; (https://www.gnu.org/software/grub/manual/multiboot/html_node/Header-magic-fields.html#Header-magic-fields) +MAGIC_NUMBER equ 0x1BADB002 ; obligatoire +FLAGS equ 0x0 ; configuration de multiboot +CHECKSUM equ -MAGIC_NUMBER ; cf. documentation -KERNEL_STACK_SIZE equ 4096 +KERNEL_STACK_SIZE equ 4096 section .bss align 4