add missing fields to Cargo.toml

prepare to publish crate / apply clippy fixes
add highlevel description of compressed format in unpack.c
2026-01-20 11:36:42 +01:00 · 2025-07-16 21:16:44 +02:00 · 2025-07-16 21:05:57 +02:00 · 2024-05-25 22:02:47 +02:00 · 2024-05-15 10:56:25 +02:00 · 2024-04-10 23:53:46 +02:00
14 changed files with 757 additions and 220 deletions
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1,30 +1,33 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4

 [[package]]
 name = "anyhow"
-version = "1.0.47"
+version = "1.0.98"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38d9ff5d688f1c13395289f67db01d4826b46dd694e7580accdc3e8430f2d98e"
+checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"

 [[package]]
 name = "autocfg"
-version = "1.1.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
+checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"

 [[package]]
 name = "bitflags"
-version = "1.3.2"
+version = "2.9.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
+checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"

 [[package]]
 name = "cc"
-version = "1.0.72"
+version = "1.2.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
+checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
+dependencies = [
+ "shlex",
+]

 [[package]]
 name = "cdivsufsort"
@@ -38,118 +41,104 @@ dependencies = [

 [[package]]
 name = "cfg-if"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
+checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"

 [[package]]
 name = "crossbeam-channel"
-version = "0.5.1"
+version = "0.5.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
+checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
 dependencies = [
- "cfg-if",
 "crossbeam-utils",
 ]

 [[package]]
 name = "crossbeam-utils"
-version = "0.8.5"
+version = "0.8.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
-dependencies = [
- "cfg-if",
- "lazy_static",
-]
+checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"

 [[package]]
 name = "crossterm"
-version = "0.25.0"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
+checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
 dependencies = [
 "bitflags",
- "crossterm_winapi",
- "libc",
- "mio",
+ "document-features",
 "parking_lot",
- "signal-hook",
- "signal-hook-mio",
- "winapi",
+ "rustix",
 ]

 [[package]]
-name = "crossterm_winapi"
-version = "0.9.0"
+name = "document-features"
+version = "0.2.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
+checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
 dependencies = [
- "winapi",
+ "litrs",
 ]

 [[package]]
-name = "lazy_static"
-version = "1.4.0"
+name = "errno"
+version = "0.3.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
+dependencies = [
+ "libc",
+ "windows-sys",
+]

 [[package]]
 name = "lexopt"
-version = "0.2.1"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
+checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"

 [[package]]
 name = "libc"
-version = "0.2.135"
+version = "0.2.174"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
+checksum = "1171693293099992e19cddea4e8b849964e9846f4acee11b3948bcc337be8776"
+
+[[package]]
+name = "linux-raw-sys"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd945864f07fe9f5371a27ad7b52a172b4b499999f1d97574c9fa68373937e12"
+
+[[package]]
+name = "litrs"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b4ce301924b7887e9d637144fdade93f9dfff9b60981d4ac161db09720d39aa5"

 [[package]]
 name = "lock_api"
-version = "0.4.9"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
+checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
 dependencies = [
 "autocfg",
 "scopeguard",
 ]

-[[package]]
-name = "log"
-version = "0.4.17"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
-dependencies = [
- "cfg-if",
-]
-
-[[package]]
-name = "mio"
-version = "0.8.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
-dependencies = [
- "libc",
- "log",
- "wasi 0.11.0+wasi-snapshot-preview1",
- "windows-sys 0.36.1",
-]
-
 [[package]]
 name = "num-traits"
-version = "0.2.14"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
 "autocfg",
 ]

 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
 dependencies = [
 "lock_api",
 "parking_lot_core",
@@ -157,56 +146,68 @@ dependencies = [

 [[package]]
 name = "parking_lot_core"
-version = "0.9.4"
+version = "0.9.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
+checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
 dependencies = [
 "cfg-if",
 "libc",
 "redox_syscall",
 "smallvec",
- "windows-sys 0.42.0",
+ "windows-targets 0.52.6",
 ]

 [[package]]
 name = "pbr"
-version = "1.0.4"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
+checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
 dependencies = [
 "crossbeam-channel",
 "libc",
- "time",
 "winapi",
 ]

 [[package]]
 name = "proc-macro2"
-version = "1.0.44"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
 "unicode-ident",
 ]

 [[package]]
 name = "quote"
-version = "1.0.21"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
 "proc-macro2",
 ]

 [[package]]
 name = "redox_syscall"
-version = "0.2.16"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
+checksum = "0d04b7d0ee6b4a0207a0a7adb104d23ecb0b47d6beae7152d0fa34b692b29fd6"
 dependencies = [
 "bitflags",
 ]

+[[package]]
+name = "rustix"
+version = "1.0.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "11181fbabf243db407ef8df94a6ce0b2f9a733bd8be4ad02b4eda9602296cac8"
+dependencies = [
+ "bitflags",
+ "errno",
+ "libc",
+ "linux-raw-sys",
+ "windows-sys",
+]
+
 [[package]]
 name = "sacabase"
 version = "2.0.0"
@@ -218,51 +219,27 @@ dependencies = [

 [[package]]
 name = "scopeguard"
-version = "1.1.0"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
+checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"

 [[package]]
-name = "signal-hook"
-version = "0.3.14"
+name = "shlex"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
-dependencies = [
- "libc",
- "signal-hook-registry",
-]
-
-[[package]]
-name = "signal-hook-mio"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
-dependencies = [
- "libc",
- "mio",
- "signal-hook",
-]
-
-[[package]]
-name = "signal-hook-registry"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
-dependencies = [
- "libc",
-]
+checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

 [[package]]
 name = "smallvec"
-version = "1.10.0"
+version = "1.15.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
+checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"

 [[package]]
 name = "syn"
-version = "1.0.101"
+version = "2.0.104"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
+checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
 dependencies = [
 "proc-macro2",
 "quote",
@@ -271,44 +248,33 @@ dependencies = [

 [[package]]
 name = "thiserror"
-version = "1.0.36"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
+checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
 dependencies = [
 "thiserror-impl",
 ]

 [[package]]
 name = "thiserror-impl"
-version = "1.0.36"
+version = "2.0.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
+checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
 dependencies = [
 "proc-macro2",
 "quote",
 "syn",
 ]

-[[package]]
-name = "time"
-version = "0.1.44"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
-dependencies = [
- "libc",
- "wasi 0.10.0+wasi-snapshot-preview1",
- "winapi",
-]
-
 [[package]]
 name = "unicode-ident"
-version = "1.0.4"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"

 [[package]]
 name = "upkr"
-version = "0.2.2"
+version = "0.2.3"
 dependencies = [
 "anyhow",
 "cdivsufsort",
@@ -318,18 +284,6 @@ dependencies = [
 "thiserror",
 ]

-[[package]]
-name = "wasi"
-version = "0.10.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
-
-[[package]]
-name = "wasi"
-version = "0.11.0+wasi-snapshot-preview1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
-
 [[package]]
 name = "winapi"
 version = "0.3.9"
@@ -354,100 +308,137 @@ checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

 [[package]]
 name = "windows-sys"
-version = "0.36.1"
+version = "0.60.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
+checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
 dependencies = [
- "windows_aarch64_msvc 0.36.1",
- "windows_i686_gnu 0.36.1",
- "windows_i686_msvc 0.36.1",
- "windows_x86_64_gnu 0.36.1",
- "windows_x86_64_msvc 0.36.1",
+ "windows-targets 0.53.2",
 ]

 [[package]]
-name = "windows-sys"
-version = "0.42.0"
+name = "windows-targets"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
- "windows_aarch64_msvc 0.42.0",
- "windows_i686_gnu 0.42.0",
- "windows_i686_msvc 0.42.0",
- "windows_x86_64_gnu 0.42.0",
- "windows_x86_64_gnullvm",
- "windows_x86_64_msvc 0.42.0",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
+ "windows_i686_gnullvm 0.52.6",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.53.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
+dependencies = [
+ "windows_aarch64_gnullvm 0.53.0",
+ "windows_aarch64_msvc 0.53.0",
+ "windows_i686_gnu 0.53.0",
+ "windows_i686_gnullvm 0.53.0",
+ "windows_i686_msvc 0.53.0",
+ "windows_x86_64_gnu 0.53.0",
+ "windows_x86_64_gnullvm 0.53.0",
+ "windows_x86_64_msvc 0.53.0",
 ]

 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.42.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"

 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.42.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
+checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"

 [[package]]
 name = "windows_i686_gnu"
-version = "0.42.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
+checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.52.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
+
+[[package]]
+name = "windows_i686_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"

 [[package]]
 name = "windows_i686_msvc"
-version = "0.42.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
+checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"

 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.42.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
+checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"

 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.42.0"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.53.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.36.1"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"

 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.42.0"
+version = "0.53.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
+checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,7 +1,10 @@
 [package]
 name = "upkr"
-version = "0.2.2"
-edition = "2021"
+version = "0.2.3"
+edition = "2024"
+description = "Simple LZ packer with relatively small unpackers"
+license = "Unlicense"
+reepository = "https://github.com/exoticorn/upkr"

 [profile.release]
 strip = "debuginfo"
@@ -11,8 +14,8 @@ terminal = ["crossterm", "pbr"]

 [dependencies]
 cdivsufsort = "2"
-lexopt = "0.2.1"
+lexopt = "0.3.1"
 anyhow = "1"
-thiserror = "1.0.36"
+thiserror = "2.0.12"
 pbr = { version = "1", optional = true }
-crossterm = { version = "0.25.0", default-features = false, optional = true }
+crossterm = { version = "0.29.0", default-features = false, optional = true }
--- a/README.md
+++ b/README.md
@@ -27,6 +27,7 @@ The 16 bit dos unpacker also uses some variations. (`upkr --x86`)
 * [Atari Lynx](https://github.com/42Bastian/new_bll/blob/master/demos/depacker/unupkr.asm)
 * [Atari Jaguar](https://github.com/42Bastian/new_bjl/blob/main/exp/depacker/unupkr.js)
 * [8080, R800](https://github.com/ivagorRetrocomp/DeUpkr)
+* [6502](https://github.com/pfusik/upkr6502)

 ## Usage

@@ -40,6 +41,10 @@ The 16 bit dos unpacker also uses some variations. (`upkr --x86`)
 -0, ..., -9         short form for setting compression level
 -d, --decompress    decompress infile
 --heatmap           calculate heatmap from compressed file
+   --raw-cost        report raw cost of literals in heatmap
+                     (the cost of literals is spread across all matches
+                     that reference the literal by default.)
+   --hexdump         print heatmap as colored hexdump
 --margin            calculate margin for overlapped unpacking of a packed file

 When no infile is given, or the infile is '-', read from stdin.
--- a/asm_unpackers/Makefile
+++ b/asm_unpackers/Makefile
@@ -23,6 +23,13 @@ build/unpack_riscv32.o: unpack_riscv.S
 build/unpack_riscv32.bin: build/unpack_riscv32.o
 	riscv64-linux-gnu-objcopy -O binary --only-section=.text $? $@

+build/unpack_riscv32nc.o: unpack_riscv.S
+	mkdir -p build
+	riscv64-linux-gnu-gcc -march=rv32im -mabi=ilp32 -c -o $@ $?
+	
+build/unpack_riscv32nc.bin: build/unpack_riscv32nc.o
+	riscv64-linux-gnu-objcopy -O binary --only-section=.text $? $@
+
 disas-riscv32: build/unpack_riscv32.o
 	riscv64-linux-gnu-objdump -d $?

@@ -61,4 +68,4 @@ test_c: build/unpack_c
 	cmp test_data.bin /tmp/out.bin

 sizes: build/unpack_armv6m.bin build/unpack_riscv64.bin build/unpack_riscv32.bin build/unpack_arm32.bin
-	ls -l build/*.bin
+	ls -l build/*.bin
--- a/asm_unpackers/unpack_jagrisc.js
+++ b/asm_unpackers/unpack_jagrisc.js
@@ -0,0 +1,190 @@
+;;; -*-asm-*-
+;;; ukpr unpacker for Atari Jaguar RISC.
+
+;;; lyxass syntax
+
+
+; input:
+;;; R20 : packed buffer
+;;; R21 : output buffer
+;;; r30 : return address
+;;;
+;;; Register usage (destroyed!)
+;;; r0-r17,r20,r21
+;;;
+
+DST		REG 21
+SRC		REG 20
+
+	REGTOP 16
+LR_save		REG 99
+LR_save2	REG 99
+GETBIT		REG 99
+GETLENGTH	REG 99
+LITERAL		REG 99
+LOOP		REG 99
+index		REG 99
+bit_pos		REG 99
+state		REG 99
+prev_was_match	REG 99
+offset		REG 99
+prob		reg 99
+byte		REG 99
+PROBS		reg 99
+tmp2		reg 2
+tmp1		REG 1
+tmp0		REG 0
+
+	REGMAP
+
+upkr_probs	equ $200
+
+SIZEOF_PROBS	EQU 1+255+1+2*32+2*32
+
+unupkr::
+	move	LR,LR_save
+	moveq	#0,tmp0
+	movei	#upkr_probs,PROBS
+	bset	#7,tmp0
+	movei	#SIZEOF_PROBS,tmp2
+	move	PROBS,tmp1
+.init	storeb	tmp0,(tmp1)
+	subq	#1,tmp2
+	jr	pl,.init
+	addq	#1,tmp1
+
+	moveq	#0,offset
+	moveq	#0,state
+	movei	#getlength,GETLENGTH
+	movei	#getbit,GETBIT
+.looppc	move	PC,LOOP
+	addq	#.loop-.looppc,LOOP
+	move	pc,LITERAL
+	jr	.start
+	addq	#6,LITERAL
+
+.literal
+	moveq	#1,byte
+	move	pc,LR
+	jr	.into
+	addq	#6,LR		; LR = .getbit
+.getbit
+	addc	byte,byte
+.into
+	btst	#8,byte
+	jump	eq,(GETBIT)
+	move	byte,index
+
+	storeb	byte,(DST)
+	addq	#1,DST
+.start
+	moveq	#0,prev_was_match
+
+.loop
+	moveq	#0,index
+	BL	(GETBIT)
+	jump	cc,(LITERAL)
+	addq	#14,LR
+	cmpq	#1,prev_was_match
+	jr	eq,.newoff
+	shlq	#8,r0
+	jump	(GETBIT)
+	move	r0,index
+	jr	cc,.oldoff
+	shlq	#8,r0
+.newoff
+	addq	#1,r0		; r0 = 257
+	BL	(GETLENGTH)
+	subq	#1,r0
+	jump	eq,(LR_save)
+	move	r0,offset
+
+.oldoff
+	movei	#257+64,r0
+	BL	(GETLENGTH)
+
+	move	DST,r1
+	sub	offset,r1
+.cpymatch1
+	loadb	(r1),r2
+	subq	#1,r0
+	addqt	#1,r1
+	storeb	r2,(DST)
+	jr	ne,.cpymatch1
+	addq	#1,DST
+
+	jump	(LOOP)
+	moveq	#1,prev_was_match
+
+getlength:
+	move	LR,LR_save2
+	moveq	#0,byte
+	move	r0,index
+	moveq	#0,bit_pos
+	move	pc,LR
+	jump	(GETBIT)
+	addq	#6,LR
+.gl
+	jr	cc,.exit
+	addq	#8,LR		; => return to "sh ..."
+	jump	(GETBIT)
+	nop
+	sh	bit_pos,r0
+	subq	#1,bit_pos	; sh < 0 => shift left!
+	or	r0,byte
+	jump	(GETBIT)
+	subq	#8,LR
+.exit
+	moveq	#1,r0
+	sh	bit_pos,r0
+	jump	(LR_save2)
+	or	byte,r0
+
+.newbyte:
+	loadb	(SRC),r2
+	shlq	#8,state
+	addq	#1,SRC
+	or	r2,state
+getbit
+	move	state,r2
+	move	PROBS,r1
+	add	index,r1		; r1 = &probs[index]
+	shrq	#12,r2
+	loadb	(r1),prob
+	jr	eq,.newbyte
+	move	state,r2
+	move	state,r0
+	shlq	#24,r2
+	shrq	#8,r0		; sh
+	shrq	#24,r2		; sl
+	cmp	prob,r2
+	addqt	#1,index
+	jr	cs,.one
+	mult	prob,r0
+
+	;; state -= ((state >> 8) + 1)*prob
+	;; prob -= (prob+8)>>4
+	move	prob,r2
+	add	prob,r0
+	addq	#8,r2
+	sub	r0,state
+	shrq	#4,r2
+	moveq	#0,r0
+	jr	.ret
+	sub	r2,prob
+
+.one
+	;; state = (state >> 8)*prob+(state & 0xff)
+	;; prob += (256 + 8 - prob) >> 4
+	move	r2,state
+	movei	#256+8,r2
+	add	r0,state
+	sub	prob,r2		; 256-prob+8
+	shrq	#4,r2
+	add	r2,prob
+
+	moveq	#3,r0
+.ret
+	storeb	prob,(r1)
+	jump	(LR)
+	shrq	#1,r0		; C = 0, r0 = 1
--- a/asm_unpackers/unpack_jagrisc_fast.js
+++ b/asm_unpackers/unpack_jagrisc_fast.js
@@ -0,0 +1,217 @@
+;;; -*-asm-*-
+;;; ukpr unpacker for Atari Jaguar RISC. (quick version)
+
+;;; lyxass syntax
+
+
+; input:
+;;; R20 : packed buffer
+;;; R21 : output buffer
+;;; r30 : return address
+;;;
+;;; Register usage (destroyed!)
+;;; r0-r17,r20,r21
+;;;
+
+DST		REG 21
+SRC		REG 20
+
+	REGTOP 17
+LR_save		REG 99
+LR_save2	REG 99
+GETBIT		REG 99
+GETLENGTH	REG 99
+LITERAL		REG 99
+LOOP		REG 99
+index		REG 99
+bit_pos		REG 99
+state		REG 99
+prev_was_match	REG 99
+offset		REG 99
+prob		reg 99
+byte		REG 99
+ndata		reg 99
+PROBS		reg 99
+tmp2		reg 2
+tmp1		REG 1
+tmp0		REG 0
+
+	REGMAP
+
+upkr_probs	equ $200
+
+SIZEOF_PROBS	EQU 1+255+1+2*32+2*32
+
+unupkr::
+	move	LR,LR_save
+	movei	#$80808080,tmp0
+	movei	#upkr_probs,PROBS
+	movei	#SIZEOF_PROBS,tmp2
+	move	PROBS,tmp1
+.init	store	tmp0,(tmp1)
+	subq	#4,tmp2
+	jr	pl,.init
+	addq	#4,tmp1
+
+	loadb	(SRC),ndata
+	addq	#1,SRC
+	moveq	#0,offset
+	moveq	#0,state
+	movei	#getlength,GETLENGTH
+	movei	#getbit,GETBIT
+.looppc	move	PC,LOOP
+	addq	#.loop-.looppc,LOOP
+	move	pc,LITERAL
+	jr	.start
+	addq	#6,LITERAL
+
+.literal
+	moveq	#1,byte
+	move	pc,LR
+	jr	.into
+	addq	#6,LR		; LR = .getbit
+.getbit
+	addc	byte,byte
+.into
+	btst	#8,byte
+	jump	eq,(GETBIT)
+	move	byte,index
+
+	storeb	byte,(DST)
+	addq	#1,DST
+.start
+	moveq	#0,prev_was_match
+
+.loop
+	moveq	#0,index
+	BL	(GETBIT)
+	jump	cc,(LITERAL)
+	addq	#14,LR
+	cmpq	#1,prev_was_match
+	jr	eq,.newoff
+	shlq	#8,r0
+	jump	(GETBIT)
+	move	r0,index
+	jr	cc,.oldoff
+	shlq	#8,r0
+.newoff
+	addq	#1,r0		; r0 = 257
+	BL	(GETLENGTH)
+	subq	#1,r0
+	move	r0,offset
+	jump	eq,(LR_save)
+	nop
+.oldoff
+	movei	#257+64,r0
+	BL	(GETLENGTH)
+
+	move	DST,r2
+	move	DST,r1
+	or	offset,r2
+	btst	#0,r2
+	moveq	#1,prev_was_match
+	jr	ne,.cpymatch1
+	sub	offset,r1
+.cpymatch2
+	loadw	(r1),r2
+	addqt	#2,r1
+	subq	#2,r0
+	storew	r2,(DST)
+	jump	eq,(LOOP)
+	addqt	#2,DST
+	jr	pl,.cpymatch2
+	nop
+	jump	(LOOP)
+	subq	#1,DST
+
+.cpymatch1
+	loadb	(r1),r2
+	subq	#1,r0
+	addqt	#1,r1
+	storeb	r2,(DST)
+	jr	ne,.cpymatch1
+	addq	#1,DST
+
+	jump	(LOOP)
+//->	nop
+
+getlength:
+	move	LR,LR_save2
+	moveq	#0,byte
+	move	r0,index
+	moveq	#0,bit_pos
+	move	pc,LR
+	jump	(GETBIT)
+	addq	#6,LR
+.gl
+	jr	cc,.exit
+	addq	#8,LR		; => return to "sh ..."
+	jump	(GETBIT)
+	nop
+	sh	bit_pos,r0
+	subq	#1,bit_pos	; sh < 0 => shift left!
+	or	r0,byte
+	jump	(GETBIT)
+	subq	#8,LR
+.exit
+	moveq	#1,r0
+	sh	bit_pos,r0
+	jump	(LR_save2)
+	or	byte,r0
+
+.newbyte:
+	move	ndata,r2
+	shlq	#8,state
+	loadb	(SRC),ndata
+	or	r2,state
+	addq	#1,SRC
+	move	state,r2
+	shrq	#12,r2
+	jr	ne,.done
+	move	state,r2
+	jr	.newbyte
+getbit
+	move	state,r2
+	move	PROBS,r1
+	add	index,r1		; r1 = &probs[index]
+	shrq	#12,r2
+	loadb	(r1),prob
+	jr	eq,.newbyte
+	move	state,r2
+.done
+	move	state,r0
+	shlq	#24,r2
+	shrq	#8,r0		; sh
+	shrq	#24,r2		; sl
+	cmp	prob,r2
+	addqt	#1,index
+	jr	cs,.one
+	mult	prob,r0
+
+	;; state -= ((state >> 8) + 1)*prob
+	;; prob -= (prob+8)>>4
+	move	prob,r2
+	add	prob,r0
+	addq	#8,r2
+	sub	r0,state
+	shrq	#4,r2
+	moveq	#0,r0
+	sub	r2,prob
+	shrq	#1,r0		; C = 0, r0 = 0
+	jump	(LR)
+	storeb	prob,(r1)
+
+.one
+	;; state = (state >> 8)*prob+(state & 0xff)
+	;; prob += (256 + 8 - prob) >> 4
+	move	r2,state
+	movei	#256+8,r2
+	add	r0,state
+	sub	prob,r2		; 256-prob+8
+	shrq	#4,r2
+	add	r2,prob
+
+	moveq	#3,r0
+	storeb	prob,(r1)
+	jump	(LR)
+	shrq	#1,r0		; C = 0, r0 = 1
--- a/c_unpacker/unpack.c
+++ b/c_unpacker/unpack.c
@@ -1,3 +1,56 @@
+/*
+    A simple C unpacker for upkr compressed data.
+
+    This implements two variants, selected by the UPKR_BITSTREAM define:
+    - normal: faster and smaller on modern hardware as whole bytes are shifted into
+              the rANS state at a time, but requires 20bits for the state
+    - bitstream: only single bits are shifted into the rANS state at a time
+                 which allows the state to always fit in 16bits which is a boon
+                 on very old CPUs.
+    The encoder and decoder need to be configured to use the same varianet.
+
+    upkr compressed data is a rANS byte-/bit-stream encoding a series of literal
+    byte values and back-references as probability encoded bits.
+
+    upkr_decode_bit reads one bit from the rANS stream, taking a probability context
+    as parameter. The probability context is a byte estimating the probability of
+    a bit encoded in this context being set. It is updated by upkr_decode_bit
+    after each decoded bit to reflect the observed past frequencies of on/off bits.
+
+    There are a number of different contexts used in the compressed format. The order in the
+    upkr_probs array is arbitrary, the only requirement for the unpacker is that all bits
+    that shared the same context while encoding also share the same context while decoding.
+    The contexts are:
+    - is match
+    - has offset
+    - literal bit N (0-7) with already decoded highest bits of literal == M (255 total)
+    - offset bit N (one less than max offset bits)
+    - has offset bit N (max offset bits)
+    - length bit N (one less then max length bits)
+    - has length bit N (max length bits)
+
+    Literal bytes are encoded from highest to lowest bit, with the bit position and
+    the already decoded bits as context.
+
+    Offst and Length are encoded in an interlaced variant of elias gamma coding. They
+    are encoded from lowest to highest bits. For each bit, first one bit is read in the
+    "has offset/length bit N)". If this is set, offset/length bit N is read in it's context
+    and the decoding continues with the next bit. If the "has bit N" is read as false, a
+    fixed 1 bit is added as the top bit at this position.
+
+    The highlevel decode loop then looks like this:
+    loop:
+        if read_bit(IS_MATCH):
+            if prev_was_match || read_bit(HAS_OFFSET):
+                offset = read_length_or_offset(OFFSET) - 1
+                if offset == 0:
+                    break
+            length = read_length_or_offset(LENGTH)
+            copy_bytes_from_offset(length, offset)
+        else:
+            read_and_push(literal)
+*/
+
 typedef unsigned char u8;
 typedef unsigned short u16;
 typedef unsigned long u32;
@@ -14,6 +67,7 @@ u32 upkr_state;

 int upkr_decode_bit(int context_index) {
 #ifdef UPKR_BITSTREAM
+    // shift in single bits until rANS state is >= 32768
    while(upkr_state < 32768) {
        if(upkr_bits_left == 0) {
            upkr_current_byte = *upkr_data_ptr++;
@@ -24,6 +78,7 @@ int upkr_decode_bit(int context_index) {
        --upkr_bits_left;
    }
 #else
+    // shift in a full byte until rANS state is >= 4096
    while(upkr_state < 4096) {
        upkr_state = (upkr_state << 8) | *upkr_data_ptr++;
    }
@@ -32,6 +87,8 @@ int upkr_decode_bit(int context_index) {
    int prob = upkr_probs[context_index];
    int bit = (upkr_state & 255) < prob ? 1 : 0;
    
+    // rANS state and context probability update
+    // for the later, add 1/16th (rounded) of difference from either 0 or 256
    if(bit) {
        upkr_state = prob * (upkr_state >> 8) + (upkr_state & 255);
        prob += (256 - prob + 8) >> 4;
@@ -60,6 +117,7 @@ void* upkr_unpack(void* destination, void* compressed_data) {
 #ifdef UPKR_BITSTREAM
    upkr_bits_left = 0;
 #endif
+    // all contexts are initialized to 128 = equal probability of 0 and 1
    for(int i = 0; i < sizeof(upkr_probs); ++i)
        upkr_probs[i] = 128;
    
@@ -68,10 +126,13 @@ void* upkr_unpack(void* destination, void* compressed_data) {
    int prev_was_match = 0;
    int offset = 0;
    for(;;) {
+        // is match
        if(upkr_decode_bit(0)) {
+            // has offset
            if(prev_was_match || upkr_decode_bit(256)) {
                offset = upkr_decode_length(257) - 1;
                if(offset == 0) {
+                    // a 0 offset signals the end of the compressed data
                    break;
                }
            }
@@ -82,6 +143,9 @@ void* upkr_unpack(void* destination, void* compressed_data) {
            }
            prev_was_match = 1;
        } else {
+            // byte contains the previously read bits and indicates the number of
+            // read bits by the set top bit. Therefore it can be directly used as the
+            // context index. The set top bit ends up at bit position 8 and is not stored.
            int byte = 1;
            while(byte < 256) {
                int bit = upkr_decode_bit(byte);
--- a/release/.gitignore
+++ b/release/.gitignore
@@ -2,3 +2,4 @@
 *.tgz
 upkr-linux/
 upkr-windows/
+upkr-windows-32/
--- a/release/Makefile
+++ b/release/Makefile
@@ -1,11 +1,12 @@
 VERSION := $(shell cargo run --release -- --version)

-all: clean upkr-linux-$(VERSION).tgz upkr-windows-$(VERSION).zip
+all: clean upkr-linux-$(VERSION).tgz upkr-windows-$(VERSION).zip upkr-windows-32-$(VERSION).zip

 clean:
 	rm -rf upkr-linux
 	rm -f upkr-linux*.tgz
 	rm -rf upkr-windows
+	rm -rf upkr-windows-32
 	rm -f upkr-windows*.zip

 upkr-linux-$(VERSION).tgz: upkr-linux/upkr PHONY
@@ -22,6 +23,13 @@ upkr-windows-$(VERSION).zip: upkr-windows/upkr.exe PHONY
 	cd .. && git archive HEAD asm_unpackers | tar -xC release/upkr-windows
 	zip -r -9 $@ upkr-windows

+upkr-windows-32-$(VERSION).zip: upkr-windows-32/upkr.exe PHONY
+	cp ../README.md upkr-windows-32/
+	cd .. && git archive HEAD c_unpacker | tar -xC release/upkr-windows-32
+	cd .. && git archive HEAD z80_unpacker | tar -xC release/upkr-windows-32
+	cd .. && git archive HEAD asm_unpackers | tar -xC release/upkr-windows-32
+	zip -r -9 $@ upkr-windows-32
+
 upkr-linux/upkr:
 	cargo build --target x86_64-unknown-linux-musl --release -F terminal
 	mkdir -p upkr-linux
@@ -33,5 +41,11 @@ upkr-windows/upkr.exe:
 	mkdir -p upkr-windows
 	cp ../target/x86_64-pc-windows-gnu/release/upkr.exe upkr-windows/
 	x86_64-w64-mingw32-strip upkr-windows/upkr.exe
+
+upkr-windows-32/upkr.exe:
+	cargo build --target i686-pc-windows-gnu --release -F terminal
+	mkdir -p upkr-windows-32
+	cp ../target/i686-pc-windows-gnu/release/upkr.exe upkr-windows-32/
+	i686-w64-mingw32-strip upkr-windows-32/upkr.exe
 	
-PHONY:
+PHONY:
--- a/src/context_state.rs
+++ b/src/context_state.rs
@@ -1,6 +1,6 @@
 use crate::{
-    rans::{ONE_PROB, PROB_BITS},
    Config,
+    rans::{ONE_PROB, PROB_BITS},
 };

 const INIT_PROB: u16 = 1 << (PROB_BITS - 1);
@@ -49,12 +49,10 @@ impl<'a> Context<'a> {
            };

            (offset + old as i32 - ((old as i32 + UPDATE_ADD as i32) >> UPDATE_RATE)) as u8
+        } else if bit ^ self.state.invert_bit_encoding {
+            old + ((ONE_PROB - old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
        } else {
-            if bit ^ self.state.invert_bit_encoding {
-                old + ((ONE_PROB - old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
-            } else {
-                old - ((old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
-            }
+            old - ((old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
        };
    }
 }
--- a/src/heatmap.rs
+++ b/src/heatmap.rs
@@ -12,6 +12,7 @@
 pub struct Heatmap {
    data: Vec<u8>,
    cost: Vec<f32>,
+    raw_cost: Vec<f32>,
    literal_index: Vec<usize>,
 }

@@ -20,6 +21,7 @@ impl Heatmap {
        Heatmap {
            data: Vec::new(),
            cost: Vec::new(),
+            raw_cost: Vec::new(),
            literal_index: Vec::new(),
        }
    }
@@ -41,6 +43,8 @@ impl Heatmap {
    }

    pub(crate) fn finish(&mut self) {
+        self.raw_cost = self.cost.clone();
+
        let mut ref_count = vec![0usize; self.literal_index.len()];
        for &index in &self.literal_index {
            ref_count[index] += 1;
@@ -73,16 +77,28 @@ impl Heatmap {
        self.cost.len()
    }

+    /// Returns whether the heatmap data is empty
+    pub fn is_empty(&self) -> bool {
+        self.cost.is_empty()
+    }
+
    /// Returns whether the byte at `index` was encoded as a literal
    pub fn is_literal(&self, index: usize) -> bool {
        self.literal_index[index] == index
    }

-    /// Returns the cost of encoding the byte at `index` in (fractional) bits
+    /// Returns the cost of encoding the byte at `index` in (fractional) bits.
+    /// The cost of literal bytes is spread across the matches that reference it.
+    /// See `raw_cost` for the raw encoding cost of each byte.
    pub fn cost(&self, index: usize) -> f32 {
        self.cost[index]
    }

+    /// Returns the raw cost of encoding the byte at `index` in (fractional) bits
+    pub fn raw_cost(&self, index: usize) -> f32 {
+        self.raw_cost[index]
+    }
+
    /// Returns the uncompressed data byte at `index`
    pub fn byte(&self, index: usize) -> u8 {
        self.data[index]
@@ -91,19 +107,35 @@ impl Heatmap {
    #[cfg(feature = "crossterm")]
    /// Print the heatmap as a colored hexdump
    pub fn print_as_hex(&self) -> std::io::Result<()> {
+        self.print_as_hex_internal(false)
+    }
+
+    #[cfg(feature = "crossterm")]
+    /// Print the heatmap as a colored hexdump, based on `raw_cost`.
+    pub fn print_as_hex_raw_cost(&self) -> std::io::Result<()> {
+        self.print_as_hex_internal(true)
+    }
+
+    #[cfg(feature = "crossterm")]
+    fn print_as_hex_internal(&self, report_raw_cost: bool) -> std::io::Result<()> {
        use crossterm::{
-            style::{Attribute, Color, Print, SetAttribute, SetBackgroundColor},
            QueueableCommand,
+            style::{Attribute, Color, Print, SetAttribute, SetBackgroundColor},
        };
-        use std::io::{stdout, Write};
+        use std::io::{Write, stdout};

        fn set_color(
            mut out: impl QueueableCommand,
            heatmap: &Heatmap,
            index: usize,
            num_colors: u16,
+            report_raw_cost: bool,
        ) -> std::io::Result<()> {
-            let cost = heatmap.cost(index);
+            let cost = if report_raw_cost {
+                heatmap.raw_cost(index)
+            } else {
+                heatmap.cost(index)
+            };
            if num_colors < 256 {
                let colors = [
                    Color::Red,
@@ -149,7 +181,7 @@ impl Heatmap {
            stdout.queue(Print(&format!("{:04x}  ", row_start)))?;

            for i in row_range.clone() {
-                set_color(&mut stdout, self, i, num_colors)?;
+                set_color(&mut stdout, self, i, num_colors, report_raw_cost)?;
                stdout.queue(Print(&format!("{:02x} ", self.data[i])))?;
            }

@@ -160,7 +192,7 @@ impl Heatmap {
                .queue(Print(&gap))?;

            for i in row_range.clone() {
-                set_color(&mut stdout, self, i, num_colors)?;
+                set_color(&mut stdout, self, i, num_colors, report_raw_cost)?;
                let byte = self.data[i];
                if byte >= 32 && byte < 127 {
                    stdout.queue(Print(format!("{}", byte as char)))?;
--- a/src/lz.rs
+++ b/src/lz.rs
@@ -1,7 +1,7 @@
+use crate::Config;
 use crate::context_state::ContextState;
 use crate::heatmap::Heatmap;
 use crate::rans::{EntropyCoder, RansDecoder};
-use crate::Config;
 use thiserror::Error;

 #[derive(Copy, Clone, Debug)]
@@ -13,8 +13,8 @@ pub enum Op {
 impl Op {
    pub fn encode(&self, coder: &mut dyn EntropyCoder, state: &mut CoderState, config: &Config) {
        let literal_base = state.pos % state.parity_contexts * 256;
-        match self {
-            &Op::Literal(lit) => {
+        match *self {
+            Op::Literal(lit) => {
                encode_bit(coder, state, literal_base, !config.is_match_bit);
                let mut context_index = 1;
                for i in (0..8).rev() {
@@ -25,7 +25,7 @@ impl Op {
                state.prev_was_match = false;
                state.pos += 1;
            }
-            &Op::Match { offset, len } => {
+            Op::Match { offset, len } => {
                encode_bit(coder, state, literal_base, config.is_match_bit);
                let mut new_offset = true;
                if !state.prev_was_match && !config.no_repeated_offsets {
@@ -217,8 +217,8 @@ fn unpack_internal(
    config: &Config,
    max_size: usize,
 ) -> Result<isize, UnpackError> {
-    let mut decoder = RansDecoder::new(packed_data, &config)?;
-    let mut contexts = ContextState::new((1 + 255) * config.parity_contexts + 1 + 64 + 64, &config);
+    let mut decoder = RansDecoder::new(packed_data, config)?;
+    let mut contexts = ContextState::new((1 + 255) * config.parity_contexts + 1 + 64 + 64, config);
    let mut offset = usize::MAX;
    let mut position = 0usize;
    let mut prev_was_match = false;
@@ -264,7 +264,7 @@ fn unpack_internal(
                    &mut decoder,
                    &mut contexts,
                    256 * config.parity_contexts + 1,
-                    &config,
+                    config,
                )? - if config.eof_in_length { 0 } else { 1 };
                if offset == 0 {
                    break;
@@ -274,7 +274,7 @@ fn unpack_internal(
                &mut decoder,
                &mut contexts,
                256 * config.parity_contexts + 65,
-                &config,
+                config,
            )?;
            if config.eof_in_length && length == 1 {
                break;
--- a/src/main.rs
+++ b/src/main.rs
@@ -10,6 +10,7 @@ fn main() -> Result<()> {
    let mut unpack = false;
    let mut calculate_margin = false;
    let mut create_heatmap = false;
+    let mut report_raw_cost = false;
    #[allow(unused_mut)]
    let mut do_hexdump = false;
    let mut level = 2;
@@ -62,6 +63,7 @@ fn main() -> Result<()> {
            Short('u') | Long("unpack") | Short('d') | Long("decompress") => unpack = true,
            Long("margin") => calculate_margin = true,
            Long("heatmap") => create_heatmap = true,
+            Long("raw-cost") => report_raw_cost = true,
            #[cfg(feature = "crossterm")]
            Long("hexdump") => do_hexdump = true,
            Short('l') | Long("level") => level = parser.value()?.parse()?,
@@ -72,8 +74,8 @@ fn main() -> Result<()> {
                process::exit(0);
            }
            Long("max-unpacked-size") => max_unpacked_size = parser.value()?.parse()?,
-            Value(val) if infile.is_none() => infile = Some(val.try_into()?),
-            Value(val) if outfile.is_none() => outfile = Some(val.try_into()?),
+            Value(val) if infile.is_none() => infile = Some(val.into()),
+            Value(val) if outfile.is_none() => outfile = Some(val.into()),
            _ => return Err(arg.unexpected().into()),
        }
    }
@@ -141,14 +143,22 @@ fn main() -> Result<()> {
            }
            match do_hexdump {
                #[cfg(feature = "crossterm")]
-                true => heatmap.print_as_hex()?,
+                true => {
+                    if report_raw_cost {
+                        heatmap.print_as_hex_raw_cost()?
+                    } else {
+                        heatmap.print_as_hex()?
+                    }
+                }
                _ => {
                    let mut heatmap_bin = Vec::with_capacity(heatmap.len());
                    for i in 0..heatmap.len() {
-                        let cost = (heatmap.cost(i).log2() * 8. + 64.)
-                            .round()
-                            .max(0.)
-                            .min(127.) as u8;
+                        let cost = if report_raw_cost {
+                            heatmap.raw_cost(i)
+                        } else {
+                            heatmap.cost(i)
+                        };
+                        let cost = (cost.log2() * 8. + 64.).round().clamp(0., 127.) as u8;
                        heatmap_bin.push((cost << 1) | heatmap.is_literal(i) as u8);
                    }
                    outfile(OutFileType::Heatmap).write(&heatmap_bin)?;
@@ -249,6 +259,9 @@ fn print_help(exit_code: i32) -> ! {
    eprintln!(" -0, ..., -9         short form for setting compression level");
    eprintln!(" -d, --decompress    decompress infile");
    eprintln!(" --heatmap           calculate heatmap from compressed file");
+    eprintln!("   --raw-cost        report raw cost of literals in heatmap");
+    #[cfg(feature = "crossterm")]
+    eprintln!("   --hexdump         print heatmap as colored hexdump");
    eprintln!(" --margin            calculate margin for overlapped unpacking of a packed file");
    eprintln!();
    eprintln!("When no infile is given, or the infile is '-', read from stdin.");
@@ -259,7 +272,9 @@ fn print_help(exit_code: i32) -> ! {
    eprintln!("Version: {}", env!("CARGO_PKG_VERSION"));
    eprintln!();
    eprintln!("Config presets for specific unpackers:");
-    eprintln!(" --z80               --big-endian-bitstream --invert-bit-encoding --simplified-prob-update -9");
+    eprintln!(
+        " --z80               --big-endian-bitstream --invert-bit-encoding --simplified-prob-update -9"
+    );
    eprintln!(
        " --x86               --bitstream --invert-is-match-bit --invert-continue-value-bit --invert-new-offset-bit"
    );
--- a/src/parsing_packer.rs
+++ b/src/parsing_packer.rs
@@ -4,7 +4,7 @@ use std::rc::Rc;

 use crate::match_finder::MatchFinder;
 use crate::rans::{CostCounter, RansCoder};
-use crate::{lz, ProgressCallback};
+use crate::{ProgressCallback, lz};

 pub fn pack(
    data: &[u8],
@@ -68,7 +68,7 @@ fn parse(
        });
        let mut seen_offsets = HashSet::new();
        let mut remaining = Vec::new();
-        for arr in mem::replace(vec, Vec::new()) {
+        for arr in mem::take(vec) {
            if seen_offsets.insert(arr.state.last_offset()) {
                if vec.len() < max_arrivals {
                    vec.push(arr);
Author	SHA1	Message	Date
Dennis Ranke	a9e56d9d50	add missing fields to Cargo.toml	2025-07-16 21:16:44 +02:00
Dennis Ranke	1e4beedfee	prepare to publish crate / apply clippy fixes	2025-07-16 21:05:57 +02:00
Dennis Ranke	0c5ba4e32c	add highlevel description of compressed format in unpack.c	2024-05-25 22:02:47 +02:00
Piotr Fusik	f33bcb2396	mention 6502 unpacker	2024-05-15 10:56:25 +02:00
42Bastian	6d8e13d7e8	add Jaguar RISC versions	2024-04-10 23:53:46 +02:00
Dennis Ranke	88cbda559c	add 32bit windows build to releases	2024-03-04 13:07:40 +01:00
Dennis Ranke	f647449497	add --raw-cost and --hexdump flags to help text	2023-08-25 19:42:59 +02:00
Dennis Ranke	7186188118	add --raw-cost option for heatmap reporting	2023-08-25 19:34:17 +02:00