From ba874a653e4769137797e02f1bc8ef4496e5b4e6 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 7 Jun 2022 13:03:49 +0800 Subject: [PATCH 1/5] make the rawserial path queue up to 128 characters if getchar() isn't live --- services/keyboard/src/main.rs | 38 ++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/services/keyboard/src/main.rs b/services/keyboard/src/main.rs index f754895b3..1103fa862 100644 --- a/services/keyboard/src/main.rs +++ b/services/keyboard/src/main.rs @@ -10,6 +10,11 @@ use log::info; use num_traits::*; use xous_ipc::Buffer; use xous::{CID, msg_scalar_unpack, msg_blocking_scalar_unpack, MessageSender}; +#[cfg(feature="rawserial")] +use std::collections::VecDeque; +#[cfg(feature="rawserial")] +const BLOCKING_QUEUE_LEN: usize = 128; + #[cfg(any(target_os = "none", target_os = "xous"))] mod implementation { use utralib::generated::*; @@ -762,10 +767,14 @@ fn main() -> ! { log::warn!("kbd server is overriding WFI for debugging, remember to disable for production"); llio.wfi_override(true).unwrap(); }*/ + #[cfg(not(feature="rawserial"))] let mut esc_index: Option = None; + #[cfg(not(feature="rawserial"))] let mut esc_chars = [0u8; 16]; // storage for any blocking listeners let mut blocking_listener = Vec::::new(); + #[cfg(feature="rawserial")] + let mut blocking_queue = VecDeque::::new(); log::trace!("starting main loop"); loop { @@ -842,14 +851,28 @@ fn main() -> ! { #[cfg(feature="rawserial")] { - for listener in blocking_listener.drain(..) { - // we must unblock anyways once the key is hit; even if the key is invalid, - // send the invalid key. The receiving library function will clean this up into a nil-response vector. - xous::return_scalar2(listener, k, 0).unwrap(); + if blocking_listener.len() == 0 { + if blocking_queue.len() > BLOCKING_QUEUE_LEN { + log::warn!("blocking queue has overflowed, dropping {}", k); + } else { + blocking_queue.push_back(k); + } + } else { + for listener in blocking_listener.drain(..) { + // we must unblock anyways once the key is hit; even if the key is invalid, + // send the invalid key. The receiving library function will clean this up into a nil-response vector. + if blocking_queue.len() != 0 { + blocking_queue.push_back(k); + let k_prime = blocking_queue.pop_front().unwrap(); + xous::return_scalar2(listener, k_prime, 0).unwrap(); + } else { + xous::return_scalar2(listener, k, 0).unwrap(); + } + } } continue; // do not execute the remaining code in this branch } - + #[cfg(not(feature="rawserial"))] let key = match esc_index { Some(i) => { esc_chars[i] = (k & 0xff) as u8; @@ -896,7 +919,7 @@ fn main() -> ! { } } }; - #[cfg(feature="debuginject")] + #[cfg(all(feature="debuginject", not(feature="rawserial")))] if let Some(conn) = listener_conn { if key != '\u{0000}' { log::info!("injecting key '{}'({:x})", key, key as u32); // always be noisy about this, it's an exploit path @@ -910,7 +933,7 @@ fn main() -> ! { ).unwrap(); } } - #[cfg(feature="debuginject")] + #[cfg(all(feature="debuginject", not(feature="rawserial")))] for listener in blocking_listener.drain(..) { // we must unblock anyways once the key is hit; even if the key is invalid, // send the invalid key. The receiving library function will clean this up into a nil-response vector. @@ -1018,6 +1041,7 @@ fn main() -> ! { xous::terminate_process(0) } +#[cfg(not(feature="rawserial"))] fn esc_match(esc_chars: &[u8]) -> Result, ()> { let mut extended = Vec::::new(); for (i, &c) in esc_chars.iter().enumerate() { From 09a968ef09e8b9d96e11b3b4c6fc6a674902a29d Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 7 Jun 2022 14:00:25 +0800 Subject: [PATCH 2/5] remove debug-here dependency this contains a dependency to `failure` two levels down that has a critical vulnerability. Unfortunately no new versions of debug-here have been published in a while. It's no longer used, so just stripping it out altogether. --- Cargo.lock | 77 ----------------------------------- kernel/Cargo.toml | 1 - kernel/src/main.rs | 2 +- services/shellchat/Cargo.toml | 3 -- 4 files changed, 1 insertion(+), 82 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e5292d33a..46db1befa 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2,15 +2,6 @@ # It is not intended for manual editing. version = 3 -[[package]] -name = "addr2line" -version = "0.17.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b9ecd88a8c8378ca913a680cd98f0f13ac67383d35993f86c90a70e3f137816b" -dependencies = [ - "gimli", -] - [[package]] name = "adler" version = "1.0.2" @@ -127,21 +118,6 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" -[[package]] -name = "backtrace" -version = "0.3.65" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "11a17d453482a265fd5f8479f2a3f405566e6ca627837aaddb85af8b1ab8ef61" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "rustc-demangle", -] - [[package]] name = "ball" version = "0.1.0" @@ -856,17 +832,6 @@ dependencies = [ "syn", ] -[[package]] -name = "debug-here" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7791f83f55f330aa6406d71cc29d6d785ea1e2cf326001d7b2b45a5065efb1" -dependencies = [ - "lazy_static", - "which", - "winapi", -] - [[package]] name = "delegate" version = "0.6.2" @@ -1117,15 +1082,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", -] - [[package]] name = "fastrand" version = "1.7.0" @@ -1445,12 +1401,6 @@ dependencies = [ "xous-names", ] -[[package]] -name = "gimli" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "78cc372d058dcf6d5ecd98510e7fbc9e5aec4d21de70f65fea8fecebcd881bd4" - [[package]] name = "glob" version = "0.3.0" @@ -1779,7 +1729,6 @@ version = "0.8.2" dependencies = [ "bitflags", "crossbeam-channel", - "debug-here", "gdbstub", "gdbstub_arch", "hex", @@ -2244,15 +2193,6 @@ dependencies = [ "syn", ] -[[package]] -name = "object" -version = "0.28.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e42c982f2d955fac81dd7e1d0e1426a7d702acd9c98d19ab01083a6a0328c424" -dependencies = [ - "memchr", -] - [[package]] name = "once_cell" version = "1.12.0" @@ -2839,12 +2779,6 @@ dependencies = [ "zeroize", ] -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - [[package]] name = "rustc-std-workspace-alloc" version = "1.0.0" @@ -3099,7 +3033,6 @@ dependencies = [ "com_rs-ref", "content-plugin-api", "curve25519-dalek", - "debug-here", "digest 0.9.0", "dns", "ed25519-dalek", @@ -4051,16 +3984,6 @@ dependencies = [ "webpki", ] -[[package]] -name = "which" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" -dependencies = [ - "failure", - "libc", -] - [[package]] name = "winapi" version = "0.3.9" diff --git a/kernel/Cargo.toml b/kernel/Cargo.toml index 4daa1566d..21a1b8736 100644 --- a/kernel/Cargo.toml +++ b/kernel/Cargo.toml @@ -40,7 +40,6 @@ default = ["print-panics", "gdbserver"] [target.'cfg(any(windows, unix))'.dependencies] crossbeam-channel = "0.5" -debug-here = "0.2.2" hex = "0.4" lazy_static = "1.4" rand = "0.7.3" diff --git a/kernel/src/main.rs b/kernel/src/main.rs index 226690ba5..60db7711d 100644 --- a/kernel/src/main.rs +++ b/kernel/src/main.rs @@ -155,7 +155,7 @@ pub extern "C" fn kmain() { use std::panic; panic::set_hook(Box::new(|arg| { println!("Panic Details: {:?}", arg); - debug_here::debug_here!(); + // debug_here::debug_here!(); })); } diff --git a/services/shellchat/Cargo.toml b/services/shellchat/Cargo.toml index 893d1700f..d54441fbe 100644 --- a/services/shellchat/Cargo.toml +++ b/services/shellchat/Cargo.toml @@ -93,6 +93,3 @@ aestests = [] # adds AES tests tts = [] # adds text to speech plugin pddbtest = [] default = [] # "debugprint" - -[target.'cfg(any(windows,unix))'.dependencies] -debug-here = "*" From aad8391a3ee9241c74662370d6c3ff09d051cc1b Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 7 Jun 2022 14:06:01 +0800 Subject: [PATCH 3/5] remove stale crossbeam-utils entry from Cargo.lock unused lock dependency refers to a vulnerable version of crossbeam-utils. --- kernel/Cargo.lock | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock index 013dba3fc..37d758f5f 100644 --- a/kernel/Cargo.lock +++ b/kernel/Cargo.lock @@ -134,16 +134,6 @@ dependencies = [ "crossbeam-utils", ] -[[package]] -name = "crossbeam-utils" -version = "0.8.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db" -dependencies = [ - "cfg-if 1.0.0", - "lazy_static", -] - [[package]] name = "debug-here" version = "0.2.2" From f614b70cda89e57bc96edf21be5852a6a316fb1f Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 7 Jun 2022 14:08:13 +0800 Subject: [PATCH 4/5] remove stale version of regex from cargo.lock this version has a security vulnerability, but is not used anywhere in the build. removing. --- locales/Cargo.lock | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/locales/Cargo.lock b/locales/Cargo.lock index 83abbca01..a85d9dab9 100644 --- a/locales/Cargo.lock +++ b/locales/Cargo.lock @@ -65,17 +65,6 @@ dependencies = [ "proc-macro2", ] -[[package]] -name = "regex" -version = "1.5.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d07a8629359eb56f1e2fb1652bb04212c072a87ba68546a04065d525673ac461" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - [[package]] name = "regex-syntax" version = "0.6.25" From 2f096c143570f0bb21f3accc9bd790c50ade5353 Mon Sep 17 00:00:00 2001 From: bunnie Date: Tue, 7 Jun 2022 14:10:54 +0800 Subject: [PATCH 5/5] remove kernel Cargo.lock file This is no longer used since we moved to a monorepo. This also removes some stale dependencies. --- kernel/Cargo.lock | 559 ---------------------------------------------- 1 file changed, 559 deletions(-) delete mode 100644 kernel/Cargo.lock diff --git a/kernel/Cargo.lock b/kernel/Cargo.lock deleted file mode 100644 index 37d758f5f..000000000 --- a/kernel/Cargo.lock +++ /dev/null @@ -1,559 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "addr2line" -version = "0.16.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd" -dependencies = [ - "gimli", -] - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[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.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "28ae2b3dec75a406790005a200b1bd89785afc02517a00ca99ecfe093ee9e6cf" - -[[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 = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "backtrace" -version = "0.3.61" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e7a905d892734eea339e896738c14b9afce22b5318f64b951e70bf3844419b01" -dependencies = [ - "addr2line", - "cc", - "cfg-if 1.0.0", - "libc", - "miniz_oxide", - "object", - "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", -] - -[[package]] -name = "bit_field" -version = "0.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ed8765909f9009617974ab6b7d332625b320b33c326b1e9321382ef1999b5d56" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cc" -version = "1.0.69" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e70cc2f62c6ce1868963827bd677764c62d07c3d9a3e1fb1177ee1a9ab199eb2" - -[[package]] -name = "cfg-if" -version = "0.1.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[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 = "convert_case" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e" - -[[package]] -name = "crossbeam-channel" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4" -dependencies = [ - "cfg-if 1.0.0", - "crossbeam-utils", -] - -[[package]] -name = "debug-here" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d7791f83f55f330aa6406d71cc29d6d785ea1e2cf326001d7b2b45a5065efb1" -dependencies = [ - "lazy_static", - "which", - "winapi", -] - -[[package]] -name = "failure" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d32e9bd16cc02eae7db7ef620b392808b89f6a5e16bb3497d159c6b92a0f4f86" -dependencies = [ - "backtrace", -] - -[[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 = "getrandom" -version = "0.1.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8fc3cb4d91f53b50155bdcfd23f6a4c39ae1969c2ae85982b135750cccaf5fce" -dependencies = [ - "cfg-if 1.0.0", - "libc", - "wasi", -] - -[[package]] -name = "gimli" -version = "0.25.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "hex" -version = "0.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70" - -[[package]] -name = "kernel" -version = "0.8.2" -dependencies = [ - "bitflags", - "crossbeam-channel", - "debug-here", - "gdbstub", - "gdbstub_arch", - "hex", - "lazy_static", - "rand", - "rand_chacha 0.3.1", - "riscv", - "stats_alloc", - "utralib", - "xous", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" - -[[package]] -name = "libc" -version = "0.2.100" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1fa8cddc8fbbee11227ef194b5317ed014b8acbf15139bd716a18ad3fe99ec5" - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if 1.0.0", -] - -[[package]] -name = "managed" -version = "0.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0ca88d725a0a943b096803bd34e73a4437208b6077654cc4ecb2947a5f91618d" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "miniz_oxide" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92518e98c078586bc6c934028adcca4c92a53d6a958196de835170a01d84e4b" -dependencies = [ - "adler", - "autocfg", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", -] - -[[package]] -name = "object" -version = "0.26.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c" -dependencies = [ - "memchr", -] - -[[package]] -name = "paste" -version = "1.0.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "acbf547ad0c65e31259204bd90935776d1c693cec2f4ff7abb7a1bbbd40dfe58" - -[[package]] -name = "ppv-lite86" -version = "0.2.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ac74c624d6b2d21f425f752262f42188365d7b8ff1aff74c82e45136510a4857" - -[[package]] -name = "proc-macro2" -version = "1.0.28" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c7ed8b8c7b886ea3ed7dde405212185f423ab44682667c8c6dd14aa1d9f6612" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quick-xml" -version = "0.19.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b3d72d5477478f85bd00b6521780dfba1ec6cdaadcf90b8b181c36d7de561f9b" -dependencies = [ - "memchr", -] - -[[package]] -name = "quote" -version = "1.0.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c3d0b9745dc2debf507c8422de05d7226cc1f0644216dfdfead988f9b1ab32a7" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03" -dependencies = [ - "getrandom", - "libc", - "rand_chacha 0.2.2", - "rand_core 0.5.1", - "rand_hc", - "rand_pcg", -] - -[[package]] -name = "rand_chacha" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f4c8ed856279c9737206bf725bf36935d8666ead7aa69b52be55af369d193402" -dependencies = [ - "ppv-lite86", - "rand_core 0.5.1", -] - -[[package]] -name = "rand_chacha" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e6c10a63a0fa32252be49d21e7709d4d4baf8d231c2dbce1eaa8141b9b127d88" -dependencies = [ - "ppv-lite86", - "rand_core 0.6.3", -] - -[[package]] -name = "rand_core" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "90bde5296fc891b0cef12a6d03ddccc162ce7b2aff54160af9338f8d40df6d19" -dependencies = [ - "getrandom", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" - -[[package]] -name = "rand_hc" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "rand_pcg" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16abd0c1b639e9eb4d7c50c0b8100b0d0f849be2349829c740fe8e6eb4816429" -dependencies = [ - "rand_core 0.5.1", -] - -[[package]] -name = "riscv" -version = "0.5.6" -dependencies = [ - "bare-metal", - "bit_field", -] - -[[package]] -name = "rustc-demangle" -version = "0.1.21" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342" - -[[package]] -name = "rustc_version" -version = "0.2.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "138e3e0acb6c9fb258b19b67cb8abd63c00679d2851805ea151465464fe9030a" -dependencies = [ - "semver", -] - -[[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-parser" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3" - -[[package]] -name = "stats_alloc" -version = "0.1.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a260c96bf26273969f360c2fc2e2c7732acc2ce49d939c7243c7230c2ad179d0" - -[[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", - "convert_case", - "quick-xml", -] - -[[package]] -name = "syn" -version = "1.0.75" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b7f58f7e8eaa0009c5fec437aabf511bd9933e4b2d7407bd05273c01a8906ea7" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[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 = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[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 = "wasi" -version = "0.9.0+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cccddf32554fecc6acb585f82a32a72e28b48f8c4c1883ddfeeeaa96f7d8e519" - -[[package]] -name = "which" -version = "2.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b57acb10231b9493c8472b20cb57317d0679a49e0bdbee44b3b803a6473af164" -dependencies = [ - "failure", - "libc", -] - -[[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" - -[[package]] -name = "xous" -version = "0.8.3" -dependencies = [ - "bitflags", - "debug-here", - "hex", - "lazy_static", - "xous-macros", -] - -[[package]] -name = "xous-macros" -version = "0.1.0" -dependencies = [ - "proc-macro2", - "quote", - "rand", - "syn", -]