From a480d932768d151720daab08673fd3db584f289c Mon Sep 17 00:00:00 2001 From: TheOddGarlic Date: Tue, 2 Aug 2022 12:49:17 +0300 Subject: [PATCH 1/4] Bump hashbrown, switch to my toml fork --- Cargo.toml | 1 - ableos/Cargo.toml | 5 ++--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 735bcb00..7673c18a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,5 +1,4 @@ [workspace] - members = [ "ableos", "asl", diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml index f458a930..556d39dd 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -69,7 +69,6 @@ pc-keyboard = "0.5" version = "0.4.17" default-features = false - [dependencies.logos] version = "0.12" default-features = false @@ -88,7 +87,7 @@ default-features = false features = ["derive", "alloc"] [dependencies.hashbrown] -version = "0.7" +version = "0.12" default-features = false features = ["inline-more"] @@ -109,7 +108,7 @@ git = "https://git.ablecorp.us:443/able/y-compositor-protocol.git" path = "../ext2-rs" [dependencies.toml] -git = "https://github.com/diondokter/toml-rs" +git = "https://git.ablecorp.us:443/theoddgarlic/toml-rs" # version = "0.5.8" default-features = false From b3721bca19628230bb08fca7c332d12b3d588686 Mon Sep 17 00:00:00 2001 From: TheOddGarlic Date: Tue, 2 Aug 2022 13:44:42 +0300 Subject: [PATCH 2/4] handle dependencies, get rid of shadeable --- Cargo.lock | 408 +++----- Cargo.toml | 1 - ableos/Cargo.lock | 915 ------------------ ableos/Cargo.toml | 10 +- ableos/src/devices/dev_vterm.rs | 3 +- ableos/src/graphics/mod.rs | 167 ++-- .../src/graphics}/pixel_format.rs | 12 - ableos/src/lib.rs | 2 +- ableos/src/rhai_shell/mod.rs | 112 +-- ableos/src/tests.rs | 1 - facepalm/Cargo.lock | 25 - qrcode-rust/Cargo.lock | 338 ------- repbuild/Cargo.lock | 289 ------ shadeable/.config/cargo.toml | 4 - shadeable/Cargo.lock | 262 ----- shadeable/Cargo.toml | 18 - shadeable/README.md | 1 - shadeable/shaders/simple.shade | 17 - shadeable/src/engine_internals.rs | 57 -- shadeable/src/lib.rs | 26 - 20 files changed, 280 insertions(+), 2388 deletions(-) delete mode 100644 ableos/Cargo.lock rename {shadeable/src => ableos/src/graphics}/pixel_format.rs (99%) delete mode 100644 facepalm/Cargo.lock delete mode 100644 qrcode-rust/Cargo.lock delete mode 100644 repbuild/Cargo.lock delete mode 100644 shadeable/.config/cargo.toml delete mode 100644 shadeable/Cargo.lock delete mode 100644 shadeable/Cargo.toml delete mode 100644 shadeable/README.md delete mode 100644 shadeable/shaders/simple.shade delete mode 100644 shadeable/src/engine_internals.rs delete mode 100644 shadeable/src/lib.rs diff --git a/Cargo.lock b/Cargo.lock index 1f5e1fab..b5aaa5e1 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -36,7 +36,7 @@ dependencies = [ "externc-libm", "facepalm", "genfs", - "hashbrown 0.7.2", + "hashbrown", "kernel", "lazy_static", "libwasm", @@ -51,12 +51,10 @@ dependencies = [ "pretty-hex", "qrcode", "rdrand", - "rhai", "riscv", "rkyv", "serde", - "shadeable", - "spin 0.9.2", + "spin 0.9.4", "toml", "uart_16550", "unicode-width", @@ -72,47 +70,31 @@ dependencies = [ [[package]] name = "acpi" -version = "4.1.0" +version = "4.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55237649c6e747ea67e5ed45125af5e6a35ea1250c5e44995eb6049a955bd004" +checksum = "654f48ab3178632ea535be1765073b990895cb62f70a7e5671975d7150c26d15" dependencies = [ "bit_field", "log", "rsdp", ] -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - [[package]] name = "ahash" version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" dependencies = [ - "const-random", "getrandom", "once_cell", "version_check", ] -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - [[package]] name = "anyhow" -version = "1.0.56" +version = "1.0.59" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4361135be9122e0870de935d7c439aef945b9f9ddd4199a553b5270b49c82a27" +checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" [[package]] name = "asl" @@ -141,9 +123,9 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" [[package]] name = "axel" version = "0.1.0" -source = "git+https://git.ablecorp.us/able/aos_userland#7f61266a9b6a5d0032ff84b3ee971eb7b14bd1fa" +source = "git+https://git.ablecorp.us/able/aos_userland#a9a2514de31c10c1f02956f3513a636e2c5190ff" dependencies = [ - "hashbrown 0.7.2", + "hashbrown", "log", "logos", "versioning", @@ -157,9 +139,9 @@ checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" [[package]] name = "beef" -version = "0.5.1" +version = "0.5.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" +checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1" [[package]] name = "bit_field" @@ -187,16 +169,16 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" [[package]] name = "clap" -version = "3.1.8" +version = "3.2.16" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71c47df61d9e16dc010b55dba1952a57d8c215dbb533fd13cdd13369aac73b1c" +checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" dependencies = [ "atty", "bitflags", "clap_derive", + "clap_lex", "indexmap", - "lazy_static", - "os_str_bytes", + "once_cell", "strsim", "termcolor", "textwrap", @@ -204,9 +186,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "3.1.7" +version = "3.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3aab4734e083b809aaf5794e14e756d1c798d2c69c7f7de7a09a2f5214993c1" +checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" dependencies = [ "heck", "proc-macro-error", @@ -215,6 +197,15 @@ dependencies = [ "syn", ] +[[package]] +name = "clap_lex" +version = "0.2.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" +dependencies = [ + "os_str_bytes", +] + [[package]] name = "conquer-once" version = "0.3.2" @@ -230,54 +221,27 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e763eef8846b13b380f37dfecda401770b0ca4e56e95170237bd7c25c7db3582" -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "core-error" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efcdb2972eb64230b4c50646d8498ff73f5128d196a90c7236eec4cbe8619b8f" -dependencies = [ - "version_check", -] - [[package]] name = "cpuio" version = "0.3.2" source = "git+https://git.ablecorp.us/ondra05/cpuio.git#093cc103101b4ba4abd02d77c884113a376cdc64" -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - [[package]] name = "downcast-rs" version = "1.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" +[[package]] +name = "embedded-hal" +version = "0.2.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "35949884794ad573cf46071e41c9b60efb0cb311e3ca01f7af807af1debc66ff" +dependencies = [ + "nb 0.1.3", + "void", +] + [[package]] name = "ext2" version = "0.1.1" @@ -285,7 +249,7 @@ dependencies = [ "bitflags", "genfs", "rlibc", - "spin 0.9.2", + "spin 0.9.4", ] [[package]] @@ -323,9 +287,9 @@ checksum = "65b9e52a0ffd4c2f11f9f84e8885a40cb99f490971eee78bbd7ddffd6ac023d6" [[package]] name = "getrandom" -version = "0.2.6" +version = "0.2.7" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9be70c98951c83b8d2f8f60d7065fa6d5146873094452a1008da8c2f1e4205ad" +checksum = "4eb1a864a501629691edf6c15a593b7a51eebaa1e8468e9ddc623de7c9b58ec6" dependencies = [ "cfg-if", "libc", @@ -334,27 +298,11 @@ dependencies = [ [[package]] name = "hashbrown" -version = "0.7.2" +version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" +checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.3.8", - "autocfg", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "hashbrown" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" -dependencies = [ - "ahash 0.7.6", + "ahash", ] [[package]] @@ -374,21 +322,12 @@ dependencies = [ [[package]] name = "indexmap" -version = "1.8.1" +version = "1.9.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0f647032dfaa1f8b6dc29bd3edb7bbef4861b8b8007ebb118d6db284fd59f6ee" +checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" dependencies = [ "autocfg", - "hashbrown 0.11.2", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", + "hashbrown", ] [[package]] @@ -411,20 +350,20 @@ dependencies = [ [[package]] name = "libc" -version = "0.2.122" +version = "0.2.126" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec647867e2bf0772e28c8bcde4f0d19a9216916e890543b5a03ed8ef27b8f259" +checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" [[package]] name = "libm" -version = "0.2.2" +version = "0.2.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" +checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145" [[package]] name = "libwasm" version = "0.1.0" -source = "git+https://git.ablecorp.us/able/libwasm.git#aa1f7d5c0985649b6d73249dcad908272e82d7eb" +source = "git+https://git.ablecorp.us/theoddgarlic/libwasm.git#337bf84d1964ec3ffa91ee6840c15711cc1051b4" [[package]] name = "linked_list_allocator" @@ -483,12 +422,6 @@ dependencies = [ "syn", ] -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - [[package]] name = "memory_units" version = "0.3.0" @@ -496,16 +429,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" [[package]] -name = "no-std-compat" -version = "0.4.1" +name = "nb" +version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" +checksum = "801d31da0513b6ec5214e9bf433a77966320625a37860f910be265be6e18d06f" +dependencies = [ + "nb 1.0.0", +] + +[[package]] +name = "nb" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "546c37ac5d9e56f55e73b677106873d9d9f5190605e41a856503623648488cae" [[package]] name = "num-integer" -version = "0.1.44" +version = "0.1.45" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" +checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" dependencies = [ "autocfg", "num-traits", @@ -524,34 +466,30 @@ dependencies = [ [[package]] name = "num-traits" -version = "0.2.14" +version = "0.2.15" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" +checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" dependencies = [ "autocfg", - "libm", ] [[package]] name = "once_cell" -version = "1.10.0" +version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" +checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" [[package]] name = "os_str_bytes" -version = "6.0.0" +version = "6.2.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64" -dependencies = [ - "memchr", -] +checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" [[package]] name = "owned_ttf_parser" -version = "0.15.0" +version = "0.15.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d" +checksum = "07ef1a404ae479dd6906f4fa2c88b3c94028f1284beb42a47c183a7c27ee9a3e" dependencies = [ "ttf-parser", ] @@ -621,19 +559,13 @@ dependencies = [ "version_check", ] -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - [[package]] name = "proc-macro2" -version = "1.0.37" +version = "1.0.42" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ec757218438d5fda206afc041538b2f6d889286160d649a86a24d37e1235afd1" +checksum = "c278e965f1d8cf32d6e0e96de3d3e79712178ae67986d9cf9151f51e95aac89b" dependencies = [ - "unicode-xid", + "unicode-ident", ] [[package]] @@ -662,9 +594,9 @@ version = "0.12.0" [[package]] name = "quote" -version = "1.0.18" +version = "1.0.20" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1feb54ed693b93a84e14094943b84b7c4eae204c512b7ccb95ab0c66d278ad1" +checksum = "3bcdf212e9776fbcb2d23ab029360416bb1706b1aea2d1a5ba002727cbcab804" dependencies = [ "proc-macro2", ] @@ -677,29 +609,18 @@ checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" [[package]] name = "rdrand" -version = "0.8.1" +version = "0.8.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0d5cb05cb40e4e5805399c27b12a064427cf553081ae9b82bc1a88111a576" +checksum = "e233b642160555c1aa1ff7a78443c6139342f411b6fa6602af2ebbfee9e166bb" dependencies = [ "rand_core", ] -[[package]] -name = "regex" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - [[package]] name = "regex-syntax" -version = "0.6.25" +version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" +checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" [[package]] name = "repbuild" @@ -710,63 +631,24 @@ dependencies = [ "xshell", ] -[[package]] -name = "rhai" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef3d57e55ca044c53ced279d2d3ee9df229b247556b005a23713d5206a2ecfc" -dependencies = [ - "ahash 0.7.6", - "bitflags", - "core-error", - "instant", - "libm", - "no-std-compat", - "num-traits", - "rhai_codegen", - "smallvec", - "smartstring", -] - -[[package]] -name = "rhai_codegen" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa0ff1c9dc19c9f8bba510a2a75d3f0449f6233570c2672c7e31c692a11a59a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - [[package]] name = "riscv" -version = "0.7.0" +version = "0.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" +checksum = "5e2856a701069e2d262b264750d382407d272d5527f7a51d3777d1805b4e2d3c" dependencies = [ "bare-metal", "bit_field", - "riscv-target", -] - -[[package]] -name = "riscv-target" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222" -dependencies = [ - "lazy_static", - "regex", + "embedded-hal", ] [[package]] name = "rkyv" -version = "0.7.37" +version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1f08c8062c1fe1253064043b8fc07bfea1b9702b71b4a86c11ea3588183b12e1" +checksum = "cec2b3485b07d96ddfd3134767b8a447b45ea4eb91448d0a35180ec0ffd5ed15" dependencies = [ - "hashbrown 0.12.0", + "hashbrown", "ptr_meta", "rkyv_derive", "seahash", @@ -774,9 +656,9 @@ dependencies = [ [[package]] name = "rkyv_derive" -version = "0.7.37" +version = "0.7.39" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e289706df51226e84814bf6ba1a9e1013112ae29bc7a9878f73fce360520c403" +checksum = "6eaedadc88b53e36dd32d940ed21ae4d850d5916f2581526921f553a72ac34c4" dependencies = [ "proc-macro2", "quote", @@ -800,9 +682,9 @@ dependencies = [ [[package]] name = "rustversion" -version = "1.0.6" +version = "1.0.8" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2cc38e8fa666e2de3c4aba7edeb5ffc5246c1c2ed0e3d17e560aeeba736b23f" +checksum = "24c8ad4f0c00e1eb5bc7614d236a7f1300e3dbd76b68cac8e06fb00b015ad8d8" [[package]] name = "scopeguard" @@ -818,50 +700,24 @@ checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" [[package]] name = "serde" -version = "1.0.136" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" +checksum = "7af873f2c95b99fcb0bd0fe622a43e29514658873c8ceba88c4cb88833a22500" dependencies = [ "serde_derive", ] [[package]] name = "serde_derive" -version = "1.0.136" +version = "1.0.141" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" +checksum = "75743a150d003dd863b51dc809bcad0d73f2102c53632f1e954e738192a3413f" dependencies = [ "proc-macro2", "quote", "syn", ] -[[package]] -name = "shadeable" -version = "0.1.0" -dependencies = [ - "libm", - "log", - "rhai", -] - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - [[package]] name = "spin" version = "0.5.2" @@ -870,9 +726,9 @@ checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" [[package]] name = "spin" -version = "0.9.2" +version = "0.9.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" +checksum = "7f6002a767bff9e83f8eeecf883ecb8011875a21ae8da43bffb817a57e78cc09" dependencies = [ "lock_api", ] @@ -886,12 +742,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - [[package]] name = "strsim" version = "0.10.0" @@ -900,13 +750,13 @@ checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" [[package]] name = "syn" -version = "1.0.91" +version = "1.0.98" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b683b2b825c8eef438b77c36a06dc262294da3d5a5813fac20da149241dcd44d" +checksum = "c50aef8a904de4c23c788f104b7dddc7d6f79c647c7c8ce4cc8f73eb0ca773dd" dependencies = [ "proc-macro2", "quote", - "unicode-xid", + "unicode-ident", ] [[package]] @@ -924,52 +774,44 @@ version = "0.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - [[package]] name = "toml" -version = "0.5.6" -source = "git+https://github.com/diondokter/toml-rs#c4161aa70202b3992dbec79b76e7a8659713b604" +version = "0.5.9" +source = "git+https://git.ablecorp.us/theoddgarlic/toml-rs#34db433429f3ad38921d13ac9aba74c8a706f376" dependencies = [ - "hashbrown 0.7.2", + "hashbrown", "serde", ] [[package]] name = "ttf-parser" -version = "0.15.0" +version = "0.15.2" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" +checksum = "7b3e06c9b9d80ed6b745c7159c40b311ad2916abb34a49e9be2653b90db0d8dd" [[package]] name = "uart_16550" -version = "0.2.17" +version = "0.2.18" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3616395dbb38a9c39a5865b5691c21d9f8369ba876355cfef8ce39d0d4cf3281" +checksum = "b074eb9300ad949edd74c529c0e8d451625af71bb948e6b65fe69f72dc1363d9" dependencies = [ "bitflags", + "rustversion", "x86_64", ] +[[package]] +name = "unicode-ident" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "15c61ba63f9235225a22310255a29b806b907c9b8c964bcbd0a2c70f3f2deea7" + [[package]] name = "unicode-width" version = "0.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - [[package]] name = "version_check" version = "0.9.4" @@ -979,7 +821,7 @@ checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" [[package]] name = "versioning" version = "0.1.2" -source = "git+https://git.ablecorp.us/able/aos_userland#7f61266a9b6a5d0032ff84b3ee971eb7b14bd1fa" +source = "git+https://git.ablecorp.us/able/aos_userland#a9a2514de31c10c1f02956f3513a636e2c5190ff" dependencies = [ "serde", ] @@ -997,6 +839,12 @@ dependencies = [ "x86_64", ] +[[package]] +name = "void" +version = "1.0.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d" + [[package]] name = "volatile" version = "0.2.7" @@ -1005,15 +853,15 @@ checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945" [[package]] name = "volatile" -version = "0.4.4" +version = "0.4.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" +checksum = "e3ca98349dda8a60ae74e04fd90c7fb4d6a4fbe01e6d3be095478aa0b76f6c0c" [[package]] name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" +version = "0.11.0+wasi-snapshot-preview1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" +checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423" [[package]] name = "wasmi" @@ -1088,14 +936,14 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f" [[package]] name = "x86_64" -version = "0.14.9" +version = "0.14.10" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958cd5cb28e720db2f59ee9dc4235b5f82a183d079fb0e6caf43ad074cfdc66a" +checksum = "100555a863c0092238c2e0e814c1096c1e5cf066a309c696a87e907b5f8c5d69" dependencies = [ "bit_field", "bitflags", "rustversion", - "volatile 0.4.4", + "volatile 0.4.5", ] [[package]] @@ -1106,7 +954,7 @@ dependencies = [ "lazy_static", "log", "serde", - "spin 0.9.2", + "spin 0.9.4", "x86_64", ] diff --git a/Cargo.toml b/Cargo.toml index 7673c18a..514797fa 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,6 +5,5 @@ members = [ "ext2-rs", "kernel", "facepalm", - "shadeable", "repbuild", ] diff --git a/ableos/Cargo.lock b/ableos/Cargo.lock deleted file mode 100644 index 454df7e2..00000000 --- a/ableos/Cargo.lock +++ /dev/null @@ -1,915 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ab_glyph" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24606928a235e73cdef55a0c909719cadd72fce573e5713d58cb2952d8f5794c" -dependencies = [ - "ab_glyph_rasterizer", - "libm", - "owned_ttf_parser", -] - -[[package]] -name = "ab_glyph_rasterizer" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a13739d7177fbd22bb0ed28badfff9f372f8bef46c863db4e1c6248f6b223b6e" -dependencies = [ - "libm", -] - -[[package]] -name = "ableos" -version = "0.1.1" -dependencies = [ - "ab_glyph", - "acpi", - "axel", - "bootloader", - "cpuio", - "ext2", - "externc-libm", - "facepalm", - "genfs", - "hashbrown 0.7.2", - "kernel", - "lazy_static", - "libwasm", - "linked_list_allocator", - "lliw", - "log", - "logos", - "pc-beeper", - "pic8259", - "picorand", - "pretty-hex", - "rdrand", - "rhai", - "riscv", - "rkyv", - "serde", - "shadeable", - "spin 0.5.2", - "toml", - "uart_16550", - "unicode-width", - "vga", - "volatile 0.2.7", - "wasmi", - "watson", - "x86_64", - "y-compositor-protocol", -] - -[[package]] -name = "acpi" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "55237649c6e747ea67e5ed45125af5e6a35ea1250c5e44995eb6049a955bd004" -dependencies = [ - "bit_field", - "log", - "rsdp", -] - -[[package]] -name = "ahash" -version = "0.3.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e8fd72866655d1904d6b0997d0b07ba561047d070fbe29de039031c641b61217" - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "const-random", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "aho-corasick" -version = "0.7.18" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1e37cfd5e7657ada45f742d6e99ca5788580b5c529dc78faf11ece6dc702656f" -dependencies = [ - "memchr", -] - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "axel" -version = "0.1.0" -source = "git+https://git.ablecorp.us/able/aos_userland#a96bc8b896fdee392e8f26125298da6b4b21dd9a" -dependencies = [ - "hashbrown 0.7.2", - "log", - "logos", - "versioning", -] - -[[package]] -name = "bare-metal" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f8fe8f5a8a398345e52358e18ff07cc17a568fbca5c6f73873d3a62056309603" - -[[package]] -name = "beef" -version = "0.5.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bed554bd50246729a1ec158d08aa3235d1b69d94ad120ebe187e28894787e736" - -[[package]] -name = "bit_field" -version = "0.10.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dcb6dd1c2376d2e096796e234a70e17e94cc2d5d54ff8ce42b28cef1d0d359a4" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bootloader" -version = "0.9.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "de78decc37247c7cfac5dbf3495c7298c6ac97cb355161caa7e15969c6648e6c" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "conquer-once" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7c6d3a9775a69f6d1fe2cc888999b67ed30257d3da4d2af91984e722f2ec918a" -dependencies = [ - "conquer-util", -] - -[[package]] -name = "conquer-util" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e763eef8846b13b380f37dfecda401770b0ca4e56e95170237bd7c25c7db3582" - -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "core-error" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efcdb2972eb64230b4c50646d8498ff73f5128d196a90c7236eec4cbe8619b8f" -dependencies = [ - "version_check", -] - -[[package]] -name = "cpuio" -version = "0.3.2" -source = "git+https://git.ablecorp.us/ondra05/cpuio.git#093cc103101b4ba4abd02d77c884113a376cdc64" - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "downcast-rs" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ea835d29036a4087793836fa931b08837ad5e957da9e23886b29586fb9b6650" - -[[package]] -name = "ext2" -version = "0.1.1" -source = "git+https://git.ablecorp.us/able/ext2-rs.git#15bcf9f72e2523e7ebe2a8d09c1231ca9139f326" -dependencies = [ - "bitflags", - "genfs", - "rlibc", - "spin 0.9.2", -] - -[[package]] -name = "externc-libm" -version = "0.1.0" -source = "git+https://git.ablecorp.us/able/externc-libm.git#0781df85c094bcd7e5ef7505e9c5cc6317eeda75" -dependencies = [ - "libm", -] - -[[package]] -name = "facepalm" -version = "0.1.0" -dependencies = [ - "log", -] - -[[package]] -name = "fnv" -version = "1.0.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" - -[[package]] -name = "font8x8" -version = "0.3.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "875488b8711a968268c7cf5d139578713097ca4635a76044e8fe8eedf831d07e" - -[[package]] -name = "genfs" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "65b9e52a0ffd4c2f11f9f84e8885a40cb99f490971eee78bbd7ddffd6ac023d6" - -[[package]] -name = "getrandom" -version = "0.2.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d39cd93900197114fa1fcb7ae84ca742095eed9442088988ae74fa744e930e77" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "hashbrown" -version = "0.7.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "96282e96bfcd3da0d3aa9938bedf1e50df3269b6db08b4876d2da0bb1a0841cf" -dependencies = [ - "ahash 0.3.8", - "autocfg", -] - -[[package]] -name = "hashbrown" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8c21d40587b92fa6a6c6e3c1bdbf87d75511db5672f9c93175574b3a00df1758" -dependencies = [ - "ahash 0.7.6", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "kernel" -version = "0.1.2" -dependencies = [ - "lazy_static", - "log", - "versioning", -] - -[[package]] -name = "lazy_static" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646" -dependencies = [ - "spin 0.5.2", -] - -[[package]] -name = "libc" -version = "0.2.119" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1bf2e165bb3457c8e098ea76f3e3bc9db55f87aa90d52d0e6be741470916aaa4" - -[[package]] -name = "libm" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "33a33a362ce288760ec6a508b94caaec573ae7d3bbbd91b87aa0bad4456839db" - -[[package]] -name = "libwasm" -version = "0.1.0" -source = "git+https://git.ablecorp.us/able/libwasm.git#aa1f7d5c0985649b6d73249dcad908272e82d7eb" - -[[package]] -name = "linked_list_allocator" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "549ce1740e46b291953c4340adcd74c59bcf4308f4cac050fd33ba91b7168f4a" -dependencies = [ - "spinning_top", -] - -[[package]] -name = "lliw" -version = "0.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2d502c8bcc35a4f7ca9a7ffb7ac27b15ba30b1b92c2d69a1e4437e2635d73af7" - -[[package]] -name = "lock_api" -version = "0.4.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88943dd7ef4a2e5a4bfa2753aaab3013e34ce2533d1996fb18ef591e315e2b3b" -dependencies = [ - "scopeguard", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "logos" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "427e2abca5be13136da9afdbf874e6b34ad9001dd70f2b103b083a85daa7b345" -dependencies = [ - "logos-derive", -] - -[[package]] -name = "logos-derive" -version = "0.12.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "56a7d287fd2ac3f75b11f19a1c8a874a7d55744bd91f7a1b3e7cf87d4343c36d" -dependencies = [ - "beef", - "fnv", - "proc-macro2", - "quote", - "regex-syntax", - "syn", - "utf8-ranges", -] - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "memory_units" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "71d96e3f3c0b6325d8ccd83c33b28acb183edcb6c67938ba104ec546854b0882" - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "num-integer" -version = "0.1.44" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d2cc698a63b549a70bc047073d2949cce27cd1c7b0a4a862d08a8031bc2801db" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5c000134b5dbf44adc5cb772486d335293351644b801551abe8f75c84cfa4aef" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "once_cell" -version = "1.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9" - -[[package]] -name = "owned_ttf_parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4fb1e509cfe7a12db2a90bfa057dfcdbc55a347f5da677c506b53dd099cfec9d" -dependencies = [ - "ttf-parser", -] - -[[package]] -name = "parity-wasm" -version = "0.42.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "be5e13c266502aadf83426d87d81a0f5d1ef45b8027f5a471c360abfe4bfae92" - -[[package]] -name = "pc-beeper" -version = "0.1.0" -source = "git+https://github.com/AbleOS/pc-beeper#9b61a9d60552a9da4285f5ceb39ab2cccbb60b4b" -dependencies = [ - "x86_64", -] - -[[package]] -name = "pic8259" -version = "0.10.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ec21f514e2e16e94649f1d041ca4a7069b512c037ac156360652a775e6229d" -dependencies = [ - "x86_64", -] - -[[package]] -name = "picorand" -version = "0.1.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b6fc30519d2508c7e20e01da371cd27b1d4533fdb98e279955cb636b50210688" - -[[package]] -name = "pretty-hex" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "ptr_meta" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0738ccf7ea06b608c10564b31debd4f5bc5e197fc8bfe088f68ae5ce81e7a4f1" -dependencies = [ - "ptr_meta_derive", -] - -[[package]] -name = "ptr_meta_derive" -version = "0.1.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "16b845dbfca988fa33db069c0e230574d15a3088f147a87b64c7589eb662c9ac" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "quote" -version = "1.0.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "864d3e96a899863136fc6e99f3d7cae289dafe43bf2c5ac19b70df7210c0a145" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rand_core" -version = "0.6.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d34f1408f55294453790c48b2f1ebbb1c5b4b7563eb1f418bcfcfdbb06ebb4e7" - -[[package]] -name = "rdrand" -version = "0.8.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c4e0d5cb05cb40e4e5805399c27b12a064427cf553081ae9b82bc1a88111a576" -dependencies = [ - "rand_core", -] - -[[package]] -name = "regex" -version = "1.5.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1a11647b6b25ff05a515cb92c365cec08801e83423a235b51e231e1808747286" -dependencies = [ - "aho-corasick", - "memchr", - "regex-syntax", -] - -[[package]] -name = "regex-syntax" -version = "0.6.25" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f497285884f3fcff424ffc933e56d7cbca511def0c9831a7f9b5f6153e3cc89b" - -[[package]] -name = "rhai" -version = "1.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ef3d57e55ca044c53ced279d2d3ee9df229b247556b005a23713d5206a2ecfc" -dependencies = [ - "ahash 0.7.6", - "bitflags", - "core-error", - "instant", - "libm", - "no-std-compat", - "num-traits", - "rhai_codegen", - "smallvec", - "smartstring", -] - -[[package]] -name = "rhai_codegen" -version = "1.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "faa0ff1c9dc19c9f8bba510a2a75d3f0449f6233570c2672c7e31c692a11a59a" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "riscv" -version = "0.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6907ccdd7a31012b70faf2af85cd9e5ba97657cc3987c4f13f8e4d2c2a088aba" -dependencies = [ - "bare-metal", - "bit_field", - "riscv-target", -] - -[[package]] -name = "riscv-target" -version = "0.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "88aa938cda42a0cf62a20cfe8d139ff1af20c2e681212b5b34adb5a58333f222" -dependencies = [ - "lazy_static", - "regex", -] - -[[package]] -name = "rkyv" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2cdcf5caf69bcc87b1e3f5427b4f21a32fdd53c2847687bdf9861abb1cdaa0d8" -dependencies = [ - "hashbrown 0.12.0", - "ptr_meta", - "rkyv_derive", - "seahash", -] - -[[package]] -name = "rkyv_derive" -version = "0.7.35" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a6cf557da1f81b8c7e889c59c9c3abaf6978f7feb156b9579e4f8bf6d7a2bada" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "rlibc" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fc874b127765f014d792f16763a81245ab80500e2ad921ed4ee9e82481ee08fe" - -[[package]] -name = "rsdp" -version = "2.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "66d3add2fc55ef37511bcf81a08ee7a09eff07b23aae38b06a29024a38c604b1" -dependencies = [ - "log", -] - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "seahash" -version = "4.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1c107b6f4780854c8b126e228ea8869f4d7b71260f962fefb57b996b8959ba6b" - -[[package]] -name = "serde" -version = "1.0.136" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ce31e24b01e1e524df96f1c2fdd054405f8d7376249a5110886fb4b658484789" -dependencies = [ - "serde_derive", -] - -[[package]] -name = "serde_derive" -version = "1.0.136" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "08597e7152fcd306f41838ed3e37be9eaeed2b61c42e2117266a554fab4662f9" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "shadeable" -version = "0.1.0" -dependencies = [ - "libm", - "log", - "rhai", -] - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "spin" -version = "0.5.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6e63cff320ae2c57904679ba7cb63280a3dc4613885beafb148ee7bf9aa9042d" - -[[package]] -name = "spin" -version = "0.9.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "511254be0c5bcf062b019a6c89c01a664aa359ded62f78aa72c6fc137c0590e5" -dependencies = [ - "lock_api", -] - -[[package]] -name = "spinning_top" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "75adad84ee84b521fb2cca2d4fd0f1dab1d8d026bda3c5bea4ca63b5f9f9293c" -dependencies = [ - "lock_api", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "syn" -version = "1.0.86" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8a65b3f4ffa0092e9887669db0eae07941f023991ab58ea44da8fe8e2d511c6b" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "toml" -version = "0.5.6" -source = "git+https://github.com/diondokter/toml-rs#c4161aa70202b3992dbec79b76e7a8659713b604" -dependencies = [ - "hashbrown 0.7.2", - "serde", -] - -[[package]] -name = "ttf-parser" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c74c96594835e10fa545e2a51e8709f30b173a092bfd6036ef2cec53376244f3" - -[[package]] -name = "uart_16550" -version = "0.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "af81448a9a53c7b0f66198381f80912fd18f2c8965f9da4319e6f92e740bca5b" -dependencies = [ - "bitflags", - "x86_64", -] - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "utf8-ranges" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b4ae116fef2b7fea257ed6440d3cfcff7f190865f170cdad00bb6465bf18ecba" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "versioning" -version = "0.1.2" -source = "git+https://git.ablecorp.us/able/aos_userland#a96bc8b896fdee392e8f26125298da6b4b21dd9a" -dependencies = [ - "serde", -] - -[[package]] -name = "vga" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "67cbcb7bfff998d176ffb8f2c3dfd6cb0fe62740e36dee6c64fc3928c01001bf" -dependencies = [ - "bitflags", - "conquer-once", - "font8x8", - "num-traits", - "spinning_top", - "x86_64", -] - -[[package]] -name = "volatile" -version = "0.2.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f6b06ad3ed06fef1713569d547cdbdb439eafed76341820fb0e0344f29a41945" - -[[package]] -name = "volatile" -version = "0.4.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e4c2dbd44eb8b53973357e6e207e370f0c1059990df850aca1eca8947cf464f0" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" - -[[package]] -name = "wasmi" -version = "0.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ca00c5147c319a8ec91ec1a0edbec31e566ce2c9cc93b3f9bb86a9efd0eb795d" -dependencies = [ - "downcast-rs", - "libm", - "memory_units", - "num-rational", - "num-traits", - "parity-wasm", - "wasmi-validation", -] - -[[package]] -name = "wasmi-validation" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "165343ecd6c018fc09ebcae280752702c9a2ef3e6f8d02f1cfcbdb53ef6d7937" -dependencies = [ - "parity-wasm", -] - -[[package]] -name = "watson" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1cea7ead78c402dbf14e7f11911b0b48955ea13d46e012e2d98775e23c65d4ef" -dependencies = [ - "serde", - "webassembly", -] - -[[package]] -name = "webassembly" -version = "0.5.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d1a10e1dedffff9cfcbdd33c289c65b87da634259a460a3f23d513649fa7a8c" - -[[package]] -name = "x86_64" -version = "0.14.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "958ab3202b01bc43ba2eb832102c4a487ed93151667a2289062e5f2b00058be2" -dependencies = [ - "bit_field", - "bitflags", - "volatile 0.4.4", -] - -[[package]] -name = "y-compositor-protocol" -version = "0.1.1" -source = "git+https://git.ablecorp.us/able/y-compositor-protocol.git#d3bcd0d41c712bfc4b4f0f9e7b5dd470e00c04a2" -dependencies = [ - "rkyv", - "serde", -] diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml index 556d39dd..93ce4b65 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -57,8 +57,6 @@ unicode-width = "0.1.7" picorand = "0.1.0" watson = "0.4" genfs = "0.1.0" -rhai = "1.6.0" -libwasm = { git = "https://git.ablecorp.us:443/able/libwasm.git" } axel = { git = "https://git.ablecorp.us/able/aos_userland" } versioning = { git = "https://git.ablecorp.us/able/aos_userland" } # embedded-graphics = "*" @@ -112,9 +110,6 @@ git = "https://git.ablecorp.us:443/theoddgarlic/toml-rs" # version = "0.5.8" default-features = false -[dependencies.shadeable] -path = "../shadeable" - [dependencies.facepalm] path = "../facepalm" @@ -128,10 +123,13 @@ default-features = false features = ["core"] version = "*" +[dependencies.libwasm] +git = "https://git.ablecorp.us:443/theoddgarlic/libwasm.git" +default-features = false + [dependencies.externc-libm] git = "https://git.ablecorp.us:443/able/externc-libm.git" - [target.'cfg(target_arch = "riscv")'.dependencies] riscv = "*" diff --git a/ableos/src/devices/dev_vterm.rs b/ableos/src/devices/dev_vterm.rs index 2825c84e..8ea16546 100644 --- a/ableos/src/devices/dev_vterm.rs +++ b/ableos/src/devices/dev_vterm.rs @@ -4,7 +4,8 @@ use core::ops::Not; use core::sync::atomic::AtomicU32; use core::sync::atomic::Ordering; use kernel::device_interface::character::CharacterDevice; -use shadeable::pixel_format::Rgba64; + +use crate::pixel_format::Rgba64; pub const VTERM_HEIGHT: u32 = 40; pub const VTERM_WIDTH: u32 = 100; diff --git a/ableos/src/graphics/mod.rs b/ableos/src/graphics/mod.rs index b34aa8bd..e4080294 100644 --- a/ableos/src/graphics/mod.rs +++ b/ableos/src/graphics/mod.rs @@ -1,3 +1,15 @@ +pub mod pixel_format; + +use spin::Lazy; +use vga::{colors::Color16, writers::GraphicsWriter}; + +use crate::vga_e::VGAE; + +use pixel_format::*; + +pub static SCREEN_BUFFER: Lazy> = + Lazy::new(|| spin::Mutex::new(ScreenBuffer::new(640, 480))); + const FONT_SCALE: f32 = 1.6; const GLYPH_HEIGHT: f32 = 18.0; @@ -97,23 +109,23 @@ impl ScreenBuffer { } } - pub fn shade(&mut self) { - for y in 0..100 { - for x in 0..100 { - let rgba_ret = evaluate_shader(x, y, self.buff[y * self.size.x + x]); - match rgba_ret { - Ok(pixel) => { - // info!("{:?}", pixel); - self.set_pixel(x, y, pixel); - } + // pub fn shade(&mut self) { + // for y in 0..100 { + // for x in 0..100 { + // let rgba_ret = evaluate_shader(x, y, self.buff[y * self.size.x + x]); + // match rgba_ret { + // Ok(pixel) => { + // // info!("{:?}", pixel); + // self.set_pixel(x, y, pixel); + // } - Err(err) => error!("{}", err), - } - } - } + // Err(err) => error!("{}", err), + // } + // } + // } - info!("Shaders done"); - } + // info!("Shaders done"); + // } // TODO force clear pub fn force_redraw(&mut self) { @@ -175,7 +187,6 @@ impl VgaBuffer for ScreenBuffer { let mode = VGAE.lock(); for y in 0..self.size.y { for x in 0..self.size.x { - // use shadeable::pixel_format::into_vga_16; let vga_color = into_vga_16(self.buff[y * self.size.x + x]); if into_vga_16(self.clear_color) != vga_color { mode.set_pixel(x, y, vga_color); @@ -187,7 +198,7 @@ impl VgaBuffer for ScreenBuffer { } pub fn into_vga_16(rgba_64: Rgba64) -> Color16 { - use shadeable::pixel_format::ChannelValue::*; + use pixel_format::ChannelValue::*; use vga::colors::Color16::*; match ( get_r(rgba_64).into(), @@ -260,72 +271,72 @@ pub fn into_vga_16(rgba_64: Rgba64) -> Color16 { } // TODO: Incorporate this into the ableos vga crate -/// Draw a glyph on the screen at the given position -/// -/// # Arguments -/// * `x` - the x position of the glyph -/// * `y` - the y position of the glyph -/// * `glyph` - the glyph to draw -/// * `color` - the color of the glyph -pub fn draw_char(&mut self, mut x: u32, mut y: u32, character: char, color: Rgba64) { - // trace!["Judy Hopps is thicc af"]; - // let mode = *VGAE.lock(); - // trace!["She got them bouncy bunny buns"]; +// /// Draw a glyph on the screen at the given position +// /// +// /// # Arguments +// /// * `x` - the x position of the glyph +// /// * `y` - the y position of the glyph +// /// * `glyph` - the glyph to draw +// /// * `color` - the color of the glyph +// pub fn draw_char(&mut self, mut x: u32, mut y: u32, character: char, color: Rgba64) { +// // trace!["Judy Hopps is thicc af"]; +// // let mode = *VGAE.lock(); +// // trace!["She got them bouncy bunny buns"]; - let basic_multingual_plane = FontRef::try_from_slice(include_bytes!( - "../../../ableos/assets/fonts/unifont-14.0.01.ttf" - )) - .unwrap(); +// let basic_multingual_plane = FontRef::try_from_slice(include_bytes!( +// "../../../ableos/assets/fonts/unifont-14.0.01.ttf" +// )) +// .unwrap(); - let supplementary_multilingual_plane = FontRef::try_from_slice(include_bytes!( - "../../../ableos/assets/fonts/unifont_upper-14.0.01.ttf" - )) - .unwrap(); +// let supplementary_multilingual_plane = FontRef::try_from_slice(include_bytes!( +// "../../../ableos/assets/fonts/unifont_upper-14.0.01.ttf" +// )) +// .unwrap(); - // let mut has_char = false; - // for x in font.codepoint_ids() { - // if x.1 == character { - // has_char = true; - // break; - // } - // } +// // let mut has_char = false; +// // for x in font.codepoint_ids() { +// // if x.1 == character { +// // has_char = true; +// // break; +// // } +// // } - let in_supp_plane = character as u32 > 0xffff; +// let in_supp_plane = character as u32 > 0xffff; - let plane = match in_supp_plane { - false => basic_multingual_plane, - true => supplementary_multilingual_plane, - }; +// let plane = match in_supp_plane { +// false => basic_multingual_plane, +// true => supplementary_multilingual_plane, +// }; - match character { - '\n' => { - // x = 0; - // y += (GLYPH_HEIGHT * FONT_SCALE) as u32; - } - _ => { - let q_glyph: Glyph = plane.glyph_id(character).with_scale_and_position( - 20.0 * FONT_SCALE, - ab_glyph::point(GLYPH_WIDTH * FONT_SCALE, GLYPH_HEIGHT * FONT_SCALE), - ); +// match character { +// '\n' => { +// // x = 0; +// // y += (GLYPH_HEIGHT * FONT_SCALE) as u32; +// } +// _ => { +// let q_glyph: Glyph = plane.glyph_id(character).with_scale_and_position( +// 20.0 * FONT_SCALE, +// ab_glyph::point(GLYPH_WIDTH * FONT_SCALE, GLYPH_HEIGHT * FONT_SCALE), +// ); - // elf: I don't know if GLYPH_HEIGHT is in the right units here. I'm just guessing. - if x as usize > self.size.x { - x = 0; - y += (GLYPH_HEIGHT * FONT_SCALE) as u32; - } +// // elf: I don't know if GLYPH_HEIGHT is in the right units here. I'm just guessing. +// if x as usize > self.size.x { +// x = 0; +// y += (GLYPH_HEIGHT * FONT_SCALE) as u32; +// } - if let Some(q) = plane.outline_glyph(q_glyph) { - q.draw(|gx, gy, c| { - if c > 0.0015 { - let corner = q.px_bounds().min; - self.set_pixel( - gx as usize + corner.x as usize + x as usize, - gy as usize + corner.y as usize + y as usize, - color, - ); - } - }); - } - } - } -} +// if let Some(q) = plane.outline_glyph(q_glyph) { +// q.draw(|gx, gy, c| { +// if c > 0.0015 { +// let corner = q.px_bounds().min; +// self.set_pixel( +// gx as usize + corner.x as usize + x as usize, +// gy as usize + corner.y as usize + y as usize, +// color, +// ); +// } +// }); +// } +// } +// } +// } diff --git a/shadeable/src/pixel_format.rs b/ableos/src/graphics/pixel_format.rs similarity index 99% rename from shadeable/src/pixel_format.rs rename to ableos/src/graphics/pixel_format.rs index 149e567f..7553e591 100644 --- a/shadeable/src/pixel_format.rs +++ b/ableos/src/graphics/pixel_format.rs @@ -1,14 +1,11 @@ use core::ops::{BitAnd, BitOr, Shr}; - pub type Rgba64 = u64; - pub enum ChannelValue { Dark, Low, Mid, High, } - impl From for ChannelValue { fn from(b: u8) -> Self { use ChannelValue::*; @@ -20,48 +17,39 @@ impl From for ChannelValue { } } } - pub fn get_r(rgba: Rgba64) -> u8 { rgba.bitand(0xff_00_00_00).shr(0o30) as u8 } pub fn get_g(rgba: Rgba64) -> u8 { rgba.bitand(0xff_00_00).shr(0o20) as u8 } - pub fn get_b(rgba: Rgba64) -> u8 { rgba.bitand(0xff_00).shr(0o10) as u8 } - pub fn get_a(rgba: Rgba64) -> u8 { (rgba & 0xff) as u8 } - pub fn set_r(rgba: Rgba64, r: u8) -> Rgba64 { rgba.bitand(0xffffffff_00_ff_ff_ff) .bitor((r as Rgba64).shr(0o30)) } - pub fn set_g(rgba: Rgba64, g: u8) -> Rgba64 { rgba.bitand(0xffffffff_ff_00_ff_ff) .bitor((g as Rgba64).shr(0o20)) } - pub fn set_b(rgba: Rgba64, b: u8) -> Rgba64 { rgba.bitand(0xffffffff_ff_ff_00_ff) .bitor((b as Rgba64).shr(0o10)) } - pub fn set_a(rgba: Rgba64, a: u8) -> Rgba64 { rgba.bitand(0xffffffff_ff_ff_ff_00).bitor(a as Rgba64) } - pub fn rgba_div(a: Rgba64, b: Rgba64) -> Rgba64 { set_r(0, get_r(a) / get_r(b)) | set_g(0, get_g(a) / get_g(b)) | set_g(0, get_b(a) / get_b(b)) | set_g(0, get_a(a) / get_a(b)) } - pub fn new_rgba64(r: u8, g: u8, b: u8, a: u8) -> Rgba64 { set_r(0, r) | set_g(0, g) | set_b(0, b) | set_a(0, a) } diff --git a/ableos/src/lib.rs b/ableos/src/lib.rs index b2995995..99600f06 100644 --- a/ableos/src/lib.rs +++ b/ableos/src/lib.rs @@ -47,7 +47,7 @@ pub mod devices; pub mod driver_traits; pub mod experiments; pub mod filesystem; -// pub mod graphics; +pub mod graphics; pub mod kernel_state; pub mod keyboard; pub mod kmain; diff --git a/ableos/src/rhai_shell/mod.rs b/ableos/src/rhai_shell/mod.rs index ab03642e..3d3d5928 100644 --- a/ableos/src/rhai_shell/mod.rs +++ b/ableos/src/rhai_shell/mod.rs @@ -1,9 +1,9 @@ -use crate::arch::{drivers::sysinfo::master, shutdown, sloop}; +use crate::arch::{drivers::sysinfo::master}; use crate::systeminfo::{KERNEL_VERSION, RELEASE_TYPE}; use crate::{filesystem::FILE_SYSTEM, time::fetch_time, KERNEL_STATE}; use genfs::{Fs, OpenOptions}; use kernel::allocator::ALLOCATOR; -use rhai::Engine; +// use rhai::Engine; use spin::Lazy; use x86_64::instructions::interrupts::{disable, enable}; @@ -15,50 +15,50 @@ pub static CURRENT_DIR: Lazy> = Lazy::new(|| spin::Mutex::ne #[cfg(target_arch = "riscv64")] pub fn shell() {} -#[cfg(target_arch = "x86_64")] -pub fn shell() { - let _current_dir = "/".to_string(); - let engine = engine_construction(); - let mut scope = rhai::Scope::new(); +// #[cfg(target_arch = "x86_64")] +// pub fn shell() { +// let _current_dir = "/".to_string(); +// let engine = engine_construction(); +// let mut scope = rhai::Scope::new(); - println!("Rhaishell v{}", RHAISHELL_VERSION); +// println!("Rhaishell v{}", RHAISHELL_VERSION); - let mut buf = String::new(); - print!("> "); +// let mut buf = String::new(); +// print!("> "); - loop { - match x86_64::instructions::interrupts::without_interrupts(|| KEYBUFF.lock().pop()) { - Some('\n') => { - if buf == "quit" { - println!("Bye!"); - break; - } +// loop { +// match x86_64::instructions::interrupts::without_interrupts(|| KEYBUFF.lock().pop()) { +// Some('\n') => { +// if buf == "quit" { +// println!("Bye!"); +// break; +// } - match engine.eval_with_scope::(&mut scope, &buf) { - Ok(o) => println!("{o}"), +// match engine.eval_with_scope::(&mut scope, &buf) { +// Ok(o) => println!("{o}"), - Err(e) => println!("Eval error: {e}"), - }; +// Err(e) => println!("Eval error: {e}"), +// }; - buf.clear(); - print!("> "); - } - Some('\u{0008}') => { - buf.pop(); - } +// buf.clear(); +// print!("> "); +// } +// Some('\u{0008}') => { +// buf.pop(); +// } - Some('\u{0009}') => { - buf.push(' '); - buf.push(' '); - buf.push(' '); - buf.push(' '); - } +// Some('\u{0009}') => { +// buf.push(' '); +// buf.push(' '); +// buf.push(' '); +// buf.push(' '); +// } - Some(chr) => buf.push(chr), - None => (), - } - } -} +// Some(chr) => buf.push(chr), +// None => (), +// } +// } +// } pub fn afetch() { let kstate = KERNEL_STATE.lock(); @@ -194,24 +194,24 @@ pub fn change_directory(path: String) { } } -fn engine_construction() -> Engine { - let mut engine = rhai::Engine::new(); +// fn engine_construction() -> Engine { +// let mut engine = rhai::Engine::new(); - engine.on_print(|x| println!("{}", x)); - engine.on_debug(|x, src, pos| { - let src = src.unwrap_or("unknown"); - println!("DEBUG: {} at {:?}: {}", src, pos, x); - debug!("{} at {:?}: {}", src, pos, x); - }); +// engine.on_print(|x| println!("{}", x)); +// engine.on_debug(|x, src, pos| { +// let src = src.unwrap_or("unknown"); +// println!("DEBUG: {} at {:?}: {}", src, pos, x); +// debug!("{} at {:?}: {}", src, pos, x); +// }); - engine.register_fn("afetch", afetch); - engine.register_fn("set_hostname", set_hostname); - engine.register_fn("shutdown", shutdown); - engine.register_fn("peek", peek_memory); - engine.register_fn("poke", poke_memory); - engine.register_fn("sloop", sloop); - engine.register_fn("log_dump", log_dump); - // engine.register_fn("ls", ls); +// engine.register_fn("afetch", afetch); +// engine.register_fn("set_hostname", set_hostname); +// engine.register_fn("shutdown", shutdown); +// engine.register_fn("peek", peek_memory); +// engine.register_fn("poke", poke_memory); +// engine.register_fn("sloop", sloop); +// engine.register_fn("log_dump", log_dump); +// // engine.register_fn("ls", ls); - engine -} +// engine +// } diff --git a/ableos/src/tests.rs b/ableos/src/tests.rs index aa1f62bd..ae6177f5 100644 --- a/ableos/src/tests.rs +++ b/ableos/src/tests.rs @@ -6,7 +6,6 @@ use crate::{ use kernel::TICK; use picorand::PicoRandGenerate; use rkyv::{ser::serializers::AllocSerializer, Deserialize}; -use shadeable::pixel_format::from_vga_16; use vga::colors::Color16; use y_compositor_protocol::Version; diff --git a/facepalm/Cargo.lock b/facepalm/Cargo.lock deleted file mode 100644 index 0cbf9d3e..00000000 --- a/facepalm/Cargo.lock +++ /dev/null @@ -1,25 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "facepalm" -version = "0.1.0" -dependencies = [ - "log", -] - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] diff --git a/qrcode-rust/Cargo.lock b/qrcode-rust/Cargo.lock deleted file mode 100644 index fc33c585..00000000 --- a/qrcode-rust/Cargo.lock +++ /dev/null @@ -1,338 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "adler" -version = "1.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe" - -[[package]] -name = "adler32" -version = "1.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aae1277d39aeec15cb388266ecc24b11c80469deae6067e17a1a7aa9e5c1f234" - -[[package]] -name = "autocfg" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "bytemuck" -version = "1.11.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a5377c8865e74a160d21f29c2d40669f53286db6eab59b88540cbb12ffc8b835" - -[[package]] -name = "byteorder" -version = "1.4.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "14c189c53d098945499cdfa7ecc63567cf3886b3332b312a5b4585d8d3a6a610" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "checked_int_cast" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "17cc5e6b5ab06331c33589842070416baa137e8b0eb912b008cfd4a78ada7919" - -[[package]] -name = "color_quant" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" - -[[package]] -name = "crc32fast" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b540bd8bc810d3885c6ea91e2018302f68baba2129ab3e88f32389ee9370880d" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "crossbeam-channel" -version = "0.5.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c2dd04ddaf88237dc3b8d8f9a3c1004b506b54b3313403944054d23c0870c521" -dependencies = [ - "cfg-if", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-deque" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "715e8152b692bba2d374b53d4875445368fdf21a94751410af607a5ac677d1fc" -dependencies = [ - "cfg-if", - "crossbeam-epoch", - "crossbeam-utils", -] - -[[package]] -name = "crossbeam-epoch" -version = "0.9.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "045ebe27666471bb549370b4b0b3e51b07f56325befa4284db65fc89c02511b1" -dependencies = [ - "autocfg", - "cfg-if", - "crossbeam-utils", - "memoffset", - "once_cell", - "scopeguard", -] - -[[package]] -name = "crossbeam-utils" -version = "0.8.11" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51887d4adc7b564537b15adcfb307936f8075dfcd5f00dde9a9f1d29383682bc" -dependencies = [ - "cfg-if", - "once_cell", -] - -[[package]] -name = "deflate" -version = "0.8.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73770f8e1fe7d64df17ca66ad28994a0a623ea497fa69486e14984e715c5d174" -dependencies = [ - "adler32", - "byteorder", -] - -[[package]] -name = "either" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3f107b87b6afc2a64fd13cac55fe06d6c8859f12d4b14cbcdd2c67d0976781be" - -[[package]] -name = "gif" -version = "0.11.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3edd93c6756b4dfaf2709eafcc345ba2636565295c198a9cfbf75fa5e3e00b06" -dependencies = [ - "color_quant", - "weezl", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "image" -version = "0.23.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "24ffcb7e7244a9bf19d35bf2883b9c080c4ced3c07a9895572178cdb8f13f6a1" -dependencies = [ - "bytemuck", - "byteorder", - "color_quant", - "gif", - "jpeg-decoder", - "num-iter", - "num-rational", - "num-traits", - "png", - "scoped_threadpool", - "tiff", -] - -[[package]] -name = "jpeg-decoder" -version = "0.1.22" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "229d53d58899083193af11e15917b5640cd40b29ff475a1fe4ef725deb02d0f2" -dependencies = [ - "rayon", -] - -[[package]] -name = "libc" -version = "0.2.126" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836" - -[[package]] -name = "memoffset" -version = "0.6.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5aa361d4faea93603064a027415f07bd8e1d5c88c9fbf68bf56a285428fd79ce" -dependencies = [ - "autocfg", -] - -[[package]] -name = "miniz_oxide" -version = "0.3.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "791daaae1ed6889560f8c4359194f56648355540573244a5448a83ba1ecc7435" -dependencies = [ - "adler32", -] - -[[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-integer" -version = "0.1.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9" -dependencies = [ - "autocfg", - "num-traits", -] - -[[package]] -name = "num-iter" -version = "0.1.43" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7d03e6c028c5dc5cac6e2dec0efda81fc887605bb3d884578bb6d6bf7514e252" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-rational" -version = "0.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "12ac428b1cb17fce6f731001d307d351ec70a6d202fc2e60f7d4c5e42d8f4f07" -dependencies = [ - "autocfg", - "num-integer", - "num-traits", -] - -[[package]] -name = "num-traits" -version = "0.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd" -dependencies = [ - "autocfg", -] - -[[package]] -name = "num_cpus" -version = "1.13.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "19e64526ebdee182341572e50e9ad03965aa510cd94427a4549448f285e957a1" -dependencies = [ - "hermit-abi", - "libc", -] - -[[package]] -name = "once_cell" -version = "1.13.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" - -[[package]] -name = "png" -version = "0.16.8" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c3287920cb847dee3de33d301c463fba14dda99db24214ddf93f83d3021f4c6" -dependencies = [ - "bitflags", - "crc32fast", - "deflate", - "miniz_oxide 0.3.7", -] - -[[package]] -name = "qrcode" -version = "0.12.0" -dependencies = [ - "checked_int_cast", - "image", -] - -[[package]] -name = "rayon" -version = "1.5.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bd99e5772ead8baa5215278c9b15bf92087709e9c1b2d1f97cdb5a183c933a7d" -dependencies = [ - "autocfg", - "crossbeam-deque", - "either", - "rayon-core", -] - -[[package]] -name = "rayon-core" -version = "1.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "258bcdb5ac6dad48491bb2992db6b7cf74878b0384908af124823d118c99683f" -dependencies = [ - "crossbeam-channel", - "crossbeam-deque", - "crossbeam-utils", - "num_cpus", -] - -[[package]] -name = "scoped_threadpool" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1d51f5df5af43ab3f1360b429fa5e0152ac5ce8c0bd6485cae490332e96846a8" - -[[package]] -name = "scopeguard" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd" - -[[package]] -name = "tiff" -version = "0.6.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a53f4706d65497df0c4349241deddf35f84cee19c87ed86ea8ca590f4464437" -dependencies = [ - "jpeg-decoder", - "miniz_oxide 0.4.4", - "weezl", -] - -[[package]] -name = "weezl" -version = "0.1.7" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9193164d4de03a926d909d3bc7c30543cecb35400c02114792c2cae20d5e2dbb" diff --git a/repbuild/Cargo.lock b/repbuild/Cargo.lock deleted file mode 100644 index e8c1cff9..00000000 --- a/repbuild/Cargo.lock +++ /dev/null @@ -1,289 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "anyhow" -version = "1.0.45" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ee10e43ae4a853c0a3591d4e2ada1719e553be18199d9da9d4a83f5927c2f5c7" - -[[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 = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "clap" -version = "3.0.0-beta.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "feff3878564edb93745d58cf63e17b63f24142506e7a20c87a5521ed7bfb1d63" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "indexmap", - "lazy_static", - "os_str_bytes", - "strsim", - "termcolor", - "textwrap", - "unicase", -] - -[[package]] -name = "clap_derive" -version = "3.0.0-beta.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8b15c6b4f786ffb6192ffe65a36855bc1fc2444bcd0945ae16748dcd6ed7d0d3" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "hashbrown" -version = "0.11.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ab5ef0d4909ef3724cc8cce6ccc8572c5c817592e9285f5464f8e86f8bd3726e" - -[[package]] -name = "heck" -version = "0.3.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6d621efb26863f0e9924c6ac577e8275e5e6b77455db64ffa6c65c904e9e132c" -dependencies = [ - "unicode-segmentation", -] - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.7.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bc633605454125dec4b66843673f01c7df2b89479b32e0ed634e43a91cff62a5" -dependencies = [ - "autocfg", - "hashbrown", -] - -[[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.107" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fbe5e23404da5b4f555ef85ebed98fb4083e55a00c317800bc2a50ede9f3d219" - -[[package]] -name = "memchr" -version = "2.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a" - -[[package]] -name = "os_str_bytes" -version = "4.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "addaa943333a514159c80c97ff4a93306530d965d27e139188283cd13e06a799" -dependencies = [ - "memchr", -] - -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - -[[package]] -name = "proc-macro2" -version = "1.0.32" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba508cc11742c0dc5c1659771673afbab7a0efab23aa17e854cbab0837ed0b43" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.10" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "38bc8cc6a5f2e3655e0899c1b848643b2562f853f114bfec7be120678e3ace05" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "repbuild" -version = "0.1.1" -dependencies = [ - "anyhow", - "clap", - "xshell", -] - -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - -[[package]] -name = "syn" -version = "1.0.81" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2afee18b8beb5a596ecb4a2dce128c719b4ba399d34126b9e4396e3f9860966" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "termcolor" -version = "1.1.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2dfed899f0eb03f32ee8c6a0aabdb8a7949659e3466561fc0adf54e26d88c5f4" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.14.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80" -dependencies = [ - "unicode-width", -] - -[[package]] -name = "unicase" -version = "2.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6" -dependencies = [ - "version_check", -] - -[[package]] -name = "unicode-segmentation" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8895849a949e7845e06bd6dc1aa51731a103c42707010a5b591c0038fb73385b" - -[[package]] -name = "unicode-width" -version = "0.1.9" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3ed742d4ea2bd1176e236172c8429aaf54486e7ac098db29ffe6529e0ce50973" - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "version_check" -version = "0.9.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5fecdca9a5291cc2b8dcf7dc02453fee791a280f3743cb0905f8822ae463b3fe" - -[[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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "xshell" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39" diff --git a/shadeable/.config/cargo.toml b/shadeable/.config/cargo.toml deleted file mode 100644 index 07896742..00000000 --- a/shadeable/.config/cargo.toml +++ /dev/null @@ -1,4 +0,0 @@ - -[unstable] -build-std = ["core", "compiler_builtins", "alloc"] -build-std-features = ["compiler-builtins-mem"] \ No newline at end of file diff --git a/shadeable/Cargo.lock b/shadeable/Cargo.lock deleted file mode 100644 index 1a06ca5b..00000000 --- a/shadeable/Cargo.lock +++ /dev/null @@ -1,262 +0,0 @@ -# This file is automatically @generated by Cargo. -# It is not intended for manual editing. -version = 3 - -[[package]] -name = "ahash" -version = "0.7.6" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fcb51a0695d8f838b1ee009b3fbf66bda078cd64590202a864a8f3e8c4315c47" -dependencies = [ - "const-random", - "getrandom", - "once_cell", - "version_check", -] - -[[package]] -name = "autocfg" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a" - -[[package]] -name = "bitflags" -version = "1.3.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a" - -[[package]] -name = "cfg-if" -version = "1.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" - -[[package]] -name = "const-random" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f590d95d011aa80b063ffe3253422ed5aa462af4e9867d43ce8337562bac77c4" -dependencies = [ - "const-random-macro", - "proc-macro-hack", -] - -[[package]] -name = "const-random-macro" -version = "0.1.13" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "615f6e27d000a2bffbc7f2f6a8669179378fa27ee4d0a509e985dfc0a7defb40" -dependencies = [ - "getrandom", - "lazy_static", - "proc-macro-hack", - "tiny-keccak", -] - -[[package]] -name = "core-error" -version = "0.0.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "efcdb2972eb64230b4c50646d8498ff73f5128d196a90c7236eec4cbe8619b8f" -dependencies = [ - "version_check", -] - -[[package]] -name = "crunchy" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a81dae078cea95a014a339291cec439d2f232ebe854a9d672b796c6afafa9b7" - -[[package]] -name = "getrandom" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "418d37c8b1d42553c93648be529cb70f920d3baf8ef469b74b9638df426e0b4c" -dependencies = [ - "cfg-if", - "libc", - "wasi", -] - -[[package]] -name = "instant" -version = "0.1.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c" -dependencies = [ - "cfg-if", -] - -[[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.112" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b03d17f364a3a042d5e5d46b053bbbf82c92c9430c592dd4c064dc6ee997125" - -[[package]] -name = "libm" -version = "0.2.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7d73b3f436185384286bd8098d17ec07c9a7d2388a6599f824d8502b529702a" - -[[package]] -name = "log" -version = "0.4.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "51b9bbe6c47d51fc3e1a9b945965946b4c44142ab8792c50835a980d362c2710" -dependencies = [ - "cfg-if", -] - -[[package]] -name = "no-std-compat" -version = "0.4.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c" - -[[package]] -name = "num-traits" -version = "0.2.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290" -dependencies = [ - "autocfg", - "libm", -] - -[[package]] -name = "once_cell" -version = "1.9.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da32515d9f6e6e489d7bc9d84c71b060db7247dc035bbe44eac88cf87486d8d5" - -[[package]] -name = "proc-macro-hack" -version = "0.5.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dbf0c48bc1d91375ae5c3cd81e3722dff1abcf81a30960240640d223f59fe0e5" - -[[package]] -name = "proc-macro2" -version = "1.0.36" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c7342d5883fbccae1cc37a2353b09c87c9b0f3afd73f5fb9bba687a1f733b029" -dependencies = [ - "unicode-xid", -] - -[[package]] -name = "quote" -version = "1.0.14" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "47aa80447ce4daf1717500037052af176af5d38cc3e571d9ec1c7353fc10c87d" -dependencies = [ - "proc-macro2", -] - -[[package]] -name = "rhai" -version = "1.6.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0a10b3f41db25733e2e953811858dd90c1e96cd618606ddf6961d34b3910b18" -dependencies = [ - "ahash", - "bitflags", - "core-error", - "instant", - "libm", - "no-std-compat", - "num-traits", - "rhai_codegen", - "smallvec", - "smartstring", -] - -[[package]] -name = "rhai_codegen" -version = "1.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e02d33d76a7aa8ec72ac8298d5b52134fd2dff77445ada0c65f6f8c40d8f2931" -dependencies = [ - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "shadeable" -version = "0.1.0" -dependencies = [ - "libm", - "log", - "rhai", -] - -[[package]] -name = "smallvec" -version = "1.8.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2dd574626839106c320a323308629dcb1acfc96e32a8cba364ddc61ac23ee83" - -[[package]] -name = "smartstring" -version = "1.0.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3fb72c633efbaa2dd666986505016c32c3044395ceaf881518399d2f4127ee29" -dependencies = [ - "autocfg", - "static_assertions", - "version_check", -] - -[[package]] -name = "static_assertions" -version = "1.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f" - -[[package]] -name = "syn" -version = "1.0.85" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a684ac3dcd8913827e18cd09a68384ee66c1de24157e3c556c9ab16d85695fb7" -dependencies = [ - "proc-macro2", - "quote", - "unicode-xid", -] - -[[package]] -name = "tiny-keccak" -version = "2.0.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237" -dependencies = [ - "crunchy", -] - -[[package]] -name = "unicode-xid" -version = "0.2.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "8ccb82d61f80a663efe1f787a51b16b5a51e3314d6ac365b08639f52387b33f3" - -[[package]] -name = "version_check" -version = "0.9.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f" - -[[package]] -name = "wasi" -version = "0.10.2+wasi-snapshot-preview1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fd6fbd9a79829dd1ad0cc20627bf1ed606756a7f77edff7b66b7064f9cb327c6" diff --git a/shadeable/Cargo.toml b/shadeable/Cargo.toml deleted file mode 100644 index 05ffb7df..00000000 --- a/shadeable/Cargo.toml +++ /dev/null @@ -1,18 +0,0 @@ -[package] -name = "shadeable" -version = "0.1.0" -edition = "2021" - -# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html - -[dependencies] - -# vga = "*" -libm = "*" -log ="*" - -[dependencies.rhai] -version = "1.6" -features = [ "no_std", "only_i64"] -default-features = false - diff --git a/shadeable/README.md b/shadeable/README.md deleted file mode 100644 index dcf214e6..00000000 --- a/shadeable/README.md +++ /dev/null @@ -1 +0,0 @@ -# Shadeable is a rhai based shader language \ No newline at end of file diff --git a/shadeable/shaders/simple.shade b/shadeable/shaders/simple.shade deleted file mode 100644 index 48e8b2de..00000000 --- a/shadeable/shaders/simple.shade +++ /dev/null @@ -1,17 +0,0 @@ -const VERSION = 0.5; - -fn main(){ - let abcd = RGBA(255, 255, 0, 0); - //print("hi"); - - //debug("hi part 2"); - - if PIXEL_X == 30 { - PIXEL_RGBA; - } - else if PIXEL_X == 10 { - RGBA(0, 0, 0, 0); - } else { - abcd; - } -} \ No newline at end of file diff --git a/shadeable/src/engine_internals.rs b/shadeable/src/engine_internals.rs deleted file mode 100644 index 6339c63e..00000000 --- a/shadeable/src/engine_internals.rs +++ /dev/null @@ -1,57 +0,0 @@ -use crate::pixel_format::{get_a, get_b, get_g, get_r, set_a, set_b, set_g, set_r}; -use crate::pixel_format::{rgba_div, Rgba64}; -use log::{debug, info}; -use rhai::Engine; -use rhai::INT; - -pub fn engine_startup() -> Engine { - let mut engine = Engine::new(); - - engine.on_print(|x| info!("PRINTED FROM SHADER: {}", x)); - - // Any function or closure that takes a '&str', an 'Option<&str>' and a 'Position' argument - // can be used to override 'debug'. - engine.on_debug(|x, src, pos| { - let src = src.unwrap_or("unknown"); - debug!("SHADER DEBUG of {} at {:?}: {}", src, pos, x); - }); - - engine - .register_type::() - .register_fn("RGBA", get_rgba_rhai) - .register_fn("RGBA", get_rgba_from_int) - .register_fn("RGBA", get_rgba_from_int) - .register_fn("/", rgba_div); - // .register_fn("*", rgba_mult) - // .register_fn("+", rgba_add) - // .register_fn("-", rgba_sub) - - // engine.register_global_module(RandomPackage::new().as_shared_module()); - - engine -} - -pub fn get_rgba_rhai(r: INT, g: INT, b: INT, a: INT) -> Rgba64 { - let mut pixel = 0; - - pixel |= set_r(pixel, r as u8); - pixel |= set_g(pixel, g as u8); - pixel |= set_b(pixel, b as u8); - pixel |= set_a(pixel, a as u8); - pixel -} - -pub fn get_rgba_from_int(pixel: INT) -> Rgba64 { - let mut pixel = pixel as u64; - - let r = get_r(pixel.try_into().unwrap()); - let g = get_g(pixel.try_into().unwrap()); - let b = get_b(pixel.try_into().unwrap()); - let a = get_a(pixel.try_into().unwrap()); - - pixel |= set_r(pixel, r as u8); - pixel |= set_g(pixel, g as u8); - pixel |= set_b(pixel, b as u8); - pixel |= set_a(pixel, a as u8); - pixel -} diff --git a/shadeable/src/lib.rs b/shadeable/src/lib.rs deleted file mode 100644 index 3979e806..00000000 --- a/shadeable/src/lib.rs +++ /dev/null @@ -1,26 +0,0 @@ -#![no_std] -extern crate alloc; - -pub mod pixel_format; - -mod engine_internals; - -use alloc::boxed::Box; -use core::result::Result; -use engine_internals::engine_startup; -use pixel_format::Rgba64; -use rhai::{EvalAltResult, Scope}; - -pub const SHADER: &str = include_str!("../shaders/simple.shade"); - -pub fn evaluate_shader(x: usize, y: usize, pixel: Rgba64) -> Result> { - let engine = engine_startup(); - - let ast = engine.compile(SHADER)?; - let mut scope = Scope::new(); - scope.push("PIXEL_RGBA", pixel); - scope.push("PIXEL_X", x); - scope.push("PIXEL_Y", y); - - engine.call_fn(&mut scope, &ast, "main", ()) -} From da42059b61aaba59dc127a478781dd379b60ef77 Mon Sep 17 00:00:00 2001 From: TheOddGarlic Date: Tue, 2 Aug 2022 14:07:24 +0300 Subject: [PATCH 3/4] fix cargo check std error, temporarily get rid of repbuild --- Cargo.lock | 189 +-------------------------- Cargo.toml | 1 - ableos/Cargo.toml | 2 +- ableos/src/arch/x86_64/interrupts.rs | 6 - asl/Cargo.toml | 3 + repbuild/Cargo.toml | 13 -- repbuild/README.md | 5 - repbuild/assets/mkfs.sh | 50 ------- repbuild/src/main.rs | 158 ---------------------- 9 files changed, 5 insertions(+), 422 deletions(-) delete mode 100644 repbuild/Cargo.toml delete mode 100644 repbuild/README.md delete mode 100644 repbuild/assets/mkfs.sh delete mode 100644 repbuild/src/main.rs diff --git a/Cargo.lock b/Cargo.lock index b5aaa5e1..08bb43d8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -90,12 +90,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "anyhow" -version = "1.0.59" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c91f1f46651137be86f3a2b9a8359f9ab421d04d941c62b5982e1ca21113adf9" - [[package]] name = "asl" version = "0.1.0" @@ -103,17 +97,6 @@ dependencies = [ "logos", ] -[[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.1.0" @@ -167,45 +150,6 @@ version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd" -[[package]] -name = "clap" -version = "3.2.16" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a3dbbb6653e7c55cc8595ad3e1f7be8f32aba4eb7ff7f0fd1163d4f3d137c0a9" -dependencies = [ - "atty", - "bitflags", - "clap_derive", - "clap_lex", - "indexmap", - "once_cell", - "strsim", - "termcolor", - "textwrap", -] - -[[package]] -name = "clap_derive" -version = "3.2.15" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9ba52acd3b0a5c33aeada5cdaa3267cdc7c594a98731d4268cdc1532f4264cb4" -dependencies = [ - "heck", - "proc-macro-error", - "proc-macro2", - "quote", - "syn", -] - -[[package]] -name = "clap_lex" -version = "0.2.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2850f2f5a82cbf437dd5af4d49848fbdfc27c157c3d010345776f952765261c5" -dependencies = [ - "os_str_bytes", -] - [[package]] name = "conquer-once" version = "0.3.2" @@ -305,31 +249,6 @@ dependencies = [ "ahash", ] -[[package]] -name = "heck" -version = "0.4.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2540771e65fc8cb83cd6e8a237f70c319bd5c29f78ed1084ba5d50eeac86f7f9" - -[[package]] -name = "hermit-abi" -version = "0.1.19" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33" -dependencies = [ - "libc", -] - -[[package]] -name = "indexmap" -version = "1.9.1" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "10a35a97730320ffe8e2d410b5d3b69279b98d2c14bdb8b70ea89ecf7888d41e" -dependencies = [ - "autocfg", - "hashbrown", -] - [[package]] name = "kernel" version = "0.1.2" @@ -363,7 +282,7 @@ checksum = "da83a57f3f5ba3680950aa3cbc806fc297bc0b289d42e8942ed528ace71b8145" [[package]] name = "libwasm" version = "0.1.0" -source = "git+https://git.ablecorp.us/theoddgarlic/libwasm.git#337bf84d1964ec3ffa91ee6840c15711cc1051b4" +source = "git+https://git.ablecorp.us/able/libwasm.git#e50b7beb8a2087f5a9e527c3ebac31fd3ff42aff" [[package]] name = "linked_list_allocator" @@ -479,12 +398,6 @@ version = "1.13.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "18a6dbe30758c9f83eb00cbea4ac95966305f5a7772f3f42ebfc7fc7eddbd8e1" -[[package]] -name = "os_str_bytes" -version = "6.2.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "648001efe5d5c0102d8cea768e348da85d90af8ba91f0bea908f157951493cd4" - [[package]] name = "owned_ttf_parser" version = "0.15.1" @@ -535,30 +448,6 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "bc5c99d529f0d30937f6f4b8a86d988047327bb88d04d2c4afc356de74722131" -[[package]] -name = "proc-macro-error" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "da25490ff9892aab3fcf7c36f08cfb902dd3e71ca0f9f9517bea02a73a5ce38c" -dependencies = [ - "proc-macro-error-attr", - "proc-macro2", - "quote", - "syn", - "version_check", -] - -[[package]] -name = "proc-macro-error-attr" -version = "1.0.4" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a1be40180e52ecc98ad80b184934baf3d0d29f979574e439af5a55274b35f869" -dependencies = [ - "proc-macro2", - "quote", - "version_check", -] - [[package]] name = "proc-macro2" version = "1.0.42" @@ -622,15 +511,6 @@ version = "0.6.27" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a3f87b73ce11b1619a3c6332f45341e0047173771e8b8b73f87bfeefb7b56244" -[[package]] -name = "repbuild" -version = "0.1.1" -dependencies = [ - "anyhow", - "clap", - "xshell", -] - [[package]] name = "riscv" version = "0.8.0" @@ -742,12 +622,6 @@ dependencies = [ "lock_api", ] -[[package]] -name = "strsim" -version = "0.10.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623" - [[package]] name = "syn" version = "1.0.98" @@ -759,21 +633,6 @@ dependencies = [ "unicode-ident", ] -[[package]] -name = "termcolor" -version = "1.1.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "bab24d30b911b2376f3a13cc2cd443142f0c81dda04c118693e35b3835757755" -dependencies = [ - "winapi-util", -] - -[[package]] -name = "textwrap" -version = "0.15.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb" - [[package]] name = "toml" version = "0.5.9" @@ -903,37 +762,6 @@ version = "0.5.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1d1a10e1dedffff9cfcbdd33c289c65b87da634259a460a3f23d513649fa7a8c" -[[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-util" -version = "0.1.5" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "70ec6ce85bb158151cae5e5c87f95a8e97d2c0c4b001223f33a334e3ce5de178" -dependencies = [ - "winapi", -] - -[[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 = "x86_64" version = "0.14.10" @@ -958,21 +786,6 @@ dependencies = [ "x86_64", ] -[[package]] -name = "xshell" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "eaad2035244c56da05573d4d7fda5f903c60a5f35b9110e157a14a1df45a9f14" -dependencies = [ - "xshell-macros", -] - -[[package]] -name = "xshell-macros" -version = "0.1.17" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4916a4a3cad759e499a3620523bf9545cc162d7a06163727dde97ce9aaa4cf39" - [[package]] name = "y-compositor-protocol" version = "0.1.1" diff --git a/Cargo.toml b/Cargo.toml index 514797fa..fe72b0f0 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -5,5 +5,4 @@ members = [ "ext2-rs", "kernel", "facepalm", - "repbuild", ] diff --git a/ableos/Cargo.toml b/ableos/Cargo.toml index 93ce4b65..b3ae1f4f 100644 --- a/ableos/Cargo.toml +++ b/ableos/Cargo.toml @@ -124,7 +124,7 @@ features = ["core"] version = "*" [dependencies.libwasm] -git = "https://git.ablecorp.us:443/theoddgarlic/libwasm.git" +git = "https://git.ablecorp.us:443/able/libwasm.git" default-features = false [dependencies.externc-libm] diff --git a/ableos/src/arch/x86_64/interrupts.rs b/ableos/src/arch/x86_64/interrupts.rs index e08eb07f..7762a00d 100644 --- a/ableos/src/arch/x86_64/interrupts.rs +++ b/ableos/src/arch/x86_64/interrupts.rs @@ -213,9 +213,6 @@ pub fn reset_pit_for_cpu() { set_pit_3(1000); } pub fn bsod(src: BSODSource) -> ! { - let mut x = 1; - let mut y = 0; - let src1 = match src { BSODSource::DoubleFault(_) => "DoubleFault".to_string(), BSODSource::Panic(panic_info) => { @@ -231,9 +228,6 @@ pub fn bsod(src: BSODSource) -> ! { println!("\n{}", st); - let mut x = 1; - let mut y = 34; - // let sf = format!("https://git.ablecorp.us/able/ableos/wiki/Double-Faults"); let sd = match src { diff --git a/asl/Cargo.toml b/asl/Cargo.toml index 7004b189..37043743 100644 --- a/asl/Cargo.toml +++ b/asl/Cargo.toml @@ -6,4 +6,7 @@ edition = "2021" # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html [dependencies] + +[dependencies.logos] logos = "0.12.1" +default-features = false diff --git a/repbuild/Cargo.toml b/repbuild/Cargo.toml deleted file mode 100644 index 40974016..00000000 --- a/repbuild/Cargo.toml +++ /dev/null @@ -1,13 +0,0 @@ -[package] -name = "repbuild" -version = "0.1.1" -edition = "2021" -authors = ["Able", "NotAble"] - -[dependencies] -xshell = "0.1.9" -anyhow = "*" - -[dependencies.clap] -version = "3.1.8" -features = ["derive"] diff --git a/repbuild/README.md b/repbuild/README.md deleted file mode 100644 index a406f7e7..00000000 --- a/repbuild/README.md +++ /dev/null @@ -1,5 +0,0 @@ -# AbleOS Build system -The ableOS build system was ripped from repnops xtask build system in the risc-v kernel (hence the name) - -# Release -Fail if not compiling on all platforms diff --git a/repbuild/assets/mkfs.sh b/repbuild/assets/mkfs.sh deleted file mode 100644 index e9fa36ac..00000000 --- a/repbuild/assets/mkfs.sh +++ /dev/null @@ -1,50 +0,0 @@ -set -eu - -root_dir=root -img_file=img.ext2 -user="Able" - - -# Create a test directory to convert to ext2. -mkdir -p "$root_dir" -mkdir -p "$root_dir/boot" - -mkdir -p "$root_dir/system" -mkdir -p "$root_dir/system/bins" -mkdir -p "$root_dir/system/configs" - -mkdir -p "$root_dir/shared" -mkdir -p "$root_dir/shared/bins" -mkdir -p "$root_dir/shared/configs" - - -mkdir -p "$root_dir/home" - -mkdir -p "$root_dir/home/$user" -mkdir -p "$root_dir/home/$user/.trash" -mkdir -p "$root_dir/home/$user/bins" -mkdir -p "$root_dir/home/$user/configs" - - -# Build the userland here - - - - - - - - -mke2fs \ - -L '' \ - -N 0 \ - -O ^64bit \ - -d "$root_dir" \ - -m 5 \ - -r 1 \ - -I 128 \ - -t ext2 \ - "$img_file" \ - 4M \ -; - diff --git a/repbuild/src/main.rs b/repbuild/src/main.rs deleted file mode 100644 index f6d5f010..00000000 --- a/repbuild/src/main.rs +++ /dev/null @@ -1,158 +0,0 @@ -use std::io::stdin; - -use anyhow::{Error, Ok}; -use clap::Parser; - -#[derive(clap::Parser, Debug)] -// #[clap(version = clap::crate_version!(), author = clap::crate_authors!("\n"))] - -/// Hello Remember this is a feature -enum Command { - Run { - #[clap(long, short)] - debug: bool, - #[clap(long, short)] - profile: bool, - - #[clap(long, short, arg_enum)] - machine: Option, - }, - - Doc { - #[clap(long, short, arg_enum)] - machine: Option, - }, - - Mount { - #[clap(long, short)] - path: Option, - }, - - Unmount { - #[clap(long, short)] - path: Option, - }, - MakeFS {}, -} - -#[derive(clap::ArgEnum, Debug, Clone)] -enum MachineType { - X86, - Riscv, - Arm, -} - -fn main() -> anyhow::Result<()> { - let args = Command::parse(); - - match args { - Command::Run { - debug, - profile, - - machine, - } => { - let _dir = xshell::pushd("./ableos"); - - match machine.unwrap_or(MachineType::X86) { - MachineType::X86 => { - // export RUSTFLAGS=\"-Cforce-unwind-tables -Clink-arg=-Wl,eh_frame.ld\" && - - match debug { - true => xshell::cmd!("cargo run -- -S -gdb tcp::9000").run()?, - false => xshell::cmd!("cargo run --release").run()?, - } - - if profile { - xshell::cmd!("python qprofiler.py --path=qmp-sock --filename=target/x86_64-ableos/release/ableos").run()?; - } - } - MachineType::Arm => { - xshell::cmd!("cargo build --release --target=json_targets/aarch64-ableos.json") - .run()?; - #[rustfmt::skip] - xshell::cmd!( - "qemu-system-aarch64 - -machine virt - -m 1024M - -cpu cortex-a53 - -kernel target/aarch64-ableos/release/ableos - -device virtio-keyboard - " - ).run()?; - } - MachineType::Riscv => { - xshell::cmd!("cargo build --release --target=riscv64gc-unknown-none-elf") - .run()?; - #[rustfmt::skip] - xshell::cmd!( - "qemu-system-riscv64 - -machine virt - -cpu rv64 - -smp 8 - -m 128M - -bios src/arch/riscv/firmwear/opensbi-riscv64-generic-fw_jump.bin - -kernel target/riscv64gc-unknown-none-elf/release/ableos - " - // -serial stdio - ).run()?; - } - } - } - - Command::Doc { machine } => { - let _dir = xshell::pushd("./ableos"); - - match machine.unwrap_or(MachineType::X86) { - MachineType::X86 => { - xshell::cmd!("cargo doc --open").run()?; - } - MachineType::Arm => { - xshell::cmd!("cargo doc --open --target=json_targets/aarch64-ableos.json") - .run()?; - } - MachineType::Riscv => { - xshell::cmd!("cargo doc --open --target=riscv64gc-unknown-none-elf").run()?; - } - } - } - - Command::Mount { path } => { - let path = path.unwrap_or_else(|| "./userland/root_fs/mnt".to_string()); - xshell::cmd!("sudo mount userland/root_fs/ext2.img {path}").run()?; - } - - Command::Unmount { path } => { - let path = path.unwrap_or_else(|| "./userland/root_fs/mnt".to_string()); - xshell::cmd!("sudo umount {path}").run()?; - } - Command::MakeFS {} => match make_fs() { - Result::Ok(_) => {} - Err(err) => println!("{}", err), - }, - } - - Ok(()) -} - -pub fn make_fs() -> Result<(), Error> { - xshell::cmd!("sh repbuild/assets/mkfs.sh").run()?; - - println!("Make changes in root_fs"); - - let mut input = String::new(); - println!("Press enter when ready:"); - stdin().read_line(&mut input).unwrap(); - - // build - - // xshell::cmd!("rm -rf root").run()?; - - Ok(()) -} - -pub fn make_user(user: String) -> Result<(), Error> { - xshell::mkdir_p(user)?; - - Ok(()) -} From d75875afafa8cc2be57223048889720945850235 Mon Sep 17 00:00:00 2001 From: TheOddGarlic Date: Tue, 2 Aug 2022 19:44:42 +0300 Subject: [PATCH 4/4] fix asl logos dependency --- asl/Cargo.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/asl/Cargo.toml b/asl/Cargo.toml index 37043743..b01793c6 100644 --- a/asl/Cargo.toml +++ b/asl/Cargo.toml @@ -8,5 +8,5 @@ edition = "2021" [dependencies] [dependencies.logos] -logos = "0.12.1" +version = "0.12.1" default-features = false