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

Fix bug in terminal.cpp where it would use incorrect pointers in scroll_up, removed old debug code from kmain.cpp, kernel.cpp no longer appends itself to the process list, update process.cpp to take a filename when constructing a new process. Update idt.cpp to plug context_switch in to int 0x20 (IRQ0)

Browse Source
This commit is contained in:
Xnoe
2021-11-27 13:11:44 +00:00
parent bfa648d96b
commit d6c1cc1869
8 changed files with 39 additions and 94 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Makefile
+13 -3
View File
@@ -2,13 +2,16 @@ 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 build/program/program.bin hello.txt alpha.txt
DISK_IMG_FILES = build/kernel/kernel.bin build/program/program.bin build/program/hello.bin \
build/program/world.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_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
PROGRAM_OBJS = build/program_code_entry.o build/program/program.o build/common/common.o
HELLO_OBJS = build/program_code_entry.o build/program/hello.o build/common/common.o
WORLD_OBJS = build/program_code_entry.o build/program/world.o build/common/common.o
run: disk.img
qemu-system-x86_64 disk.img
@@ -32,6 +35,7 @@ prepare:
mkdir -p build/kernel
mkdir -p build/kernel/datatypes
mkdir -p build/program
mkdir -p build/common
mountpoint img.d | grep not || umount img.d
clean:
@@ -69,4 +73,10 @@ build/%.o: src/%.asm
# Program
build/program/program.bin: src/program/program.ld $(PROGRAM_OBJS)
ld $(LDFLAGS) -T $< $(PROGRAM_OBJS)
ld $(LDFLAGS) -T $< $(PROGRAM_OBJS)
build/program/hello.bin: src/program/hello.ld $(HELLO_OBJS)
ld $(LDFLAGS) -T $< $(HELLO_OBJS)
build/program/world.bin: src/program/world.ld $(WORLD_OBJS)
ld $(LDFLAGS) -T $< $(WORLD_OBJS)