diff --git a/Fennix Kernel.code-workspace b/Fennix Kernel.code-workspace index 673dc3f6..6202aeaa 100644 --- a/Fennix Kernel.code-workspace +++ b/Fennix Kernel.code-workspace @@ -232,6 +232,7 @@ "tskdbg", "ttbr", "uarch", + "uartmemdmp", "ubsan", "UINTFASTX", "UINTLEASTX", diff --git a/Makefile b/Makefile index 22bfdb73..923d9a71 100644 --- a/Makefile +++ b/Makefile @@ -30,11 +30,11 @@ QEMUFLAGS += -device vmware-svga -M q35 \ -net user \ -netdev user,id=usernet0 \ -device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \ - -object filter-dump,id=usernet0,netdev=usernet0,file=network.log,maxlen=1024 \ + -object filter-dump,id=usernet0,netdev=usernet0,file=network.dmp,maxlen=1024 \ -serial file:serial.log \ -serial file:profiler.log \ - -serial null \ - -serial null \ + -serial file:serial3.dmp \ + -serial file:serial4.dmp \ -device ahci,id=ahci \ -drive id=bootdsk,file=$(OSNAME).iso,format=raw,if=none \ -device ide-hd,drive=bootdsk,bus=ahci.0 \ @@ -50,11 +50,11 @@ QEMUFLAGS += -M q35 \ -net user \ -netdev user,id=usernet0 \ -device e1000,netdev=usernet0,mac=00:69:96:00:42:00 \ - -object filter-dump,id=usernet0,netdev=usernet0,file=network.log,maxlen=1024 \ + -object filter-dump,id=usernet0,netdev=usernet0,file=network.dmp,maxlen=1024 \ -serial file:serial.log \ -serial file:profiler.log \ - -serial null \ - -serial null \ + -serial file:serial3.dmp \ + -serial file:serial4.dmp \ -hda $(OSNAME).iso \ -audiodev pa,id=pa1,server=/run/user/1000/pulse/native \ -machine pcspk-audiodev=pa1 \ @@ -64,8 +64,8 @@ QEMUFLAGS += -M raspi3b \ -cpu cortex-a57 \ -serial file:serial.log \ -serial file:profiler.log \ - -serial null \ - -serial null \ + -serial file:serial3.dmp \ + -serial file:serial4.dmp \ -kernel $(OSNAME).img endif @@ -162,15 +162,15 @@ endif # endif vscode_debug: build_kernel build_userspace build_drivers build_image - rm -f serial.log profiler.log network.log + rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp $(QEMU) -S -gdb tcp::1234 -d int -no-reboot -no-shutdown $(QEMU_UEFI_BIOS) -m 4G $(QEMUFLAGS) -smp $(shell echo $(shell nproc)/4 | bc) qemu: qemu_vdisk - rm -f serial.log profiler.log network.log + rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp $(QEMU) $(QEMU_UEFI_BIOS) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc) qemubios: qemu_vdisk - rm -f serial.log profiler.log network.log + rm -f serial.log profiler.log serial3.dmp serial4.dmp network.dmp $(QEMU) -cpu host $(QEMUFLAGS) $(QEMUHWACCELERATION) $(QEMUMEMORY) -smp $(shell nproc) run: build qemu