Skip to content

Commit 9c3d8ee

Browse files
committed
feat: Seperate exector from kernel
1 parent c87464b commit 9c3d8ee

File tree

10 files changed

+16
-296
lines changed

10 files changed

+16
-296
lines changed

Cargo.lock

+1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,5 @@
44
debug = true
55

66
[workspace]
7-
members = ["crates/*", "kernel"]
7+
members = ["kernel"]
88
resolver = "2"

byteos.toml

+13
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ run = "make ARCH=riscv64 justrun"
66
board = "qemu"
77
driver = "kvirtio,kgoldfish-rtc,ns16550a"
88

9+
[bin.riscv64-qemu.env]
10+
HEAP_SIZE = "0x0180_0000"
11+
MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
12+
913
# build for x86_64-qemu
1014
[bin.x86_64-qemu]
1115
target = "x86_64-unknown-none"
@@ -16,6 +20,7 @@ run = "make ARCH=x86_64 justrun"
1620

1721
[bin.x86_64-qemu.env]
1822
HEAP_SIZE = "0x0200_0000"
23+
MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
1924

2025
# build for aarch64-qemu
2126
[bin.aarch64-qemu]
@@ -25,10 +30,18 @@ run = "make ARCH=aarch64 justrun"
2530
board = "qemu"
2631
driver = "kvirtio,kgoldfish-rtc,ns16550a"
2732

33+
[bin.aarch64-qemu.env]
34+
HEAP_SIZE = "0x0200_0000"
35+
MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"
36+
2837
# build for loongarch64-qemu
2938
[bin.loongarch64-qemu]
3039
target = "loongarch64-unknown-none"
3140
run = "make ARCH=loongarch64 justrun"
3241
[bin.loongarch64-qemu.configs]
3342
board = "qemu"
3443
driver = "kramdisk,kgoldfish-rtc,ns16550a"
44+
45+
[bin.loongarch64-qemu.env]
46+
HEAP_SIZE = "0x0200_0000"
47+
MOUNT_IMG_PATH = "/home/yufeng/Code/ByteOS/mount.img"

crates/executor/Cargo.toml

-13
This file was deleted.

crates/executor/src/executor.rs

-132
This file was deleted.

crates/executor/src/lib.rs

-75
This file was deleted.

crates/executor/src/ops.rs

-31
This file was deleted.

crates/executor/src/task.rs

-35
This file was deleted.

crates/executor/src/thread.rs

-8
This file was deleted.

kernel/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ hal = { git = "https://github.com/Byte-OS/hal.git" }
2323
arch = { git = "https://github.com/Byte-OS/arch.git" }
2424
fs = { git = "https://github.com/Byte-OS/fs.git" }
2525
fdt = "0.1.5"
26-
executor = { path = "../crates/executor" }
26+
executor = { git = "https://github.com/Byte-OS/executor.git" }
2727
xmas-elf = "0.9.0"
2828
sync = { git = "https://github.com/Byte-OS/sync.git" }
2929
bitflags = "2.0.2"

0 commit comments

Comments
 (0)