zhenxing
/
zCore
forked from rcore-os/zCore
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

remove kernel-sync feature

This commit is contained in:
DeathWish5 2022-04-06 17:23:51 +08:00
parent 9156ebc6dd
commit 8b6f0c0e00
9 changed files with 14 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Cargo.toml
View File

@ -16,4 +16,4 @@ exclude = [
] ]
[profile.release] [profile.release]
lto = true lto = true

4
drivers/Cargo.toml
View File

@ -23,6 +23,7 @@ device_tree = { git = "https://github.com/rcore-os/device_tree-rs", rev = "2f2e5
bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51" } bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51" }
virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "2aaf7d6", optional = true } virtio-drivers = { git = "https://github.com/rcore-os/virtio-drivers", rev = "2aaf7d6", optional = true }
rcore-console = { git = "https://github.com/rcore-os/rcore-console", default-features = false, rev = "ca5b1bc", optional = true } rcore-console = { git = "https://github.com/rcore-os/rcore-console", default-features = false, rev = "ca5b1bc", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "35e833e3", default-features = false, features = ["log", "alloc", "verbose", "proto-ipv4", "proto-ipv6", "proto-igmp", "medium-ip", "medium-ethernet", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp"] } # smoltcp = { git = "https://github.com/smoltcp-rs/smoltcp", rev = "35e833e3", default-features = false, features = ["log", "alloc", "verbose", "proto-ipv4", "proto-ipv6", "proto-igmp", "medium-ip", "medium-ethernet", "socket-raw", "socket-udp", "socket-tcp", "socket-icmp"] }
smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] } smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
@ -30,11 +31,10 @@ smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-fe
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
async-std = { version = "1.10", optional = true } async-std = { version = "1.10", optional = true }
sdl2 = { version = "0.34", optional = true } sdl2 = { version = "0.34", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
[target.'cfg(target_arch = "x86_64")'.dependencies] [target.'cfg(target_arch = "x86_64")'.dependencies]
acpi = "4.1" acpi = "4.1"

3
kernel-hal/Cargo.toml
View File

@ -23,6 +23,7 @@ git-version = "0.3"
numeric-enum-macro = "0.2" numeric-enum-macro = "0.2"
lazy_static = { version = "1.4", features = ["spin_no_std"] } lazy_static = { version = "1.4", features = ["spin_no_std"] }
zcore-drivers = { path = "../drivers", features = ["virtio"] } zcore-drivers = { path = "../drivers", features = ["virtio"] }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] } smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
@ -32,13 +33,11 @@ nix = { version = "0.23", optional = true }
tempfile = { version = "3", optional = true } tempfile = { version = "3", optional = true }
async-std = { version = "1.10", optional = true } async-std = { version = "1.10", optional = true }
bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51", optional = true } bitmap-allocator = { git = "https://github.com/rcore-os/bitmap-allocator", rev = "b3f9f51", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" } executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" }
naive-timer = "0.2.0" naive-timer = "0.2.0"
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# All mode on x86_64 # All mode on x86_64
[target.'cfg(target_arch = "x86_64")'.dependencies] [target.'cfg(target_arch = "x86_64")'.dependencies]

4
kernel-hal/src/bare/arch/riscv/interrupt.rs
View File

@ -6,11 +6,11 @@ hal_fn_impl! {
impl mod crate::hal_fn::interrupt { impl mod crate::hal_fn::interrupt {
fn wait_for_interrupt() { fn wait_for_interrupt() {
let enable = sstatus::read().sie(); let enable = sstatus::read().sie();
if enable == false { if !enable {
unsafe { sstatus::set_sie() }; unsafe { sstatus::set_sie() };
} }
unsafe { asm::wfi(); } unsafe { asm::wfi(); }
if enable == false { if !enable {
unsafe { sstatus::clear_sie() }; unsafe { sstatus::clear_sie() };
} }
} }

3
linux-object/Cargo.toml
View File

@ -27,11 +27,10 @@ rcore-fs-devfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec"
cfg-if = "1.0" cfg-if = "1.0"
smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] } smoltcp = { git = "https://gitee.com/gcyyfun/smoltcp", rev="043eb60", default-features = false, features = ["alloc","log", "async", "medium-ethernet","proto-ipv4", "proto-igmp", "socket-icmp", "socket-udp", "socket-tcp", "socket-raw"] }
zcore-drivers = { path = "../drivers", features = ["virtio"] } zcore-drivers = { path = "../drivers", features = ["virtio"] }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# LibOS mode # LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync" }

3
linux-syscall/Cargo.toml
View File

@ -18,11 +18,10 @@ kernel-hal = { path = "../kernel-hal", default-features = false }
rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec" } rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec" }
lazy_static = { version = "1.4", features = ["spin_no_std"] } lazy_static = { version = "1.4", features = ["spin_no_std"] }
bitvec = { version = "0.22", default-features = false, features = ["alloc"] } bitvec = { version = "0.22", default-features = false, features = ["alloc"] }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# LibOS mode # LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync" }

5
zCore/Cargo.toml
View File

@ -54,19 +54,18 @@ zircon-object = { path = "../zircon-object" }
linux-object = { path = "../linux-object", optional = true } linux-object = { path = "../linux-object", optional = true }
rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true } rcore-fs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true }
rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true } rcore-fs-sfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" }
# LibOS mode # LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
async-std = { version = "1.10", optional = true } async-std = { version = "1.10", optional = true }
chrono = { version = "0.4", optional = true } chrono = { version = "0.4", optional = true }
rcore-fs-hostfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true } rcore-fs-hostfs = { git = "https://github.com/rcore-os/rcore-fs", rev = "7c232ec", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"]}
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
buddy_system_allocator = "0.8" buddy_system_allocator = "0.8"
executor = { git = "https://github.com/DeathWish5/PreemptiveScheduler" }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# Bare-metal mode on x86_64 # Bare-metal mode on x86_64
[target.'cfg(all(target_os = "none", target_arch = "x86_64"))'.dependencies] [target.'cfg(all(target_os = "none", target_arch = "x86_64"))'.dependencies]

5
zircon-object/Cargo.toml
View File

@ -26,14 +26,13 @@ region-alloc = { git = "https://github.com/rzswh/region-allocator", rev = "122c7
lazy_static = { version = "1.4", features = ["spin_no_std" ] } lazy_static = { version = "1.4", features = ["spin_no_std" ] }
cfg-if = "1.0" cfg-if = "1.0"
#rvm = { git = "https://github.com/rcore-os/RVM", rev = "382fc60", optional = true } #rvm = { git = "https://github.com/rcore-os/RVM", rev = "382fc60", optional = true }
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
[dev-dependencies] [dev-dependencies]
async-std = { version = "1.10", features = ["attributes", "unstable"] } async-std = { version = "1.10", features = ["attributes", "unstable"] }
# LibOS mode # LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync" }

5
zircon-syscall/Cargo.toml
View File

@ -20,11 +20,10 @@ zircon-object = { path = "../zircon-object" }
kernel-hal = { path = "../kernel-hal", default-features = false } kernel-hal = { path = "../kernel-hal", default-features = false }
futures = { version = "0.3", default-features = false, features = ["alloc", "async-await"] } futures = { version = "0.3", default-features = false, features = ["alloc", "async-await"] }
cfg-if = "1.0" cfg-if = "1.0"
lock = { git = "https://github.com/DeathWish5/kernel-sync" }
# LibOS mode # LibOS mode
[target.'cfg(not(target_os = "none"))'.dependencies] [target.'cfg(not(target_os = "none"))'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync", features = ["libos"] }
# Bare-metal mode # Bare-metal mode
[target.'cfg(target_os = "none")'.dependencies] [target.'cfg(target_os = "none")'.dependencies]
lock = { git = "https://github.com/DeathWish5/kernel-sync" }