Refactoring arch-specific subcrates

Author: katietheqt-old

.cargo/config

@@ -1,2 +1,2 @@
-[alias]
-xbuild = "build -Zbuild-std=core"
+[build]
+target = "src/real/x86_64-real_mode.json"

Cargo.lock

@@ -1,18 +1,11 @@
-[workspace]
-members = [
-  "src/shared",
-  "src/v86",
-  "src/bootsector",
-  "src/stage_2",
-  "example-kernel",
-  "test-kernel",
-]
+[package]
+name = "bootloader"
+version = "0.1.0"
+authors = ["Ryland Morgan <[email protected]>"]
+edition = "2018"
+build = "build.rs"
 
-[profile.release]
-opt-level = "z"
-panic = "abort"
-lto = true
+[dependencies]
 
-[profile.release.package.bootsector]
-opt-level = "s"
-codegen-units = 1
+[build-dependencies]
+llvm-tools = "0.1"

Cargo.toml

@@ -11,17 +11,28 @@ fn main() {
         .expect("llvm-objcopy not found");
 
     build_subproject(
-        Path::new("../bootsector"),
+        Path::new("src/real/bootsector"),
         &[
             "_start",
             "real_mode_println",
             "no_int13h_extensions",
             "dap_load_failed",
         ],
-        "x86_64-real_mode.json",
+        "real/x86_64-real_mode.json",
         &out_dir,
         &objcopy,
     );
+
+    build_subproject(
+        Path::new("src/real/stage2"),
+        &[
+            "second_stage",
+        ],
+        "real/x86_64-real_mode.json",
+        &out_dir,
+        &objcopy,
+    );
+
 }
 
 fn build_subproject(
@@ -42,11 +53,13 @@ fn build_subproject(
     // build
     let mut cmd = Command::new("cargo");
     cmd.arg("xbuild").arg("--release");
+    
     cmd.arg("--verbose");
+
     cmd.arg(format!("--manifest-path={}", manifest_path.display()));
     cmd.arg(format!(
         "--target={}",
-        dir.join("../..").join(target).display()
+        dir.join("..").join("..").join(target).display()
     ));
     cmd.arg("-Z").arg("unstable-options");
     cmd.arg("--out-dir").arg(&out_dir);
@@ -58,7 +71,7 @@ fn build_subproject(
         out_path.join("target").join(dir_name).join("sysroot"),
     );
     let status = cmd.status().unwrap();
-    assert!(status.success());
+    assert!(status.success(), "Subcrate build failed!");
 
     // localize symbols
     let mut cmd = Command::new(objcopy);

src/stage_2/build.rs renamed to build.rs

@@ -0,0 +1,2 @@
+#![no_std]
+#![no_main]

src/lib.rs

@@ -5,5 +5,3 @@ authors = ["Ryland Morgan <[email protected]>"]
 edition = "2018"
 
 [dependencies]
-bitflags = "1.2.1"
-bit_field = "0.10.0"

src/v86/Cargo.toml renamed to src/protected/v86/Cargo.toml

@@ -1,15 +1,10 @@
-#![feature(abi_x86_interrupt)]
-#![feature(const_fn)]
-#![feature(llvm_asm)]
 #![no_std]
+
 // FIXME
 #![allow(dead_code, unused_imports)]
 
 use core::slice;
 
-pub mod gdt;
-pub mod idt;
-
 const EFLAG_IF: u32 = 0x00000200;
 const EFLAG_VM: u32 = 0x00020000;
 /*

src/v86/src/lib.rs renamed to src/protected/v86/src/lib.rs

@@ -0,0 +1,14 @@
+[workspace]
+members = [
+  "bootsector",
+  "stage_2"
+]
+
+[profile.release]
+opt-level = "z"
+panic = "abort"
+lto = true
+
+[profile.release.package.bootsector]
+opt-level = "s"
+codegen-units = 1

src/real/Cargo.lock

@@ -11,4 +11,4 @@ name = "bootsector"
 crate-type = ["staticlib"]
 
 [dependencies]
-shared = { path = "../shared" }
+shared = { path = "../../shared" }