diff --git a/Cargo.lock b/Cargo.lock index 64899ca..2717138 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -265,9 +265,9 @@ dependencies = [ [[package]] name = "rustsbi" -version = "0.2.0-alpha.10" +version = "0.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7bbdd096bc2e150359b4dcec38a395eedf04ca789ca2fed29dc0d6a646e6ff8" +checksum = "9fe8b0cff28f5a0dcf42e3c4b0c59ab3b23f7bb5f534013e404374b4070e75b2" dependencies = [ "embedded-hal", "nb 1.0.0", diff --git a/README.md b/README.md index 32178bc..db1ecad 100644 --- a/README.md +++ b/README.md @@ -9,13 +9,7 @@ cargo qemu When running `cargo qemu`, the test kernel will build and run. Expected output should be: ``` - Finished dev [unoptimized + debuginfo] target(s) in 0.03s - Running `target\debug\xtask.exe qemu` -xtask: mode: Debug - Compiling rustsbi-qemu v0.0.2 (D:\RustSBI\rustsbi-qemu\rustsbi-qemu) - Finished dev [unoptimized + debuginfo] target(s) in 0.44s - Finished dev [unoptimized + debuginfo] target(s) in 0.04s -[rustsbi] RustSBI version 0.2.0-alpha.7 +[rustsbi] RustSBI version 0.2.0, adapting to RISC-V SBI v0.3 .______ __ __ _______.___________. _______..______ __ | _ \ | | | | / | | / || _ \ | | | |_) | | | | | | (----`---| |----`| (----`| |_) || | @@ -23,27 +17,28 @@ xtask: mode: Debug | |\ \----.| `--' |.----) | | | .----) | | |_) || | | _| `._____| \______/ |_______/ |__| |_______/ |______/ |__| -[rustsbi] Implementation: RustSBI-QEMU Version 0.0.2 +[rustsbi] Implementation: RustSBI-QEMU Version 0.1.0 [rustsbi-dtb] Hart count: cluster0 with 8 cores [rustsbi] misa: RV64ACDFIMSU [rustsbi] mideleg: ssoft, stimer, sext (0x222) [rustsbi] medeleg: ima, ia, bkpt, la, sa, uecall, ipage, lpage, spage (0xb1ab) -[rustsbi] pmp0: 0x10000000 ..= 0x10001fff (rwx) -[rustsbi] pmp1: 0x80000000 ..= 0x8fffffff (rwx) -[rustsbi] pmp2: 0x0 ..= 0xffffffffffffff (---) +[rustsbi] pmp0: 0x10000000 ..= 0x10001fff (rw-) +[rustsbi] pmp1: 0x2000000 ..= 0x200ffff (rw-) +[rustsbi] pmp2: 0xc000000 ..= 0xc3fffff (rw-) +[rustsbi] pmp3: 0x80000000 ..= 0x8fffffff (rwx) [rustsbi] enter supervisor 0x80200000 << Test-kernel: Hart id = 0, DTB physical address = 0x87000000 >> Test-kernel: Testing base extension << Test-kernel: Base extension version: 1 -<< Test-kernel: SBI specification version: 2 +<< Test-kernel: SBI specification version: 3 << Test-kernel: SBI implementation Id: 4 << Test-kernel: SBI implementation version: 200 << Test-kernel: Device mvendorid: 0 << Test-kernel: Device marchid: 0 << Test-kernel: Device mimpid: 0 >> Test-kernel: Testing SBI instruction emulation -<< Test-kernel: Current time: d1540 -<< Test-kernel: Time after operation: d407b +<< Test-kernel: Current time: 17fc45 +<< Test-kernel: Time after operation: 187678 >> Test-kernel: Trigger illegal exception << Test-kernel: Value of scause: Exception(IllegalInstruction) << Test-kernel: Illegal exception delegate success @@ -67,7 +62,7 @@ xtask: mode: Debug ### Requirements -`cargo-binutils` and `llvm-tools-preview` are needed +You should have `cargo-binutils` and `llvm-tools-preview` installed. ``` cargo install cargo-binutils @@ -112,7 +107,7 @@ You should use these following line of parameters: This project is licensed under Mulan PSL v2. ```text -Copyright (c) 2021 Wuxiang Zhi Feng Team +Copyright (c) 2021-2022 RustSBI Team RustSBI-QEMU is licensed under Mulan PSL v2. You can use this software according to the terms and conditions of the Mulan PSL v2. You may obtain a copy of Mulan PSL v2 at: diff --git a/rustsbi-qemu/Cargo.toml b/rustsbi-qemu/Cargo.toml index 5b92932..a11dedd 100644 --- a/rustsbi-qemu/Cargo.toml +++ b/rustsbi-qemu/Cargo.toml @@ -1,12 +1,12 @@ [package] name = "rustsbi-qemu" -version = "0.0.2" +version = "0.1.0" edition = "2018" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] -rustsbi = { version = "0.2.0-alpha.10" } +rustsbi = "0.2.0" buddy_system_allocator = "0.8" lazy_static = { version = "1", features = ["spin_no_std"] } spin = "0.9"