From 3ba21a66bb549444fd65428b45925ff542ecc57b Mon Sep 17 00:00:00 2001 From: Bensong Liu <bensl@microsoft.com> Date: Mon, 2 Nov 2020 15:33:43 +0800 Subject: [PATCH] note --- bootloader/boot.asm | 2 ++ kernel/Makefile | 4 +++- kernel/{kernel.c => kernel.cc} | 0 3 files changed, 5 insertions(+), 1 deletion(-) rename kernel/{kernel.c => kernel.cc} (100%) diff --git a/bootloader/boot.asm b/bootloader/boot.asm index e321a10..ff513b2 100644 --- a/bootloader/boot.asm +++ b/bootloader/boot.asm @@ -1,3 +1,5 @@ +; This code file would be compiled and placed in MBR first block. + [bits 16] [org 0x7c00] diff --git a/kernel/Makefile b/kernel/Makefile index b38f334..da48893 100644 --- a/kernel/Makefile +++ b/kernel/Makefile @@ -2,13 +2,15 @@ assemble: kernel head ld -o kernel.img -Ttext 0x7e00 --oformat binary image_head.o kernel.o -m elf_i386 # Sector 1 = bootloader, Sector 2 - (512B TO 64K) = kernel + # Extend kernel.img to correct size. + test $$(stat -c %s kernel.img) -le 65024 truncate --size=65024 kernel.img head: nasm -f elf image_head.asm -o image_head.o kernel: - gcc -ffreestanding -fno-pie -c kernel.c -o kernel.o -m32 + g++ -ffreestanding -fno-pie -c kernel.cc -o kernel.o -m32 clean: rm *.o *.img diff --git a/kernel/kernel.c b/kernel/kernel.cc similarity index 100% rename from kernel/kernel.c rename to kernel/kernel.cc -- GitLab