From 6e5f0a408961eaa91de386baab6e80d6b3facf36 Mon Sep 17 00:00:00 2001 From: Marco Cetica Date: Tue, 25 Aug 2020 01:09:22 +0200 Subject: [PATCH] Added 32 nasm flag and fixed clean Make directive --- Makefile | 5 ++++- kernel/cpu/Makefile | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 47d09f8..a23c499 100644 --- a/Makefile +++ b/Makefile @@ -40,7 +40,7 @@ iso: clean: rm -rf obj/ kernel/*.o kernel/cpu/*.o - rm -rf kernel/shell/*.o + rm -rf kernel/shell/*.o kernel/mem/*.o rm -rf kernel/drivers/*.o kernel/libc/*.o rm -rf iceOS.iso bochslog.txt commands isodir @@ -49,6 +49,9 @@ bochs: run: qemu-system-x86_64 -cdrom iceOS.iso + +run-debug: + qemu-system-x86_64 -cdrom iceOS.iso -d exec,cpu run-curses: qemu-system-x86_64 -cdrom iceOS.iso -curses diff --git a/kernel/cpu/Makefile b/kernel/cpu/Makefile index 4098b6a..339e604 100644 --- a/kernel/cpu/Makefile +++ b/kernel/cpu/Makefile @@ -2,7 +2,7 @@ OBJS = kernel_loader.asm.o ports.asm.o \ gdt.asm.o idt.asm.o interrupts.asm.o ASM = nasm -ASMFLAGS = -f elf +ASMFLAGS = -f elf32 all: $(OBJS) %.asm.o: %.asm $(ASM) $(ASMFLAGS) $< -o $@