Merge pull request #30 from Alignof/develop

Ver 0.2.0

.cargo/config.toml

@@ -0,0 +1,14 @@
+[target.riscv64imac-unknown-none-elf]
+runner = "qemu-system-riscv64 -S -gdb tcp::10000 -machine virt -bios none -nographic -m 2G -initrd vmlinux_debug -kernel"
+#runner = "qemu-system-riscv64 -S -gdb tcp::10000 -d int,in_asm,cpu_reset,mmu,page,guest_errors  -machine virt -bios none -nographic -m 2G -initrd vmlinux -kernel"
+#runner = "qemu-system-riscv64 -machine virt -bios none -nographic -m 2G -initrd vmlinux -kernel"
+
+rustflags = [
+  "-C", "link-arg=-Tmemory.x",
+  "-C", "link-arg=-Tlink.x",
+  "-C", "target-feature=+h",
+]
+
+[build]
+target = "riscv64imac-unknown-none-elf"
+

.github/workflows/rust.yml

@@ -20,18 +20,14 @@ jobs:
           submodules: recursive
 
       - name: install clippy
-        uses: dtolnay/rust-toolchain@stable
-        with:
-          toolchain: stable # Rustup toolchain specifier e.g. stable, nightly, 1.42.0, nightly-2022-01-01. 
-          target: riscv64imac-unknown-none-elf # Comma-separated string of additional targets to install e.g. wasm32-unknown-unknown
-          components: clippy, rustfmt
+        uses: dsherret/rust-toolchain-file@v1
 
-      - uses: sksat/action-clippy@v0.7.0
+      - uses: sksat/action-clippy@v1.0.0
         if: github.event_name == 'push'
         with:
           reporter: github-check
 
-      - uses: sksat/action-clippy@v0.7.0
+      - uses: sksat/action-clippy@v1.0.0
         if: github.event_name == 'pull_request'
         with:
           reporter: github-pr-review

.gitignore

@@ -21,3 +21,4 @@ Cargo.lock
 .gdb_history
 fedora-vmlinux
 stage4-disk.img
+vmlinux_debug

Cargo.toml

@@ -1,21 +1,20 @@
 [package]
 name = "hikami"
-version = "0.1.0"
+version = "0.2.0"
 edition = "2021"
 
 [lints.clippy]
 pedantic = "warn"
 
-# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
-
-[[bin]]
-name = "hikami"
-path = "src/machine_init.rs"
-
 [dependencies]
 elf = { version = "0.7.2", default-features = false }
 fdt = "0.1.5"
-panic-halt = "0.2.0"
-riscv = "0.10.1"
+linked_list_allocator = "0.10.5"
+raki = { version = "1.0.0-beta.3" }
+riscv = "0.11.1"
 riscv-rt = "0.11.0"
+rustsbi = { version = "0.4.0-alpha.1", features = ["machine"] }
+sbi-rt = "0.0.3"
+sbi-spec = { version = "0.0.7", features = [ "legacy" ] }
+spin = "0.9.8"
 wild_screen_alloc = { version = "0.1.1",  path = "wild-screen-alloc" }

README.md

@@ -1,2 +1,16 @@
 # hikami
+[![Rust](https://github.com/Alignof/hikami/actions/workflows/rust.yml/badge.svg)](https://github.com/Alignof/hikami/actions/workflows/rust.yml)  
 Light weight hypervisor for RISC-V H-extension.
+
+## Tutorial
+TODO
+
+## References
+- [The RISC-V Instruction Set Manual: Volume I Version 20240411](https://github.com/riscv/riscv-isa-manual/releases/download/20240411/unpriv-isa-asciidoc.pdf)
+- [The RISC-V Instruction Set Manual: Volume II Version 20240411](https://github.com/riscv/riscv-isa-manual/releases/download/20240411/priv-isa-asciidoc.pdf)
+- [Rvirt](https://github.com/mit-pdos/RVirt)
+- [hypocaust-2](https://github.com/KuangjuX/hypocaust-2)
+
+## Acknowledgement
+Exploratory IT Human Resources Project (MITOU Program) of Information-technology Promotion Agency, Japan (IPA) in the fiscal year 2024.  
+[https://www.ipa.go.jp/jinzai/mitou/it/2024/gaiyou-tn-3.html](https://www.ipa.go.jp/jinzai/mitou/it/2024/gaiyou-tn-3.html)