From 3222bcbfe2362e85d126fd463f58b1ac4db5e537 Mon Sep 17 00:00:00 2001 From: fekhesk Date: Wed, 26 Oct 2022 00:05:53 -0700 Subject: [PATCH] refactor a ton of code to be multiboot compatible --- .gitignore | 3 + .idea/misc.xml | 10 ++ .idea/modules.xml | 8 -- .idea/windows.iml | 15 --- Cargo.toml | 4 + Makefile | 51 ++++++++++ arch/x86_64/boot.asm | 160 +++++++++++++++++++++++++++++++ arch/x86_64/grub.cfg | 7 ++ arch/x86_64/linker.ld | 16 ++++ arch/x86_64/longmodestart.asm | 17 ++++ arch/x86_64/multiboot_header.asm | 16 ++++ assembly/boot.asm | 31 ------ build.rs | 3 - linker.ld | 29 ------ serial.log | 13 +++ src/internals/errors.rs | 102 +------------------- src/{main.rs => lib.rs} | 40 +++++--- src/serial/mod.rs | 8 ++ src/serial/terminal.rs | 37 +++++++ src/serial/terminal_helpers.rs | 9 ++ 20 files changed, 382 insertions(+), 197 deletions(-) delete mode 100644 .idea/modules.xml delete mode 100644 .idea/windows.iml create mode 100644 Makefile create mode 100644 arch/x86_64/boot.asm create mode 100644 arch/x86_64/grub.cfg create mode 100644 arch/x86_64/linker.ld create mode 100644 arch/x86_64/longmodestart.asm create mode 100644 arch/x86_64/multiboot_header.asm delete mode 100644 assembly/boot.asm delete mode 100644 build.rs delete mode 100644 linker.ld create mode 100644 serial.log rename src/{main.rs => lib.rs} (53%) create mode 100644 src/serial/terminal.rs create mode 100644 src/serial/terminal_helpers.rs diff --git a/.gitignore b/.gitignore index 0b4c8d1..17bb528 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ Cargo.lock #/target #Cargo.lock +/boot.o +/build/ +/OVMF-pure-efi.fd diff --git a/.idea/misc.xml b/.idea/misc.xml index 283b9b4..6afde3a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,5 +1,15 @@ + + + + +