freya/kern
1
0
Fork 0
mirror of https://github.com/kenshineto/kern.git synced 2025-04-13 22:17:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

disable kvm (breaks gdb), fix kernel to be flat binary

Browse source
This commit is contained in:
Murphy 2025-03-27 16:35:42 -04:00
parent 08fad27c0e
commit eab3dd71ee
Signed by: freya
GPG key ID: 9FBC6FFD6D2DBF17
2 changed files with 7 additions and 7 deletions

12
Makefile
View file

@ -12,10 +12,6 @@ QEMUOPTS = -drive file=bin/disk.img,index=0,media=disk,format=raw \
-m 4G \ -m 4G \
-name kern -name kern
ifeq ($(UNAME), Linux)
QEMUOPTS += -enable-kvm -display sdl
endif
qemu: bin/disk.img qemu: bin/disk.img
$(QEMU) $(QEMUOPTS) $(QEMU) $(QEMUOPTS)
@ -40,12 +36,16 @@ bin/boot.bin: build
cd bin && \ cd bin && \
objcopy -S -O binary -j .text boot boot.bin objcopy -S -O binary -j .text boot boot.bin
bin/kernel.bin: build
cd bin && \
objcopy -S -O binary kernel kernel.bin
bin/user.img: build bin/user.img: build
cd bin && \ cd bin && \
./mkblob init idle prog* shell ./mkblob init idle prog* shell
bin/disk.img: build bin/boot.bin bin/user.img bin/disk.img: bin/kernel.bin bin/boot.bin bin/user.img
cd bin && \ cd bin && \
./BuildImage -d usb -o disk.img -b boot.bin \ ./BuildImage -d usb -o disk.img -b boot.bin \
kernel 0x10000 user.img 0x30000 kernel.bin 0x10000 user.img 0x30000

2
build.zig
View file

@ -29,6 +29,7 @@ const ld_flags = &[_][]const u8{
const boot_src = &[_][]const u8{"boot/boot.S"}; const boot_src = &[_][]const u8{"boot/boot.S"};
const kernel_src = &[_][]const u8{ const kernel_src = &[_][]const u8{
"kernel/startup.S", // must be first
"kernel/cio.c", "kernel/cio.c",
"kernel/clock.c", "kernel/clock.c",
"kernel/isrs.S", "kernel/isrs.S",
@ -37,7 +38,6 @@ const kernel_src = &[_][]const u8{
"kernel/list.c", "kernel/list.c",
"kernel/procs.c", "kernel/procs.c",
"kernel/sio.c", "kernel/sio.c",
"kernel/startup.S",
"kernel/support.c", "kernel/support.c",
"kernel/syscalls.c", "kernel/syscalls.c",
"kernel/user.c", "kernel/user.c",