refactor: move the rustsbi library to the `library` directory

Signed-off-by: guttatus <xingzhiang2020@gmail.com>

Cargo.toml

@@ -1,53 +1,11 @@
-[package]
-name = "rustsbi"
-description = "Minimal RISC-V's SBI implementation library in Rust"
-version = "0.4.0"
-authors = [
-    "Luo Jia <me@luojia.cc>",
-    "Campbell He <hkp18@mails.tsinghua.edu.cn>",
-    "Yifan Wu <shinbokuow@163.com>",
-]
-documentation = "https://docs.rs/rustsbi"
-edition.workspace = true
-license.workspace = true
-repository.workspace = true
-readme = "README.md"
-keywords = ["riscv", "sbi", "rustsbi"]
-categories = ["os", "embedded", "hardware-support", "no-std"]
-exclude = ["/.github"]
-
-[dependencies]
-sbi-spec = { version = "0.0.8", path = "sbi-spec" }
-riscv = { version = "0.12.0", optional = true, default-features = false }
-sbi-rt = { version = "0.0.3", features = ["integer-impls"], optional = true, path = "sbi-rt" }
-rustsbi-macros = { version = "0.0.2", path = "macros" }
-
-[features]
-default = []
-# Run RustSBI on machine mode.
-# This feature enables to use RISC-V primitives on current machine mode environment
-# If you are developing a cross-architecture virtual machine, consider disabling this feature
-# to customize environment variables for RISC-V architecture like mvendorid, mimpid, etc.
-machine = ["rustsbi-macros/machine", "dep:riscv"]
-# Enables the struct `Forward`.
-# Struct `Forward` uses the current SBI environment to implement the RustSBI environment.
-# This feature is only usable when current software runs on another SBI environment,
-# e.g., hypervisors for RISC-V architecture.
-forward = ["dep:sbi-rt"]
-
-[package.metadata.docs.rs]
-default-target = "riscv64imac-unknown-none-elf"
-targets = [
-    "riscv32imac-unknown-none-elf", "riscv64imac-unknown-none-elf",
-]
-
 [workspace]
 resolver = "2"
 members = [
-    "macros",
-    "sbi-rt",
-    "sbi-spec",
-    "sbi-testing",
+    "library/macros",
+    "library/sbi-rt",
+    "library/sbi-spec",
+    "library/sbi-testing",
+    "library/rustsbi",
 ]
 
 [workspace.package]

macros/Cargo.toml → library/macros/Cargo.toml

@@ -9,7 +9,7 @@ documentation = "https://docs.rs/rustsbi"
 edition.workspace = true
 license.workspace = true
 repository.workspace = true
-readme = "../README.md"
+readme = "../../README.md"
 keywords = ["riscv", "sbi", "rustsbi"]
 categories = ["os", "embedded", "hardware-support", "no-std"]
 

library/rustsbi/Cargo.toml

@@ -0,0 +1,43 @@
+[package]
+name = "rustsbi"
+description = "Minimal RISC-V's SBI implementation library in Rust"
+version = "0.4.0"
+authors = [
+    "Luo Jia <me@luojia.cc>",
+    "Campbell He <hkp18@mails.tsinghua.edu.cn>",
+    "Yifan Wu <shinbokuow@163.com>",
+]
+documentation = "https://docs.rs/rustsbi"
+edition.workspace = true
+license.workspace = true
+repository.workspace = true
+readme = "../../README.md"
+keywords = ["riscv", "sbi", "rustsbi"]
+categories = ["os", "embedded", "hardware-support", "no-std"]
+
+[dependencies]
+sbi-spec = { version = "0.0.8", path = "../sbi-spec" }
+riscv = { version = "0.12.0", optional = true, default-features = false }
+sbi-rt = { version = "0.0.3", features = ["integer-impls"], optional = true, path = "../sbi-rt" }
+rustsbi-macros = { version = "0.0.2", path = "../macros" }
+
+[features]
+default = []
+# Run RustSBI on machine mode.
+# This feature enables to use RISC-V primitives on current machine mode environment
+# If you are developing a cross-architecture virtual machine, consider disabling this feature
+# to customize environment variables for RISC-V architecture like mvendorid, mimpid, etc.
+machine = ["rustsbi-macros/machine", "dep:riscv"]
+# Enables the struct `Forward`.
+# Struct `Forward` uses the current SBI environment to implement the RustSBI environment.
+# This feature is only usable when current software runs on another SBI environment,
+# e.g., hypervisors for RISC-V architecture.
+forward = ["dep:sbi-rt"]
+
+[package.metadata.docs.rs]
+default-target = "riscv64imac-unknown-none-elf"
+targets = [
+    "riscv32imac-unknown-none-elf", "riscv64imac-unknown-none-elf",
+]
+
+# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

sbi-testing/src/thread.rs → library/sbi-testing/src/thread.rs

@@ -147,7 +147,7 @@ unsafe extern "C" fn execute_naked() {
             SAVE_ALL
         ",
             // 设置陷入入口
-            "   la   t0, 1f
+            "   la   t0, 2f
             csrw stvec, t0
         ",
             // 保存调度上下文地址并切换上下文
@@ -164,7 +164,7 @@ unsafe extern "C" fn execute_naked() {
             // 陷入
             "   .align 2",
             // 切换上下文
-            "1: csrrw sp, sscratch, sp",
+            "2: csrrw sp, sscratch, sp",
             // 保存线程上下文
             "   SAVE_ALL
             csrrw t0, sscratch, sp

sbi-testing/src/time.rs → library/sbi-testing/src/time.rs

@@ -52,13 +52,13 @@ pub fn test(delay: u64, mut f: impl FnMut(Case)) {
     let mut ok = 0xffusize;
     unsafe {
         core::arch::asm!(
-            "   la   {stvec}, 1f
+            "   la   {stvec}, 2f
                 csrw stvec,   {stvec}
                 csrr {begin}, time
                 csrr {end},   time
                 mv   {ok},    zero
             .align 2
-            1:
+            2:
             ",
             stvec = out(reg) _,
             begin = out(reg) begin,