feat: Seperate exector from kernel

Byte-OS · Apr 19, 2024 · 9c3d8ee · 9c3d8ee
1 parent c87464b
commit 9c3d8ee
Show file tree

Hide file tree

Showing 10 changed files with 16 additions and 296 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -4,5 +4,5 @@
 debug = true
 
 [workspace]
-members = ["crates/*", "kernel"]
+members = ["kernel"]
 resolver = "2"
diff --git a/byteos.toml b/byteos.toml
@@ -6,6 +6,10 @@ run = "make ARCH=riscv64 justrun"
     board = "qemu"
     driver = "kvirtio,kgoldfish-rtc,ns16550a"
 
+    [bin.riscv64-qemu.env]
+    HEAP_SIZE = "0x0180_0000"
+    MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
+
 # build for x86_64-qemu
 [bin.x86_64-qemu]
 target = "x86_64-unknown-none"
@@ -16,6 +20,7 @@ run = "make ARCH=x86_64 justrun"
 
     [bin.x86_64-qemu.env]
     HEAP_SIZE = "0x0200_0000"
+    MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
 
 # build for aarch64-qemu
 [bin.aarch64-qemu]
@@ -25,10 +30,18 @@ run = "make ARCH=aarch64 justrun"
     board = "qemu"
     driver = "kvirtio,kgoldfish-rtc,ns16550a"
 
+    [bin.aarch64-qemu.env]
+    HEAP_SIZE = "0x0200_0000"
+    MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
+
 # build for loongarch64-qemu
 [bin.loongarch64-qemu]
 target = "loongarch64-unknown-none"
 run = "make ARCH=loongarch64 justrun"
     [bin.loongarch64-qemu.configs]
     board = "qemu"
     driver = "kramdisk,kgoldfish-rtc,ns16550a"
+
+    [bin.loongarch64-qemu.env]
+    HEAP_SIZE = "0x0200_0000"
+    MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
diff --git a/crates/executor/Cargo.toml b/crates/executor/Cargo.toml
diff --git a/crates/executor/src/executor.rs b/crates/executor/src/executor.rs
diff --git a/crates/executor/src/lib.rs b/crates/executor/src/lib.rs
diff --git a/crates/executor/src/ops.rs b/crates/executor/src/ops.rs
diff --git a/crates/executor/src/task.rs b/crates/executor/src/task.rs
diff --git a/crates/executor/src/thread.rs b/crates/executor/src/thread.rs
diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml
@@ -23,7 +23,7 @@ hal = { git = "https://github.com/Byte-OS/hal.git" }
 arch = { git = "https://github.com/Byte-OS/arch.git" }
 fs = { git = "https://github.com/Byte-OS/fs.git" }
 fdt = "0.1.5"
-executor = { path = "../crates/executor" }
+executor = { git = "https://github.com/Byte-OS/executor.git" }
 xmas-elf = "0.9.0"
 sync = { git = "https://github.com/Byte-OS/sync.git" }
 bitflags = "2.0.2"