[Opt] project structure refactored

M4tsuri · Oct 18, 2021 · 3d28858 · 3d28858
1 parent ec22ccf
commit 3d28858
Show file tree

Hide file tree

Showing 22 changed files with 34 additions and 13 deletions.
diff --git a/.gitignore b/.gitignore
@@ -0,0 +1,8 @@
+/target
+**/target
+.gdb_history
+**/.gdb_history
+.DS_Store
+**/.DS_Store
+.gdbinit
+**/.gdbinit
diff --git a/bootloader/.gitignore b/bootloader/.gitignore
diff --git a/bootloader/Cargo.toml b/bootloader/Cargo.toml
@@ -6,7 +6,7 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-layout = { path = "src/bios/layout" }
+layout = { path = "./src/bios/layout" }
 
 [build-dependencies]
 llvm-tools = "0.1.1"

diff --git a/bootloader/src/bios/stage_1/Cargo.toml b/bootloader/src/bios/stage_1/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../i386" }
+i386 = { path = "../../../../i386" }
 layout = { path = "../layout" }
diff --git a/bootloader/src/bios/stage_2/Cargo.toml b/bootloader/src/bios/stage_2/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../i386" }
+i386 = { path = "../../../../i386" }
 layout = { path = "../layout" }
diff --git a/bootloader/src/bios/stage_3/Cargo.toml b/bootloader/src/bios/stage_3/Cargo.toml
@@ -6,5 +6,5 @@ edition = "2018"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-i386 = { path = "../i386" }
+i386 = { path = "../../../../i386" }
 layout = { path = "../layout" }
diff --git a/bootloader/src/main.rs b/bootloader/src/main.rs
@@ -1,7 +1,7 @@
 use std::{fs::File, io::{Read, Write}, path::Path};
 use layout::*;
 
-static MINEFEST_PATH: &str = "/Users/ctsinon/Projects/Orangs/bootloader";
+static MINEFEST_PATH: &str = "/Users/ctsinon/Projects/Orangs/OrustS/bootloader";
 
 static STAGES: [(&str, usize); 3] = [
     (&"target/stage_1/target/release/stage_1.bin", STAGE1_SIZE),

diff --git a/bootloader/src/bios/i386/Cargo.lock → i386/Cargo.lock b/bootloader/src/bios/i386/Cargo.lock → i386/Cargo.lock
diff --git a/i386/Cargo.toml b/i386/Cargo.toml
@@ -0,0 +1,10 @@
+[package]
+name = "i386"
+version = "0.1.0"
+edition = "2018"
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
+
+[dependencies]
+layout = { path = "../bootloader/src/bios/layout" }
+
diff --git a/bootloader/src/bios/i386/src/addr.rs → i386/src/addr.rs b/bootloader/src/bios/i386/src/addr.rs → i386/src/addr.rs
diff --git a/bootloader/src/bios/i386/src/bitwise.rs → i386/src/bitwise.rs b/bootloader/src/bios/i386/src/bitwise.rs → i386/src/bitwise.rs
diff --git a/bootloader/src/bios/i386/src/disk.rs → i386/src/disk.rs b/bootloader/src/bios/i386/src/disk.rs → i386/src/disk.rs
diff --git a/bootloader/src/bios/i386/src/dt.rs → i386/src/dt.rs b/bootloader/src/bios/i386/src/dt.rs → i386/src/dt.rs
diff --git a/bootloader/src/bios/i386/src/dt/gdt.rs → i386/src/dt/gdt.rs b/bootloader/src/bios/i386/src/dt/gdt.rs → i386/src/dt/gdt.rs
diff --git a/bootloader/src/bios/i386/src/dt/ldt.rs → i386/src/dt/ldt.rs b/bootloader/src/bios/i386/src/dt/ldt.rs → i386/src/dt/ldt.rs
diff --git a/bootloader/src/bios/i386/src/dt/utils.rs → i386/src/dt/utils.rs b/bootloader/src/bios/i386/src/dt/utils.rs → i386/src/dt/utils.rs
diff --git a/bootloader/src/bios/i386/src/lib.rs → i386/src/lib.rs b/bootloader/src/bios/i386/src/lib.rs → i386/src/lib.rs
diff --git a/bootloader/src/bios/i386/src/ring.rs → i386/src/ring.rs b/bootloader/src/bios/i386/src/ring.rs → i386/src/ring.rs
diff --git a/bootloader/src/bios/i386/src/tss.rs → i386/src/tss.rs b/bootloader/src/bios/i386/src/tss.rs → i386/src/tss.rs
diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock
diff --git a/bootloader/src/bios/i386/Cargo.toml → kernel/Cargo.toml b/bootloader/src/bios/i386/Cargo.toml → kernel/Cargo.toml
@@ -1,10 +1,8 @@
 [package]
-name = "i386"
+name = "kernel"
 version = "0.1.0"
 edition = "2018"
 
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-layout = { path = "../layout" }
-
diff --git a/kernel/src/main.rs b/kernel/src/main.rs
@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}