diff --git a/Cargo.lock b/Cargo.lock index a6e54b7..df75e70 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -106,6 +106,56 @@ dependencies = [ "libc", ] +[[package]] +name = "anstream" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "824a212faf96e9acacdbd09febd34438f8f711fb84e09a8916013cd7815ca28d" +dependencies = [ + "anstyle", + "anstyle-parse", + "anstyle-query", + "anstyle-wincon", + "colorchoice", + "is_terminal_polyfill", + "utf8parse", +] + +[[package]] +name = "anstyle" +version = "1.0.14" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "940b3a0ca603d1eade50a4846a2afffd5ef57a9feac2c0e2ec2e14f9ead76000" + +[[package]] +name = "anstyle-parse" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "52ce7f38b242319f7cabaa6813055467063ecdc9d355bbb4ce0c68908cd8130e" +dependencies = [ + "utf8parse", +] + +[[package]] +name = "anstyle-query" +version = "1.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "40c48f72fd53cd289104fc64099abca73db4166ad86ea0b4341abe65af83dadc" +dependencies = [ + "windows-sys 0.61.2", +] + +[[package]] +name = "anstyle-wincon" +version = "3.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "291e6a250ff86cd4a820112fb8898808a366d8f9f58ce16d1f538353ad55747d" +dependencies = [ + "anstyle", + "once_cell_polyfill", + "windows-sys 0.61.2", +] + [[package]] name = "anyhow" version = "1.0.102" @@ -260,6 +310,9 @@ name = "bitflags" version = "2.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "843867be96c8daad0d758b57df9392b6d8d271134fce549de6ce169ff98a92af" +dependencies = [ + "serde_core", +] [[package]] name = "bitmap_to_asm" @@ -351,9 +404,9 @@ dependencies = [ [[package]] name = "cc" -version = "1.2.56" +version = "1.2.57" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "aebf35691d1bfb0ac386a69bac2fde4dd276fb618cf8bf4f5318fe285e821bb2" +checksum = "7a0dd1ca384932ff3641c8718a02769f1698e7563dc6974ffd03346116310423" dependencies = [ "find-msvc-tools", "jobserver", @@ -385,6 +438,92 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "613afe47fcd5fac7ccf1db93babcb082c5994d996f20b8b159f2ad1658eb5724" +[[package]] +name = "chrono" +version = "0.4.44" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c673075a2e0e5f4a1dde27ce9dee1ea4558c7ffe648f576438a20ca1d2acc4b0" +dependencies = [ + "iana-time-zone", + "num-traits", + "serde", + "windows-link", +] + +[[package]] +name = "clap" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b193af5b67834b676abd72466a96c1024e6a6ad978a1f484bd90b85c94041351" +dependencies = [ + "clap_builder", + "clap_derive", +] + +[[package]] +name = "clap-repl" +version = "0.3.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4ffd4e57297ee7a10fb637964a79fd4bf5c8d22fd4ceaac5d3964d55df9e9e38" +dependencies = [ + "clap", + "clap_complete", + "console", + "nu-ansi-term", + "reedline", + "shlex", +] + +[[package]] +name = "clap_builder" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "714a53001bf66416adb0e2ef5ac857140e7dc3a0c48fb28b2f10762fc4b5069f" +dependencies = [ + "anstream", + "anstyle", + "clap_lex 1.1.0", + "strsim", +] + +[[package]] +name = "clap_complete" +version = "4.5.16" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c677cd0126f3026d8b093fa29eae5d812fde5c05bc66dbb29d0374eea95113a" +dependencies = [ + "clap", + "clap_lex 0.7.7", + "is_executable", + "pathdiff", + "shlex", + "unicode-xid", +] + +[[package]] +name = "clap_derive" +version = "4.6.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1110bd8a634a1ab8cb04345d8d878267d57c3cf1b38d91b71af6686408bbca6a" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "clap_lex" +version = "0.7.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c3e64b0cc0439b12df2fa678eae89a1c56a529fd067a9115f7827f1fffd22b32" + +[[package]] +name = "clap_lex" +version = "1.1.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c8d4a3bb8b1e0c1050499d1815f5ab16d04f0959b233085fb31653fbfc9d98f9" + [[package]] name = "codespan-reporting" version = "0.11.1" @@ -392,7 +531,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3538270d33cc669650c4b093848450d380def10c331d38c768e34cac80576e6e" dependencies = [ "termcolor", - "unicode-width", + "unicode-width 0.1.14", ] [[package]] @@ -401,6 +540,12 @@ version = "1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3d7b894f5411737b7867f4827955924d7c254fc9f4d91a6aad6b097804b1018b" +[[package]] +name = "colorchoice" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1d07550c9036bf2ae0c684c4297d503f838287c83c53686d05370d0e139ae570" + [[package]] name = "com" version = "0.6.0" @@ -451,6 +596,19 @@ dependencies = [ "crossbeam-utils", ] +[[package]] +name = "console" +version = "0.15.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "054ccb5b10f9f2cbf51eb355ca1d05c2d279ce1804688d0db74b4733a5aeafd8" +dependencies = [ + "encode_unicode", + "libc", + "once_cell", + "unicode-width 0.2.2", + "windows-sys 0.59.0", +] + [[package]] name = "core-foundation" version = "0.9.4" @@ -534,6 +692,32 @@ version = "0.8.21" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28" +[[package]] +name = "crossterm" +version = "0.28.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6" +dependencies = [ + "bitflags 2.11.0", + "crossterm_winapi", + "mio", + "parking_lot", + "rustix 0.38.44", + "serde", + "signal-hook", + "signal-hook-mio", + "winapi", +] + +[[package]] +name = "crossterm_winapi" +version = "0.9.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "acdd7c62a3665c7f6830a51635d9ac9b23ed385797f70a83bb8bafe9c572ab2b" +dependencies = [ + "winapi", +] + [[package]] name = "crunchy" version = "0.2.4" @@ -590,6 +774,12 @@ version = "1.15.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719" +[[package]] +name = "encode_unicode" +version = "1.0.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "34aa73646ffb006b8f5147f3dc182bd4bcb190227ce861fc4a4844bf8e3cb2c0" + [[package]] name = "equator" version = "0.4.2" @@ -661,6 +851,17 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "fd-lock" +version = "4.0.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ce92ff622d6dadf7349484f42c93271a0d49b7cc4d466a936405bacbe10aa78" +dependencies = [ + "cfg-if", + "rustix 1.1.4", + "windows-sys 0.59.0", +] + [[package]] name = "fdeflate" version = "0.3.7" @@ -895,6 +1096,12 @@ dependencies = [ "winapi", ] +[[package]] +name = "heck" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea" + [[package]] name = "hermit-abi" version = "0.5.2" @@ -907,6 +1114,30 @@ version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "dfa686283ad6dd069f105e5ab091b04c62850d3e4cf5d67debad1933f55023df" +[[package]] +name = "iana-time-zone" +version = "0.1.65" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e31bc9ad994ba00e440a8aa5c9ef0ec67d5cb5e5cb0cc7f8b744a35b389cc470" +dependencies = [ + "android_system_properties", + "core-foundation-sys", + "iana-time-zone-haiku", + "js-sys", + "log", + "wasm-bindgen", + "windows-core 0.62.2", +] + +[[package]] +name = "iana-time-zone-haiku" +version = "0.1.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f" +dependencies = [ + "cc", +] + [[package]] name = "image" version = "0.25.10" @@ -968,6 +1199,30 @@ dependencies = [ "syn 2.0.117", ] +[[package]] +name = "is_executable" +version = "1.0.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "baabb8b4867b26294d818bf3f651a454b6901431711abb96e296245888d6e8c4" +dependencies = [ + "windows-sys 0.60.2", +] + +[[package]] +name = "is_terminal_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a6cb138bb79a146c1bd460005623e142ef0181e3d0219cb493e02f7d08a35695" + +[[package]] +name = "itertools" +version = "0.12.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ba291022dbbd398a455acf126c1e341954079855bc60dfdda641363bd6922569" +dependencies = [ + "either", +] + [[package]] name = "itertools" version = "0.14.0" @@ -1185,6 +1440,18 @@ dependencies = [ "simd-adler32", ] +[[package]] +name = "mio" +version = "1.1.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a69bcab0ad47271a0234d9422b131806bf3968021e5dc9328caf2d4cd58557fc" +dependencies = [ + "libc", + "log", + "wasi", + "windows-sys 0.61.2", +] + [[package]] name = "moxcms" version = "0.8.1" @@ -1275,6 +1542,15 @@ version = "0.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0676bb32a98c1a483ce53e500a81ad9c3d5b3f7c920c28c24e9cb0980d0b5bc8" +[[package]] +name = "nu-ansi-term" +version = "0.50.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" +dependencies = [ + "windows-sys 0.61.2", +] + [[package]] name = "num-bigint" version = "0.4.6" @@ -1327,9 +1603,9 @@ dependencies = [ [[package]] name = "num_enum" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "b1207a7e20ad57b847bbddc6776b968420d38292bbfe2089accff5e19e82454c" +checksum = "5d0bca838442ec211fa11de3a8b0e0e8f3a4522575b5c4c06ed722e005036f26" dependencies = [ "num_enum_derive", "rustversion", @@ -1337,9 +1613,9 @@ dependencies = [ [[package]] name = "num_enum_derive" -version = "0.7.5" +version = "0.7.6" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff32365de1b6743cb203b710788263c44a03de03802daf96092f2da4fe6ba4d7" +checksum = "680998035259dcfcafe653688bf2aa6d3e2dc05e98be6ab46afb089dc84f1df8" dependencies = [ "proc-macro-crate", "proc-macro2", @@ -1571,15 +1847,21 @@ dependencies = [ [[package]] name = "once_cell" -version = "1.21.3" +version = "1.21.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "42f5e15c9953c5e4ccceeb2e7382a716482c34515315f7b03532b8b4e8393d2d" +checksum = "9f7c3e4beb33f85d45ae3e3a1792185706c8e16d043238c593331cc7cd313b50" + +[[package]] +name = "once_cell_polyfill" +version = "1.70.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "384b8ab6d37215f3c5301a95a4accb5d64aa607f1fcb26a11b5303878451b4fe" [[package]] name = "orbclient" -version = "0.3.50" +version = "0.3.51" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "52ad2c6bae700b7aa5d1cc30c59bdd3a1c180b09dbaea51e2ae2b8e1cf211fdd" +checksum = "59aed3b33578edcfa1bc96a321d590d31832b6ad55a26f0313362ce687e9abd6" dependencies = [ "libc", "libredox", @@ -1638,6 +1920,12 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "35fb2e5f958ec131621fdd531e9fc186ed768cbe395337403ae56c17a74c68ec" +[[package]] +name = "pathdiff" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "df94ce210e5bc13cb6651479fa48d14f601d9858cfe0467f43ae157023b938d3" + [[package]] name = "percent-encoding" version = "2.3.2" @@ -1877,7 +2165,7 @@ dependencies = [ "built", "cfg-if", "interpolate_name", - "itertools", + "itertools 0.14.0", "libc", "libfuzzer-sys", "log", @@ -1964,6 +2252,26 @@ dependencies = [ "bitflags 2.11.0", ] +[[package]] +name = "reedline" +version = "0.38.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9bfa8cb0ad84c396c936d8abb814703d7042a433d2da75a0c7060cbdc89109f3" +dependencies = [ + "chrono", + "crossterm", + "fd-lock", + "itertools 0.12.1", + "nu-ansi-term", + "serde", + "strip-ansi-escapes", + "strum", + "strum_macros", + "thiserror 1.0.69", + "unicode-segmentation", + "unicode-width 0.1.14", +] + [[package]] name = "regex" version = "1.12.3" @@ -2093,6 +2401,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9a8e94ea7f378bd32cbbd37198a4a91436180c5bb472411e48b5ec2e2124ae9e" dependencies = [ "serde_core", + "serde_derive", ] [[package]] @@ -2121,6 +2430,37 @@ version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64" +[[package]] +name = "signal-hook" +version = "0.3.18" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d881a16cf4426aa584979d30bd82cb33429027e42122b169753d6ef1085ed6e2" +dependencies = [ + "libc", + "signal-hook-registry", +] + +[[package]] +name = "signal-hook-mio" +version = "0.2.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b75a19a7a740b25bc7944bdee6172368f988763b744e3d4dfe753f6b4ece40cc" +dependencies = [ + "libc", + "mio", + "signal-hook", +] + +[[package]] +name = "signal-hook-registry" +version = "1.4.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c4db69cba1110affc0e9f7bcd48bbf87b3f4fc7c61fc9155afd4c469eb3d6c1b" +dependencies = [ + "errno", + "libc", +] + [[package]] name = "simd-adler32" version = "0.3.8" @@ -2140,6 +2480,8 @@ dependencies = [ name = "simu" version = "0.1.0" dependencies = [ + "clap", + "clap-repl", "parse_int", "pixels", "wait_on_address", @@ -2229,6 +2571,40 @@ version = "0.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6637bab7722d379c8b41ba849228d680cc12d0a45ba1fa2b48f2a30577a06731" +[[package]] +name = "strip-ansi-escapes" +version = "0.2.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2a8f8038e7e7969abb3f1b7c2a811225e9296da208539e0f79c5251d6cac0025" +dependencies = [ + "vte", +] + +[[package]] +name = "strsim" +version = "0.11.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f" + +[[package]] +name = "strum" +version = "0.26.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06" + +[[package]] +name = "strum_macros" +version = "0.26.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be" +dependencies = [ + "heck", + "proc-macro2", + "quote", + "rustversion", + "syn 2.0.117", +] + [[package]] name = "syn" version = "1.0.109" @@ -2341,18 +2717,18 @@ dependencies = [ [[package]] name = "toml_datetime" -version = "1.0.0+spec-1.1.0" +version = "1.0.1+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "32c2555c699578a4f59f0cc68e5116c8d7cabbd45e1409b989d4be085b53f13e" +checksum = "9b320e741db58cac564e26c607d3cc1fdc4a88fd36c879568c07856ed83ff3e9" dependencies = [ "serde_core", ] [[package]] name = "toml_edit" -version = "0.25.4+spec-1.1.0" +version = "0.25.5+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7193cbd0ce53dc966037f54351dbbcf0d5a642c7f0038c382ef9e677ce8c13f2" +checksum = "8ca1a40644a28bce036923f6a431df0b34236949d111cc07cb6dca830c9ef2e1" dependencies = [ "indexmap", "toml_datetime", @@ -2362,9 +2738,9 @@ dependencies = [ [[package]] name = "toml_parser" -version = "1.0.9+spec-1.1.0" +version = "1.0.10+spec-1.1.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "702d4415e08923e7e1ef96cd5727c0dfed80b4d2fa25db9647fe5eb6f7c5a4c4" +checksum = "7df25b4befd31c4816df190124375d5a20c6b6921e2cad937316de3fccd63420" dependencies = [ "winnow", ] @@ -2418,12 +2794,24 @@ version = "0.1.14" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af" +[[package]] +name = "unicode-width" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b4ac048d71ede7ee76d585517add45da530660ef4390e49b098733c6e897f254" + [[package]] name = "unicode-xid" version = "0.2.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853" +[[package]] +name = "utf8parse" +version = "0.2.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821" + [[package]] name = "v_frame" version = "0.3.9" @@ -2441,6 +2829,15 @@ version = "0.9.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" +[[package]] +name = "vte" +version = "0.14.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "231fdcd7ef3037e8330d8e17e61011a2c244126acc0a982f4040ac3f9f0bc077" +dependencies = [ + "memchr", +] + [[package]] name = "wait_on_address" version = "0.1.4" @@ -2465,6 +2862,12 @@ dependencies = [ "winapi-util", ] +[[package]] +name = "wasi" +version = "0.11.1+wasi-snapshot-preview1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ccf3ec651a847eb01de73ccad15eb7d99f80485de043efb2f370cd654f4ea44b" + [[package]] name = "wasip2" version = "1.0.2+wasi-0.2.9" @@ -2828,7 +3231,7 @@ version = "0.52.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be" dependencies = [ - "windows-core", + "windows-core 0.52.0", "windows-targets 0.52.6", ] @@ -2841,12 +3244,65 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-core" +version = "0.62.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b8e83a14d34d0623b51dce9581199302a221863196a1dde71a7663a4c2be9deb" +dependencies = [ + "windows-implement", + "windows-interface", + "windows-link", + "windows-result", + "windows-strings", +] + +[[package]] +name = "windows-implement" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "053e2e040ab57b9dc951b72c264860db7eb3b0200ba345b4e4c3b14f67855ddf" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + +[[package]] +name = "windows-interface" +version = "0.59.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3f316c4a2570ba26bbec722032c4099d8c8bc095efccdc15688708623367e358" +dependencies = [ + "proc-macro2", + "quote", + "syn 2.0.117", +] + [[package]] name = "windows-link" version = "0.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "f0805222e57f7521d6a62e36fa9163bc891acd422f971defe97d64e70d0a4fe5" +[[package]] +name = "windows-result" +version = "0.4.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7781fa89eaf60850ac3d2da7af8e5242a5ea78d1a11c49bf2910bb5a73853eb5" +dependencies = [ + "windows-link", +] + +[[package]] +name = "windows-strings" +version = "0.5.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7837d08f69c77cf6b07689544538e017c1bfcf57e34b4c0ff58e6c2cd3b37091" +dependencies = [ + "windows-link", +] + [[package]] name = "windows-sys" version = "0.45.0" @@ -2874,6 +3330,15 @@ dependencies = [ "windows-targets 0.52.6", ] +[[package]] +name = "windows-sys" +version = "0.60.2" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb" +dependencies = [ + "windows-targets 0.53.5", +] + [[package]] name = "windows-sys" version = "0.61.2" @@ -2907,13 +3372,30 @@ dependencies = [ "windows_aarch64_gnullvm 0.52.6", "windows_aarch64_msvc 0.52.6", "windows_i686_gnu 0.52.6", - "windows_i686_gnullvm", + "windows_i686_gnullvm 0.52.6", "windows_i686_msvc 0.52.6", "windows_x86_64_gnu 0.52.6", "windows_x86_64_gnullvm 0.52.6", "windows_x86_64_msvc 0.52.6", ] +[[package]] +name = "windows-targets" +version = "0.53.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "4945f9f551b88e0d65f3db0bc25c33b8acea4d9e41163edf90dcd0b19f9069f3" +dependencies = [ + "windows-link", + "windows_aarch64_gnullvm 0.53.1", + "windows_aarch64_msvc 0.53.1", + "windows_i686_gnu 0.53.1", + "windows_i686_gnullvm 0.53.1", + "windows_i686_msvc 0.53.1", + "windows_x86_64_gnu 0.53.1", + "windows_x86_64_gnullvm 0.53.1", + "windows_x86_64_msvc 0.53.1", +] + [[package]] name = "windows_aarch64_gnullvm" version = "0.42.2" @@ -2926,6 +3408,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3" +[[package]] +name = "windows_aarch64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "a9d8416fa8b42f5c947f8482c43e7d89e73a173cead56d044f6a56104a6d1b53" + [[package]] name = "windows_aarch64_msvc" version = "0.42.2" @@ -2938,6 +3426,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469" +[[package]] +name = "windows_aarch64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "b9d782e804c2f632e395708e99a94275910eb9100b2114651e04744e9b125006" + [[package]] name = "windows_i686_gnu" version = "0.42.2" @@ -2950,12 +3444,24 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b" +[[package]] +name = "windows_i686_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "960e6da069d81e09becb0ca57a65220ddff016ff2d6af6a223cf372a506593a3" + [[package]] name = "windows_i686_gnullvm" version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66" +[[package]] +name = "windows_i686_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "fa7359d10048f68ab8b09fa71c3daccfb0e9b559aed648a8f95469c27057180c" + [[package]] name = "windows_i686_msvc" version = "0.42.2" @@ -2968,6 +3474,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66" +[[package]] +name = "windows_i686_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1e7ac75179f18232fe9c285163565a57ef8d3c89254a30685b57d83a38d326c2" + [[package]] name = "windows_x86_64_gnu" version = "0.42.2" @@ -2980,6 +3492,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78" +[[package]] +name = "windows_x86_64_gnu" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9c3842cdd74a865a8066ab39c8a7a473c0778a3f29370b5fd6b4b9aa7df4a499" + [[package]] name = "windows_x86_64_gnullvm" version = "0.42.2" @@ -2992,6 +3510,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d" +[[package]] +name = "windows_x86_64_gnullvm" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0ffa179e2d07eee8ad8f57493436566c7cc30ac536a3379fdf008f47f6bb7ae1" + [[package]] name = "windows_x86_64_msvc" version = "0.42.2" @@ -3004,6 +3528,12 @@ version = "0.52.6" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec" +[[package]] +name = "windows_x86_64_msvc" +version = "0.53.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d6bbff5f0aada427a1e5a6da5f1f98158182f26556f345ac9e04d36d0ebed650" + [[package]] name = "winit" version = "0.30.13" @@ -3068,9 +3598,9 @@ dependencies = [ [[package]] name = "winnow" -version = "0.7.15" +version = "1.0.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "df79d97927682d2fd8adb29682d1140b343be4ac0f08fd68b7765d9c059d3945" +checksum = "a90e88e4667264a994d34e6d1ab2d26d398dcdca8b7f52bec8668957517fc7d8" dependencies = [ "memchr", ] @@ -3152,18 +3682,18 @@ checksum = "7a5a4b21e1a62b67a2970e6831bc091d7b87e119e7f9791aef9702e3bef04448" [[package]] name = "zerocopy" -version = "0.8.42" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "f2578b716f8a7a858b7f02d5bd870c14bf4ddbbcf3a4c05414ba6503640505e3" +checksum = "efbb2a062be311f2ba113ce66f697a4dc589f85e78a4aea276200804cea0ed87" dependencies = [ "zerocopy-derive", ] [[package]] name = "zerocopy-derive" -version = "0.8.42" +version = "0.8.47" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7e6cc098ea4d3bd6246687de65af3f920c430e236bee1e3bf2e441463f08a02f" +checksum = "0e8bc7269b54418e7aeeef514aa68f8690b8c0489a06b0136e5f57c4c5ccab89" dependencies = [ "proc-macro2", "quote", diff --git a/simu/Cargo.toml b/simu/Cargo.toml index 18de5a6..88d5f00 100644 --- a/simu/Cargo.toml +++ b/simu/Cargo.toml @@ -9,6 +9,8 @@ winit = { version = "0.30.13", features = ["x11", "x11-dl", "x11rb", "ahash", "b winit_input_helper = "0.17.0" parse_int = { version = "0.9.0", optional = true } wait_on_address = { version = "0.1.4", optional = true } +clap-repl = { version = "0.3.2", optional = true } +clap = { version = "4.6.0", optional = true } [features] @@ -16,9 +18,7 @@ default = ["futex"] div_mul = [] rgba = [] rich_keyboard = [] -debug = ["dep:parse_int"] +debug = ["dep:parse_int","dep:clap-repl","dep:clap"] futex = ["dep:wait_on_address"] - -# [[bench]] -# name = "bench" -# harness = false +clap-repl = ["dep:clap-repl"] +clap = ["dep:clap"] diff --git a/simu/src/cpu.rs b/simu/src/cpu.rs index 08b61a1..636ed30 100644 --- a/simu/src/cpu.rs +++ b/simu/src/cpu.rs @@ -6,7 +6,6 @@ use std::{ io::Read, mem::transmute, ops::{Index, IndexMut}, - process::exit, sync::atomic::AtomicU32, time::{self, Instant}, }; @@ -314,7 +313,7 @@ pub(crate) fn instr_to_text(i: u32, a: u32, book: &HashMap) -> Stri format!("skip {} {cond} {reg} {op2}", addr(d as u32)) } Instruction::Jump(a) => format!("jump {}", addr(a)), - Instruction::Call(a) => format!("call {}", addr(a)), + Instruction::Call(a) => format!("call {}", addr(a % 0x1000_0000)), Instruction::Ret() => format!("ret"), Instruction::Reti() => format!("reti"), Instruction::Swi() => format!("swi"), @@ -339,7 +338,7 @@ pub struct Computer { #[cfg(feature = "debug")] pub(crate) error: bool, #[cfg(feature = "debug")] - pub(crate) book: HashMap, + pub(crate) book: (HashMap,HashMap), } impl Index for Computer { @@ -368,7 +367,7 @@ impl Computer { #[cfg(feature = "debug")] error: false, #[cfg(feature = "debug")] - book: HashMap::new(), + book: (HashMap::new(),HashMap::new()), }; let mut buf = String::new(); std::fs::File::open(filename) @@ -386,12 +385,15 @@ impl Computer { while let Some((_, line)) = lines.next() { if let Some([addr, s]) = line.split_ascii_whitespace().collect::>().as_array() { if let Ok(i) = u32::from_str_radix(addr, 16) { - new.book.insert(i, s.to_string()); + new.book.0.insert(i, s.to_string()); + new.book.1.insert(s.to_string(), i); } } } new } + + #[inline(always)] pub fn step(&mut self, s: usize) { match self.interupts { @@ -745,6 +747,10 @@ impl Computer { } } } + #[cfg(feature = "debug")] + pub fn debug_step(&mut self,s: usize){ + self.step(s); + } #[inline(always)] fn resolve(&self, op2: Op2) -> u32 { match op2 { diff --git a/simu/src/main.rs b/simu/src/main.rs index 5131663..95eebc9 100644 --- a/simu/src/main.rs +++ b/simu/src/main.rs @@ -20,7 +20,7 @@ use winit::event_loop::EventLoop; use winit::platform::scancode::PhysicalKeyExtScancode; use winit::window::Window; -use crate::cpu::{Computer, MMIOInterupt}; +use crate::cpu::{Computer, MMIOInterupt, instr_to_text}; mod wait; use wait::WaitOnAtomic; mod cpu; @@ -304,143 +304,7 @@ fn main() -> Result<(), Error> { //ugly debug code, I should improve that using a real TUI crate #[cfg(feature = "debug")] { - let mut input = std::io::stdin().lines(); - loop { - { - println!( - "interrupts are {:?}, with mmio interupts flags {}", - simulation.interupts, - SHARED.external_enabled_interupts.load(Relaxed) - ); - for i in 0..8 { - println!( - "r{i} 0x{:08x} r{} 0x{:08x}", - simulation.regs[i], - i + 8, - simulation.regs[i + 8] - ); - } - println!( - "SP: {:08x} PC: {:08x}", - simulation.sp * 4, - simulation.pc * 4 - ); - println!("RAM near SP"); - let min_pc = (simulation.pc).min(0x0100_0000 / 4 - 8); - let min_sp = (simulation.sp).min(0x0100_0000 / 4 - 8); - for i in 0..8 { - println!( - "{:8x}: 0x{:08x}", - (min_sp + i) * 4, - simulation.ram[min_sp + i], - ); - } - println!("Ram near PC"); - for i in 0..8 { - let idx = min_pc + i; - let istr = simulation.ram[idx]; - if let Some(s) = simulation.book.get(&(idx as u32 * 4)) { - println!("{s}:") - }; - println!( - "{:8x}: 0x{:08x} {}", - idx * 4, - istr, - cpu::instr_to_text(istr, idx as u32 * 4, &simulation.book) - ) - } - } - while { - let next = input.next().unwrap().unwrap(); - let next: Vec<_> = next.split_ascii_whitespace().collect(); - if next.len() > 0 { - match next[0] { - "s" | "step" => { - let n: usize = { - if next.len() >= 2 { - parse_int::parse(next[1]).unwrap_or(1) - } else { - 1 - } - }; - for _ in 0..n { - if simulation.error { - println!("cannot step, cpu killed"); - break; - } - simulation.step(1); - } - false - } - "r" | "run" => { - while !simulation.error { - simulation.step(64); - } - false - } - "p" | "print" => { - if next.len() >= 2 { - match parse_int::parse::(next[1]) { - Ok(i) => { - let v = simulation.ram[i as usize / 4]; - println!( - "0x{:8x} -- {}", - v, - cpu::instr_to_text(v, i, &simulation.book) - ); - true - } - Err(e) => { - println!("{e}"); - true - } - } - } else { - println!("{HELP_MSG}"); - true - } - } - "c" | "context" => false, - "u" | "up" => { - while !simulation.error - && simulation.ram[simulation.pc] != 0x8800_0000 - { - simulation.step(1); - } - false - } - "t" | "to" => { - if next.len() >= 2 { - match parse_int::parse::(next[1]) { - Ok(v) => { - while !simulation.error - && simulation.pc != (v as usize / 4) - { - simulation.step(1); - } - false - } - Err(e) => { - println!("{e}"); - true - } - } - } else { - println!("{HELP_MSG}"); - true - } - } - _ => { - println!("{HELP_MSG}"); - true - } - } - } else { - println!("{HELP_MSG}"); - true - } - } {} - } + debug_loop(&mut simulation); } }); @@ -457,11 +321,209 @@ fn main() -> Result<(), Error> { } #[cfg(feature = "debug")] -const HELP_MSG: &str = " -step n - step trough n instructions (alias s) -run - run program until exit / error (alias r) -context - print context (alias c) -print n - print ram content at address n and next 8 (alias p) -up - run until the nex ret is reached (alias u) -to n - tun until PC = n (alias t) -"; +fn debug_loop(com: &mut Computer) { + struct Wrap(DefaultCompleter, DefaultCompleter); + + use clap::Parser; + use clap_repl::ClapEditor; + use clap_repl::reedline::{ + Completer, DefaultCompleter, DefaultPrompt, DefaultPromptSegment, FileBackedHistory, + }; + + use crate::cpu::instr_to_text; + + #[derive(Debug, Parser)] + #[command(name = "")] // This name will show up in clap's error messages, so it is important to set it to "". + enum Commands { + /// Step by single instrcution + #[command(alias = "s")] + Step { + ///number of instruction to step (default one) + num: Option, + }, + /// Run until program halt, or specified instruction is reached + #[command(alias = "r")] + Run { + /// Can be either a label or a address (support hex format) + desigantor: Option, + }, + /// run until the current function return. + #[command(alias = "u")] + Up, + /// Print memory at address. Support hexa format + #[command(alias = "p")] + Print { address: String }, + /// Print the address associated with a label + #[command(alias = "l")] + Label { label: String }, + /// Print context + #[command(alias = "c")] + Context, + } + let prompt = DefaultPrompt { + left_prompt: DefaultPromptSegment::Basic(">>".to_owned()), + right_prompt: DefaultPromptSegment::Empty, + }; + + let commands_comp = DefaultCompleter::new_with_wordlen( + ["step", "run", "up", "print", "label", "help", "context"] + .map(|s| s.to_string()) + .to_vec(), + 0, + ); + let mut labels_comp = + DefaultCompleter::with_inclusions("_0123456789".chars().collect::>().as_slice()) + .set_min_word_len(0); + labels_comp.insert(com.book.0.values().cloned().collect()); + + let editor = ClapEditor::::builder() + .with_prompt(Box::new(prompt)) + .with_editor_hook(|reed| { + reed.with_history(Box::new( + FileBackedHistory::with_file(1000, "debug_cmd.hist".into()).unwrap(), + )) + .with_completer(Box::new(Wrap(commands_comp, labels_comp))) + .with_quick_completions(true) + .with_partial_completions(true) + }) + .build(); + + debug_context(com); + editor.repl(|command| match command { + Commands::Step { num } => { + let steps = num.unwrap_or(1); + com.debug_step(steps); + debug_context(com); + } + Commands::Run { desigantor } => match desigantor { + Some(s) => match parse_int::parse::(s.as_str()) { + Ok(addr) => { + while com.pc != (addr / 4) { + com.debug_step(1); + } + debug_context(com); + } + Err(_) => match com.book.1.get(s.as_str()).cloned() { + Some(addr) => { + while com.pc != (addr as usize / 4) { + com.debug_step(1); + } + debug_context(com); + } + None => { + println!("Error, {s} cannot be interpreted as addr nor label") + } + }, + }, + None => { + while !com.error { + com.debug_step(64); + } + debug_context(com); + } + }, + Commands::Up => { + let curr_sp = com.sp; + while (com.sp > curr_sp) + || ((com.ram[com.pc] != (0b10001000 << 24)) + && (com.ram[com.pc] != (0b10101000 << 24))) + { + com.debug_step(1); + } + debug_context(com); + } + Commands::Print { address } => match parse_int::parse::(address.as_str()) { + Ok(addr) => match com.ram.get(addr / 4) { + Some(i) => { + println!( + "RAM at {addr:8x}: {:8x} {}", + i, + instr_to_text(*i, u32::MAX, &com.book.0) + ) + } + None => println!("Cannot index RAM at address {addr:8x}"), + }, + Err(_) => match com.book.1.get(address.as_str()).cloned() { + Some(addr) => println!( + "RAM at {addr:8x}: {:8x} {}", + com.ram[addr as usize / 4], + instr_to_text(com.ram[addr as usize / 4], addr, &com.book.0) + ), + None => { + println!("Error, {address} cannot be interpreted as addr nor label") + } + }, + }, + Commands::Label { label } => match com.book.1.get(label.as_str()) { + Some(addr) => println!("label is at addr {addr}"), + None => println!("error: label not found"), + }, + Commands::Context => debug_context(com), + }); + exit(0); + + impl Completer for Wrap { + fn complete(&mut self, line: &str, pos: usize) -> Vec { + let trimmed = line.trim_start(); + let line_parts = trimmed.splitn(2, ' ').collect::>(); + + if line_parts.len() <= 1 { + self.0.complete(line, pos) + } else { + match line_parts[0] { + "r" | "run" | "p" | "print" | "l" | "label" => { + let trimmed_2 = line_parts[1].trim_start(); + let offset = line.len() - trimmed_2.len(); + let mut sub = self.1.complete(trimmed_2, pos - offset); + for sug in sub.iter_mut() { + use clap_repl::reedline::Span; + + sug.span = Span { + start: sug.span.start + offset, + end: sug.span.end + offset, + } + } + sub + } + _ => Vec::new(), + } + } + } + } +} + +fn debug_context(com: &Computer) { + println!("Interupt state: {:?}", com.interupts); + for i in 0..8 { + println!( + "r{i} = {:8x} r{:<2} = {:8x}", + com.regs[i], + i + 8, + com.regs[i + 8] + ); + } + println!("SP={:08x} PC={:08x}", com.sp, com.pc); + println!("RAM at SP | Ram at PC:"); + + let mut pc_lines = Vec::new(); + + for i in 0..16 { + match com.book.0.get(&((com.pc + i) as u32 * 4)) { + Some(label) => pc_lines.push(format!(" {label}:")), + None => {} + }; + pc_lines.push(format!( + + "{:08x} {}", + com.ram[com.pc + i], + instr_to_text(com.ram[com.pc + i], (com.pc + i) as u32 * 4, &com.book.0) + )); + } + for (i, pc_l) in pc_lines.iter().enumerate() { + if com.sp + i < com.ram.len() { + println!("{:08x} | {pc_l}", com.ram[com.sp + i]) + } else { + println!(" -- | {pc_l}") + } + } +}