wip

Author: phil-opp

Cargo.lock

@@ -0,0 +1,20 @@
+use std::{
+    process::Command,
+    path::Path,
+};
+
+fn main() {
+    let mut cmd = Command::new("cargo");
+    cmd.arg("xbuild").arg("--release");
+    cmd.arg("--manifest-path").arg("protected_mode/Cargo.toml");
+    cmd.arg("--target").arg("protected_mode/i686-bootloader.json");
+    cmd.env("RUSTFLAGS", "");
+    cmd.status().unwrap();
+
+    let out_dir = Path::new("protected_mode/target/i686-bootloader/release").canonicalize().unwrap();
+
+    println!("cargo:rustc-link-search=native={}", out_dir.display());
+    println!("cargo:rustc-link-lib=static=protected_mode");
+
+    println!("cargo:rerun-if-changed=protected_mode");
+}

build.rs

@@ -1,4 +1,4 @@
-ENTRY(_start)
+ENTRY(entry_point)
 
 SECTIONS {
     . = 0x500;
@@ -31,14 +31,14 @@ SECTIONS {
         *(.boot)
 
         /* second stage */
-        _second_stage_start_addr = .;
+        _bootloader_rest_start_addr = .;
         *(.second_stage)
         *(.context_switch)
         *(.text .text.*)
         *(.rodata .rodata.*)
         *(.data .data.*)
         . = ALIGN(512);
-        _second_stage_end_addr = .;
+        _bootloader_rest_end_addr = .;
     }
 
     _kernel_info_block_start = .;

linker.ld

@@ -0,0 +1,2 @@
+/target/
+**/*.rs.bk

protected_mode/.gitignore

@@ -0,0 +1,11 @@
+[package]
+name = "protected_mode"
+version = "0.1.0"
+authors = ["Philipp Oppermann <[email protected]>"]
+edition = "2018"
+
+[lib]
+crate-type = ["staticlib"]
+
+[dependencies]
+x86_64 = "0.3"

protected_mode/Cargo.lock

@@ -0,0 +1,15 @@
+{
+    "arch": "x86",
+    "data-layout": "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128",
+    "llvm-target": "i686-unknown-linux-gnu",
+    "linker-flavor": "ld.lld",
+    "linker": "rust-lld",
+    "target-endian": "little",
+    "target-pointer-width": "32",
+    "target-c-int-width": "32",
+    "os": "none",
+    "disable-redzone": true,
+    "panic": "abort",
+    "executables": true,
+	"relocation_model": "static"
+}

protected_mode/Cargo.toml

@@ -1,4 +1,5 @@
 .section .second_stage, "awx"
+.global do_e820
 .intel_syntax noprefix
 .code16
 

protected_mode/i686-bootloader.json

@@ -0,0 +1,31 @@
+#![feature(global_asm)]
+#![feature(lang_items)]
+
+#![no_std]
+
+use core::panic::PanicInfo;
+
+global_asm!(include_str!("e820.s"));
+
+pub mod stages;
+
+extern "C" {
+    pub fn first_stage();
+}
+
+#[no_mangle]
+pub extern "C" fn hello_world() {
+    unsafe { first_stage() }
+}
+
+#[panic_handler]
+#[no_mangle]
+pub extern "C" fn panic(_info: &PanicInfo) -> ! {
+    loop {}
+}
+
+#[lang = "eh_personality"]
+#[no_mangle]
+pub extern "C" fn eh_personality() {
+    loop {}
+}