fix bad tabulations

This commit is contained in:
rick 2023-09-13 20:31:19 +02:00
parent 9415a40263
commit 4b67b84146
Signed by: Rick
GPG key ID: 5CBE8779CD27BCBA
2 changed files with 17 additions and 16 deletions

View file

@ -2,8 +2,8 @@ OBJECTS = loader.o framebuffer.o io.o kmain.o
CC = gcc CC = gcc
CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector \ CFLAGS = -m32 -nostdlib -nostdinc -fno-builtin -fno-stack-protector \
-nostartfiles -nodefaultlibs -Iinclude -Wall -Wextra -Werror -c \ -nostartfiles -nodefaultlibs -Iinclude -Wall -Wextra -Werror -c \
-ansi -pedantic -ansi -pedantic
LDFLAGS = -T link.ld -melf_i386 LDFLAGS = -T link.ld -melf_i386
@ -29,15 +29,15 @@ kernel.elf: $(OBJECTS)
os.iso: kernel.elf os.iso: kernel.elf
cp kernel.elf iso/boot/kernel.elf cp kernel.elf iso/boot/kernel.elf
mkisofs -R \ mkisofs -R \
-b boot/grub/stage2_eltorito \ -b boot/grub/stage2_eltorito \
-no-emul-boot \ -no-emul-boot \
-boot-load-size 4 \ -boot-load-size 4 \
-A os \ -A os \
-input-charset UTF-8 \ -input-charset UTF-8 \
-quiet \ -quiet \
-boot-info-table \ -boot-info-table \
-o os.iso \ -o os.iso \
iso iso
run: os.iso run: os.iso

View file

@ -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) ; valeurs pour l'entête de multiboot
MAGIC_NUMBER equ 0x1BADB002 ; obligatoire ; (https://www.gnu.org/software/grub/manual/multiboot/html_node/Header-magic-fields.html#Header-magic-fields)
FLAGS equ 0x0 ; configuration de multiboot MAGIC_NUMBER equ 0x1BADB002 ; obligatoire
CHECKSUM equ -MAGIC_NUMBER ; cf. documentation FLAGS equ 0x0 ; configuration de multiboot
CHECKSUM equ -MAGIC_NUMBER ; cf. documentation
KERNEL_STACK_SIZE equ 4096 KERNEL_STACK_SIZE equ 4096
section .bss section .bss
align 4 align 4