xnoe/xnoe-os
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Add XnoeOS's first non-kernel program. Test systemcalls

Browse Source
This commit is contained in:
Xnoe
2021-11-27 02:32:43 +00:00
parent 0bb88e4da8
commit c84a3ffdea
4 changed files with 115 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+15 -12
View File
@@ -2,12 +2,13 @@ CFLAGS = -g -std=gnu11 -m32 -mgeneral-regs-only -nostdlib -fno-builtin -fno-exce
CXXFLAGS = -g -m32 -fno-use-cxa-atexit -mgeneral-regs-only -nostdlib -fno-builtin -fno-rtti -fno-exceptions -fno-leading-underscore -fpermissive -fno-pie -fno-stack-protector -I.
LDFLAGS =
DISK_IMG_FILES = build/kernel/kernel.bin hello.txt alpha.txt
DISK_IMG_FILES = build/kernel/kernel.bin build/program/program.bin hello.txt alpha.txt
KERNEL_OBJS = build/kernel/entry.o build/kernel/screenstuff.o build/kernel/io.o build/kernel/idt.o build/kernel/keyboard.o \
build/kernel/strings.o build/kernel/atapio.o build/kernel/kmain.o build/kernel/paging.o build/kernel/allocate.o \
build/kernel/gdt.o build/kernel/memory.o build/kernel/process.o build/kernel/datatypes/hash.o \
build/kernel/terminal.o build/kernel/global.o build/kernel/kernel.o
STAGE2_OBS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o
STAGE2_OBJS = build/c_code_entry.o build/boot_stage2/io.o build/boot_stage2/atapio.o build/boot_stage2/strings.o build/boot_stage2/screenstuff.o build/boot_stage2/stage2.o build/boot_stage2/paging.o
PROGRAM_OBJS = build/program_code_entry.o build/program/program.o
run: disk.img
qemu-system-x86_64 disk.img
@@ -30,6 +31,7 @@ prepare:
mkdir -p build/boot_stage2
mkdir -p build/kernel
mkdir -p build/kernel/datatypes
mkdir -p build/program
mountpoint img.d | grep not || umount img.d
clean:
@@ -39,15 +41,15 @@ build/boot/boot.bin: src/boot/boot.asm
nasm $< -o $@
# Boot Stage 2
build/boot_stage2/boot.bin: src/boot_stage2/boot_stage2.ld $(STAGE2_OBS)
ld $(LDFLAGS) -T $< $(STAGE2_OBS)
build/boot_stage2/boot.bin: src/boot_stage2/boot_stage2.ld $(STAGE2_OBJS)
ld $(LDFLAGS) -T $< $(STAGE2_OBJS)
build/boot_stage2/%.o: src/boot_stage2/%.c
gcc $(CFLAGS) -o $@ -c $<
# Kernel
build/kernel/kernel.bin: build/kernel/kernel.elf
objcopy -O binary build/kernel/kernel.elf build/kernel/kernel.bin
build/%.bin: build/%.elf
objcopy -O binary $< $@
build/kernel/kernel.elf: src/kernel/kernel.ld $(KERNEL_OBJS)
ld $(LDFLAGS) -T $< $(KERNEL_OBJS)
@@ -55,15 +57,16 @@ build/kernel/kernel.elf: src/kernel/kernel.ld $(KERNEL_OBJS)
build/boot_stage2/stage2.o: src/boot_stage2/main.c
gcc $(CFLAGS) -o $@ -c $<
build/kernel/%.o: src/kernel/%.c
build/%.o: src/%.c
gcc $(CFLAGS) -o $@ -c $<
build/kernel/%.o: src/kernel/%.cpp
build/%.o: src/%.cpp
g++ $(CXXFLAGS) -o $@ -c $<
build/kernel/%.o: src/kernel/%.asm
build/%.o: src/%.asm
nasm -felf32 $< -o $@
# Generic
build/%.o: src/%.asm
nasm -felf32 $< -o $@
# Program
build/program/program.bin: src/program/program.ld $(PROGRAM_OBJS)
ld $(LDFLAGS) -T $< $(PROGRAM_OBJS)