Skip writing objects and ldscripts if unchanged

Avoids unnecessary rebuilds with build systems like ninja & make that track mtime
Use custom syntect packs to reduce binary size
2023-11-18 17:21:08 -05:00 · 2023-11-18 16:12:03 -05:00 · 2023-11-18 15:07:44 -05:00 · 2023-11-18 15:03:24 -05:00 · 2023-11-18 13:56:58 -05:00
10 changed files with 1546 additions and 645 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@ -8,6 +8,7 @@ on:
  pull_request:

 env:
+  BUILD_PROFILE: release-lto
  CARGO_BIN_NAME: dtk
  CARGO_TARGET_DIR: target

@ -131,16 +132,16 @@ jobs:
        with:
          targets: ${{ matrix.target }}
      - name: Cargo build
-        run: cargo ${{ matrix.build }} --release --all-features --target ${{ matrix.target }} --bin ${{ env.CARGO_BIN_NAME }}
+        run: cargo ${{ matrix.build }} --profile ${{ env.BUILD_PROFILE }} --all-features --target ${{ matrix.target }} --bin ${{ env.CARGO_BIN_NAME }}
      - name: Upload artifacts
        uses: actions/upload-artifact@v3
        with:
          name: ${{ matrix.name }}
          path: |
-            ${{ env.CARGO_TARGET_DIR }}/release/${{ env.CARGO_BIN_NAME }}
-            ${{ env.CARGO_TARGET_DIR }}/release/${{ env.CARGO_BIN_NAME }}.exe
-            ${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/release/${{ env.CARGO_BIN_NAME }}
-            ${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/release/${{ env.CARGO_BIN_NAME }}.exe
+            ${{ env.CARGO_TARGET_DIR }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
+            ${{ env.CARGO_TARGET_DIR }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
+            ${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}
+            ${{ env.CARGO_TARGET_DIR }}/${{ matrix.target }}/${{ env.BUILD_PROFILE }}/${{ env.CARGO_BIN_NAME }}.exe
          if-no-files-found: error

  release:
--- a/Cargo.lock
+++ b/Cargo.lock
@ -4,9 +4,9 @@ version = 3

 [[package]]
 name = "addr2line"
-version = "0.19.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
 dependencies = [
 "gimli",
 ]
@ -19,20 +19,21 @@ checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"

 [[package]]
 name = "ahash"
-version = "0.8.3"
+version = "0.8.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c99f64d1e06488f620f932677e24bc6e2897582980441ae90a671415bd7ec2f"
+checksum = "91429305e9f0a25f6205c5b8e0d2db09e0708a7a6df0f42212bb56c32c8ac97a"
 dependencies = [
 "cfg-if",
 "once_cell",
 "version_check",
+ "zerocopy",
 ]

 [[package]]
 name = "aho-corasick"
-version = "1.0.3"
+version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b8f9420f797f2d9e935edf629310eb938a0d839f984e25327f3c7eed22300c"
+checksum = "b2969dcb958b36655471fc61f7e416fa76033bdd4bfed0678d8fee1e2d07a1f0"
 dependencies = [
 "memchr",
 ]
@ -79,7 +80,7 @@ dependencies = [
 "argh_shared",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.39",
 ]

 [[package]]
@ -131,16 +132,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

 [[package]]
 name = "backtrace"
-version = "0.3.67"
+version = "0.3.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
 dependencies = [
 "addr2line",
 "cc",
 "cfg-if",
 "libc",
- "miniz_oxide 0.6.2",
- "object 0.30.3",
+ "miniz_oxide",
+ "object",
 "rustc-demangle",
 ]

@ -152,9 +153,9 @@ checksum = "4c7f02d4ea65f2c1853089ffd8d2787bdbc63de2f0d29dedbcf8ccdfa0ccd4cf"

 [[package]]
 name = "base64"
-version = "0.21.4"
+version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ba43ea6f343b788c8764558649e08df62f86c6ef251fdaeb1ffd010a9ae50a2"
+checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"

 [[package]]
 name = "bincode"
@ -173,15 +174,15 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"

 [[package]]
 name = "bitflags"
-version = "2.4.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4682ae6287fcf752ecaabbfcc7b6f9b72aa33933dc23a554d853aea8eea8635"
+checksum = "327762f6e5a765692301e5bb513e0d9fef63be86bbc14528052b1cd3e6f03e07"

 [[package]]
 name = "block-buffer"
-version = "0.10.3"
+version = "0.10.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "69cce20737498f97b993470a6e536b8523f0af7892a4f928cceb1ac5e52ebe7e"
+checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71"
 dependencies = [
 "generic-array",
 ]
@ -224,9 +225,9 @@ dependencies = [

 [[package]]
 name = "cpufeatures"
-version = "0.2.5"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28d997bd5e24a5928dd43e46dc529867e207907fe0b239c3477d924f7f2ca320"
+checksum = "ce420fe07aecd3e67c5f910618fe65e94158f6dcc0adf44e00d69ce2bdfe0fd0"
 dependencies = [
 "libc",
 ]
@ -310,6 +311,7 @@ dependencies = [
 "flate2",
 "glob",
 "hex",
+ "indent",
 "indexmap",
 "itertools",
 "log",
@ -318,7 +320,7 @@ dependencies = [
 "multimap",
 "nintendo-lz",
 "num_enum",
- "object 0.32.1",
+ "object",
 "once_cell",
 "owo-colors",
 "path-slash",
@ -334,6 +336,7 @@ dependencies = [
 "sha-1",
 "smallvec",
 "supports-color 2.1.0",
+ "syntect",
 "tracing",
 "tracing-attributes",
 "tracing-subscriber",
@ -342,9 +345,9 @@ dependencies = [

 [[package]]
 name = "digest"
-version = "0.10.6"
+version = "0.10.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8168378f4e5023e7218c89c891c0fd8ecdb5e5e4f18cb78f38cf245dd021e76f"
+checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292"
 dependencies = [
 "block-buffer",
 "crypto-common",
@ -383,9 +386,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"

 [[package]]
 name = "errno"
-version = "0.3.5"
+version = "0.3.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ac3e13f66a2f95e32a39eaa81f6b95d42878ca0e1db0c7543723dfe12557e860"
+checksum = "f258a7194e7f7c2a7837a8913aeab7fd8c383457034fa20ce4dd3dcb813e8eb8"
 dependencies = [
 "libc",
 "windows-sys 0.48.0",
@ -420,19 +423,25 @@ dependencies = [

 [[package]]
 name = "flate2"
-version = "1.0.27"
+version = "1.0.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6c98ee8095e9d1dcbf2fcc6d95acccb90d1c81db1e44725c6a984b1dbdfb010"
+checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
 dependencies = [
 "crc32fast",
- "miniz_oxide 0.7.1",
+ "miniz_oxide",
 ]

 [[package]]
-name = "generic-array"
-version = "0.14.6"
+name = "fnv"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bff49e947297f3312447abdca79f45f4738097cc82b06e72054d2223f601f1b9"
+checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
+
+[[package]]
+name = "generic-array"
+version = "0.14.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a"
 dependencies = [
 "typenum",
 "version_check",
@ -449,9 +458,9 @@ dependencies = [

 [[package]]
 name = "gimli"
-version = "0.27.3"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
+checksum = "6fb8d784f27acf97159b40fc4db5ecd8aa23b9ad5ef69cdd136d3bc80665f0c0"

 [[package]]
 name = "glob"
@ -461,9 +470,9 @@ checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"

 [[package]]
 name = "hashbrown"
-version = "0.14.1"
+version = "0.14.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7dfda62a12f55daeae5015f81b0baea145391cb4520f86c248fc615d72640d12"
+checksum = "f93e7192158dbcda357bdec5fb5788eebf8bbac027f3f33e719d29135ae84156"
 dependencies = [
 "ahash",
 ]
@ -490,10 +499,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"

 [[package]]
-name = "indexmap"
-version = "2.0.2"
+name = "indent"
+version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8adf3ddd720272c6ea8bf59463c04e0f93d0bbf7c5439b691bca2987e0270897"
+checksum = "d9f1a0777d972970f204fdf8ef319f1f4f8459131636d7e3c96c5d59570d0fa6"
+
+[[package]]
+name = "indexmap"
+version = "2.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d530e1a18b1cb4c484e6e34556a0d948706958449fca0cab753d649f2bce3d1f"
 dependencies = [
 "equivalent",
 "hashbrown",
@ -518,9 +533,9 @@ checksum = "616cde7c720bb2bb5824a224687d8f77bfd38922027f01d825cd7453be5099fb"

 [[package]]
 name = "itertools"
-version = "0.11.0"
+version = "0.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1c173a5686ce8bfa551b3563d0c2170bf24ca44da99c7ca4bfdab5418c3fe57"
+checksum = "25db6b064527c5d482d0423354fcd07a89a2dfe07b67892e62411946db7f07b0"
 dependencies = [
 "either",
 ]
@ -539,15 +554,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"

 [[package]]
 name = "libc"
-version = "0.2.147"
+version = "0.2.150"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4668fb0ea861c1df094127ac5f1da3409a82116a4ba74fca2e58ef927159bb3"
+checksum = "89d92a4743f9a61002fae18374ed11e7973f530cb3a3255fb354818118b2203c"

 [[package]]
 name = "linux-raw-sys"
-version = "0.4.10"
+version = "0.4.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2479e8c062e40bf0066ffa0bc823de0a9368974af99c9f6df941d2c231e03f"
+checksum = "969488b55f8ac402214f3f5fd243ebb7206cf82de60d3172994707a4bcc2b829"

 [[package]]
 name = "log"
@ -588,15 +603,6 @@ dependencies = [
 "autocfg",
 ]

-[[package]]
-name = "miniz_oxide"
-version = "0.6.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
-dependencies = [
- "adler",
-]
-
 [[package]]
 name = "miniz_oxide"
 version = "0.7.1"
@ -608,9 +614,9 @@ dependencies = [

 [[package]]
 name = "multimap"
-version = "0.9.0"
+version = "0.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70db9248a93dc36a36d9a47898caa007a32755c7ad140ec64eeeb50d5a730631"
+checksum = "e1a5d38b9b352dbd913288736af36af41c48d61b1a8cd34bcecd727561b7d511"
 dependencies = [
 "serde",
 ]
@ -637,41 +643,32 @@ dependencies = [

 [[package]]
 name = "num-traits"
-version = "0.2.16"
+version = "0.2.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f30b0abd723be7e2ffca1272140fac1a2f084c77ec3e123c192b66af1ee9e6c2"
+checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
 dependencies = [
 "autocfg",
 ]

 [[package]]
 name = "num_enum"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70bf6736f74634d299d00086f02986875b3c2d924781a6a2cb6c201e73da0ceb"
+checksum = "683751d591e6d81200c39fb0d1032608b77724f34114db54f571ff1317b337c0"
 dependencies = [
 "num_enum_derive",
 ]

 [[package]]
 name = "num_enum_derive"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "56ea360eafe1022f7cc56cd7b869ed57330fb2453d0c7831d99b74c65d2f5597"
+checksum = "6c11e44798ad209ccdd91fc192f0526a369a01234f7373e1b141c96d7cee4f0e"
 dependencies = [
 "proc-macro-crate",
 "proc-macro2",
 "quote",
- "syn 2.0.37",
-]
-
-[[package]]
-name = "object"
-version = "0.30.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea86265d3d3dcb6a27fc51bd29a4bf387fae9d2986b823079d4986af253eb439"
-dependencies = [
- "memchr",
+ "syn 2.0.39",
 ]

 [[package]]
@ -692,6 +689,28 @@ version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dd8b5dd2ae5ed71462c540258bedcb51965123ad7e7ccf4b9a8cafaa4a63576d"

+[[package]]
+name = "onig"
+version = "6.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8c4b31c8722ad9171c6d77d3557db078cab2bd50afcc9d09c8b315c59df8ca4f"
+dependencies = [
+ "bitflags 1.3.2",
+ "libc",
+ "once_cell",
+ "onig_sys",
+]
+
+[[package]]
+name = "onig_sys"
+version = "69.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b829e3d7e9cc74c7e315ee8edb185bf4190da5acde74afd7fc59c35b1f086e7"
+dependencies = [
+ "cc",
+ "pkg-config",
+]
+
 [[package]]
 name = "overload"
 version = "0.1.1"
@ -725,9 +744,15 @@ dependencies = [

 [[package]]
 name = "pin-project-lite"
-version = "0.2.12"
+version = "0.2.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12cc1b0bf1727a77a54b6654e7b5f1af8604923edc8b81885f8ec92f9e3f0a05"
+checksum = "8afb450f006bf6385ca15ef45d71d2288452bc3683ce2e2cacc0d18e4be60b58"
+
+[[package]]
+name = "pkg-config"
+version = "0.3.27"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26072860ba924cbfa98ea39c8c19b4dd6a4a25423dbdf219c1eca91aa0cf6964"

 [[package]]
 name = "ppc750cl"
@ -740,20 +765,18 @@ dependencies = [

 [[package]]
 name = "proc-macro-crate"
-version = "1.2.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eda0fc3b0fb7c975631757e14d9049da17374063edb6ebbcbc54d880d4fe94e9"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "once_cell",
- "thiserror",
- "toml",
+ "toml_edit",
 ]

 [[package]]
 name = "proc-macro2"
-version = "1.0.67"
+version = "1.0.69"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d433d9f1a3e8c1263d9456598b16fec66f4acc9a74dacffd35c7bb09b3a1328"
+checksum = "134c189feb4956b20f6f547d2cf727d4c0fe06722b20a0eec87ed445a97f92da"
 dependencies = [
 "unicode-ident",
 ]
@ -810,14 +833,14 @@ dependencies = [

 [[package]]
 name = "regex"
-version = "1.9.6"
+version = "1.10.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebee201405406dbf528b8b672104ae6d6d63e6d118cb10e4d51abbc7b58044ff"
+checksum = "380b951a9c5e80ddfd6136919eef32310721aa4aacd4889a8d39124b026ab343"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-automata 0.3.9",
- "regex-syntax 0.7.5",
+ "regex-automata 0.4.3",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@ -831,13 +854,13 @@ dependencies = [

 [[package]]
 name = "regex-automata"
-version = "0.3.9"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b23e92ee4318893fa3fe3e6fb365258efbfe6ac6ab30f090cdcbb7aa37efa9"
+checksum = "5f804c7828047e88b2d32e2d7fe5a105da8ee3264f01902f796c8e067dc2483f"
 dependencies = [
 "aho-corasick",
 "memchr",
- "regex-syntax 0.7.5",
+ "regex-syntax 0.8.2",
 ]

 [[package]]
@ -852,6 +875,12 @@ version = "0.7.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dbb5fb1acd8a1a18b3dd5be62d25485eb770e05afb408a9627d14d451bae12da"

+[[package]]
+name = "regex-syntax"
+version = "0.8.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c08c74e62047bb2de4ff487b251e4a92e24f48745648451635cec7d591162d9f"
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.23"
@ -866,11 +895,11 @@ checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"

 [[package]]
 name = "rustix"
-version = "0.38.13"
+version = "0.38.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7db8590df6dfcd144d22afd1b83b36c21a18d7cbc1dc4bb5295a8712e9eb662"
+checksum = "9ad981d6c340a49cdc40a1028d9c6084ec7e9fa33fcb839cab656a267071e234"
 dependencies = [
- "bitflags 2.4.0",
+ "bitflags 2.4.1",
 "errno",
 "libc",
 "linux-raw-sys",
@ -883,6 +912,15 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1ad4cc8da4ef723ed60bced201181d83791ad433213d8c24efffda1eec85d741"

+[[package]]
+name = "same-file"
+version = "1.0.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "93fc1dc3aaa9bfed95e02e6eadabb4baf7e3078b0bd1b4d7b6b0b68378900502"
+dependencies = [
+ "winapi-util",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@ -891,29 +929,29 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
 name = "serde"
-version = "1.0.188"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9e0fcba69a370eed61bcf2b728575f726b50b55cba78064753d708ddc7549e"
+checksum = "bca2a08484b285dcb282d0f67b26cadc0df8b19f8c12502c13d966bf9482f001"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.188"
+version = "1.0.192"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4eca7ac642d82aa35b60049a6eccb4be6be75e599bd2e9adb5f875a737654af2"
+checksum = "d6c7207fbec9faa48073f3e3074cbe553af6ea512d7c21ba46e434e70ea9fbc1"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.39",
 ]

 [[package]]
 name = "serde_json"
-version = "1.0.107"
+version = "1.0.108"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b420ce6e3d8bd882e9b243c6eed35dbc9a6110c9769e74b584e0d68d1f20c65"
+checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
 dependencies = [
 "itoa",
 "ryu",
@ -922,20 +960,20 @@ dependencies = [

 [[package]]
 name = "serde_repr"
-version = "0.1.16"
+version = "0.1.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8725e1dfadb3a50f7e5ce0b1a540466f6ed3fe7a0fca2ac2b8b831d31316bd00"
+checksum = "3081f5ffbb02284dda55132aa26daecedd7372a42417bbbab6f14ab7d6bb9145"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.39",
 ]

 [[package]]
 name = "serde_yaml"
-version = "0.9.25"
+version = "0.9.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a49e178e4452f45cb61d0cd8cebc1b0fafd3e41929e996cef79aa3aca91f574"
+checksum = "3cc7a1570e38322cfe4154732e5110f887ea57e22b76f4bfd32b5bdd3368666c"
 dependencies = [
 "indexmap",
 "itoa",
@ -957,18 +995,18 @@ dependencies = [

 [[package]]
 name = "sharded-slab"
-version = "0.1.4"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "900fba806f70c630b0a382d0d825e17a0f19fcd059a2ade1ff237bcddf446b31"
+checksum = "f40ca3c46823713e0d4209592e8d6e826aa57e928f09752619fc696c499637f6"
 dependencies = [
 "lazy_static",
 ]

 [[package]]
 name = "smallvec"
-version = "1.11.1"
+version = "1.11.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "942b4a808e05215192e39f4ab80813e599068285906cc91aa64f923db842bd5a"
+checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"

 [[package]]
 name = "strsim"
@ -1009,15 +1047,34 @@ dependencies = [

 [[package]]
 name = "syn"
-version = "2.0.37"
+version = "2.0.39"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7303ef2c05cd654186cb250d29049a24840ca25d2747c25c0381c8d9e2f582e8"
+checksum = "23e78b90f2fcf45d3e842032ce32e3f2d1545ba6636271dcbf24fa306d87be7a"
 dependencies = [
 "proc-macro2",
 "quote",
 "unicode-ident",
 ]

+[[package]]
+name = "syntect"
+version = "5.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e02b4b303bf8d08bfeb0445cba5068a3d306b6baece1d5582171a9bf49188f91"
+dependencies = [
+ "bincode",
+ "bitflags 1.3.2",
+ "flate2",
+ "fnv",
+ "once_cell",
+ "onig",
+ "regex-syntax 0.7.5",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "walkdir",
+]
+
 [[package]]
 name = "textwrap"
 version = "0.11.0"
@ -1029,22 +1086,22 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1177e8c6d7ede7afde3585fd2513e611227efd6481bd78d2e82ba1ce16557ed4"
+checksum = "f9a7210f5c9a7156bb50aa36aed4c95afb51df0df00713949448cf9e97d382d2"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.49"
+version = "1.0.50"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10712f02019e9288794769fba95cd6847df9874d49d871d062172f9dd41bc4cc"
+checksum = "266b2e40bc00e5a6c09c3584011e08b06f123c00362c92b975ba9843aaaa14b8"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.39",
 ]

 [[package]]
@ -1058,21 +1115,28 @@ dependencies = [
 ]

 [[package]]
-name = "toml"
-version = "0.5.11"
+name = "toml_datetime"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f4f7f0dd8d50a853a531c426359045b1998f04219d88799810762cd4ad314234"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
+
+[[package]]
+name = "toml_edit"
+version = "0.20.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
- "serde",
+ "indexmap",
+ "toml_datetime",
+ "winnow",
 ]

 [[package]]
 name = "tracing"
-version = "0.1.37"
+version = "0.1.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ce8c33a8d48bd45d624a6e523445fd21ec13d3653cd51f681abf67418f54eb8"
+checksum = "c3523ab5a71916ccf420eebdf5521fcef02141234bbc0b8a49f2fdc4544364ef"
 dependencies = [
- "cfg-if",
 "pin-project-lite",
 "tracing-attributes",
 "tracing-core",
@ -1080,20 +1144,20 @@ dependencies = [

 [[package]]
 name = "tracing-attributes"
-version = "0.1.26"
+version = "0.1.27"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f4f31f56159e98206da9efd823404b79b6ef3143b4a7ab76e67b1751b25a4ab"
+checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
 "proc-macro2",
 "quote",
- "syn 2.0.37",
+ "syn 2.0.39",
 ]

 [[package]]
 name = "tracing-core"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0955b8137a1df6f1a2e9a37d8a6656291ff0297c1a97c24e0d8425fe2312f79a"
+checksum = "c06d3da6113f116aaee68e4d601191614c9053067f9ab7f6edbcb161237daa54"
 dependencies = [
 "once_cell",
 "valuable",
@ -1101,20 +1165,20 @@ dependencies = [

 [[package]]
 name = "tracing-log"
-version = "0.1.3"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78ddad33d2d10b1ed7eb9d1f518a5674713876e97e5bb9b7345a7984fbb4f922"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "lazy_static",
 "log",
+ "once_cell",
 "tracing-core",
 ]

 [[package]]
 name = "tracing-subscriber"
-version = "0.3.17"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30a651bc37f915e81f087d86e62a18eec5f79550c7faff886f7090b4ea757c77"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
 "matchers",
 "nu-ansi-term",
@ -1130,30 +1194,30 @@ dependencies = [

 [[package]]
 name = "typenum"
-version = "1.15.0"
+version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf81ac59edc17cc8697ff311e8f5ef2d99fcbd9817b34cec66f90b6c3dfd987"
+checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"

 [[package]]
 name = "unicase"
-version = "2.6.0"
+version = "2.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "50f37be617794602aabbeee0be4f259dc1778fabe05e2d67ee8f79326d5cb4f6"
+checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
 dependencies = [
 "version_check",
 ]

 [[package]]
 name = "unicode-ident"
-version = "1.0.11"
+version = "1.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "301abaae475aa91687eb82514b328ab47a211a533026cb25fc3e519b86adfc3c"
+checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"

 [[package]]
 name = "unicode-width"
-version = "0.1.10"
+version = "0.1.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0edd1e5b14653f783770bce4a4dabb4a5108a5370a5f5d8cfe8710c361f6c8b"
+checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"

 [[package]]
 name = "unsafe-libyaml"
@ -1179,6 +1243,16 @@ version = "0.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"

+[[package]]
+name = "walkdir"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d71d857dc86794ca4c280d616f7da00d2dbfd8cd788846559a6813e6aa4b54ee"
+dependencies = [
+ "same-file",
+ "winapi-util",
+]
+
 [[package]]
 name = "winapi"
 version = "0.3.9"
@ -1195,6 +1269,15 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"

+[[package]]
+name = "winapi-util"
+version = "0.1.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+dependencies = [
+ "winapi",
+]
+
 [[package]]
 name = "winapi-x86_64-pc-windows-gnu"
 version = "0.4.0"
@ -1324,8 +1407,37 @@ version = "0.48.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"

+[[package]]
+name = "winnow"
+version = "0.5.19"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "829846f3e3db426d4cee4510841b71a8e58aa2a76b1132579487ae430ccd9c7b"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "xxhash-rust"
 version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9828b178da53440fa9c766a3d2f73f7cf5d0ac1fe3980c1e5018d899fd19e07b"
+
+[[package]]
+name = "zerocopy"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e97e415490559a91254a2979b4829267a57d2fcd741a98eee8b722fb57289aa0"
+dependencies = [
+ "zerocopy-derive",
+]
+
+[[package]]
+name = "zerocopy-derive"
+version = "0.7.26"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd7e48ccf166952882ca8bd778a43502c64f33bf94c12ebe2a7f08e5a0f6689f"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.39",
+]
--- a/Cargo.toml
+++ b/Cargo.toml
@ -16,8 +16,11 @@ name = "dtk"
 path = "src/main.rs"

 [profile.release]
-lto = "thin"
 panic = "abort"
+
+[profile.release-lto]
+inherits = "release"
+lto = "thin"
 strip = "debuginfo"

 [dependencies]
@ -25,24 +28,25 @@ anyhow = { version = "1.0.75", features = ["backtrace"] }
 ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "write_symbol_table" }
 argp = "0.3.0"
 base16ct = "0.2.0"
-base64 = "0.21.4"
+base64 = "0.21.5"
 cwdemangle = "0.1.6"
 dol = { git = "https://github.com/encounter/ppc750cl", rev = "4a2bbbc6f84dcb76255ab6f3595a8d4a0ce96618" }
 enable-ansi-support = "0.2.1"
 filetime = "0.2.22"
 fixedbitset = "0.4.2"
 flagset = { version = "0.4.4", features = ["serde"] }
-flate2 = "1.0.27"
+flate2 = "1.0.28"
 glob = "0.3.1"
 hex = "0.4.3"
-indexmap = "2.0.2"
-itertools = "0.11.0"
+indent = "0.1.1"
+indexmap = "2.1.0"
+itertools = "0.12.0"
 log = "0.4.20"
 memchr = "2.6.4"
 memmap2 = "0.9.0"
-multimap = "0.9.0"
+multimap = "0.9.1"
 nintendo-lz = "0.1.3"
-num_enum = "0.7.0"
+num_enum = "0.7.1"
 object = { version = "0.32.1", features = ["read_core", "std", "elf", "write_std"], default-features = false }
 once_cell = "1.18.0"
 owo-colors = { version = "3.5.0", features = ["supports-colors"] }
@ -50,16 +54,17 @@ path-slash = "0.2.1"
 petgraph = { version = "0.6.4", default-features = false }
 ppc750cl = { git = "https://github.com/encounter/ppc750cl", rev = "4a2bbbc6f84dcb76255ab6f3595a8d4a0ce96618" }
 rayon = "1.8.0"
-regex = "1.9.6"
+regex = "1.10.2"
 rustc-hash = "1.1.0"
-serde = "1.0.188"
-serde_json = "1.0.107"
-serde_repr = "0.1.16"
-serde_yaml = "0.9.25"
+serde = "1.0.192"
+serde_json = "1.0.108"
+serde_repr = "0.1.17"
+serde_yaml = "0.9.27"
 sha-1 = "0.10.1"
-smallvec = "1.11.1"
+smallvec = "1.11.2"
 supports-color = "2.1.0"
-tracing = "0.1.37"
-tracing-attributes = "0.1.26"
-tracing-subscriber = { version = "0.3.17", features = ["env-filter"] }
+syntect = { version = "5.1.0", features = ["parsing", "regex-onig", "dump-load"], default-features = false }
+tracing = "0.1.40"
+tracing-attributes = "0.1.27"
+tracing-subscriber = { version = "0.3.18", features = ["env-filter"] }
 xxhash-rust = { version = "0.8.7", features = ["xxh3"] }
--- a/assets/syntax/README
+++ b/assets/syntax/README
@ -0,0 +1,11 @@
+syntect packs generated from:
+https://github.com/braver/Solarized/blob/87e01090cf5fb821a234265b3138426ae84900e7/Solarized%20(dark).tmTheme
+https://github.com/sublimehq/Packages/tree/fa6b8629c95041bf262d4c1dab95c456a0530122/C%2B%2B
+
+// let mut theme_set = ThemeSet::load_from_folder("../Solarized")?;
+// syntect::dumps::dump_to_file(&theme_set, "assets/syntax/default.themedump")?;
+//
+// let mut builder = SyntaxSetBuilder::new();
+// builder.add_from_folder("../sublimehq-Packages/C++", true)?;
+// let syntax_set = builder.build();
+// syntect::dumps::dump_to_file(&syntax_set, "assets/syntax/default_newlines.packdump")?;
--- a/assets/syntax/default.themedump
+++ b/assets/syntax/default.themedump
--- a/assets/syntax/default_newlines.packdump
+++ b/assets/syntax/default_newlines.packdump
--- a/src/cmd/dol.rs
+++ b/src/cmd/dol.rs
@ -17,6 +17,7 @@ use itertools::Itertools;
 use rayon::prelude::*;
 use serde::{Deserialize, Serialize};
 use tracing::{debug, info, info_span};
+use xxhash_rust::xxh3::xxh3_64;

 use crate::{
    analysis::{
@ -830,8 +831,7 @@ fn split_write_obj(
        if let Some(parent) = out_path.parent() {
            DirBuilder::new().recursive(true).create(parent)?;
        }
-        fs::write(&out_path, out_obj)
-            .with_context(|| format!("Failed to write '{}'", out_path.display()))?;
+        write_if_changed(&out_path, &out_obj)?;
    }

    // Generate ldscript.lcf
@ -842,10 +842,9 @@ fn split_write_obj(
    } else {
        None
    };
-    fs::write(
-        &out_config.ldscript,
-        generate_ldscript(&module.obj, ldscript_template.as_deref(), &module.config.force_active)?,
-    )?;
+    let ldscript_string =
+        generate_ldscript(&module.obj, ldscript_template.as_deref(), &module.config.force_active)?;
+    write_if_changed(&out_config.ldscript, ldscript_string.as_bytes())?;

    if config.write_asm {
        debug!("Writing disassembly");
@ -862,6 +861,21 @@ fn split_write_obj(
    Ok(out_config)
 }

+fn write_if_changed(path: &Path, contents: &[u8]) -> Result<()> {
+    if path.is_file() {
+        let old_file = map_file(path)?;
+        // If the file is the same size, check if the contents are the same
+        // Avoid writing if unchanged, since it will update the file's mtime
+        if old_file.len() == contents.len() as u64
+            && xxh3_64(old_file.as_slice()) == xxh3_64(contents)
+        {
+            return Ok(());
+        }
+    }
+    fs::write(path, contents)?;
+    Ok(())
+}
+
 fn load_analyze_rel(config: &ProjectConfig, module_config: &ModuleConfig) -> Result<AnalyzeResult> {
    debug!("Loading {}", module_config.object.display());
    let file = map_file(&module_config.object)?;
--- a/src/cmd/dwarf.rs
+++ b/src/cmd/dwarf.rs
@ -2,16 +2,21 @@ use std::{
    collections::{btree_map, BTreeMap},
    io::{stdout, Cursor, Read, Write},
    path::PathBuf,
+    str::from_utf8,
 };

-use anyhow::{anyhow, bail, Result};
+use anyhow::{anyhow, bail, Context, Result};
 use argp::FromArgs;
 use object::{elf, Object, ObjectSection, ObjectSymbol, RelocationKind, RelocationTarget, Section};
+use syntect::{
+    highlighting::{Color, HighlightIterator, HighlightState, Highlighter, Theme, ThemeSet},
+    parsing::{ParseState, ScopeStack, SyntaxReference, SyntaxSet},
+};

 use crate::util::{
    dwarf::{
-        process_address, process_type, process_variable_location, read_debug_section, type_string,
-        ud_type, ud_type_def, ud_type_string, AttributeKind, TagKind,
+        process_root_tag, read_debug_section, should_skip_tag, tag_type_string, AttributeKind,
+        TagKind,
    },
    file::{buf_writer, map_file},
 };
@ -40,6 +45,9 @@ pub struct DumpArgs {
    #[argp(option, short = 'o')]
    /// Output file. (Or directory, for archive)
    out: Option<PathBuf>,
+    #[argp(switch)]
+    /// Disable color output.
+    no_color: bool,
 }

 pub fn run(args: Args) -> Result<()> {
@ -49,6 +57,15 @@ pub fn run(args: Args) -> Result<()> {
 }

 fn dump(args: DumpArgs) -> Result<()> {
+    // Load syntect
+    let theme_set: ThemeSet =
+        syntect::dumps::from_binary(include_bytes!("../../assets/syntax/default.themedump"));
+    let syntax_set: SyntaxSet = syntect::dumps::from_binary(include_bytes!(
+        "../../assets/syntax/default_newlines.packdump"
+    ));
+    let theme = theme_set.themes.get("Solarized (dark)").context("Failed to load theme")?;
+    let syntax = syntax_set.find_syntax_by_name("C++").context("Failed to find syntax")?.clone();
+
    let file = map_file(&args.in_file)?;
    let buf = file.as_slice();
    if buf.starts_with(b"!<arch>\n") {
@ -80,9 +97,13 @@ fn dump(args: DumpArgs) -> Result<()> {
                let mut file = buf_writer(file_path)?;
                dump_debug_section(&mut file, &obj_file, debug_section)?;
                file.flush()?;
-            } else {
-                println!("\nFile {}:", name);
+            } else if args.no_color {
+                println!("\n// File {}:", name);
                dump_debug_section(&mut stdout(), &obj_file, debug_section)?;
+            } else {
+                let mut writer = HighlightWriter::new(syntax_set.clone(), syntax.clone(), theme);
+                writeln!(writer, "\n// File {}:", name)?;
+                dump_debug_section(&mut writer, &obj_file, debug_section)?;
            }
        }
    } else {
@ -94,8 +115,11 @@ fn dump(args: DumpArgs) -> Result<()> {
            let mut file = buf_writer(out_path)?;
            dump_debug_section(&mut file, &obj_file, debug_section)?;
            file.flush()?;
-        } else {
+        } else if args.no_color {
            dump_debug_section(&mut stdout(), &obj_file, debug_section)?;
+        } else {
+            let mut writer = HighlightWriter::new(syntax_set, syntax, theme);
+            dump_debug_section(&mut writer, &obj_file, debug_section)?;
        }
    }
    Ok(())
@ -145,140 +169,37 @@ where
                        .string_attribute(AttributeKind::Name)
                        .ok_or_else(|| anyhow!("CompileUnit without name {:?}", tag))?;
                    if units.contains(unit) {
-                        log::warn!("Duplicate unit '{}'", unit);
+                        // log::warn!("Duplicate unit '{}'", unit);
                    } else {
                        units.push(unit.clone());
                    }
+                    writeln!(w, "\n// Compile unit: {}", unit)?;

                    let children = tag.children(&tags);
                    let mut typedefs = BTreeMap::<u32, Vec<u32>>::new();
                    for child in children {
-                        match child.kind {
-                            TagKind::GlobalSubroutine | TagKind::Subroutine => {
-                                let _is_prototyped =
-                                    child.string_attribute(AttributeKind::Prototyped).is_some();
-                                if let (Some(_hi), Some(_lo)) = (
-                                    child.address_attribute(AttributeKind::HighPc),
-                                    child.address_attribute(AttributeKind::LowPc),
-                                ) {}
-                                let name = child
-                                    .string_attribute(AttributeKind::Name)
-                                    .ok_or_else(|| anyhow!("Subroutine without name"))?;
-                                let udt = ud_type(&tags, child)?;
-                                let ts = ud_type_string(&tags, &typedefs, &udt)?;
-                                writeln!(w, "{} {}{} {{", ts.prefix, name, ts.suffix)?;
-                                for tag in child.children(&tags) {
-                                    match tag.kind {
-                                        TagKind::LocalVariable => {}
-                                        _ => continue,
-                                    }
-                                    let type_attr = tag.type_attribute().ok_or_else(|| {
-                                        anyhow!("LocalVariable without type attr")
-                                    })?;
-                                    let var_type = process_type(type_attr)?;
-                                    let ts = type_string(&tags, &typedefs, &var_type)?;
-                                    let name = tag
-                                        .string_attribute(AttributeKind::Name)
-                                        .ok_or_else(|| anyhow!("LocalVariable without name"))?;
-                                    write!(w, "\t{} {}{};", ts.prefix, name, ts.suffix)?;
-                                    if let Some(location) =
-                                        tag.block_attribute(AttributeKind::Location)
-                                    {
-                                        if !location.is_empty() {
-                                            write!(
-                                                w,
-                                                " // {}",
-                                                process_variable_location(location)?
-                                            )?;
-                                        }
-                                    }
-                                    writeln!(w)?;
-                                }
-                                writeln!(w, "}}")?;
-                            }
-                            TagKind::Typedef => {
-                                let name = child
-                                    .string_attribute(AttributeKind::Name)
-                                    .ok_or_else(|| anyhow!("Typedef without name"))?;
-                                let attr = child
-                                    .type_attribute()
-                                    .ok_or_else(|| anyhow!("Typedef without type attribute"))?;
-                                let t = process_type(attr)?;
-                                let ts = type_string(&tags, &typedefs, &t)?;
-                                writeln!(w, "typedef {} {}{};", ts.prefix, name, ts.suffix)?;
+                        let tag_type = process_root_tag(&tags, child)?;
+                        if should_skip_tag(&tag_type) {
+                            continue;
+                        }
+                        writeln!(w, "{}", tag_type_string(&tags, &typedefs, &tag_type)?)?;

-                                // TODO fundamental typedefs?
-                                if let Some(ud_type_ref) =
-                                    child.reference_attribute(AttributeKind::UserDefType)
-                                {
-                                    match typedefs.entry(ud_type_ref) {
-                                        btree_map::Entry::Vacant(e) => {
-                                            e.insert(vec![child.key]);
-                                        }
-                                        btree_map::Entry::Occupied(e) => {
-                                            e.into_mut().push(child.key);
-                                        }
+                        if let TagKind::Typedef = child.kind {
+                            // TODO fundamental typedefs?
+                            if let Some(ud_type_ref) =
+                                child.reference_attribute(AttributeKind::UserDefType)
+                            {
+                                match typedefs.entry(ud_type_ref) {
+                                    btree_map::Entry::Vacant(e) => {
+                                        e.insert(vec![child.key]);
+                                    }
+                                    btree_map::Entry::Occupied(e) => {
+                                        e.into_mut().push(child.key);
                                    }
                                }
                            }
-                            TagKind::GlobalVariable | TagKind::LocalVariable => {
-                                let name = child
-                                    .string_attribute(AttributeKind::Name)
-                                    .ok_or_else(|| anyhow!("Variable without name"))?;
-                                let address = if let Some(location) =
-                                    child.block_attribute(AttributeKind::Location)
-                                {
-                                    Some(process_address(location)?)
-                                } else {
-                                    None
-                                };
-                                if let Some(type_attr) = child.type_attribute() {
-                                    let var_type = process_type(type_attr)?;
-                                    // log::info!("{:?}", var_type);
-                                    // if let TypeKind::UserDefined(key) = var_type.kind {
-                                    //     let ud_tag = tags
-                                    //         .get(&key)
-                                    //         .ok_or_else(|| anyhow!("Invalid UD type ref"))?;
-                                    //     let ud_type = ud_type(&tags, ud_tag)?;
-                                    //     log::info!("{:?}", ud_type);
-                                    // }
-                                    let ts = type_string(&tags, &typedefs, &var_type)?;
-                                    let st = if child.kind == TagKind::LocalVariable {
-                                        "static "
-                                    } else {
-                                        ""
-                                    };
-                                    let address_str = match address {
-                                        Some(addr) => format!(" : {:#010X}", addr),
-                                        None => String::new(),
-                                    };
-                                    let size = var_type.size(&tags)?;
-                                    writeln!(
-                                        w,
-                                        "{}{} {}{}{}; // size: {:#X}",
-                                        st, ts.prefix, name, ts.suffix, address_str, size,
-                                    )?;
-                                }
-                            }
-                            TagKind::StructureType
-                            | TagKind::ArrayType
-                            | TagKind::EnumerationType
-                            | TagKind::UnionType
-                            | TagKind::ClassType
-                            | TagKind::SubroutineType => {
-                                let udt = ud_type(&tags, child)?;
-                                if child.string_attribute(AttributeKind::Name).is_some() {
-                                    writeln!(w, "{}", ud_type_def(&tags, &typedefs, &udt)?)?;
-                                } else {
-                                    // log::warn!("No name for tag: {:?}", child);
-                                }
-                            }
-                            _ => {
-                                log::warn!("Unhandled CompileUnit child {:?}", child.kind);
-                            }
                        }
                    }
-                    // println!("Children: {:?}", children.iter().map(|c| c.kind).collect::<Vec<TagKind>>());
                }
                _ => {
                    log::warn!("Expected CompileUnit, got {:?}", tag.kind);
@ -298,3 +219,81 @@ where
    // }
    Ok(())
 }
+
+struct HighlightWriter<'a> {
+    line: String,
+    highlighter: Highlighter<'a>,
+    parse_state: ParseState,
+    highlight_state: HighlightState,
+    syntax_set: SyntaxSet,
+}
+
+impl<'a> HighlightWriter<'a> {
+    pub fn new(
+        syntax_set: SyntaxSet,
+        syntax: SyntaxReference,
+        theme: &'a Theme,
+    ) -> HighlightWriter<'a> {
+        let highlighter = Highlighter::new(theme);
+        let highlight_state = HighlightState::new(&highlighter, ScopeStack::new());
+        HighlightWriter {
+            line: String::new(),
+            highlighter,
+            syntax_set,
+            parse_state: ParseState::new(&syntax),
+            highlight_state,
+        }
+    }
+}
+
+#[inline]
+fn blend_fg_color(fg: Color, bg: Color) -> Color {
+    if fg.a == 0xff {
+        return fg;
+    }
+    let ratio = fg.a as u32;
+    let r = (fg.r as u32 * ratio + bg.r as u32 * (255 - ratio)) / 255;
+    let g = (fg.g as u32 * ratio + bg.g as u32 * (255 - ratio)) / 255;
+    let b = (fg.b as u32 * ratio + bg.b as u32 * (255 - ratio)) / 255;
+    Color { r: r as u8, g: g as u8, b: b as u8, a: 255 }
+}
+
+impl Write for HighlightWriter<'_> {
+    fn write(&mut self, buf: &[u8]) -> std::io::Result<usize> {
+        let str = from_utf8(buf).map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+        for s in str.split_inclusive('\n') {
+            self.line.push_str(s);
+            if self.line.ends_with('\n') {
+                self.flush()?;
+            }
+        }
+        Ok(buf.len())
+    }
+
+    fn flush(&mut self) -> std::io::Result<()> {
+        if self.line.is_empty() {
+            return Ok(());
+        }
+        let ops = self
+            .parse_state
+            .parse_line(&self.line, &self.syntax_set)
+            .map_err(|e| std::io::Error::new(std::io::ErrorKind::Other, e))?;
+        let iter = HighlightIterator::new(
+            &mut self.highlight_state,
+            &ops[..],
+            &self.line,
+            &self.highlighter,
+        );
+        for (style, text) in iter {
+            print!(
+                "\x1b[48;2;{};{};{}m",
+                style.background.r, style.background.g, style.background.b
+            );
+            let fg = blend_fg_color(style.foreground, style.background);
+            print!("\x1b[38;2;{};{};{}m{}", fg.r, fg.g, fg.b, text);
+        }
+        print!("\x1b[0m");
+        self.line.clear();
+        Ok(())
+    }
+}
--- a/src/cmd/rarc.rs
+++ b/src/cmd/rarc.rs
@ -53,7 +53,8 @@ pub fn run(args: Args) -> Result<()> {

 fn list(args: ListArgs) -> Result<()> {
    let file = map_file(&args.file)?;
-    let rarc = RarcReader::new(&mut file.as_reader())?;
+    let rarc = RarcReader::new(&mut file.as_reader())
+        .with_context(|| format!("Failed to process RARC file '{}'", args.file.display()))?;

    let mut current_path = PathBuf::new();
    for node in rarc.nodes() {
@ -77,7 +78,8 @@ fn list(args: ListArgs) -> Result<()> {

 fn extract(args: ExtractArgs) -> Result<()> {
    let file = map_file(&args.file)?;
-    let rarc = RarcReader::new(&mut file.as_reader())?;
+    let rarc = RarcReader::new(&mut file.as_reader())
+        .with_context(|| format!("Failed to process RARC file '{}'", args.file.display()))?;

    let mut current_path = PathBuf::new();
    for node in rarc.nodes() {
--- a/src/util/dwarf.rs
+++ b/src/util/dwarf.rs
Author	SHA1	Message	Date
Luke Street	8659b56da4	Skip writing objects and ldscripts if unchanged Avoids unnecessary rebuilds with build systems like ninja & make that track mtime	2023-11-18 17:21:08 -05:00
Luke Street	363fa2ac72	Use custom syntect packs to reduce binary size - Custom syntax set containing only C/C++ - Custom themeset containing only Solarized (Dark) - Disable default syntect features	2023-11-18 16:12:03 -05:00
Luke Street	d7a3fd53c7	Fix CI artifact upload	2023-11-18 15:07:44 -05:00
Luke Street	8f559c8921	Update dependencies & CI changes - Use separate release-lto profile for CI - A couple of clippy fixes	2023-11-18 15:03:24 -05:00
Luke Street	5e13998e93	Major `dwarf dump` rework - Supports games with C++ DWARF info - Syntax highlighting when printing to console (disable with `--no-color`) - Overall improvements to parsing and output	2023-11-18 13:56:58 -05:00