Protected Mode

Author: katietheqt-old

.cargo/config

@@ -2,4 +2,4 @@
 target = "i8086-bootloader.json"
 
 [alias]
-xbuild = "build -Zbuild-std=core"
+bbuild = "build -Zbuild-std=core"

Cargo.lock

@@ -3,10 +3,12 @@ name = "bootloader"
 version = "0.1.0"
 authors = ["Ryland Morgan <[email protected]>"]
 edition = "2018"
+description = "An experimental bootloader, written in Rust"
 build = "build.rs"
 
 [dependencies]
 shared = { path = "src/shared" }
+rlibc = "1"
 
 [build-dependencies]
 llvm-tools = "0.1"

Cargo.toml

@@ -26,6 +26,17 @@ fn main() {
         .tool(&exe("llvm-objcopy"))
         .expect("llvm-objcopy not found");
 
+    // Build stage 3
+    build_subproject(
+        Path::new("src/protected/stage_3"),
+        &["third_stage"],
+        "../i386-unknown-none.json",
+        &target_dir,
+        &objcopy,
+        &cargo,
+    );
+
+
     // Build the bootsector
     build_subproject(
         Path::new("src/real/bootsector"),
@@ -35,7 +46,7 @@ fn main() {
             "no_int13h_extensions",
             "dap_load_failed",
         ],
-        "../i8086-real_mode.json",
+        "../i386-unknown-none-code16.json",
         &target_dir,
         &objcopy,
         &cargo,
@@ -45,7 +56,7 @@ fn main() {
     build_subproject(
         Path::new("src/real/stage_2"),
         &["second_stage"],
-        "../i8086-real_mode.json",
+        "../i386-unknown-none-code16.json",
         &target_dir,
         &objcopy,
         &cargo,

build.rs

@@ -20,7 +20,7 @@
 	"eliminate_frame_pointer": true,
 	"pre-link-args": {
 		"ld.lld": [
-			"--script=src/real/linker.ld"
+			"--script=linker.ld"
 		]
 	}
 }

i8086-bootloader.json

@@ -24,10 +24,7 @@ SECTIONS {
     .rest_of_bootloader :
     {
         _rest_of_bootloader_start = .;
-
-        *stage_2*
-        *core*
-
+        
         *(.text .text.*)
         *(.data .data.*)
         *(.rodata .rodata.*)

linker.ld

@@ -3,5 +3,7 @@
 
 mod panic;
 
+extern crate rlibc;
+
 #[no_mangle]
 fn bootloader_no_optimize() {}

src/main.rs

@@ -4,7 +4,7 @@ use shared::utils;
 
 #[panic_handler]
 pub fn panic(info: &PanicInfo) -> ! {
-    println!("[Panic]");
+    println!("[Panic] {}", info);
 
     loop {
         utils::hlt()

src/panic.rs

@@ -0,0 +1,10 @@
+[workspace]
+members = [
+  "v86",
+  "stage_3"
+]
+
+[profile.release]
+opt-level = "z"
+panic = "abort"
+lto = true