Compare commits
22
Commits
4785e5e11b
...
v0.9.2
| Author | SHA1 | Date | |
|---|---|---|---|
 SonicSwordcane
|
0a8da6bff0 | ||
|
SonicSwordcane
|
73e8234b5b | ||
|
SonicSwordcane
|
7b590dde14 | ||
|
SonicSwordcane
|
73ccc4054a | ||
|
SonicSwordcane
|
efcffed848 | ||
|
SonicSwordcane
|
58bb34e3cc | ||
|
SonicSwordcane
|
132d494cc2 | ||
|
SonicSwordcane
|
30ee8c06f7 | ||
|
SonicSwordcane
|
1c146590fe | ||
|
SonicSwordcane
|
d610e3de14 | ||
|
SonicSwordcane
|
f7f112f7c1 | ||
|
SonicSwordcane
|
db482b5c21 | ||
|
SonicSwordcane
|
3e90d7df6d | ||
|
SonicSwordcane
|
1cab6524a4 | ||
|
SonicSwordcane
|
cd8ebab4bf | ||
|
SonicSwordcane
|
4f681d883e | ||
|
SonicSwordcane
|
a00d89bc36 | ||
|
SonicSwordcane
|
6e89a0c988 | ||
|
SonicSwordcane
|
8f9922473e | ||
|
SonicSwordcane
|
841ded3bee | ||
|
SonicSwordcane
|
04c92c1454 | ||
|
SonicSwordcane
|
e5abd48337 |
Generated
+143
-98
@@ -35,7 +35,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
|
||||
dependencies = [
|
||||
"fallible-iterator",
|
||||
"gimli",
|
||||
"gimli 0.31.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -84,9 +84,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "alsa"
|
||||
version = "0.9.1"
|
||||
version = "0.9.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ed7572b7ba83a31e20d1b48970ee402d2e3e0537dcfe0a3ff4d6eb7508617d43"
|
||||
checksum = "bdc00893e7a970727e9304671b2c88577b4cfe53dc64019fdfdf9683573a09c4"
|
||||
dependencies = [
|
||||
"alsa-sys",
|
||||
"bitflags 2.9.3",
|
||||
@@ -198,9 +198,9 @@ checksum = "b0674a1ddeecb70197781e945de4b3b8ffb61fa939a5597bcf48503737663100"
|
||||
|
||||
[[package]]
|
||||
name = "arboard"
|
||||
version = "3.6.0"
|
||||
version = "3.6.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55f533f8e0af236ffe5eb979b99381df3258853f00ba2e44b6e1955292c75227"
|
||||
checksum = "0348a1c054491f4bfe6ab86a7b6ab1e44e45d899005de92f58b3df180b36ddaf"
|
||||
dependencies = [
|
||||
"clipboard-win",
|
||||
"image",
|
||||
@@ -212,7 +212,7 @@ dependencies = [
|
||||
"objc2-foundation 0.3.1",
|
||||
"parking_lot",
|
||||
"percent-encoding",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.60.2",
|
||||
"x11rb",
|
||||
]
|
||||
|
||||
@@ -291,11 +291,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-compression"
|
||||
version = "0.4.27"
|
||||
version = "0.4.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ddb939d66e4ae03cee6091612804ba446b12878410cfa17f785f4dd67d4014e8"
|
||||
checksum = "6448dfb3960f0b038e88c781ead1e7eb7929dfc3a71a1336ec9086c00f6d1e75"
|
||||
dependencies = [
|
||||
"brotli",
|
||||
"compression-codecs",
|
||||
"compression-core",
|
||||
"flate2",
|
||||
"futures-core",
|
||||
"futures-io",
|
||||
@@ -306,9 +308,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "async-executor"
|
||||
version = "1.13.2"
|
||||
version = "1.13.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb812ffb58524bdd10860d7d974e2f01cc0950c2438a74ee5ec2e2280c6c4ffa"
|
||||
checksum = "497c00e0fd83a72a79a39fcbd8e3e2f055d6f6c7e025f3b3d91f4f8e76527fb8"
|
||||
dependencies = [
|
||||
"async-task",
|
||||
"concurrent-queue",
|
||||
@@ -479,7 +481,7 @@ dependencies = [
|
||||
"cfg-if",
|
||||
"libc",
|
||||
"miniz_oxide",
|
||||
"object",
|
||||
"object 0.36.7",
|
||||
"rustc-demangle",
|
||||
"windows-targets 0.52.6",
|
||||
]
|
||||
@@ -583,9 +585,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "brotli"
|
||||
version = "8.0.1"
|
||||
version = "8.0.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9991eea70ea4f293524138648e41ee89b0b2b12ddef3b255effa43c8056e0e0d"
|
||||
checksum = "4bd8b9603c7aa97359dbd97ecf258968c95f3adddd6db2f7e7a5bef101c84560"
|
||||
dependencies = [
|
||||
"alloc-no-stdlib",
|
||||
"alloc-stdlib",
|
||||
@@ -735,9 +737,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.45"
|
||||
version = "4.5.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1fc0e74a703892159f5ae7d3aac52c8e6c392f5ae5f359c70b5881d60aaac318"
|
||||
checksum = "2c5e4fcf9c21d2e544ca1ee9d8552de13019a42aa7dbf32747fa7aaf1df76e57"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@@ -745,9 +747,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.44"
|
||||
version = "4.5.46"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b3e7f4214277f3c7aa526a59dd3fbe306a370daee1f8b7b8c987069cd8e888a8"
|
||||
checksum = "fecb53a0e6fcfb055f686001bc2e2592fa527efaf38dbe81a6a9563562e57d41"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@@ -809,6 +811,26 @@ dependencies = [
|
||||
"memchr",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "compression-codecs"
|
||||
version = "0.4.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "46cc6539bf1c592cff488b9f253b30bc0ec50d15407c2cf45e27bd8f308d5905"
|
||||
dependencies = [
|
||||
"brotli",
|
||||
"compression-core",
|
||||
"flate2",
|
||||
"futures-core",
|
||||
"memchr",
|
||||
"pin-project-lite",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "compression-core"
|
||||
version = "0.4.28"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2957e823c15bde7ecf1e8b64e537aa03a6be5fda0e2334e99887669e75b12e01"
|
||||
|
||||
[[package]]
|
||||
name = "concurrent-queue"
|
||||
version = "2.5.0"
|
||||
@@ -1179,12 +1201,6 @@ version = "1.15.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "48c757948c5ede0e46177b7add2e67155f70e33c07fea8284df6576da70b3719"
|
||||
|
||||
[[package]]
|
||||
name = "elf"
|
||||
version = "0.8.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "55dd888a213fc57e957abf2aa305ee3e8a28dbe05687a251f33b637cd46b0070"
|
||||
|
||||
[[package]]
|
||||
name = "elsa"
|
||||
version = "1.11.2"
|
||||
@@ -1513,7 +1529,7 @@ version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "25234f20a3ec0a962a61770cfe39ecf03cb529a6e474ad8cff025ed497eda557"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"debugid",
|
||||
"rustc-hash 2.1.1",
|
||||
"serde",
|
||||
@@ -1604,6 +1620,17 @@ dependencies = [
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gimli"
|
||||
version = "0.32.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc6298e594375a7fead9efd5568f0a46e6a154fb6a9bdcbe3c06946ffd81a5f6"
|
||||
dependencies = [
|
||||
"fallible-iterator",
|
||||
"indexmap",
|
||||
"stable_deref_trait",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "gl_generator"
|
||||
version = "0.14.0"
|
||||
@@ -1779,18 +1806,20 @@ checksum = "6dbf3de79e51f3d586ab4cb9d5c3e2c14aa28ed23d180cf89b4df0454a69cc87"
|
||||
|
||||
[[package]]
|
||||
name = "hyper"
|
||||
version = "1.6.0"
|
||||
version = "1.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cc2b571658e38e0c01b1fdca3bbbe93c00d3d71693ff2770043f8c29bc7d6f80"
|
||||
checksum = "eb3aa54a13a0dfe7fbe3a59e0c76093041720fdc77b110cc0fc260fafb4dc51e"
|
||||
dependencies = [
|
||||
"atomic-waker",
|
||||
"bytes",
|
||||
"futures-channel",
|
||||
"futures-util",
|
||||
"futures-core",
|
||||
"http",
|
||||
"http-body",
|
||||
"httparse",
|
||||
"itoa",
|
||||
"pin-project-lite",
|
||||
"pin-utils",
|
||||
"smallvec",
|
||||
"tokio",
|
||||
"want",
|
||||
@@ -1831,7 +1860,7 @@ dependencies = [
|
||||
"libc",
|
||||
"percent-encoding",
|
||||
"pin-project-lite",
|
||||
"socket2 0.6.0",
|
||||
"socket2",
|
||||
"tokio",
|
||||
"tower-service",
|
||||
"tracing",
|
||||
@@ -2087,9 +2116,9 @@ checksum = "8eaf4bc02d17cbdd7ff4c7438cafcdf7fb9a4613313ad11b4f8fefe7d3fa0130"
|
||||
|
||||
[[package]]
|
||||
name = "jobserver"
|
||||
version = "0.1.33"
|
||||
version = "0.1.34"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "38f262f097c174adebe41eb73d66ae9c06b2844fb0da69969647bbddd9b0538a"
|
||||
checksum = "9afb3de4395d6b3e67a780b6de64b51c978ecf11cb9a462c66be7d4ca9039d33"
|
||||
dependencies = [
|
||||
"getrandom 0.3.3",
|
||||
"libc",
|
||||
@@ -2136,7 +2165,7 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
|
||||
|
||||
[[package]]
|
||||
name = "lemur"
|
||||
version = "0.7.3"
|
||||
version = "0.9.2"
|
||||
dependencies = [
|
||||
"anyhow",
|
||||
"atoi",
|
||||
@@ -2152,16 +2181,17 @@ dependencies = [
|
||||
"egui-wgpu",
|
||||
"egui-winit",
|
||||
"egui_extras",
|
||||
"elf",
|
||||
"fixed",
|
||||
"fxprof-processed-profile",
|
||||
"gilrs",
|
||||
"gimli 0.32.2",
|
||||
"hex",
|
||||
"image",
|
||||
"itertools 0.14.0",
|
||||
"normpath",
|
||||
"num-derive",
|
||||
"num-traits",
|
||||
"object 0.37.3",
|
||||
"oneshot",
|
||||
"pollster",
|
||||
"rand 0.9.2",
|
||||
@@ -2251,7 +2281,7 @@ dependencies = [
|
||||
"memchr",
|
||||
"prost",
|
||||
"prost-derive",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2260,10 +2290,10 @@ version = "0.10.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "aa8fc7e83909ea3b9e2784591655637d3401f2f16014f9d8d6e23ccd138e665f"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"byteorder",
|
||||
"memchr",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -2343,7 +2373,7 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bb4bdc8b0ce69932332cf76d24af69c3a155242af95c226b2ab6c2e371ed1149"
|
||||
dependencies = [
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
"zerocopy",
|
||||
"zerocopy-derive",
|
||||
]
|
||||
@@ -2462,7 +2492,7 @@ version = "0.11.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fbeff6bd154a309b2ada5639b2661ca6ae4599b34e8487dc276d2cd637da2d76"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"itoa",
|
||||
]
|
||||
|
||||
@@ -2959,7 +2989,18 @@ checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"memchr",
|
||||
"ruzstd",
|
||||
"ruzstd 0.7.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.37.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe"
|
||||
dependencies = [
|
||||
"flate2",
|
||||
"memchr",
|
||||
"ruzstd 0.8.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3093,12 +3134,12 @@ version = "0.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b2a2e496e34cd96a1bb26f681e5adb11c98f1e5378e294e60c06c0cf04c526ba"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"elsa",
|
||||
"maybe-owned",
|
||||
"pdb2",
|
||||
"range-collections",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3346,9 +3387,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn"
|
||||
version = "0.11.8"
|
||||
version = "0.11.9"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "626214629cda6781b6dc1d316ba307189c85ba657213ce642d9c77670f8202c8"
|
||||
checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"cfg_aliases",
|
||||
@@ -3357,8 +3398,8 @@ dependencies = [
|
||||
"quinn-udp",
|
||||
"rustc-hash 2.1.1",
|
||||
"rustls",
|
||||
"socket2 0.5.10",
|
||||
"thiserror 2.0.12",
|
||||
"socket2",
|
||||
"thiserror 2.0.16",
|
||||
"tokio",
|
||||
"tracing",
|
||||
"web-time",
|
||||
@@ -3366,9 +3407,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn-proto"
|
||||
version = "0.11.12"
|
||||
version = "0.11.13"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "49df843a9161c85bb8aae55f101bc0bac8bcafd637a620d9122fd7e0b2f7422e"
|
||||
checksum = "f1906b49b0c3bc04b5fe5d86a77925ae6524a19b816ae38ce1e426255f1d8a31"
|
||||
dependencies = [
|
||||
"bytes",
|
||||
"getrandom 0.3.3",
|
||||
@@ -3379,7 +3420,7 @@ dependencies = [
|
||||
"rustls",
|
||||
"rustls-pki-types",
|
||||
"slab",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
"tinyvec",
|
||||
"tracing",
|
||||
"web-time",
|
||||
@@ -3387,16 +3428,16 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "quinn-udp"
|
||||
version = "0.5.13"
|
||||
version = "0.5.14"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fcebb1209ee276352ef14ff8732e24cc2b02bbac986cd74a4c81bcb2f9881970"
|
||||
checksum = "addec6a0dcad8a8d96a771f815f0eaf55f9d1805756410b39f5fa81332574cbd"
|
||||
dependencies = [
|
||||
"cfg_aliases",
|
||||
"libc",
|
||||
"once_cell",
|
||||
"socket2 0.5.10",
|
||||
"socket2",
|
||||
"tracing",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.60.2",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3548,14 +3589,14 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex"
|
||||
version = "1.11.1"
|
||||
version = "1.11.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b544ef1b4eac5dc2db33ea63606ae9ffcfac26c1416a2806ae0bf5f56b201191"
|
||||
checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-automata 0.4.9",
|
||||
"regex-syntax 0.8.5",
|
||||
"regex-automata 0.4.10",
|
||||
"regex-syntax 0.8.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3569,13 +3610,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "regex-automata"
|
||||
version = "0.4.9"
|
||||
version = "0.4.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "809e8dc61f6de73b46c85f4c96486310fe304c434cfa43669d7b40f711150908"
|
||||
checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
|
||||
dependencies = [
|
||||
"aho-corasick",
|
||||
"memchr",
|
||||
"regex-syntax 0.8.5",
|
||||
"regex-syntax 0.8.6",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3586,9 +3627,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
|
||||
|
||||
[[package]]
|
||||
name = "regex-syntax"
|
||||
version = "0.8.5"
|
||||
version = "0.8.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
|
||||
checksum = "caf4aa5b0f434c91fe5c7f1ecb6a5ece2130b02ad2a590589dda5146df959001"
|
||||
|
||||
[[package]]
|
||||
name = "renderdoc-sys"
|
||||
@@ -3598,9 +3639,9 @@ checksum = "19b30a45b0cd0bcca8037f3d0dc3421eaf95327a17cad11964fb8179b4fc4832"
|
||||
|
||||
[[package]]
|
||||
name = "reqwest"
|
||||
version = "0.12.22"
|
||||
version = "0.12.23"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "cbc931937e6ca3a06e3b6c0aa7841849b160a90351d6ab467a8b9b9959767531"
|
||||
checksum = "d429f34c8092b2d42c7c93cec323bb4adeb7c67698f70839adec842ec10c7ceb"
|
||||
dependencies = [
|
||||
"async-compression",
|
||||
"base64",
|
||||
@@ -3799,7 +3840,16 @@ version = "0.7.3"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f"
|
||||
dependencies = [
|
||||
"twox-hash",
|
||||
"twox-hash 1.6.3",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ruzstd"
|
||||
version = "0.8.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3640bec8aad418d7d03c72ea2de10d5c646a598f9883c7babc160d91e3c1b26c"
|
||||
dependencies = [
|
||||
"twox-hash 2.1.1",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -3824,26 +3874,26 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "97e73d38bb04a373dba1260af91d4b0010e84cecd92d20b8e9949a910d5b9cbb"
|
||||
dependencies = [
|
||||
"addr2line",
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"cpp_demangle",
|
||||
"crc32fast",
|
||||
"debugid",
|
||||
"elsa",
|
||||
"flate2",
|
||||
"gimli",
|
||||
"gimli 0.31.1",
|
||||
"linux-perf-data",
|
||||
"lzma-rs",
|
||||
"macho-unwind-info",
|
||||
"memchr",
|
||||
"msvc-demangler",
|
||||
"nom",
|
||||
"object",
|
||||
"object 0.36.7",
|
||||
"pdb-addr2line",
|
||||
"rangemap",
|
||||
"rustc-demangle",
|
||||
"scala-native-demangle",
|
||||
"srcsrv",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
"uuid",
|
||||
"yoke",
|
||||
"yoke-derive",
|
||||
@@ -4054,16 +4104,6 @@ dependencies = [
|
||||
"serde",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.5.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e22376abed350d73dd1cd119b57ffccad95b4e585a7cda43e286245ce23c0678"
|
||||
dependencies = [
|
||||
"libc",
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "socket2"
|
||||
version = "0.6.0"
|
||||
@@ -4090,7 +4130,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "85cd3e3828fb4dd5ba0e7091777edb6c3db3cd2d6fc10547b29b40f6949a29be"
|
||||
dependencies = [
|
||||
"memchr",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
@@ -4165,7 +4205,7 @@ dependencies = [
|
||||
"http",
|
||||
"reqwest",
|
||||
"scopeguard",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
"tokio",
|
||||
]
|
||||
|
||||
@@ -4352,9 +4392,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "tinyvec"
|
||||
version = "1.9.0"
|
||||
version = "1.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "09b3661f17e86524eccd4371ab0429194e0d7c008abb45f7a7495b1719463c71"
|
||||
checksum = "bfa5fdc3bce6191a1dbc8c02d5c8bffcf557bafa17c124c5264a458f1b0613fa"
|
||||
dependencies = [
|
||||
"tinyvec_macros",
|
||||
]
|
||||
@@ -4378,7 +4418,7 @@ dependencies = [
|
||||
"mio",
|
||||
"pin-project-lite",
|
||||
"slab",
|
||||
"socket2 0.6.0",
|
||||
"socket2",
|
||||
"tokio-macros",
|
||||
"windows-sys 0.59.0",
|
||||
]
|
||||
@@ -4479,7 +4519,7 @@ version = "0.6.6"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "adc82fd73de2a9722ac5da747f12383d2bfdb93591ee6c58486e0097890f05f2"
|
||||
dependencies = [
|
||||
"bitflags 2.9.1",
|
||||
"bitflags 2.9.3",
|
||||
"bytes",
|
||||
"futures-util",
|
||||
"http",
|
||||
@@ -4596,6 +4636,12 @@ dependencies = [
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "twox-hash"
|
||||
version = "2.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8b907da542cbced5261bd3256de1b3a1bf340a3d37f93425a07362a1d687de56"
|
||||
|
||||
[[package]]
|
||||
name = "type-map"
|
||||
version = "0.5.1"
|
||||
@@ -4654,9 +4700,9 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
|
||||
|
||||
[[package]]
|
||||
name = "url"
|
||||
version = "2.5.6"
|
||||
version = "2.5.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "137a3c834eaf7139b73688502f3f1141a0337c5d8e4d9b536f9b8c796e26a7c4"
|
||||
checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
|
||||
dependencies = [
|
||||
"form_urlencoded",
|
||||
"idna",
|
||||
@@ -5156,7 +5202,7 @@ dependencies = [
|
||||
"samply-symbols",
|
||||
"scopeguard",
|
||||
"symsrv",
|
||||
"thiserror 2.0.12",
|
||||
"thiserror 2.0.16",
|
||||
"tokio",
|
||||
"uuid",
|
||||
"yoke",
|
||||
@@ -5877,9 +5923,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zbus"
|
||||
version = "5.9.0"
|
||||
version = "5.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4bb4f9a464286d42851d18a605f7193b8febaf5b0919d71c6399b7b26e5b0aad"
|
||||
checksum = "67a073be99ace1adc48af593701c8015cd9817df372e14a1a6b0ee8f8bf043be"
|
||||
dependencies = [
|
||||
"async-broadcast",
|
||||
"async-executor",
|
||||
@@ -5901,7 +5947,7 @@ dependencies = [
|
||||
"serde_repr",
|
||||
"tracing",
|
||||
"uds_windows",
|
||||
"windows-sys 0.59.0",
|
||||
"windows-sys 0.60.2",
|
||||
"winnow",
|
||||
"zbus_macros",
|
||||
"zbus_names",
|
||||
@@ -5910,9 +5956,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zbus_macros"
|
||||
version = "5.9.0"
|
||||
version = "5.10.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "ef9859f68ee0c4ee2e8cde84737c78e3f4c54f946f2a38645d0d4c7a95327659"
|
||||
checksum = "0e80cd713a45a49859dcb648053f63265f4f2851b6420d47a958e5697c68b131"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
@@ -6023,9 +6069,9 @@ checksum = "626bd9fa9734751fc50d6060752170984d7053f5a39061f524cda68023d4db8a"
|
||||
|
||||
[[package]]
|
||||
name = "zvariant"
|
||||
version = "5.6.0"
|
||||
version = "5.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "d91b3680bb339216abd84714172b5138a4edac677e641ef17e1d8cb1b3ca6e6f"
|
||||
checksum = "999dd3be73c52b1fccd109a4a81e4fcd20fab1d3599c8121b38d04e1419498db"
|
||||
dependencies = [
|
||||
"endi",
|
||||
"enumflags2",
|
||||
@@ -6038,9 +6084,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zvariant_derive"
|
||||
version = "5.6.0"
|
||||
version = "5.7.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "3a8c68501be459a8dbfffbe5d792acdd23b4959940fc87785fb013b32edbc208"
|
||||
checksum = "6643fd0b26a46d226bd90d3f07c1b5321fe9bb7f04673cb37ac6d6883885b68e"
|
||||
dependencies = [
|
||||
"proc-macro-crate",
|
||||
"proc-macro2",
|
||||
@@ -6051,14 +6097,13 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "zvariant_utils"
|
||||
version = "3.2.0"
|
||||
version = "3.2.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e16edfee43e5d7b553b77872d99bc36afdda75c223ca7ad5e3fbecd82ca5fc34"
|
||||
checksum = "c6949d142f89f6916deca2232cf26a8afacf2b9fdc35ce766105e104478be599"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"serde",
|
||||
"static_assertions",
|
||||
"syn",
|
||||
"winnow",
|
||||
]
|
||||
|
||||
+3
-2
@@ -4,7 +4,7 @@ description = "An emulator for the Virtual Boy."
|
||||
repository = "https://git.virtual-boy.com/PVB/lemur"
|
||||
publish = false
|
||||
license = "MIT"
|
||||
version = "0.7.3"
|
||||
version = "0.9.2"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
@@ -21,16 +21,17 @@ egui_extras = { version = "0.32", features = ["image"] }
|
||||
egui-notify = "0.20"
|
||||
egui-winit = "0.32"
|
||||
egui-wgpu = { version = "0.32", features = ["winit"] }
|
||||
elf = "0.8"
|
||||
fxprof-processed-profile = "0.8"
|
||||
fixed = { version = "1.28", features = ["num-traits"] }
|
||||
gilrs = { version = "0.11", features = ["serde-serialize"] }
|
||||
gimli = "0.32"
|
||||
hex = "0.4"
|
||||
image = { version = "0.25", default-features = false, features = ["png"] }
|
||||
itertools = "0.14"
|
||||
normpath = "1"
|
||||
num-derive = "0.4"
|
||||
num-traits = "0.2"
|
||||
object = "0.37"
|
||||
oneshot = "0.1"
|
||||
pollster = "0.4"
|
||||
rand = "0.9"
|
||||
|
||||
@@ -41,6 +41,7 @@ ENV PATH="/osxcross/bin:$PATH" \
|
||||
SHROOMS_CFLAGS_x86_64-unknown-linux-gnu="-flto" \
|
||||
CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="-Clinker-plugin-lto -Clinker=clang -Clink-arg=-fuse-ld=lld" \
|
||||
SHROOMS_CFLAGS_x86_64-pc-windows-msvc="-flto" \
|
||||
CFLAGS_x86_64-pc-windows-msvc="-I/xwin/crt/include -I/xwin/sdk/include/ucrt -I/xwin/sdk/include/um -I/xwin/sdk/include/shared" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_RUSTFLAGS="-Lnative=/xwin/crt/lib/x86_64 -Lnative=/xwin/sdk/lib/um/x86_64 -Lnative=/xwin/sdk/lib/ucrt/x86_64 -Clinker-plugin-lto -Clink-arg=-fuse-ld=lld" \
|
||||
CARGO_TARGET_X86_64_PC_WINDOWS_MSVC_LINKER="lld-link-20" \
|
||||
CARGO_TARGET_X86_64_APPLE_DARWIN_LINKER="o64-clang" \
|
||||
|
||||
@@ -18,6 +18,7 @@ fn main() -> Result<(), Box<dyn Error>> {
|
||||
};
|
||||
builder
|
||||
.include(Path::new("shrooms-vb-core/core"))
|
||||
.include(Path::new("shrooms-vb-core/util"))
|
||||
.opt_level(opt_level)
|
||||
.flag_if_supported("-fno-strict-aliasing")
|
||||
.define("VB_LITTLE_ENDIAN", None)
|
||||
@@ -29,7 +30,10 @@ fn main() -> Result<(), Box<dyn Error>> {
|
||||
.define("VB_DIRECT_FRAME", "on_frame")
|
||||
.define("VB_DIRECT_READ", "on_read")
|
||||
.define("VB_DIRECT_WRITE", "on_write")
|
||||
.define("VBU_REALLOC", "vbu_realloc_shim")
|
||||
.file(Path::new("shrooms-vb-core/core/vb.c"))
|
||||
.file(Path::new("shrooms-vb-core/util/isx.c"))
|
||||
.file(Path::new("shrooms-vb-core/util/vbu.c"))
|
||||
.compile("vb");
|
||||
|
||||
Ok(())
|
||||
|
||||
+1
-1
Submodule shrooms-vb-core updated: 8598eab087...4ed3b72995
+9
-3
@@ -24,8 +24,8 @@ use crate::{
|
||||
persistence::Persistence,
|
||||
window::{
|
||||
AboutWindow, AppWindow, BgMapWindow, CharacterDataWindow, FrameBufferWindow, GameWindow,
|
||||
GdbServerWindow, HotkeysWindow, InputWindow, ObjectWindow, ProfileWindow, RegisterWindow,
|
||||
TerminalWindow, WorldWindow,
|
||||
GdbServerWindow, HotkeysWindow, InitArgs, InputWindow, ObjectWindow, ProfileWindow,
|
||||
RegisterWindow, TerminalWindow, WorldWindow,
|
||||
},
|
||||
};
|
||||
|
||||
@@ -423,7 +423,13 @@ impl Viewport {
|
||||
let (window, state) = create_window_and_state(&ctx, event_loop, &builder, &mut painter);
|
||||
egui_winit::update_viewport_info(&mut info, &ctx, &window, true);
|
||||
|
||||
app.on_init(&ctx, painter.render_state().as_ref().unwrap());
|
||||
let render_state = painter.render_state();
|
||||
let args = InitArgs {
|
||||
ctx: &ctx,
|
||||
window: &window,
|
||||
render_state: render_state.as_ref().unwrap(),
|
||||
};
|
||||
app.on_init(args);
|
||||
Self {
|
||||
painter,
|
||||
ctx,
|
||||
|
||||
+24
-17
@@ -18,16 +18,22 @@ use tracing::{error, warn};
|
||||
|
||||
use crate::{
|
||||
audio::Audio,
|
||||
emulator::cart::Cart,
|
||||
graphics::TextureSink,
|
||||
memory::{MemoryRange, MemoryRegion},
|
||||
};
|
||||
use cart::Cart;
|
||||
pub use game_info::GameInfo;
|
||||
pub use inline_stack_map::InlineStack;
|
||||
use inline_stack_map::InlineStackMap;
|
||||
use shrooms_vb_core::{EXPECTED_FRAME_SIZE, Sim, StopReason};
|
||||
pub use shrooms_vb_core::{SimEvent, VBKey, VBRegister, VBWatchpointType};
|
||||
|
||||
mod address_set;
|
||||
mod cart;
|
||||
mod game_info;
|
||||
mod inline_stack_map;
|
||||
mod shrooms_vb_core;
|
||||
mod shrooms_vb_util;
|
||||
|
||||
#[derive(PartialEq, Eq, Hash, Clone, Copy, Debug)]
|
||||
pub enum SimId {
|
||||
@@ -221,21 +227,19 @@ impl Emulator {
|
||||
self.sim_state[index].store(SimState::Ready, Ordering::Release);
|
||||
}
|
||||
let mut profiling = false;
|
||||
if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref() {
|
||||
if let Some(cart) = self.carts[index].as_ref() {
|
||||
if profiler
|
||||
.send(ProfileEvent::Start {
|
||||
file_path: cart.file_path.clone(),
|
||||
})
|
||||
.is_ok()
|
||||
{
|
||||
sim.monitor_events(true);
|
||||
profiling = true;
|
||||
}
|
||||
}
|
||||
if let Some(profiler) = self.profilers[sim_id.to_index()].as_ref()
|
||||
&& let Some(cart) = self.carts[index].as_ref()
|
||||
&& profiler
|
||||
.send(ProfileEvent::Start {
|
||||
info: cart.info.clone(),
|
||||
})
|
||||
.is_ok()
|
||||
{
|
||||
sim.monitor_events(true, cart.info.inline_stack_map().clone());
|
||||
profiling = true;
|
||||
}
|
||||
if !profiling {
|
||||
sim.monitor_events(false);
|
||||
sim.monitor_events(false, InlineStackMap::empty());
|
||||
}
|
||||
|
||||
if self.sim_state[index].load(Ordering::Acquire) == SimState::Ready {
|
||||
@@ -477,13 +481,15 @@ impl Emulator {
|
||||
continue;
|
||||
}
|
||||
if let Some(p) = profiler {
|
||||
let (event, inline_stack) = sim.take_profiler_updates();
|
||||
if p.send(ProfileEvent::Update {
|
||||
cycles,
|
||||
event: sim.take_sim_event(),
|
||||
event,
|
||||
inline_stack,
|
||||
})
|
||||
.is_err()
|
||||
{
|
||||
sim.monitor_events(false);
|
||||
sim.monitor_events(false, InlineStackMap::empty());
|
||||
*profiler = None;
|
||||
}
|
||||
}
|
||||
@@ -838,11 +844,12 @@ pub enum DebugEvent {
|
||||
|
||||
pub enum ProfileEvent {
|
||||
Start {
|
||||
file_path: PathBuf,
|
||||
info: Arc<GameInfo>,
|
||||
},
|
||||
Update {
|
||||
cycles: u32,
|
||||
event: Option<SimEvent>,
|
||||
inline_stack: Option<InlineStack>,
|
||||
},
|
||||
}
|
||||
|
||||
|
||||
+42
-9
@@ -4,21 +4,25 @@ use std::{
|
||||
fs::{self, File},
|
||||
io::{Read, Seek as _, SeekFrom, Write as _},
|
||||
path::{Path, PathBuf},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
use crate::emulator::SimId;
|
||||
use crate::emulator::{SimId, game_info::GameInfo, shrooms_vb_util::rom_from_isx};
|
||||
|
||||
pub struct Cart {
|
||||
pub file_path: PathBuf,
|
||||
pub rom: Vec<u8>,
|
||||
sram_file: File,
|
||||
pub sram: Vec<u8>,
|
||||
pub info: Arc<GameInfo>,
|
||||
}
|
||||
|
||||
impl Cart {
|
||||
pub fn load(file_path: &Path, sim_id: SimId) -> Result<Self> {
|
||||
let rom = fs::read(file_path)?;
|
||||
let rom = try_parse_elf(&rom).unwrap_or(rom);
|
||||
let (rom, info) = try_parse_isx(file_path, &rom)
|
||||
.or_else(|| try_parse_elf(file_path, &rom))
|
||||
.unwrap_or_else(|| (rom, GameInfo::empty(file_path)));
|
||||
|
||||
let mut sram_file = File::options()
|
||||
.read(true)
|
||||
@@ -46,6 +50,7 @@ impl Cart {
|
||||
rom,
|
||||
sram_file,
|
||||
sram,
|
||||
info: Arc::new(info),
|
||||
})
|
||||
}
|
||||
|
||||
@@ -56,18 +61,46 @@ impl Cart {
|
||||
}
|
||||
}
|
||||
|
||||
fn try_parse_elf(data: &[u8]) -> Option<Vec<u8>> {
|
||||
let parsed = elf::ElfBytes::<elf::endian::AnyEndian>::minimal_parse(data).ok()?;
|
||||
fn try_parse_isx(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
|
||||
let rom = rom_from_isx(data)?;
|
||||
let info = GameInfo::from_isx(file_path, data);
|
||||
Some((rom, info))
|
||||
}
|
||||
|
||||
fn try_parse_elf(file_path: &Path, data: &[u8]) -> Option<(Vec<u8>, GameInfo)> {
|
||||
use object::read::elf::FileHeader;
|
||||
let program = match object::FileKind::parse(data).ok()? {
|
||||
object::FileKind::Elf32 => {
|
||||
let header = object::elf::FileHeader32::parse(data).ok()?;
|
||||
parse_elf_program(header, data)?
|
||||
}
|
||||
object::FileKind::Elf64 => {
|
||||
let header = object::elf::FileHeader64::parse(data).ok()?;
|
||||
parse_elf_program(header, data)?
|
||||
}
|
||||
_ => return None,
|
||||
};
|
||||
let info = GameInfo::from_elf(file_path, data).unwrap_or_else(|_| GameInfo::empty(file_path));
|
||||
Some((program, info))
|
||||
}
|
||||
|
||||
fn parse_elf_program<Elf: object::read::elf::FileHeader<Endian = object::Endianness>>(
|
||||
header: &Elf,
|
||||
data: &[u8],
|
||||
) -> Option<Vec<u8>> {
|
||||
use object::read::elf::ProgramHeader;
|
||||
let endian = header.endian().ok()?;
|
||||
let mut bytes = vec![];
|
||||
let mut pstart = None;
|
||||
for phdr in parsed.segments()? {
|
||||
if phdr.p_filesz == 0 {
|
||||
for phdr in header.program_headers(endian, data).ok()? {
|
||||
let pma = phdr.p_paddr(endian).into();
|
||||
if pma < 0x07000000 || phdr.p_filesz(endian).into() == 0 {
|
||||
continue;
|
||||
}
|
||||
let start = pstart.unwrap_or(phdr.p_paddr);
|
||||
let start = pstart.unwrap_or(pma);
|
||||
pstart = Some(start);
|
||||
bytes.resize((phdr.p_paddr - start) as usize, 0);
|
||||
let data = parsed.segment_data(&phdr).ok()?;
|
||||
bytes.resize((pma - start) as usize, 0);
|
||||
let data = phdr.data(endian, data).ok()?;
|
||||
bytes.extend_from_slice(data);
|
||||
}
|
||||
Some(bytes)
|
||||
|
||||
@@ -0,0 +1,281 @@
|
||||
use std::{borrow::Cow, path::Path, sync::Arc};
|
||||
|
||||
use anyhow::{Result, bail};
|
||||
use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable, debugid::DebugId};
|
||||
use object::{Object, ObjectSection, ObjectSymbol};
|
||||
use wholesym::samply_symbols::{DebugIdExt, demangle_any};
|
||||
|
||||
use crate::emulator::inline_stack_map::{InlineStackMap, InlineStackMapBuilder};
|
||||
|
||||
#[derive(Debug)]
|
||||
pub struct GameInfo {
|
||||
library_info: LibraryInfo,
|
||||
inline_stack_map: InlineStackMap,
|
||||
}
|
||||
|
||||
impl GameInfo {
|
||||
pub fn from_elf(file_path: &Path, input: &[u8]) -> Result<Self> {
|
||||
let file = object::File::parse(input)?;
|
||||
|
||||
let (name, path) = name_and_path(file_path);
|
||||
let debug_id = file
|
||||
.build_id()?
|
||||
.map(|id| DebugId::from_identifier(id, true))
|
||||
.unwrap_or_default();
|
||||
let code_id = file.build_id()?.map(hex::encode);
|
||||
let mut symbols = vec![];
|
||||
for sym in file.symbols() {
|
||||
symbols.push(Symbol {
|
||||
address: sym.address() as u32,
|
||||
size: Some(sym.size() as u32),
|
||||
name: demangle_any(sym.name()?),
|
||||
});
|
||||
}
|
||||
|
||||
let inline_stack_map =
|
||||
build_inline_stack_map(file).unwrap_or_else(|_| InlineStackMap::empty());
|
||||
|
||||
let library_info = LibraryInfo {
|
||||
name: name.clone(),
|
||||
debug_name: name,
|
||||
path: path.clone(),
|
||||
debug_path: path,
|
||||
debug_id,
|
||||
code_id,
|
||||
arch: None,
|
||||
symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
|
||||
};
|
||||
|
||||
Ok(Self {
|
||||
library_info,
|
||||
inline_stack_map,
|
||||
})
|
||||
}
|
||||
|
||||
pub fn from_isx(file_path: &Path, input: &[u8]) -> Self {
|
||||
let (name, path) = name_and_path(file_path);
|
||||
let symbols = extract_isx_symbols(input);
|
||||
let library_info = LibraryInfo {
|
||||
name: name.clone(),
|
||||
debug_name: name,
|
||||
path: path.clone(),
|
||||
debug_path: path,
|
||||
debug_id: DebugId::default(),
|
||||
code_id: None,
|
||||
arch: None,
|
||||
symbol_table: symbols.map(|syms| Arc::new(SymbolTable::new(syms))),
|
||||
};
|
||||
let inline_stack_map = InlineStackMap::empty();
|
||||
Self {
|
||||
library_info,
|
||||
inline_stack_map,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn empty(file_path: &Path) -> Self {
|
||||
let (name, path) = name_and_path(file_path);
|
||||
let library_info = LibraryInfo {
|
||||
name: name.clone(),
|
||||
debug_name: name,
|
||||
path: path.clone(),
|
||||
debug_path: path,
|
||||
debug_id: DebugId::default(),
|
||||
code_id: None,
|
||||
arch: None,
|
||||
symbol_table: None,
|
||||
};
|
||||
let inline_stack_map = InlineStackMap::empty();
|
||||
Self {
|
||||
library_info,
|
||||
inline_stack_map,
|
||||
}
|
||||
}
|
||||
|
||||
pub fn name(&self) -> &str {
|
||||
&self.library_info.name
|
||||
}
|
||||
|
||||
pub fn library_info(&self) -> &LibraryInfo {
|
||||
&self.library_info
|
||||
}
|
||||
|
||||
pub fn inline_stack_map(&self) -> &InlineStackMap {
|
||||
&self.inline_stack_map
|
||||
}
|
||||
}
|
||||
|
||||
fn build_inline_stack_map(file: object::File) -> Result<InlineStackMap> {
|
||||
let endian = if file.is_little_endian() {
|
||||
gimli::RunTimeEndian::Little
|
||||
} else {
|
||||
gimli::RunTimeEndian::Big
|
||||
};
|
||||
fn load_section<'a>(file: &'a object::File, id: gimli::SectionId) -> Result<Cow<'a, [u8]>> {
|
||||
let input = match file.section_by_name(id.name()) {
|
||||
Some(section) => section.uncompressed_data()?,
|
||||
None => Cow::Owned(vec![]),
|
||||
};
|
||||
Ok(input)
|
||||
}
|
||||
let dorf = gimli::DwarfSections::load(|id| load_section(&file, id))?;
|
||||
let dorf = dorf.borrow(|sec| gimli::EndianSlice::new(sec, endian));
|
||||
let mut units = dorf.units();
|
||||
let mut frames = InlineStackMap::builder();
|
||||
while let Some(header) = units.next()? {
|
||||
let unit = dorf.unit(header)?;
|
||||
let mut entree = unit.entries_tree(None)?;
|
||||
let root = entree.root()?;
|
||||
let mut ctx = ParseContext {
|
||||
dorf: &dorf,
|
||||
unit: &unit,
|
||||
frames: &mut frames,
|
||||
};
|
||||
parse_inline(&mut ctx, root)?;
|
||||
}
|
||||
Ok(frames.build())
|
||||
}
|
||||
|
||||
fn extract_isx_symbols(input: &[u8]) -> Option<Vec<Symbol>> {
|
||||
let mut syms = vec![];
|
||||
let (_, mut buf) = input.split_at_checked(32)?;
|
||||
while !buf.is_empty() {
|
||||
let typ;
|
||||
(typ, buf) = buf.split_first()?;
|
||||
match typ {
|
||||
0x11 => {
|
||||
// Code (Virtual Boy)
|
||||
(_, buf) = buf.split_at_checked(4)?;
|
||||
let len_bytes;
|
||||
(len_bytes, buf) = buf.split_first_chunk()?;
|
||||
let len = u32::from_le_bytes(*len_bytes);
|
||||
(_, buf) = buf.split_at_checked(len as usize)?;
|
||||
}
|
||||
0x13 => {
|
||||
// Range (Virtual Boy)
|
||||
let count_bytes;
|
||||
(count_bytes, buf) = buf.split_first_chunk()?;
|
||||
let count = u16::from_le_bytes(*count_bytes);
|
||||
(_, buf) = buf.split_at_checked(count as usize * 9)?;
|
||||
}
|
||||
0x14 => {
|
||||
// Symbol (Virtual Boy)
|
||||
let count_bytes;
|
||||
(count_bytes, buf) = buf.split_first_chunk()?;
|
||||
let count = u16::from_le_bytes(*count_bytes);
|
||||
for _ in 0..count {
|
||||
let name_len;
|
||||
(name_len, buf) = buf.split_first()?;
|
||||
let name_bytes;
|
||||
(name_bytes, buf) = buf.split_at_checked(*name_len as usize)?;
|
||||
(_, buf) = buf.split_at_checked(2)?;
|
||||
let address_bytes;
|
||||
(address_bytes, buf) = buf.split_first_chunk()?;
|
||||
|
||||
let name_str = String::from_utf8_lossy(name_bytes);
|
||||
let address = u32::from_le_bytes(*address_bytes);
|
||||
syms.push(Symbol {
|
||||
address: address & 0x07ffffff,
|
||||
size: Some(4),
|
||||
name: demangle_any(&name_str),
|
||||
});
|
||||
}
|
||||
}
|
||||
0x20..=0x22 => {
|
||||
// System (undocumented)
|
||||
let length_bytes;
|
||||
(length_bytes, buf) = buf.split_first_chunk()?;
|
||||
let length = u32::from_le_bytes(*length_bytes);
|
||||
(_, buf) = buf.split_at_checked(length as usize)?;
|
||||
}
|
||||
_ => {
|
||||
return None;
|
||||
}
|
||||
}
|
||||
}
|
||||
Some(syms)
|
||||
}
|
||||
|
||||
type Reader<'a> = gimli::EndianSlice<'a, gimli::RunTimeEndian>;
|
||||
|
||||
struct ParseContext<'a> {
|
||||
dorf: &'a gimli::Dwarf<Reader<'a>>,
|
||||
unit: &'a gimli::Unit<Reader<'a>>,
|
||||
frames: &'a mut InlineStackMapBuilder,
|
||||
}
|
||||
impl ParseContext<'_> {
|
||||
fn name_attr(&self, attr: gimli::AttributeValue<Reader>) -> Result<Option<String>> {
|
||||
match attr {
|
||||
gimli::AttributeValue::DebugInfoRef(offset) => {
|
||||
let mut units = self.dorf.units();
|
||||
while let Some(header) = units.next()? {
|
||||
if let Some(offset) = offset.to_unit_offset(&header) {
|
||||
let unit = self.dorf.unit(header)?;
|
||||
return self.name_entry(&unit, offset);
|
||||
}
|
||||
}
|
||||
Ok(None)
|
||||
}
|
||||
gimli::AttributeValue::UnitRef(offset) => self.name_entry(self.unit, offset),
|
||||
other => {
|
||||
bail!("unrecognized attr {other:?}");
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn name_entry(
|
||||
&self,
|
||||
unit: &gimli::Unit<Reader>,
|
||||
offset: gimli::UnitOffset,
|
||||
) -> Result<Option<String>> {
|
||||
let abbreviations = self.dorf.abbreviations(&unit.header)?;
|
||||
let mut entries = unit.header.entries_raw(&abbreviations, Some(offset))?;
|
||||
let Some(abbrev) = entries.read_abbreviation()? else {
|
||||
return Ok(None);
|
||||
};
|
||||
let mut name = None;
|
||||
for spec in abbrev.attributes() {
|
||||
let attr = entries.read_attribute(*spec)?;
|
||||
if attr.name() == gimli::DW_AT_linkage_name
|
||||
|| (attr.name() == gimli::DW_AT_name && name.is_none())
|
||||
{
|
||||
name = Some(self.dorf.attr_string(unit, attr.value())?)
|
||||
}
|
||||
}
|
||||
Ok(name.map(|n| demangle_any(&String::from_utf8_lossy(&n))))
|
||||
}
|
||||
}
|
||||
|
||||
fn parse_inline(ctx: &mut ParseContext, node: gimli::EntriesTreeNode<Reader>) -> Result<()> {
|
||||
if node.entry().tag() == gimli::DW_TAG_inlined_subroutine
|
||||
&& let Some(attr) = node.entry().attr_value(gimli::DW_AT_abstract_origin)?
|
||||
&& let Some(name) = ctx.name_attr(attr)?
|
||||
{
|
||||
let name = Arc::new(name);
|
||||
let mut ranges = ctx.dorf.die_ranges(ctx.unit, node.entry())?;
|
||||
while let Some(range) = ranges.next()? {
|
||||
let start = range.begin as u32 & 0x07ffffff;
|
||||
let end = range.end as u32 & 0x07ffffff;
|
||||
ctx.frames.add(start, end, name.clone());
|
||||
}
|
||||
}
|
||||
let mut children = node.children();
|
||||
while let Some(child) = children.next()? {
|
||||
parse_inline(ctx, child)?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn name_and_path(file_path: &Path) -> (String, String) {
|
||||
let normalized = normpath::PathExt::normalize(file_path);
|
||||
let path = normalized
|
||||
.as_ref()
|
||||
.map(|n| n.as_path())
|
||||
.unwrap_or(file_path);
|
||||
|
||||
let name = match path.file_stem() {
|
||||
Some(s) => s.to_string_lossy().into_owned(),
|
||||
None => "game".to_string(),
|
||||
};
|
||||
let path = path.to_string_lossy().into_owned();
|
||||
(name, path)
|
||||
}
|
||||
@@ -0,0 +1,87 @@
|
||||
use std::{
|
||||
collections::{BTreeMap, HashMap},
|
||||
sync::Arc,
|
||||
};
|
||||
|
||||
pub type InlineStack = Arc<Vec<Arc<String>>>;
|
||||
|
||||
#[derive(Debug, Clone)]
|
||||
pub struct InlineStackMap {
|
||||
entries: Vec<(u32, InlineStack)>,
|
||||
empty: InlineStack,
|
||||
}
|
||||
|
||||
impl InlineStackMap {
|
||||
pub fn empty() -> Self {
|
||||
Self {
|
||||
entries: vec![],
|
||||
empty: Arc::new(vec![]),
|
||||
}
|
||||
}
|
||||
pub fn builder() -> InlineStackMapBuilder {
|
||||
InlineStackMapBuilder {
|
||||
events: BTreeMap::new(),
|
||||
}
|
||||
}
|
||||
pub fn get(&self, address: u32) -> &InlineStack {
|
||||
match self.entries.binary_search_by_key(&address, |(a, _)| *a) {
|
||||
Ok(index) => self.entries.get(index),
|
||||
Err(after) => after.checked_sub(1).and_then(|i| self.entries.get(i)),
|
||||
}
|
||||
.map(|(_, s)| s)
|
||||
.unwrap_or(&self.empty)
|
||||
}
|
||||
}
|
||||
|
||||
#[derive(Default)]
|
||||
struct Event {
|
||||
end: usize,
|
||||
start: Vec<Arc<String>>,
|
||||
}
|
||||
|
||||
pub struct InlineStackMapBuilder {
|
||||
events: BTreeMap<u32, Event>,
|
||||
}
|
||||
|
||||
impl InlineStackMapBuilder {
|
||||
pub fn add(&mut self, start: u32, end: u32, name: Arc<String>) {
|
||||
self.events.entry(start).or_default().start.push(name);
|
||||
self.events.entry(end).or_default().end += 1;
|
||||
}
|
||||
|
||||
pub fn build(self) -> InlineStackMap {
|
||||
let empty = Arc::new(vec![]);
|
||||
let mut entries = vec![];
|
||||
let mut stack_indexes = vec![];
|
||||
let mut stack = vec![];
|
||||
let mut string_dedup = HashMap::new();
|
||||
let mut stack_dedup = BTreeMap::new();
|
||||
stack_dedup.insert(vec![], empty.clone());
|
||||
|
||||
for (address, event) in self.events {
|
||||
for _ in 0..event.end {
|
||||
stack.pop();
|
||||
stack_indexes.pop();
|
||||
}
|
||||
for call in event.start {
|
||||
if let Some(index) = string_dedup.get(&call) {
|
||||
stack.push(call);
|
||||
stack_indexes.push(*index);
|
||||
} else {
|
||||
let index = string_dedup.len();
|
||||
string_dedup.insert(call.clone(), index);
|
||||
stack.push(call);
|
||||
stack_indexes.push(index);
|
||||
}
|
||||
}
|
||||
if let Some(stack) = stack_dedup.get(&stack_indexes) {
|
||||
entries.push((address, stack.clone()));
|
||||
} else {
|
||||
let stack = Arc::new(stack.clone());
|
||||
stack_dedup.insert(stack_indexes.clone(), stack.clone());
|
||||
entries.push((address, stack));
|
||||
}
|
||||
}
|
||||
InlineStackMap { entries, empty }
|
||||
}
|
||||
}
|
||||
@@ -1,10 +1,12 @@
|
||||
use std::{borrow::Cow, ffi::c_void, ptr, slice};
|
||||
use std::{borrow::Cow, ffi::c_void, ptr, slice, sync::Arc};
|
||||
|
||||
use anyhow::{Result, anyhow};
|
||||
use bitflags::bitflags;
|
||||
use num_derive::{FromPrimitive, ToPrimitive};
|
||||
use serde::{Deserialize, Serialize};
|
||||
|
||||
use crate::emulator::inline_stack_map::{InlineStack, InlineStackMap};
|
||||
|
||||
use super::address_set::AddressSet;
|
||||
|
||||
#[repr(C)]
|
||||
@@ -206,11 +208,9 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
|
||||
if data.monitor.enabled {
|
||||
// SAFETY: length is the length of code, in elements
|
||||
let code = unsafe { slice::from_raw_parts(code, length as usize) };
|
||||
if data.monitor.detect_event(sim, address, code) {
|
||||
// Something interesting will happen after this instruction is run.
|
||||
// The on_fetch callback will fire when it does.
|
||||
unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
|
||||
}
|
||||
data.monitor.detect_event(sim, address, code);
|
||||
// Something interesting will happen after this instruction is run.
|
||||
// We'll react in the on_fetch callback it does.
|
||||
}
|
||||
|
||||
let mut stopped = data.stop_reason.is_some() || data.monitor.event.is_some();
|
||||
@@ -231,7 +231,7 @@ extern "C" fn on_execute(sim: *mut VB, address: u32, code: *const u16, length: c
|
||||
extern "C" fn on_fetch(
|
||||
sim: *mut VB,
|
||||
_fetch: c_int,
|
||||
_address: u32,
|
||||
address: u32,
|
||||
_value: *mut i32,
|
||||
_cycles: *mut u32,
|
||||
) -> c_int {
|
||||
@@ -239,9 +239,13 @@ extern "C" fn on_fetch(
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
data.monitor.event = data.monitor.queued_event.take();
|
||||
data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(address);
|
||||
unsafe { vb_set_exception_callback(sim, Some(on_exception)) };
|
||||
unsafe { vb_set_fetch_callback(sim, None) };
|
||||
1
|
||||
if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
|
||||
1
|
||||
} else {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
@@ -249,17 +253,21 @@ extern "C" fn on_exception(sim: *mut VB, cause: *mut u16) -> c_int {
|
||||
// SAFETY: the *mut VB owns its userdata.
|
||||
// There is no way for the userdata to be null or otherwise invalid.
|
||||
let data: &mut VBState = unsafe { &mut *vb_get_user_data(sim).cast() };
|
||||
data.monitor.event = data.monitor.queued_event.take();
|
||||
let cause = unsafe { *cause };
|
||||
let pc = if cause == 0xff70 {
|
||||
0xffffff60
|
||||
} else {
|
||||
(cause & 0xfff0) as u32 | 0xffff0000
|
||||
};
|
||||
data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc));
|
||||
data.monitor.event = data.monitor.queued_event.take();
|
||||
data.monitor.new_inline_stack = data.monitor.detect_new_inline_stack(pc);
|
||||
data.monitor.queued_event = Some(SimEvent::Interrupt(cause, pc & 0x07ffffff));
|
||||
unsafe { vb_set_exception_callback(sim, None) };
|
||||
unsafe { vb_set_fetch_callback(sim, Some(on_fetch)) };
|
||||
if data.monitor.event.is_some() { 1 } else { 0 }
|
||||
if data.monitor.event.is_some() || data.monitor.new_inline_stack.is_some() {
|
||||
1
|
||||
} else {
|
||||
0
|
||||
}
|
||||
}
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
@@ -292,7 +300,7 @@ extern "C" fn on_read(
|
||||
extern "C" fn on_write(
|
||||
sim: *mut VB,
|
||||
address: u32,
|
||||
_type: VBDataType,
|
||||
typ_: VBDataType,
|
||||
value: *mut i32,
|
||||
_cycles: *mut u32,
|
||||
_cancel: *mut c_int,
|
||||
@@ -309,6 +317,29 @@ extern "C" fn on_write(
|
||||
}
|
||||
}
|
||||
|
||||
// If we have profiling enabled, track custom markers
|
||||
if data.monitor.enabled {
|
||||
let normalized_hw_address = address & 0x0700003f;
|
||||
if normalized_hw_address == 0x02000038 && matches!(typ_, VBDataType::S32) {
|
||||
assert!(data.monitor.queued_event.is_none());
|
||||
// The game has written the address of a null-terminated string
|
||||
// (whose length is at most 64 bytes). Read that string.
|
||||
let str_address = unsafe { *value } as u32;
|
||||
let mut bytes = [0u8; 64];
|
||||
let mut len = 0;
|
||||
for (dst, src_address) in bytes.iter_mut().zip(str_address..str_address + 64) {
|
||||
let char = unsafe { vb_read(sim, src_address, VBDataType::U8) } as u8;
|
||||
if char == 0 {
|
||||
break;
|
||||
}
|
||||
*dst = char;
|
||||
len += 1;
|
||||
}
|
||||
let name = String::from_utf8_lossy(&bytes[..len]).into_owned();
|
||||
data.monitor.queued_event = Some(SimEvent::Marker(Cow::Owned(name)));
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(start) = data.write_watchpoints.start_of_range_containing(address) {
|
||||
let watch = if data.read_watchpoints.contains(address) {
|
||||
VBWatchpointType::Access
|
||||
@@ -339,18 +370,35 @@ struct EventMonitor {
|
||||
event: Option<SimEvent>,
|
||||
queued_event: Option<SimEvent>,
|
||||
just_halted: bool,
|
||||
inline_stack_map: InlineStackMap,
|
||||
new_inline_stack: Option<InlineStack>,
|
||||
last_inline_stack: InlineStack,
|
||||
}
|
||||
|
||||
impl EventMonitor {
|
||||
fn new() -> Self {
|
||||
let inline_stack_map = InlineStackMap::empty();
|
||||
let last_inline_stack = inline_stack_map.get(0).clone();
|
||||
Self {
|
||||
enabled: false,
|
||||
event: None,
|
||||
queued_event: None,
|
||||
just_halted: false,
|
||||
inline_stack_map,
|
||||
new_inline_stack: None,
|
||||
last_inline_stack,
|
||||
}
|
||||
}
|
||||
|
||||
fn detect_new_inline_stack(&mut self, address: u32) -> Option<InlineStack> {
|
||||
let stack = self.inline_stack_map.get(address);
|
||||
if Arc::ptr_eq(stack, &self.last_inline_stack) {
|
||||
return None;
|
||||
}
|
||||
self.last_inline_stack = stack.clone();
|
||||
Some(stack.clone())
|
||||
}
|
||||
|
||||
fn detect_event(&mut self, sim: *mut VB, address: u32, code: &[u16]) -> bool {
|
||||
self.queued_event = self.do_detect_event(sim, address, code);
|
||||
self.queued_event.is_some()
|
||||
@@ -391,7 +439,9 @@ impl EventMonitor {
|
||||
// JAL .+4 is how programs get r31 to a known value for indirect calls
|
||||
// (which we detect later.)
|
||||
// Any other JAL is a function call.
|
||||
return Some(SimEvent::Call(address.wrapping_add_signed(disp)));
|
||||
return Some(SimEvent::Call(
|
||||
address.wrapping_add_signed(disp) & 0x07ffffff,
|
||||
));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -405,7 +455,7 @@ impl EventMonitor {
|
||||
if r31 as u32 == address.wrapping_add(2) {
|
||||
// JMP anywhere else, if r31 points to after the JMP, is an indirect call
|
||||
let target = unsafe { vb_get_program_register(sim, jmp_reg as u32) };
|
||||
return Some(SimEvent::Call(target as u32));
|
||||
return Some(SimEvent::Call(target as u32 & 0x07ffffff));
|
||||
}
|
||||
}
|
||||
|
||||
@@ -440,6 +490,10 @@ impl VBState {
|
||||
|| !self.read_watchpoints.is_empty()
|
||||
|| !self.write_watchpoints.is_empty()
|
||||
}
|
||||
|
||||
fn needs_write_callback(&self) -> bool {
|
||||
self.stdout.is_some() || self.monitor.enabled || !self.write_watchpoints.is_empty()
|
||||
}
|
||||
}
|
||||
|
||||
pub enum StopReason {
|
||||
@@ -492,20 +546,30 @@ impl Sim {
|
||||
unsafe { vb_reset(self.sim) };
|
||||
}
|
||||
|
||||
pub fn monitor_events(&mut self, enabled: bool) {
|
||||
pub fn monitor_events(&mut self, enabled: bool, inline_stack_map: InlineStackMap) {
|
||||
let state = self.get_state();
|
||||
state.monitor.enabled = enabled;
|
||||
state.monitor.event = None;
|
||||
state.monitor.queued_event = None;
|
||||
state.monitor.new_inline_stack = None;
|
||||
state.monitor.last_inline_stack = inline_stack_map.get(0).clone();
|
||||
state.monitor.inline_stack_map = inline_stack_map;
|
||||
if enabled {
|
||||
unsafe { vb_set_execute_callback(self.sim, Some(on_execute)) };
|
||||
unsafe { vb_set_exception_callback(self.sim, Some(on_exception)) };
|
||||
unsafe { vb_set_fetch_callback(self.sim, Some(on_fetch)) };
|
||||
unsafe { vb_set_write_callback(self.sim, Some(on_write)) };
|
||||
} else {
|
||||
if !state.needs_execute_callback() {
|
||||
let needs_execute = state.needs_execute_callback();
|
||||
let needs_write = state.needs_write_callback();
|
||||
if !needs_execute {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
unsafe { vb_set_exception_callback(self.sim, None) };
|
||||
unsafe { vb_set_fetch_callback(self.sim, None) };
|
||||
if !needs_write {
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -747,9 +811,10 @@ impl Sim {
|
||||
fn remove_write_watchpoint(&mut self, address: u32, length: usize) {
|
||||
let state = self.get_state();
|
||||
state.write_watchpoints.remove(address, length);
|
||||
let needs_write = state.needs_write_callback();
|
||||
let needs_execute = state.needs_execute_callback();
|
||||
if state.write_watchpoints.is_empty() {
|
||||
if state.stdout.is_none() {
|
||||
if !needs_write {
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
}
|
||||
if !needs_execute {
|
||||
@@ -773,12 +838,15 @@ impl Sim {
|
||||
data.breakpoints.clear();
|
||||
data.read_watchpoints.clear();
|
||||
data.write_watchpoints.clear();
|
||||
let needs_write = data.stdout.is_some();
|
||||
let needs_write = data.needs_write_callback();
|
||||
let needs_execute = data.needs_execute_callback();
|
||||
unsafe { vb_set_read_callback(self.sim, None) };
|
||||
if !needs_write {
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
}
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
if !needs_execute {
|
||||
unsafe { vb_set_execute_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
|
||||
pub fn watch_stdout(&mut self, watch: bool) {
|
||||
@@ -790,7 +858,7 @@ impl Sim {
|
||||
}
|
||||
} else {
|
||||
data.stdout.take();
|
||||
if data.write_watchpoints.is_empty() {
|
||||
if !data.needs_write_callback() {
|
||||
unsafe { vb_set_write_callback(self.sim, None) };
|
||||
}
|
||||
}
|
||||
@@ -816,9 +884,11 @@ impl Sim {
|
||||
reason
|
||||
}
|
||||
|
||||
pub fn take_sim_event(&mut self) -> Option<SimEvent> {
|
||||
pub fn take_profiler_updates(&mut self) -> (Option<SimEvent>, Option<InlineStack>) {
|
||||
let data = self.get_state();
|
||||
data.monitor.event.take()
|
||||
let event = data.monitor.event.take();
|
||||
let inline_stack = data.monitor.new_inline_stack.take();
|
||||
(event, inline_stack)
|
||||
}
|
||||
|
||||
fn get_state(&mut self) -> &mut VBState {
|
||||
|
||||
@@ -0,0 +1,31 @@
|
||||
use std::ffi::c_void;
|
||||
|
||||
#[unsafe(no_mangle)]
|
||||
unsafe fn vbu_realloc_shim(ptr: *mut c_void, new_size: usize) -> *mut c_void {
|
||||
if !ptr.is_null() {
|
||||
// not supporting proper realloc because it needs bookkeeping and it's unnecessary
|
||||
return std::ptr::null_mut();
|
||||
}
|
||||
let allocation = vec![0u8; new_size].into_boxed_slice();
|
||||
Box::into_raw(allocation).cast()
|
||||
}
|
||||
|
||||
#[link(name = "vb")]
|
||||
unsafe extern "C" {
|
||||
#[link_name = "vbuFromISX"]
|
||||
fn vbu_from_isx(bytes: *const c_void, length: usize, rom_length: *mut usize) -> *mut c_void;
|
||||
}
|
||||
|
||||
pub fn rom_from_isx(bytes: &[u8]) -> Option<Vec<u8>> {
|
||||
if !bytes.starts_with(b"ISX") {
|
||||
return None;
|
||||
}
|
||||
let mut rom_length = 0;
|
||||
let raw_rom = unsafe { vbu_from_isx(bytes.as_ptr().cast(), bytes.len(), &mut rom_length) };
|
||||
if raw_rom.is_null() {
|
||||
return None;
|
||||
}
|
||||
// SAFETY: the rom was allocated by vbu_realloc_shim, which created it from a Vec<u8>.
|
||||
let rom = unsafe { Vec::from_raw_parts(raw_rom.cast(), rom_length, rom_length) };
|
||||
Some(rom)
|
||||
}
|
||||
+20
-7
@@ -1,5 +1,4 @@
|
||||
use std::{
|
||||
path::PathBuf,
|
||||
sync::{Arc, Mutex},
|
||||
thread,
|
||||
};
|
||||
@@ -7,13 +6,14 @@ use std::{
|
||||
use anyhow::Result;
|
||||
use tokio::{select, sync::mpsc};
|
||||
|
||||
use crate::emulator::{EmulatorClient, EmulatorCommand, ProfileEvent, SimEvent, SimId};
|
||||
use crate::emulator::{
|
||||
EmulatorClient, EmulatorCommand, GameInfo, InlineStack, ProfileEvent, SimEvent, SimId,
|
||||
};
|
||||
use recording::Recording;
|
||||
use state::ProgramState;
|
||||
|
||||
mod recording;
|
||||
mod state;
|
||||
mod symbols;
|
||||
|
||||
pub struct Profiler {
|
||||
sim_id: SimId,
|
||||
@@ -132,12 +132,19 @@ async fn run_profile(
|
||||
|
||||
async fn handle_event(event: ProfileEvent, session: &mut ProfilerSession) -> Result<()> {
|
||||
match event {
|
||||
ProfileEvent::Start { file_path } => session.start_profiling(file_path).await,
|
||||
ProfileEvent::Update { cycles, event } => {
|
||||
ProfileEvent::Start { info } => session.start_profiling(info).await,
|
||||
ProfileEvent::Update {
|
||||
cycles,
|
||||
event,
|
||||
inline_stack,
|
||||
} => {
|
||||
session.track_elapsed_cycles(cycles);
|
||||
if let Some(event) = event {
|
||||
session.track_event(event)?;
|
||||
}
|
||||
if let Some(stack) = inline_stack {
|
||||
session.track_inline_stack(stack);
|
||||
}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
@@ -199,8 +206,8 @@ impl ProfilerSession {
|
||||
}
|
||||
}
|
||||
|
||||
async fn start_profiling(&mut self, file_path: PathBuf) {
|
||||
let program = ProgramState::new(file_path).await;
|
||||
async fn start_profiling(&mut self, info: Arc<GameInfo>) {
|
||||
let program = ProgramState::new(info).await;
|
||||
let recording = if self.recording.is_some() {
|
||||
Some(Recording::new(&program))
|
||||
} else {
|
||||
@@ -235,6 +242,12 @@ impl ProfilerSession {
|
||||
}
|
||||
}
|
||||
|
||||
fn track_inline_stack(&mut self, inline_stack: InlineStack) {
|
||||
if let Some(program) = &mut self.program {
|
||||
program.track_inline_stack(inline_stack);
|
||||
}
|
||||
}
|
||||
|
||||
fn start_recording(&mut self) {
|
||||
if let Some(program) = &self.program {
|
||||
self.recording = Some(Recording::new(program));
|
||||
|
||||
+17
-12
@@ -24,10 +24,8 @@ impl Recording {
|
||||
let process =
|
||||
profile.add_process(state.name(), 1, Timestamp::from_nanos_since_reference(0));
|
||||
|
||||
if let Some(symbol_file) = state.symbol_file() {
|
||||
let lib = profile.add_lib(symbol_file.library_info().clone());
|
||||
profile.add_lib_mapping(process, lib, 0x00000000, 0xffffffff, 0);
|
||||
}
|
||||
let lib = profile.add_lib(state.library_info().clone());
|
||||
profile.add_lib_mapping(process, lib, 0x00000000, 0xffffffff, 0);
|
||||
|
||||
let mut me = Self {
|
||||
profile,
|
||||
@@ -91,14 +89,21 @@ impl Recording {
|
||||
thread: ThreadHandle,
|
||||
frames: &[StackFrame],
|
||||
) -> Option<StackHandle> {
|
||||
self.profile.intern_stack_frames(
|
||||
thread,
|
||||
frames.iter().map(|f| FrameInfo {
|
||||
frame: Frame::InstructionPointer(f.address as u64),
|
||||
category_pair: CategoryHandle::OTHER.into(),
|
||||
flags: FrameFlags::empty(),
|
||||
}),
|
||||
)
|
||||
let frames = frames
|
||||
.iter()
|
||||
.map(|f| {
|
||||
let frame = match f {
|
||||
StackFrame::Address(address) => Frame::InstructionPointer(*address as u64),
|
||||
StackFrame::Label(label) => Frame::Label(self.profile.intern_string(label)),
|
||||
};
|
||||
FrameInfo {
|
||||
frame,
|
||||
category_pair: CategoryHandle::OTHER.into(),
|
||||
flags: FrameFlags::empty(),
|
||||
}
|
||||
})
|
||||
.collect::<Vec<_>>();
|
||||
self.profile.intern_stack_frames(thread, frames.into_iter())
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
+31
-30
@@ -1,54 +1,39 @@
|
||||
use std::{collections::HashMap, path::PathBuf};
|
||||
use std::{collections::HashMap, sync::Arc};
|
||||
|
||||
use anyhow::{Result, bail};
|
||||
use fxprof_processed_profile::LibraryInfo;
|
||||
|
||||
use crate::profiler::symbols::SymbolFile;
|
||||
use crate::emulator::{GameInfo, InlineStack};
|
||||
|
||||
pub struct ProgramState {
|
||||
name: String,
|
||||
symbol_file: Option<SymbolFile>,
|
||||
info: Arc<GameInfo>,
|
||||
call_stacks: HashMap<u16, Vec<StackFrame>>,
|
||||
context_stack: Vec<u16>,
|
||||
}
|
||||
|
||||
pub struct StackFrame {
|
||||
pub address: u32,
|
||||
pub enum StackFrame {
|
||||
Address(u32),
|
||||
Label(Arc<String>),
|
||||
}
|
||||
|
||||
pub const RESET_CODE: u16 = 0xfff0;
|
||||
impl ProgramState {
|
||||
pub async fn new(file_path: PathBuf) -> Self {
|
||||
let symbol_file = SymbolFile::load(&file_path).await.ok();
|
||||
let name = symbol_file
|
||||
.as_ref()
|
||||
.map(|f| f.name().to_string())
|
||||
.or_else(|| {
|
||||
file_path
|
||||
.file_stem()
|
||||
.map(|s| s.to_string_lossy().into_owned())
|
||||
})
|
||||
.unwrap_or_else(|| "game".to_string());
|
||||
pub async fn new(info: Arc<GameInfo>) -> Self {
|
||||
let mut call_stacks = HashMap::new();
|
||||
call_stacks.insert(
|
||||
RESET_CODE,
|
||||
vec![StackFrame {
|
||||
address: 0xfffffff0,
|
||||
}],
|
||||
);
|
||||
call_stacks.insert(RESET_CODE, vec![StackFrame::Address(0xfffffff0)]);
|
||||
Self {
|
||||
name,
|
||||
symbol_file,
|
||||
info,
|
||||
call_stacks,
|
||||
context_stack: vec![RESET_CODE],
|
||||
}
|
||||
}
|
||||
|
||||
pub fn name(&self) -> &str {
|
||||
&self.name
|
||||
self.info.name()
|
||||
}
|
||||
|
||||
pub fn symbol_file(&self) -> Option<&SymbolFile> {
|
||||
self.symbol_file.as_ref()
|
||||
pub fn library_info(&self) -> &LibraryInfo {
|
||||
self.info.library_info()
|
||||
}
|
||||
|
||||
pub fn current_stack(&self) -> Option<(u16, &[StackFrame])> {
|
||||
@@ -64,7 +49,7 @@ impl ProgramState {
|
||||
let Some(stack) = self.call_stacks.get_mut(code) else {
|
||||
bail!("missing stack {code:04x}");
|
||||
};
|
||||
stack.push(StackFrame { address });
|
||||
stack.push(StackFrame::Address(address));
|
||||
Ok(())
|
||||
}
|
||||
|
||||
@@ -100,7 +85,7 @@ impl ProgramState {
|
||||
self.context_stack.push(code);
|
||||
if self
|
||||
.call_stacks
|
||||
.insert(code, vec![StackFrame { address }])
|
||||
.insert(code, vec![StackFrame::Address(address)])
|
||||
.is_some()
|
||||
{
|
||||
bail!("{code:04x} fired twice");
|
||||
@@ -120,4 +105,20 @@ impl ProgramState {
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn track_inline_stack(&mut self, inline_stack: InlineStack) {
|
||||
let Some(code) = self.context_stack.last() else {
|
||||
return;
|
||||
};
|
||||
let Some(call_stack) = self.call_stacks.get_mut(code) else {
|
||||
return;
|
||||
};
|
||||
while call_stack
|
||||
.pop_if(|f| matches!(f, StackFrame::Label(_)))
|
||||
.is_some()
|
||||
{}
|
||||
for label in inline_stack.iter() {
|
||||
call_stack.push(StackFrame::Label(label.clone()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,67 +0,0 @@
|
||||
use std::{path::Path, sync::Arc};
|
||||
|
||||
use anyhow::Result;
|
||||
use fxprof_processed_profile::{LibraryInfo, Symbol, SymbolTable};
|
||||
use wholesym::{SymbolManager, samply_symbols::demangle_any};
|
||||
|
||||
pub struct SymbolFile {
|
||||
library_info: LibraryInfo,
|
||||
}
|
||||
|
||||
impl SymbolFile {
|
||||
pub async fn load(file_path: &Path) -> Result<Self> {
|
||||
let normalized = normpath::PathExt::normalize(file_path)?;
|
||||
let library_info =
|
||||
SymbolManager::library_info_for_binary_at_path(normalized.as_path(), None).await?;
|
||||
|
||||
let symbol_manager = SymbolManager::with_config(Default::default());
|
||||
let symbol_map = symbol_manager
|
||||
.load_symbol_map_for_binary_at_path(normalized.as_path(), None)
|
||||
.await?;
|
||||
|
||||
let name = library_info
|
||||
.name
|
||||
.or_else(|| {
|
||||
normalized
|
||||
.file_name()
|
||||
.map(|n| n.to_string_lossy().into_owned())
|
||||
})
|
||||
.unwrap_or("game".to_string());
|
||||
let debug_name = library_info.debug_name.unwrap_or_else(|| name.clone());
|
||||
let path = library_info
|
||||
.path
|
||||
.unwrap_or_else(|| normalized.into_os_string().to_string_lossy().into_owned());
|
||||
let debug_path = library_info.debug_path.unwrap_or_else(|| path.clone());
|
||||
let debug_id = library_info.debug_id.unwrap_or_default();
|
||||
let code_id = library_info.code_id.map(|id| id.to_string());
|
||||
let arch = library_info.arch;
|
||||
let symbols = symbol_map
|
||||
.iter_symbols()
|
||||
.map(|(address, name)| Symbol {
|
||||
address: address + 0x07000000,
|
||||
size: None,
|
||||
name: demangle_any(&name),
|
||||
})
|
||||
.collect();
|
||||
Ok(Self {
|
||||
library_info: LibraryInfo {
|
||||
name,
|
||||
debug_name,
|
||||
path,
|
||||
debug_path,
|
||||
debug_id,
|
||||
code_id,
|
||||
arch,
|
||||
symbol_table: Some(Arc::new(SymbolTable::new(symbols))),
|
||||
},
|
||||
})
|
||||
}
|
||||
|
||||
pub fn name(&self) -> &str {
|
||||
&self.library_info.name
|
||||
}
|
||||
|
||||
pub fn library_info(&self) -> &LibraryInfo {
|
||||
&self.library_info
|
||||
}
|
||||
}
|
||||
+11
-4
@@ -1,3 +1,5 @@
|
||||
use std::sync::Arc;
|
||||
|
||||
pub use about::AboutWindow;
|
||||
use egui::{Context, ViewportBuilder, ViewportId};
|
||||
pub use game::GameWindow;
|
||||
@@ -9,7 +11,7 @@ pub use terminal::TerminalWindow;
|
||||
pub use vip::{
|
||||
BgMapWindow, CharacterDataWindow, FrameBufferWindow, ObjectWindow, RegisterWindow, WorldWindow,
|
||||
};
|
||||
use winit::event::KeyEvent;
|
||||
use winit::{event::KeyEvent, window::Window};
|
||||
|
||||
use crate::emulator::SimId;
|
||||
|
||||
@@ -31,9 +33,8 @@ pub trait AppWindow {
|
||||
}
|
||||
fn initial_viewport(&self) -> ViewportBuilder;
|
||||
fn show(&mut self, ctx: &Context);
|
||||
fn on_init(&mut self, ctx: &Context, render_state: &egui_wgpu::RenderState) {
|
||||
let _ = ctx;
|
||||
let _ = render_state;
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
let _ = args;
|
||||
}
|
||||
fn on_destroy(&mut self) {}
|
||||
fn handle_key_event(&mut self, event: &KeyEvent) -> bool {
|
||||
@@ -45,3 +46,9 @@ pub trait AppWindow {
|
||||
false
|
||||
}
|
||||
}
|
||||
|
||||
pub struct InitArgs<'a> {
|
||||
pub ctx: &'a Context,
|
||||
pub window: &'a Arc<Window>,
|
||||
pub render_state: &'a egui_wgpu::RenderState,
|
||||
}
|
||||
|
||||
+18
-8
@@ -1,10 +1,14 @@
|
||||
use std::{sync::mpsc, time::Duration};
|
||||
use std::{
|
||||
sync::{Arc, mpsc},
|
||||
time::Duration,
|
||||
};
|
||||
|
||||
use crate::{
|
||||
app::UserEvent,
|
||||
emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId, SimState},
|
||||
input::{Command, ShortcutProvider},
|
||||
persistence::Persistence,
|
||||
window::InitArgs,
|
||||
};
|
||||
use anyhow::Context as _;
|
||||
use egui::{
|
||||
@@ -47,6 +51,7 @@ pub struct GameWindow {
|
||||
screen: Option<GameScreen>,
|
||||
messages: Option<mpsc::Receiver<Toast>>,
|
||||
color_picker: Option<ColorPickerState>,
|
||||
window: Option<Arc<winit::window::Window>>,
|
||||
}
|
||||
|
||||
impl GameWindow {
|
||||
@@ -73,6 +78,7 @@ impl GameWindow {
|
||||
screen: None,
|
||||
messages: None,
|
||||
color_picker: None,
|
||||
window: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -87,7 +93,7 @@ impl GameWindow {
|
||||
match command {
|
||||
Command::OpenRom => {
|
||||
let rom = rfd::FileDialog::new()
|
||||
.add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
|
||||
.add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
|
||||
.pick_file();
|
||||
if let Some(path) = rom {
|
||||
self.client
|
||||
@@ -139,7 +145,7 @@ impl GameWindow {
|
||||
.clicked()
|
||||
{
|
||||
let rom = rfd::FileDialog::new()
|
||||
.add_filter("Virtual Boy ROMs", &["vb", "vbrom"])
|
||||
.add_filter("Virtual Boy ROMs", &["vb", "vbrom", "elf", "isx"])
|
||||
.pick_file();
|
||||
if let Some(path) = rom {
|
||||
self.client
|
||||
@@ -298,10 +304,13 @@ impl GameWindow {
|
||||
self.client
|
||||
.send_command(EmulatorCommand::Screenshot(self.sim_id, tx));
|
||||
let bytes = rx.await.context("Could not take screenshot")?;
|
||||
let file = rfd::FileDialog::new()
|
||||
let mut file_dialog = rfd::FileDialog::new()
|
||||
.add_filter("PNG images", &["png"])
|
||||
.set_file_name("screenshot.png")
|
||||
.save_file();
|
||||
.set_file_name("screenshot.png");
|
||||
if let Some(window) = self.window.as_ref() {
|
||||
file_dialog = file_dialog.set_parent(window);
|
||||
}
|
||||
let file = file_dialog.save_file();
|
||||
let Some(path) = file else {
|
||||
return Ok(None);
|
||||
};
|
||||
@@ -545,8 +554,8 @@ impl AppWindow for GameWindow {
|
||||
self.toasts.show(ctx);
|
||||
}
|
||||
|
||||
fn on_init(&mut self, _ctx: &Context, render_state: &egui_wgpu::RenderState) {
|
||||
let (screen, sink) = GameScreen::init(render_state);
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
let (screen, sink) = GameScreen::init(args.render_state);
|
||||
let (message_sink, message_source) = mpsc::channel();
|
||||
self.client.send_command(EmulatorCommand::ConnectToSim(
|
||||
self.sim_id,
|
||||
@@ -555,6 +564,7 @@ impl AppWindow for GameWindow {
|
||||
));
|
||||
self.screen = Some(screen);
|
||||
self.messages = Some(message_source);
|
||||
self.window = Some(args.window.clone());
|
||||
}
|
||||
|
||||
fn on_destroy(&mut self) {
|
||||
|
||||
+71
-24
@@ -1,30 +1,35 @@
|
||||
use std::{fs, time::Duration};
|
||||
use std::{fs, sync::Arc, time::Duration};
|
||||
|
||||
use anyhow::Result;
|
||||
use egui::{Button, CentralPanel, Checkbox, ViewportBuilder, ViewportId};
|
||||
use egui::{Button, CentralPanel, Checkbox, Label, ViewportBuilder, ViewportId};
|
||||
use egui_notify::{Anchor, Toast, Toasts};
|
||||
use winit::window::Window;
|
||||
|
||||
use crate::{
|
||||
emulator::{EmulatorClient, SimId},
|
||||
emulator::{EmulatorClient, EmulatorCommand, EmulatorState, SimId},
|
||||
profiler::{Profiler, ProfilerStatus},
|
||||
window::AppWindow,
|
||||
window::{AppWindow, InitArgs},
|
||||
};
|
||||
|
||||
pub struct ProfileWindow {
|
||||
sim_id: SimId,
|
||||
client: EmulatorClient,
|
||||
profiler: Profiler,
|
||||
toasts: Toasts,
|
||||
window: Option<Arc<Window>>,
|
||||
}
|
||||
|
||||
impl ProfileWindow {
|
||||
pub fn new(sim_id: SimId, client: EmulatorClient) -> Self {
|
||||
Self {
|
||||
sim_id,
|
||||
client: client.clone(),
|
||||
profiler: Profiler::new(sim_id, client),
|
||||
toasts: Toasts::new()
|
||||
.with_anchor(Anchor::BottomLeft)
|
||||
.with_margin((10.0, 10.0).into())
|
||||
.reverse(true),
|
||||
window: None,
|
||||
}
|
||||
}
|
||||
|
||||
@@ -33,6 +38,10 @@ impl ProfileWindow {
|
||||
}
|
||||
|
||||
fn finish_recording(&mut self) {
|
||||
let pause = matches!(self.client.emulator_state(), EmulatorState::Running);
|
||||
if pause {
|
||||
self.client.send_command(EmulatorCommand::Pause);
|
||||
}
|
||||
match self.try_finish_recording() {
|
||||
Ok(Some(path)) => {
|
||||
let mut toast = Toast::info(format!("Saved to {path}"));
|
||||
@@ -46,16 +55,23 @@ impl ProfileWindow {
|
||||
self.toasts.add(toast);
|
||||
}
|
||||
}
|
||||
if pause {
|
||||
self.client.send_command(EmulatorCommand::Resume);
|
||||
}
|
||||
}
|
||||
|
||||
fn try_finish_recording(&mut self) -> Result<Option<String>> {
|
||||
let bytes_receiver = self.profiler.finish_recording();
|
||||
let file = rfd::FileDialog::new()
|
||||
let mut file_dialog = rfd::FileDialog::new()
|
||||
.add_filter("Profiler files", &["json"])
|
||||
.set_file_name("profile.json")
|
||||
.save_file();
|
||||
.set_file_name("profile.json");
|
||||
if let Some(window) = self.window.as_ref() {
|
||||
file_dialog = file_dialog.set_parent(window);
|
||||
}
|
||||
let file = file_dialog.save_file();
|
||||
if let Some(path) = file {
|
||||
let bytes = pollster::block_on(bytes_receiver)?;
|
||||
let _ = fs::remove_file(&path);
|
||||
fs::write(&path, bytes)?;
|
||||
Ok(Some(path.display().to_string()))
|
||||
} else {
|
||||
@@ -84,8 +100,32 @@ impl AppWindow for ProfileWindow {
|
||||
let status = self.profiler.status();
|
||||
let recording = matches!(status, ProfilerStatus::Recording);
|
||||
CentralPanel::default().show(ctx, |ui| {
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = 0.0;
|
||||
ui.add(
|
||||
Label::new(
|
||||
"Use this tool to record performance profiles of your game, for use in ",
|
||||
)
|
||||
.wrap_mode(egui::TextWrapMode::Wrap),
|
||||
);
|
||||
ui.hyperlink("https://profiler.firefox.com");
|
||||
ui.label(".");
|
||||
});
|
||||
ui.horizontal_wrapped(|ui| {
|
||||
ui.spacing_mut().item_spacing.x = 0.0;
|
||||
ui.add(
|
||||
Label::new("For more instructions, see ").wrap_mode(egui::TextWrapMode::Wrap),
|
||||
);
|
||||
ui.hyperlink_to(
|
||||
"the Lemur wiki",
|
||||
"https://git.virtual-boy.com/PVB/lemur/wiki/Profiling-with-Lemur",
|
||||
);
|
||||
ui.label(".");
|
||||
});
|
||||
ui.separator();
|
||||
|
||||
let mut enabled = status.enabled();
|
||||
let enabled_checkbox = Checkbox::new(&mut enabled, "Profiling enabled?");
|
||||
let enabled_checkbox = Checkbox::new(&mut enabled, "Enable profiling");
|
||||
if ui.add_enabled(!recording, enabled_checkbox).changed() {
|
||||
if enabled {
|
||||
self.profiler.enable();
|
||||
@@ -93,23 +133,26 @@ impl AppWindow for ProfileWindow {
|
||||
self.profiler.disable();
|
||||
}
|
||||
}
|
||||
|
||||
ui.horizontal(|ui| {
|
||||
if !recording {
|
||||
let record_button = Button::new("Record");
|
||||
let can_record = matches!(status, ProfilerStatus::Enabled);
|
||||
if ui.add_enabled(can_record, record_button).clicked() {
|
||||
self.profiler.start_recording();
|
||||
if !enabled {
|
||||
ui.label("Enabling profiling will restart your current game.");
|
||||
} else {
|
||||
ui.horizontal(|ui| {
|
||||
if !recording {
|
||||
let record_button = Button::new("Record");
|
||||
let can_record = matches!(status, ProfilerStatus::Enabled);
|
||||
if ui.add_enabled(can_record, record_button).clicked() {
|
||||
self.profiler.start_recording();
|
||||
}
|
||||
} else {
|
||||
if ui.button("Finish recording").clicked() {
|
||||
self.finish_recording();
|
||||
}
|
||||
if ui.button("Cancel recording").clicked() {
|
||||
self.profiler.cancel_recording();
|
||||
}
|
||||
}
|
||||
} else {
|
||||
if ui.button("Finish recording").clicked() {
|
||||
self.finish_recording();
|
||||
}
|
||||
if ui.button("Cancel recording").clicked() {
|
||||
self.profiler.cancel_recording();
|
||||
}
|
||||
}
|
||||
});
|
||||
});
|
||||
}
|
||||
|
||||
match &status {
|
||||
ProfilerStatus::Recording => {
|
||||
@@ -123,4 +166,8 @@ impl AppWindow for ProfileWindow {
|
||||
});
|
||||
self.toasts.show(ctx);
|
||||
}
|
||||
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
self.window = Some(args.window.clone());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -11,7 +11,7 @@ use crate::{
|
||||
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
|
||||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
AppWindow, InitArgs,
|
||||
utils::{NumberEdit, UiExt},
|
||||
},
|
||||
};
|
||||
@@ -187,8 +187,8 @@ impl AppWindow for BgMapWindow {
|
||||
.with_inner_size((640.0, 480.0))
|
||||
}
|
||||
|
||||
fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
|
||||
ctx.add_texture_loader(self.loader.clone());
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
args.ctx.add_texture_loader(self.loader.clone());
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
|
||||
@@ -12,7 +12,7 @@ use crate::{
|
||||
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
|
||||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
AppWindow, InitArgs,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
},
|
||||
};
|
||||
@@ -251,8 +251,8 @@ impl AppWindow for CharacterDataWindow {
|
||||
.with_inner_size((640.0, 480.0))
|
||||
}
|
||||
|
||||
fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
|
||||
ctx.add_texture_loader(self.loader.clone());
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
args.ctx.add_texture_loader(self.loader.clone());
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
|
||||
@@ -11,7 +11,7 @@ use crate::{
|
||||
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
|
||||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
AppWindow, InitArgs,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
},
|
||||
};
|
||||
@@ -153,8 +153,8 @@ impl AppWindow for FrameBufferWindow {
|
||||
.with_inner_size((640.0, 480.0))
|
||||
}
|
||||
|
||||
fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
|
||||
ctx.add_texture_loader(self.loader.clone());
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
args.ctx.add_texture_loader(self.loader.clone());
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
|
||||
@@ -11,7 +11,7 @@ use crate::{
|
||||
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
|
||||
memory::{MemoryClient, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
AppWindow, InitArgs,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
},
|
||||
};
|
||||
@@ -208,8 +208,8 @@ impl AppWindow for ObjectWindow {
|
||||
.with_inner_size((640.0, 500.0))
|
||||
}
|
||||
|
||||
fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
|
||||
ctx.add_texture_loader(self.loader.clone());
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
args.ctx.add_texture_loader(self.loader.clone());
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
|
||||
@@ -17,7 +17,7 @@ use crate::{
|
||||
images::{ImageBuffer, ImageParams, ImageProcessor, ImageRenderer, ImageTextureLoader},
|
||||
memory::{MemoryClient, MemoryRef, MemoryView},
|
||||
window::{
|
||||
AppWindow,
|
||||
AppWindow, InitArgs,
|
||||
utils::{NumberEdit, UiExt as _},
|
||||
},
|
||||
};
|
||||
@@ -523,8 +523,8 @@ impl AppWindow for WorldWindow {
|
||||
.with_inner_size((640.0, 520.0))
|
||||
}
|
||||
|
||||
fn on_init(&mut self, ctx: &Context, _render_state: &egui_wgpu::RenderState) {
|
||||
ctx.add_texture_loader(self.loader.clone());
|
||||
fn on_init(&mut self, args: InitArgs) {
|
||||
args.ctx.add_texture_loader(self.loader.clone());
|
||||
}
|
||||
|
||||
fn show(&mut self, ctx: &Context) {
|
||||
|
||||
Reference in New Issue
Block a user