From 35af35381aec10cef0304d102cff221a71ea16fc Mon Sep 17 00:00:00 2001 From: Sean Cross Date: Fri, 14 Jan 2022 15:31:36 +0800 Subject: [PATCH] kernel: integrate kernel into main monorepo This moves the kernel into the main monorepo, allowing it to share packages with the rest of the system. This change will allow us to reduce the number of rebuilds that take place, as well as reducing disk usage. Note that the loader is still an indepenent project, and the integration of that into the monorepo is pending. Signed-off-by: Sean Cross --- Cargo.lock | 137 +++++++++++++++++++++++++++-- Cargo.toml | 2 +- kernel/.cargo/config | 21 ----- kernel/Cargo.toml | 9 +- kernel/build.rs | 1 + kernel/utralib/.gitignore | 2 - kernel/utralib/Cargo.lock | 143 ------------------------------- kernel/utralib/Cargo.toml | 13 --- kernel/utralib/README.md | 4 - kernel/utralib/build.rs | 14 --- kernel/utralib/src/lib.rs | 3 - services/engine-25519/Cargo.toml | 2 +- utralib/Cargo.toml | 5 +- utralib/src/lib.rs | 2 +- xtask/src/main.rs | 2 +- 15 files changed, 141 insertions(+), 219 deletions(-) delete mode 100644 kernel/.cargo/config delete mode 100644 kernel/utralib/.gitignore delete mode 100644 kernel/utralib/Cargo.lock delete mode 100644 kernel/utralib/Cargo.toml delete mode 100644 kernel/utralib/README.md delete mode 100644 kernel/utralib/build.rs delete mode 100644 kernel/utralib/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 1cfc7bdf1..1b5410b5d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -120,6 +120,15 @@ dependencies = [ "rustc-demangle", ] +[[package]] +name = "bare-metal" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a3caf393d93b2d453e80638d0674597020cef3382ada454faacd43d1a55a735a" +dependencies = [ + "rustc_version 0.2.3", +] + [[package]] name = "base64" version = "0.13.0" @@ -183,6 +192,12 @@ dependencies = [ "which 3.1.1", ] +[[package]] +name = "bit_field" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" + [[package]] name = "bitfield" version = "0.13.2" @@ -191,9 +206,9 @@ checksum = "46afbd2983a5d5a7bd740ccb198caf5b82f45c40c09c0eed36052d91cb92e719" [[package]] name = "bitflags" -version = "1.2.1" +version = "1.3.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" +checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" [[package]] name = "blitstr" @@ -521,6 +536,26 @@ dependencies = [ "cfg-if 1.0.0", ] +[[package]] +name = "crossbeam-channel" +version = "0.5.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e54ea8bc3fb1ee042f5aace6e3c6e025d3874866da222930f70ce62aceba0bfa" +dependencies = [ + "cfg-if 1.0.0", + "crossbeam-utils", +] + +[[package]] +name = "crossbeam-utils" +version = "0.8.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "cfcae03edb34f947e64acdb1c33ec169824e20657e9ecb61cef6c8c74dcb8120" +dependencies = [ + "cfg-if 1.0.0", + "lazy_static", +] + [[package]] name = "csv" version = "1.1.5" @@ -599,7 +634,7 @@ dependencies = [ "byteorder", "digest", "engine-25519", - "engine25519-as", + "engine25519-as 0.1.0 (git+https://github.com/betrusted-io/engine25519-as.git?rev=6681e73c1fdc4a460b5ef9f9c7c91aef546d00f3)", "log", "rand_core 0.5.1", "subtle", @@ -720,7 +755,7 @@ dependencies = [ name = "engine-25519" version = "0.1.0" dependencies = [ - "engine25519-as", + "engine25519-as 0.1.0 (git+https://github.com/betrusted-io/engine25519-as.git?rev=274b82899d28535ac6d4b7869e26eef2039578d5)", "llio", "log", "log-server", @@ -735,6 +770,11 @@ dependencies = [ "xous-names", ] +[[package]] +name = "engine25519-as" +version = "0.1.0" +source = "git+https://github.com/betrusted-io/engine25519-as.git?rev=274b82899d28535ac6d4b7869e26eef2039578d5#274b82899d28535ac6d4b7869e26eef2039578d5" + [[package]] name = "engine25519-as" version = "0.1.0" @@ -863,6 +903,28 @@ dependencies = [ "xous-names", ] +[[package]] +name = "gdbstub" +version = "0.5.0" +source = "git+https://github.com/daniel5151/gdbstub.git?rev=9227dfd0b78db5b20859d13c890f6f47e597029e#9227dfd0b78db5b20859d13c890f6f47e597029e" +dependencies = [ + "bitflags", + "cfg-if 0.1.10", + "log", + "managed", + "num-traits", + "paste", +] + +[[package]] +name = "gdbstub_arch" +version = "0.1.0" +source = "git+https://github.com/daniel5151/gdbstub.git?rev=9227dfd0b78db5b20859d13c890f6f47e597029e#9227dfd0b78db5b20859d13c890f6f47e597029e" +dependencies = [ + "gdbstub", + "num-traits", +] + [[package]] name = "generic-array" version = "0.14.4" @@ -1061,6 +1123,25 @@ dependencies = [ "xous-names", ] +[[package]] +name = "kernel" +version = "0.8.2" +dependencies = [ + "bitflags", + "crossbeam-channel", + "debug-here", + "gdbstub", + "gdbstub_arch", + "hex", + "lazy_static", + "rand 0.7.3", + "rand_chacha 0.3.1", + "riscv", + "stats_alloc", + "utralib", + "xous", +] + [[package]] name = "kernel-test" version = "0.1.0" @@ -1433,6 +1514,12 @@ dependencies = [ "sdl2-sys", ] +[[package]] +name = "paste" +version = "1.0.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0744126afe1a6dd7f394cb50a716dbe086cb06e255e53d8d0185d82828358fb5" + [[package]] name = "pddb" version = "0.1.0" @@ -1722,6 +1809,14 @@ dependencies = [ "winapi", ] +[[package]] +name = "riscv" +version = "0.5.6" +dependencies = [ + "bare-metal", + "bit_field", +] + [[package]] name = "rkyv" version = "0.4.3" @@ -1851,13 +1946,22 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1956f5517128a2b6f23ab2dadf1a976f4f5b27962e7724c2bf3d45e539ec098c" +[[package]] +name = "rustc_version" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" +dependencies = [ + "semver 0.9.0", +] + [[package]] name = "rustc_version" version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366" dependencies = [ - "semver", + "semver 1.0.4", ] [[package]] @@ -1910,12 +2014,27 @@ dependencies = [ "version-compare", ] +[[package]] +name = "semver" +version = "0.9.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d7eb9ef2c18661902cc47e535f9bc51b78acd254da71d375c2f6720d9a40403" +dependencies = [ + "semver-parser", +] + [[package]] name = "semver" version = "1.0.4" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "568a8e6258aa33c13358f81fd834adb854c6f7c9468520910a9b1e8fac068012" +[[package]] +name = "semver-parser" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" + [[package]] name = "serde" version = "1.0.130" @@ -2125,6 +2244,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" +[[package]] +name = "stats_alloc" +version = "0.1.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a260c96bf26273969f360c2fc2e2c7732acc2ce49d939c7243c7230c2ad179d0" + [[package]] name = "status" version = "0.1.0" @@ -2815,7 +2940,7 @@ dependencies = [ "atty", "curl", "filetime", - "rustc_version", + "rustc_version 0.4.0", "zip", ] diff --git a/Cargo.toml b/Cargo.toml index 2f224ff5e..13810d254 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -90,6 +90,7 @@ members = [ "services/net", "services/dns", "services/modals", + "kernel", ] resolver = "2" @@ -98,7 +99,6 @@ resolver = "2" # packages to be rebuilt every time they were touched. # Keep them out of the main workspace. exclude = [ - "kernel", "loader", "utralib", # Exclude UTRA, since it is machine-generated. "locales", # exclude because it is machine-generated diff --git a/kernel/.cargo/config b/kernel/.cargo/config deleted file mode 100644 index 2b608c286..000000000 --- a/kernel/.cargo/config +++ /dev/null @@ -1,21 +0,0 @@ -[target.riscv32i-unknown-none-elf] -rustflags = [ - "-C", "link-arg=-Tlink.x", - "-C", "linker-plugin-lto=yes", - "-C", "force-frame-pointers=no", -] - -[target.riscv32imac-unknown-none-elf] -rustflags = [ - "-C", "link-arg=-Tlink.x", - "-C", "force-frame-pointers=no", -] - -[target.riscv32imac-unknown-xous-elf] -rustflags = [ - "-C", "link-arg=-Tlink.x", - "-C", "force-frame-pointers=no", -] - -[build] -#target = "riscv32imac-unknown-none-elf" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 9568e8cab..faaeba232 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -24,7 +24,7 @@ xous-kernel = { package = "xous", path = "../xous-rs", features = [ ] } [target.'cfg(not(any(windows, unix)))'.dependencies] -utralib = { path = "utralib" } +utralib = { path = "../utralib", default_features = false } [target.'cfg(target_arch = "riscv32")'.dependencies] riscv = { version = "0.5.6", path = "../imports/riscv-0.5.6" } @@ -45,10 +45,3 @@ hex = "0.4" lazy_static = "1.4" rand = "0.7.3" rand_chacha = "0.3.1" - -[profile.release] -codegen-units = 1 # 1 better optimizations -debug = true # symbols are nice and they don't increase the size on Flash -lto = "fat" -# panic = "abort" # Remove some panic information -# opt-level = 'z' # Optimize for size instead of performance diff --git a/kernel/build.rs b/kernel/build.rs index fa21b2647..88875c097 100644 --- a/kernel/build.rs +++ b/kernel/build.rs @@ -35,6 +35,7 @@ fn main() { println!("cargo:rustc-link-lib=static={}", name); println!("cargo:rustc-link-search={}", out_dir.display()); println!("cargo:rerun-if-changed=bin/{}.a", target); + println!("cargo:rustc-link-arg=-Tlink.x"); // Put the linker script somewhere the linker can find it fs::File::create(out_dir.join("link.x")) diff --git a/kernel/utralib/.gitignore b/kernel/utralib/.gitignore deleted file mode 100644 index 015ca2444..000000000 --- a/kernel/utralib/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -target/ -src/generated.rs diff --git a/kernel/utralib/Cargo.lock b/kernel/utralib/Cargo.lock deleted file mode 100644 index 26701f447..000000000 --- a/kernel/utralib/Cargo.lock +++ /dev/null @@ -1,143 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -[[package]] -name = "ansi_term" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee49baf6cb617b853aa8d93bf420db2383fab46d314482ca2803b40d5fde979b" -dependencies = [ - "winapi", -] - -[[package]] -name = "anyhow" -version = "1.0.33" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fd36ffbb1fb7c834eac128ea8d0e310c5aeb635548f9d58861e1308d46e71c" - -[[package]] -name = "atty" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8" -dependencies = [ - "hermit-abi", - "libc", - "winapi", -] - -[[package]] -name = "bitflags" -version = "1.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cf1de2fe8c75bc145a2f577add951f8134889b4795d47466a54a5c846d691693" - -[[package]] -name = "clap" -version = "2.33.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "37e58ac78573c40708d45522f0d80fa2f01cc4f9b4e2bf749807255454312002" -dependencies = [ - "ansi_term", - "atty", - "bitflags", - "strsim", - "textwrap", - "unicode-width", - "vec_map", -] - -[[package]] -name = "hermit-abi" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aca5565f760fb5b220e499d72710ed156fdb74e631659e99377d9ebfbd13ae8" -dependencies = [ - "libc", -] - -[[package]] -name = "libc" -version = "0.2.79" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2448f6066e80e3bfc792e9c98bf705b4b0fc6e8ef5b43e5889aff0eaa9c58743" - -[[package]] -name = "memchr" -version = "2.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3728d817d99e5ac407411fa471ff9800a778d88a24685968b36824eaf4bee400" - -[[package]] -name = "quick-xml" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d72d5477478f85bd00b6521780dfba1ec6cdaadcf90b8b181c36d7de561f9b" -dependencies = [ - "memchr", -] - -[[package]] -name = "strsim" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ea5119cdb4c55b55d432abb513a0429384878c15dde60cc77b1c99de1a95a6a" - -[[package]] -name = "svd2utra" -version = "0.1.0" -dependencies = [ - "anyhow", - "clap", - "quick-xml", -] - -[[package]] -name = "textwrap" -version = "0.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d326610f408c7a4eb6f51c37c330e496b08506c9457c9d34287ecc38809fb060" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "unicode-width" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9337591893a19b88d8d87f2cec1e73fad5cdfd10e5a6f349f498ad6ea2ffb1e3" - -[[package]] -name = "utralib" -version = "0.1.0" -dependencies = [ - "svd2utra", -] - -[[package]] -name = "vec_map" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f1bddf1187be692e79c5ffeab891132dfb0f236ed36a43c7ed39f1165ee20191" - -[[package]] -name = "winapi" -version = "0.3.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c839a674fcd7a98952e593242ea400abe93992746761e38641405d28b00f419" -dependencies = [ - "winapi-i686-pc-windows-gnu", - "winapi-x86_64-pc-windows-gnu", -] - -[[package]] -name = "winapi-i686-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6" - -[[package]] -name = "winapi-x86_64-pc-windows-gnu" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" diff --git a/kernel/utralib/Cargo.toml b/kernel/utralib/Cargo.toml deleted file mode 100644 index 23e8af651..000000000 --- a/kernel/utralib/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "utralib" -version = "0.1.0" -authors = ["Sean Cross "] -edition = "2018" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -# Dependency policy: nail down all dependencies to the minor version number, so that changes to the code base are deliberate acts. -[dependencies] - -[build-dependencies] -svd2utra = { path = "../../svd2utra" } diff --git a/kernel/utralib/README.md b/kernel/utralib/README.md deleted file mode 100644 index 60461647f..000000000 --- a/kernel/utralib/README.md +++ /dev/null @@ -1,4 +0,0 @@ -# UTRA - -The meat of this directory is auto-generated by svd2utra. Documentation -on this API is also located in that directory. diff --git a/kernel/utralib/build.rs b/kernel/utralib/build.rs deleted file mode 100644 index 50cf18224..000000000 --- a/kernel/utralib/build.rs +++ /dev/null @@ -1,14 +0,0 @@ -use std::env; - -fn main() { - let svd_filename = env::var("XOUS_SVD_FILE") - .expect("Set the environment variable `XOUS_SVD_FILE` to point to an SVD file"); - println!("cargo:rerun-if-env-changed=XOUS_SVD_FILE"); - - let svd_file_path = std::path::Path::new(&svd_filename); - println!("cargo:rerun-if-changed={}", svd_file_path.canonicalize().unwrap().display()); - - let src_file = std::fs::File::open(svd_filename).expect("couldn't open src file"); - let mut dest_file = std::fs::File::create("src/generated.rs").expect("couldn't open dest file"); - svd2utra::generate(src_file, &mut dest_file).unwrap(); -} diff --git a/kernel/utralib/src/lib.rs b/kernel/utralib/src/lib.rs deleted file mode 100644 index 24d4bdeb5..000000000 --- a/kernel/utralib/src/lib.rs +++ /dev/null @@ -1,3 +0,0 @@ -#![cfg_attr(any(target_os = "none", target_os = "xous"), no_std)] -pub mod generated; -pub use generated::*; diff --git a/services/engine-25519/Cargo.toml b/services/engine-25519/Cargo.toml index f7f65a01d..7913ef491 100644 --- a/services/engine-25519/Cargo.toml +++ b/services/engine-25519/Cargo.toml @@ -22,7 +22,7 @@ rkyv = {version = "0.4.3", default-features = false, features = ["const_generics [dependencies.engine25519-as] git="https://github.com/betrusted-io/engine25519-as.git" -rev="6681e73c1fdc4a460b5ef9f9c7c91aef546d00f3" +rev="274b82899d28535ac6d4b7869e26eef2039578d5" default-features = false features = [] diff --git a/utralib/Cargo.toml b/utralib/Cargo.toml index a2b809f54..fa10c20ce 100644 --- a/utralib/Cargo.toml +++ b/utralib/Cargo.toml @@ -4,7 +4,10 @@ version = "0.1.0" authors = ["Sean Cross "] edition = "2018" -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html +[features] +std = [] + +default_features = ["std"] # Dependency policy: nail down all dependencies to the minor version number, so that changes to the code base are deliberate acts. [dependencies] diff --git a/utralib/src/lib.rs b/utralib/src/lib.rs index 6cf78339f..94f7bfa82 100644 --- a/utralib/src/lib.rs +++ b/utralib/src/lib.rs @@ -1,3 +1,3 @@ -#![cfg_attr(target_os = "none", no_std)] +#![cfg_attr(any(target_os = "none", not(feature = "std")), no_std)] pub mod generated; pub use generated::*; diff --git a/xtask/src/main.rs b/xtask/src/main.rs index 0a9609514..69d5c47df 100644 --- a/xtask/src/main.rs +++ b/xtask/src/main.rs @@ -585,7 +585,7 @@ fn build_kernel(debug: bool) -> Result { &["kernel"], debug, Some(KERNEL_TARGET), - Some("kernel".into()), + None, None, None, )?; path.push("kernel");