mirror of
https://github.com/exoticorn/upkr.git
synced 2026-01-20 19:46:42 +01:00
Compare commits
24 Commits
literal_le
...
a9e56d9d50
| Author | SHA1 | Date | |
|---|---|---|---|
| a9e56d9d50 | |||
| 1e4beedfee | |||
| 0c5ba4e32c | |||
|
f33bcb2396 | ||
|
6d8e13d7e8 | ||
| 88cbda559c | |||
| f647449497 | |||
| 7186188118 | |||
| 588c1452b9 | |||
| 1e0c8bb5a7 | |||
| e11622202b | |||
| 795e6c3090 | |||
| 080db40d00 | |||
|
f502bf4e28 | ||
| 2eb8f230ba | |||
| 4eab36b9d9 | |||
| 7cec54f62b | |||
| 7fa6be6ff4 | |||
| cab51e06ff | |||
| c4fce626da | |||
| 0d7cda06bb | |||
|
|
140678ae20 | ||
| d7bdc8c1c7 | |||
| 887722a66b |
354
Cargo.lock
generated
354
Cargo.lock
generated
@@ -1,24 +1,33 @@
|
|||||||
# This file is automatically @generated by Cargo.
|
# This file is automatically @generated by Cargo.
|
||||||
# It is not intended for manual editing.
|
# It is not intended for manual editing.
|
||||||
version = 3
|
version = 4
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "anyhow"
|
name = "anyhow"
|
||||||
version = "1.0.47"
|
version = "1.0.98"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "38d9ff5d688f1c13395289f67db01d4826b46dd694e7580accdc3e8430f2d98e"
|
checksum = "e16d2d3311acee920a9eb8d33b8cbc1787ce4a264e85f964c2404b969bdcd487"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.0.1"
|
version = "1.5.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
checksum = "c08606f8c3cbf4ce6ec8e28fb0014a2c086708fe954eaa885384a6165172e7e8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitflags"
|
||||||
|
version = "2.9.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "1b8e56985ec62d17e9c1001dc89c88ecd7dc08e47eba5ec7c29c7b5eeecde967"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
version = "1.0.72"
|
version = "1.2.29"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "22a9137b95ea06864e018375b72adfb7db6e6f68cfc8df5a04d00288050485ee"
|
checksum = "5c1599538de2394445747c8cf7935946e3cc27e9625f889d979bfb2aaf569362"
|
||||||
|
dependencies = [
|
||||||
|
"shlex",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cdivsufsort"
|
name = "cdivsufsort"
|
||||||
@@ -32,87 +41,173 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
version = "1.0.0"
|
version = "1.0.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "9555578bc9e57714c812a1f84e4fc5b4d21fcb063490c624de019f7464c91268"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-channel"
|
name = "crossbeam-channel"
|
||||||
version = "0.5.1"
|
version = "0.5.15"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
|
checksum = "82b8f8f868b36967f9606790d1903570de9ceaf870a7bf9fbbd3016d636a2cb2"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-utils"
|
name = "crossbeam-utils"
|
||||||
version = "0.8.5"
|
version = "0.8.21"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
|
checksum = "d0a5c400df2834b80a4c3327b3aad3a4c4cd4de0629063962b03235697506a28"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossterm"
|
||||||
|
version = "0.29.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d8b9f2e4c67f833b660cdb0a3523065869fb35570177239812ed4c905aeff87b"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"bitflags",
|
||||||
"lazy_static",
|
"document-features",
|
||||||
|
"parking_lot",
|
||||||
|
"rustix",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "document-features"
|
||||||
version = "1.4.0"
|
version = "0.2.11"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
|
checksum = "95249b50c6c185bee49034bcb378a49dc2b5dff0be90ff6616d31d64febab05d"
|
||||||
|
dependencies = [
|
||||||
|
"litrs",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "errno"
|
||||||
|
version = "0.3.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "778e2ac28f6c47af28e4907f13ffd1e1ddbd400980a9abd7c8df189bf578a5ad"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"windows-sys",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lexopt"
|
name = "lexopt"
|
||||||
version = "0.2.1"
|
version = "0.3.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
|
checksum = "9fa0e2a1fcbe2f6be6c42e342259976206b383122fc152e872795338b5a3f3a7"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.108"
|
version = "0.2.174"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
|
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.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "96936507f153605bddfcda068dd804796c84324ed2510809e5b2a624c81da765"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"scopeguard",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
version = "0.2.14"
|
version = "0.2.19"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "9a64b1ec5cda2586e284722486d802acf1f7dbdc623e2bfc57e65ca1cd099290"
|
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pbr"
|
name = "parking_lot"
|
||||||
version = "1.0.4"
|
version = "0.12.4"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "ff5751d87f7c00ae6403eb1fcbba229b9c76c9a30de8c1cf87182177b168cea2"
|
checksum = "70d58bf43669b5795d1576d0641cfb6fbb2057bf629506267a92807158584a13"
|
||||||
|
dependencies = [
|
||||||
|
"lock_api",
|
||||||
|
"parking_lot_core",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "parking_lot_core"
|
||||||
|
version = "0.9.11"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bc838d2a56b5b1a6c25f55575dfc605fabb63bb2365f6c2353ef9159aa69e4a5"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if",
|
||||||
|
"libc",
|
||||||
|
"redox_syscall",
|
||||||
|
"smallvec",
|
||||||
|
"windows-targets 0.52.6",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "pbr"
|
||||||
|
version = "1.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ed5827dfa0d69b6c92493d6c38e633bbaa5937c153d0d7c28bf12313f8c6d514"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"libc",
|
"libc",
|
||||||
"time",
|
|
||||||
"winapi",
|
"winapi",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "proc-macro2"
|
name = "proc-macro2"
|
||||||
version = "1.0.44"
|
version = "1.0.95"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "7bd7356a8122b6c4a24a82b278680c73357984ca2fc79a0f9fa6dea7dced7c58"
|
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "quote"
|
name = "quote"
|
||||||
version = "1.0.21"
|
version = "1.0.40"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "bbe448f377a7d6961e30f5955f9b8d106c3f5e449d493ee1b125c1d43c2b5179"
|
checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.5.13"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
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]]
|
[[package]]
|
||||||
name = "sacabase"
|
name = "sacabase"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
@@ -123,10 +218,28 @@ dependencies = [
|
|||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "scopeguard"
|
||||||
version = "1.0.101"
|
version = "1.2.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "e90cde112c4b9690b8cbe810cba9ddd8bc1d7472e2cae317b69e9438c1cba7d2"
|
checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "shlex"
|
||||||
|
version = "1.3.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "smallvec"
|
||||||
|
version = "1.15.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "67b1b7a3b5fe4f1376887184045fcf45c69e92af734b7aaddc05fb777b6fbd03"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
version = "2.0.104"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "17b6f705963418cdb9927482fa304bc562ece2fdd4f616084c50b7023b435a40"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
@@ -135,58 +248,42 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror"
|
name = "thiserror"
|
||||||
version = "1.0.36"
|
version = "2.0.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "0a99cb8c4b9a8ef0e7907cd3b617cc8dc04d571c4e73c8ae403d80ac160bb122"
|
checksum = "567b8a2dae586314f7be2a752ec7474332959c6460e02bde30d702a66d488708"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"thiserror-impl",
|
"thiserror-impl",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror-impl"
|
name = "thiserror-impl"
|
||||||
version = "1.0.36"
|
version = "2.0.12"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "3a891860d3c8d66fec8e73ddb3765f90082374dbaaa833407b904a94f1a7eb43"
|
checksum = "7f7cf42b4507d8ea322120659672cf1b9dbb93f8f2d4ecfd6e51350ff5b17a1d"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
"quote",
|
"quote",
|
||||||
"syn",
|
"syn",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "time"
|
|
||||||
version = "0.1.44"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
|
||||||
dependencies = [
|
|
||||||
"libc",
|
|
||||||
"wasi",
|
|
||||||
"winapi",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "unicode-ident"
|
name = "unicode-ident"
|
||||||
version = "1.0.4"
|
version = "1.0.18"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
|
checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "upkr"
|
name = "upkr"
|
||||||
version = "0.2.0-pre3"
|
version = "0.2.3"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cdivsufsort",
|
"cdivsufsort",
|
||||||
|
"crossterm",
|
||||||
"lexopt",
|
"lexopt",
|
||||||
"pbr",
|
"pbr",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "wasi"
|
|
||||||
version = "0.10.0+wasi-snapshot-preview1"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
@@ -208,3 +305,140 @@ name = "winapi-x86_64-pc-windows-gnu"
|
|||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.60.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
|
||||||
|
dependencies = [
|
||||||
|
"windows-targets 0.53.2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-targets"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
|
||||||
|
dependencies = [
|
||||||
|
"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.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
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.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
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.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnullvm"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnullvm"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.52.6"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.53.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
|
||||||
|
|||||||
17
Cargo.toml
17
Cargo.toml
@@ -1,14 +1,21 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "upkr"
|
name = "upkr"
|
||||||
version = "0.2.0-pre3"
|
version = "0.2.3"
|
||||||
edition = "2021"
|
edition = "2024"
|
||||||
|
description = "Simple LZ packer with relatively small unpackers"
|
||||||
|
license = "Unlicense"
|
||||||
|
reepository = "https://github.com/exoticorn/upkr"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
strip = "debuginfo"
|
strip = "debuginfo"
|
||||||
|
|
||||||
|
[features]
|
||||||
|
terminal = ["crossterm", "pbr"]
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
cdivsufsort = "2"
|
cdivsufsort = "2"
|
||||||
lexopt = "0.2.1"
|
lexopt = "0.3.1"
|
||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
thiserror = "1.0.36"
|
thiserror = "2.0.12"
|
||||||
pbr = "1"
|
pbr = { version = "1", optional = true }
|
||||||
|
crossterm = { version = "0.29.0", default-features = false, optional = true }
|
||||||
|
|||||||
76
README.md
76
README.md
@@ -2,13 +2,83 @@
|
|||||||
|
|
||||||
Upkr is a simple general purpose lz packer designed to be used in the [MicroW8](https://github.com/exoticorn/microw8) platform.
|
Upkr is a simple general purpose lz packer designed to be used in the [MicroW8](https://github.com/exoticorn/microw8) platform.
|
||||||
The compressed format is losely based on [Shrinkler](https://github.com/askeksa/Shrinkler) with the main difference being that
|
The compressed format is losely based on [Shrinkler](https://github.com/askeksa/Shrinkler) with the main difference being that
|
||||||
Upkr doesn't differnetiate between literals at odd or even addresses and that I went with rANS/rABS instead of a range coder.
|
Upkr doesn't differentiate between literals at odd or even addresses (by default) and that I went with rANS/rABS instead of a range coder.
|
||||||
|
|
||||||
At this point, Upkr should still be considered unstable - the compressed format is not very likely to change but I still want
|
Compression rate is on par with Shrinkler.
|
||||||
to keep that option open a little longer.
|
|
||||||
|
The differences compare to Shrinkler also makes it interesting on 8bit platforms. The z80 unpacker included in the release
|
||||||
|
is both about twice as fast and smaller than the Shrinkler unpacker.
|
||||||
|
|
||||||
## Inspirations:
|
## Inspirations:
|
||||||
|
|
||||||
* Ferris' blog about his [C64 intro packer](https://yupferris.github.io/blog/2020/08/31/c64-4k-intro-packer-deep-dive.html)
|
* Ferris' blog about his [C64 intro packer](https://yupferris.github.io/blog/2020/08/31/c64-4k-intro-packer-deep-dive.html)
|
||||||
* [Shrinkler](https://github.com/askeksa/Shrinkler)
|
* [Shrinkler](https://github.com/askeksa/Shrinkler)
|
||||||
* Ryg's [sample rANS implementation](https://github.com/rygorous/ryg_rans)
|
* Ryg's [sample rANS implementation](https://github.com/rygorous/ryg_rans)
|
||||||
|
|
||||||
|
## Unpackers
|
||||||
|
|
||||||
|
The release includes a reference c unpacker, as well as some optimized asm unpackers (arm and riscv). The unpckers in
|
||||||
|
c_unpacker and asm_unpackers unpack the default upkr compressed format. The z80_unpacker
|
||||||
|
is based on some variations to the compressed format. (Use `upkr --z80` to select those variations.)
|
||||||
|
The 16 bit dos unpacker also uses some variations. (`upkr --x86`)
|
||||||
|
|
||||||
|
### More unpackers outside this repository
|
||||||
|
|
||||||
|
* [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
|
||||||
|
|
||||||
|
```
|
||||||
|
upkr [-l level(0-9)] [config options] <infile> [<outfile>]
|
||||||
|
upkr -u [config options] <infile> [<outfile>]
|
||||||
|
upkr --heatmap [config options] <infile> [<outfile>]
|
||||||
|
upkr --margin [config options] <infile>
|
||||||
|
|
||||||
|
-l, --level N compression level 0-9
|
||||||
|
-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.
|
||||||
|
When no outfile is given and reading from stdin, or when outfile is '-', write to stdout.
|
||||||
|
|
||||||
|
Config presets for specific unpackers:
|
||||||
|
--z80 --big-endian-bitstream --invert-bit-encoding --simplified-prob-update -9
|
||||||
|
--x86 --bitstream --invert-is-match-bit --invert-continue-value-bit --invert-new-offset-bit
|
||||||
|
--x86b --bitstream --invert-continue-value-bit --no-repeated-offsets -9
|
||||||
|
|
||||||
|
Config options (need to match when packing/unpacking):
|
||||||
|
-b, --bitstream bitstream mode
|
||||||
|
-p, --parity N use N (2/4) parity contexts
|
||||||
|
-r, --reverse reverse input & output
|
||||||
|
|
||||||
|
Config options to tailor output to specific optimized unpackers:
|
||||||
|
--invert-is-match-bit
|
||||||
|
--invert-new-offset-bit
|
||||||
|
--invert-continue-value-bit
|
||||||
|
--invert-bit-encoding
|
||||||
|
--simplified-prob-update
|
||||||
|
--big-endian-bitstream (implies --bitstream)
|
||||||
|
--no-repeated-offsets
|
||||||
|
--eof-in-length
|
||||||
|
--max-offset N
|
||||||
|
--max-length N
|
||||||
|
```
|
||||||
|
|
||||||
|
## Heatmap
|
||||||
|
|
||||||
|
By default, the `--heatmap` flag writes out the heatmap data as a binary file. The heatmap file is
|
||||||
|
the same size as the unpacked data. Each byte can be interpreted like this:
|
||||||
|
|
||||||
|
```
|
||||||
|
is_literal = byte & 1; // whether the byte was encoded as a literal (as opposed to a match)
|
||||||
|
size_in_bits = 2.0 ** (((byte >> 1) - 64) / 8.0); // the size this byte takes up in the compressed data
|
||||||
|
```
|
||||||
|
|||||||
@@ -23,6 +23,13 @@ build/unpack_riscv32.o: unpack_riscv.S
|
|||||||
build/unpack_riscv32.bin: build/unpack_riscv32.o
|
build/unpack_riscv32.bin: build/unpack_riscv32.o
|
||||||
riscv64-linux-gnu-objcopy -O binary --only-section=.text $? $@
|
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
|
disas-riscv32: build/unpack_riscv32.o
|
||||||
riscv64-linux-gnu-objdump -d $?
|
riscv64-linux-gnu-objdump -d $?
|
||||||
|
|
||||||
|
|||||||
@@ -17,7 +17,7 @@
|
|||||||
upkr_unpack:
|
upkr_unpack:
|
||||||
push { r3-r11, lr }
|
push { r3-r11, lr }
|
||||||
|
|
||||||
mov r2, #384
|
mov r2, #384
|
||||||
mov r3, #128
|
mov r3, #128
|
||||||
.Lclear:
|
.Lclear:
|
||||||
subs r2, r2, #1
|
subs r2, r2, #1
|
||||||
@@ -29,7 +29,7 @@ upkr_unpack:
|
|||||||
bl upkr_decode_bit
|
bl upkr_decode_bit
|
||||||
bcc .Ldata
|
bcc .Ldata
|
||||||
.Lmatch:
|
.Lmatch:
|
||||||
mov r5, #256
|
mov r5, #256
|
||||||
rsbs r6, r4, #0
|
rsbs r6, r4, #0
|
||||||
blcc upkr_decode_bit
|
blcc upkr_decode_bit
|
||||||
bcc .Lskip_offset
|
bcc .Lskip_offset
|
||||||
@@ -39,7 +39,7 @@ upkr_unpack:
|
|||||||
popeq { r3-r11, pc }
|
popeq { r3-r11, pc }
|
||||||
.Lskip_offset:
|
.Lskip_offset:
|
||||||
|
|
||||||
mov r5, #256+64
|
mov r5, #256+64
|
||||||
bl upkr_decode_length
|
bl upkr_decode_length
|
||||||
.Lcopy_loop:
|
.Lcopy_loop:
|
||||||
ldrb r5, [r0, r3]
|
ldrb r5, [r0, r3]
|
||||||
@@ -55,46 +55,46 @@ upkr_unpack:
|
|||||||
.Ldata_loop:
|
.Ldata_loop:
|
||||||
bl upkr_decode_bit
|
bl upkr_decode_bit
|
||||||
adc r5, r5, r5
|
adc r5, r5, r5
|
||||||
movs r4, r5, lsr #8
|
movs r4, r5, lsr #8
|
||||||
beq .Ldata_loop
|
beq .Ldata_loop
|
||||||
b .Lstore
|
b .Lstore
|
||||||
|
|
||||||
.type upkr_decode_length, %function
|
.type upkr_decode_length, %function
|
||||||
upkr_decode_length:
|
upkr_decode_length:
|
||||||
mov r12, lr
|
mov r12, lr
|
||||||
|
|
||||||
mov r4, #0
|
mov r4, #0
|
||||||
mvn r6, #0
|
mvn r6, #0
|
||||||
.Lbit_loop:
|
.Lbit_loop:
|
||||||
bl upkr_decode_bit_inc
|
bl upkr_decode_bit_inc
|
||||||
addcc r4, r4, r6
|
addcc r4, r4, r6
|
||||||
movcc pc, r12
|
movcc pc, r12
|
||||||
|
|
||||||
bl upkr_decode_bit_inc
|
bl upkr_decode_bit_inc
|
||||||
addcs r4, r4, r6
|
addcs r4, r4, r6
|
||||||
mov r6, r6, lsl #1
|
mov r6, r6, lsl #1
|
||||||
b .Lbit_loop
|
b .Lbit_loop
|
||||||
|
|
||||||
.type upkr_decode_bit, %function
|
.type upkr_decode_bit, %function
|
||||||
upkr_decode_bit_inc:
|
upkr_decode_bit_inc:
|
||||||
add r5, r5, #1
|
add r5, r5, #1
|
||||||
upkr_decode_bit:
|
upkr_decode_bit:
|
||||||
cmp r2, #4096
|
cmp r2, #4096
|
||||||
ldrltb r8, [r1], #1
|
ldrltb r8, [r1], #1
|
||||||
orrlt r2, r8, r2, lsl#8
|
orrlt r2, r8, r2, lsl#8
|
||||||
blt upkr_decode_bit
|
blt upkr_decode_bit
|
||||||
|
|
||||||
ldrb r8, [sp, -r5]
|
ldrb r8, [sp, -r5]
|
||||||
and r9, r2, #255
|
and r9, r2, #255
|
||||||
add r9, r9, #1
|
add r9, r9, #1
|
||||||
cmp r8, r9
|
cmp r8, r9
|
||||||
rsbcs r8, r8, #256
|
rsbcs r8, r8, #256
|
||||||
mvn r9, r2, lsr#8
|
mvn r9, r2, lsr#8
|
||||||
addcs r9, r9, #1
|
addcs r9, r9, #1
|
||||||
mla r2, r8, r9, r2
|
mla r2, r8, r9, r2
|
||||||
add r9, r8, #8
|
add r9, r8, #8
|
||||||
sub r8, r8, r9, lsr#4
|
sub r8, r8, r9, lsr#4
|
||||||
rsbcs r8, r8, #256
|
rsbcs r8, r8, #256
|
||||||
strb r8, [sp, -r5]
|
strb r8, [sp, -r5]
|
||||||
mov pc, r14
|
mov pc, r14
|
||||||
|
|
||||||
|
|||||||
190
asm_unpackers/unpack_jagrisc.js
Normal file
190
asm_unpackers/unpack_jagrisc.js
Normal file
@@ -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
|
||||||
217
asm_unpackers/unpack_jagrisc_fast.js
Normal file
217
asm_unpackers/unpack_jagrisc_fast.js
Normal file
@@ -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
|
||||||
2
c_library/.gitignore
vendored
Normal file
2
c_library/.gitignore
vendored
Normal file
@@ -0,0 +1,2 @@
|
|||||||
|
/target/
|
||||||
|
/upkr
|
||||||
127
c_library/Cargo.lock
generated
Normal file
127
c_library/Cargo.lock
generated
Normal file
@@ -0,0 +1,127 @@
|
|||||||
|
# This file is automatically @generated by Cargo.
|
||||||
|
# It is not intended for manual editing.
|
||||||
|
version = 3
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "anyhow"
|
||||||
|
version = "1.0.69"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "224afbd727c3d6e4b90103ece64b8d1b67fbb1973b1046c2281eed3f3803f800"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "autocfg"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cc"
|
||||||
|
version = "1.0.79"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "50d30906286121d95be3d479533b458f87493b30a4b5f79a607db8f5d11aa91f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cdivsufsort"
|
||||||
|
version = "2.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "edefce019197609da416762da75bb000bbd2224b2d89a7e722c2296cbff79b8c"
|
||||||
|
dependencies = [
|
||||||
|
"cc",
|
||||||
|
"sacabase",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lexopt"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "num-traits"
|
||||||
|
version = "0.2.15"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "578ede34cf02f8924ab9447f50c28075b4d3e5b269972345e7e0372b38c6cdcd"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "proc-macro2"
|
||||||
|
version = "1.0.51"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5d727cae5b39d21da60fa540906919ad737832fe0b1c165da3a34d6548c849d6"
|
||||||
|
dependencies = [
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "quote"
|
||||||
|
version = "1.0.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "8856d8364d252a14d474036ea1358d63c9e6965c8e5c1885c18f73d70bff9c7b"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "sacabase"
|
||||||
|
version = "2.0.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9883fc3d6ce3d78bb54d908602f8bc1f7b5f983afe601dabe083009d86267a84"
|
||||||
|
dependencies = [
|
||||||
|
"num-traits",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "syn"
|
||||||
|
version = "1.0.109"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "72b64191b275b66ffe2469e8af2c1cfe3bafa67b529ead792a6d0160888b4237"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"unicode-ident",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror"
|
||||||
|
version = "1.0.39"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a5ab016db510546d856297882807df8da66a16fb8c4101cb8b30054b0d5b2d9c"
|
||||||
|
dependencies = [
|
||||||
|
"thiserror-impl",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "thiserror-impl"
|
||||||
|
version = "1.0.39"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5420d42e90af0c38c3290abcca25b9b3bdf379fc9f55c528f53a269d9c9a267e"
|
||||||
|
dependencies = [
|
||||||
|
"proc-macro2",
|
||||||
|
"quote",
|
||||||
|
"syn",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "unicode-ident"
|
||||||
|
version = "1.0.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e5464a87b239f13a63a501f2701565754bae92d243d4bb7eb12f6d57d2269bf4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "upkr"
|
||||||
|
version = "0.2.1"
|
||||||
|
dependencies = [
|
||||||
|
"anyhow",
|
||||||
|
"cdivsufsort",
|
||||||
|
"lexopt",
|
||||||
|
"thiserror",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "upkr_c"
|
||||||
|
version = "0.0.1"
|
||||||
|
dependencies = [
|
||||||
|
"upkr",
|
||||||
|
]
|
||||||
17
c_library/Cargo.toml
Normal file
17
c_library/Cargo.toml
Normal file
@@ -0,0 +1,17 @@
|
|||||||
|
[package]
|
||||||
|
name = "upkr_c"
|
||||||
|
version = "0.0.1"
|
||||||
|
edition = "2021"
|
||||||
|
|
||||||
|
[lib]
|
||||||
|
name = "upkr"
|
||||||
|
crate-type = ["staticlib"]
|
||||||
|
|
||||||
|
[profile.release]
|
||||||
|
opt-level = "s"
|
||||||
|
strip = "debuginfo"
|
||||||
|
lto = true
|
||||||
|
panic = "abort"
|
||||||
|
|
||||||
|
[dependencies]
|
||||||
|
upkr = { path="..", default-features=false }
|
||||||
8
c_library/Makefile
Normal file
8
c_library/Makefile
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
upkr: upkr.c upkr.h target/release/libupkr.a
|
||||||
|
gcc -O2 -Ltarget/release -o upkr upkr.c -lupkr -lm
|
||||||
|
strip upkr
|
||||||
|
|
||||||
|
target/release/libupkr.a: cargo
|
||||||
|
cargo build --release
|
||||||
|
|
||||||
|
.PHONY: cargo
|
||||||
11
c_library/Readme.md
Normal file
11
c_library/Readme.md
Normal file
@@ -0,0 +1,11 @@
|
|||||||
|
This is a simple example of compiling upkr to a library that can be linked in a
|
||||||
|
c program. It consists of a small rust crate which implements the c api and
|
||||||
|
compiles to a static library and a matching c header file. As is, the rust
|
||||||
|
crate offers two simple functions to compress/uncompress data with the default
|
||||||
|
upkr config.
|
||||||
|
|
||||||
|
The provided makefile will only work on linux. Building the example upkr.c on
|
||||||
|
other platforms is left as an exercise for the reader ;)
|
||||||
|
|
||||||
|
On Windows you might have to make sure to install and use the correct rust
|
||||||
|
toolchain version (mingw vs. msvc) to match your c compiler.
|
||||||
42
c_library/src/lib.rs
Normal file
42
c_library/src/lib.rs
Normal file
@@ -0,0 +1,42 @@
|
|||||||
|
use std::ffi::c_int;
|
||||||
|
|
||||||
|
// the upkr config to use, this can be modified to use other configs
|
||||||
|
fn config() -> upkr::Config {
|
||||||
|
upkr::Config::default()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn upkr_compress(
|
||||||
|
output_buffer: *mut u8,
|
||||||
|
output_buffer_size: usize,
|
||||||
|
input_buffer: *const u8,
|
||||||
|
input_size: usize,
|
||||||
|
compression_level: c_int,
|
||||||
|
) -> usize {
|
||||||
|
let output_buffer = unsafe { std::slice::from_raw_parts_mut(output_buffer, output_buffer_size) };
|
||||||
|
let input_buffer = unsafe { std::slice::from_raw_parts(input_buffer, input_size) };
|
||||||
|
|
||||||
|
let packed_data = upkr::pack(input_buffer, compression_level.max(0).min(9) as u8, &config(), None);
|
||||||
|
let copy_size = packed_data.len().min(output_buffer.len());
|
||||||
|
output_buffer[..copy_size].copy_from_slice(&packed_data[..copy_size]);
|
||||||
|
|
||||||
|
packed_data.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
#[no_mangle]
|
||||||
|
pub extern "C" fn upkr_uncompress(output_buffer: *mut u8, output_buffer_size: usize, input_buffer: *const u8, input_size: usize) -> isize {
|
||||||
|
let output_buffer = unsafe { std::slice::from_raw_parts_mut(output_buffer, output_buffer_size)};
|
||||||
|
let input_buffer = unsafe { std::slice::from_raw_parts(input_buffer, input_size)};
|
||||||
|
|
||||||
|
match upkr::unpack(input_buffer, &config(), output_buffer.len()) {
|
||||||
|
Ok(unpacked_data) => {
|
||||||
|
output_buffer[..unpacked_data.len()].copy_from_slice(&unpacked_data);
|
||||||
|
unpacked_data.len() as isize
|
||||||
|
}
|
||||||
|
Err(upkr::UnpackError::OverSize { size, .. }) => size as isize,
|
||||||
|
Err(other) => {
|
||||||
|
eprintln!("[upkr] compressed data corrupt: {}", other);
|
||||||
|
-1
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
99
c_library/upkr.c
Normal file
99
c_library/upkr.c
Normal file
@@ -0,0 +1,99 @@
|
|||||||
|
#include "upkr.h"
|
||||||
|
#include <stdio.h>
|
||||||
|
#include <string.h>
|
||||||
|
#include <stdlib.h>
|
||||||
|
|
||||||
|
int main(int argc, char** argv) {
|
||||||
|
if(argc < 2) {
|
||||||
|
fprintf(stdout, "Usage:\n upkr [compress] [-0 .. -9] <file> [<out-file>]\n upkr [uncompress] <file> [<out-file>]\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
int argi = 1;
|
||||||
|
int uncompress = 0;
|
||||||
|
int compression_level = 4;
|
||||||
|
if(strcmp(argv[argi], "compress") == 0) {
|
||||||
|
++argi;
|
||||||
|
} else if(strcmp(argv[argi], "uncompress") == 0) {
|
||||||
|
uncompress = 1;
|
||||||
|
++argi;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(argi < argc && argv[argi][0] == '-') {
|
||||||
|
compression_level = atoi(argv[argi] + 1);
|
||||||
|
++argi;
|
||||||
|
}
|
||||||
|
|
||||||
|
if(argi == argc) {
|
||||||
|
fprintf(stdout, "intput filename missing\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
|
||||||
|
const char* input_name = argv[argi++];
|
||||||
|
char* output_name;
|
||||||
|
if(argi < argc) {
|
||||||
|
output_name = argv[argi];
|
||||||
|
} else {
|
||||||
|
output_name = malloc(strlen(input_name) + 5);
|
||||||
|
strcpy(output_name, input_name);
|
||||||
|
strcat(output_name, uncompress ? ".unp" : ".upk");
|
||||||
|
}
|
||||||
|
|
||||||
|
FILE* file = fopen(input_name, "rb");
|
||||||
|
if(file == 0) {
|
||||||
|
fprintf(stdout, "failed to open input file '%s'\n", file);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
fseek(file, 0, SEEK_END);
|
||||||
|
long input_size = ftell(file);
|
||||||
|
rewind(file);
|
||||||
|
|
||||||
|
char* input_buffer = (char*)malloc(input_size);
|
||||||
|
long offset = 0;
|
||||||
|
while(offset < input_size) {
|
||||||
|
long read_size = fread(input_buffer + offset, 1, input_size - offset, file);
|
||||||
|
if(read_size <= 0) {
|
||||||
|
fprintf(stdout, "error reading input file\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
offset += read_size;
|
||||||
|
}
|
||||||
|
fclose(file);
|
||||||
|
|
||||||
|
long output_buffer_size = input_size * 8;
|
||||||
|
long output_size;
|
||||||
|
char* output_buffer = (char*)malloc(output_buffer_size);
|
||||||
|
for(;;) {
|
||||||
|
if(uncompress) {
|
||||||
|
output_size = upkr_uncompress(output_buffer, output_buffer_size, input_buffer, input_size);
|
||||||
|
} else {
|
||||||
|
output_size = upkr_compress(output_buffer, output_buffer_size, input_buffer, input_size, compression_level);
|
||||||
|
}
|
||||||
|
if(output_size < 0) {
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
if(output_size <= output_buffer_size) {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
output_buffer = (char*)realloc(output_buffer, output_size);
|
||||||
|
output_buffer_size = output_size;
|
||||||
|
}
|
||||||
|
|
||||||
|
file = fopen(output_name, "wb");
|
||||||
|
if(file == 0) {
|
||||||
|
fprintf(stdout, "failed to open output file '%s'\n", output_name);
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
offset = 0;
|
||||||
|
while(offset < output_size) {
|
||||||
|
long written_size = fwrite(output_buffer + offset, 1, output_size - offset, file);
|
||||||
|
if(written_size <= 0) {
|
||||||
|
fprintf(stdout, "error writing output file\n");
|
||||||
|
return 1;
|
||||||
|
}
|
||||||
|
offset += written_size;
|
||||||
|
}
|
||||||
|
fclose(file);
|
||||||
|
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
25
c_library/upkr.h
Normal file
25
c_library/upkr.h
Normal file
@@ -0,0 +1,25 @@
|
|||||||
|
#ifndef UPKR_H_INCLUDED
|
||||||
|
|
||||||
|
#include <stddef.h>
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
extern "C" {
|
||||||
|
#endif
|
||||||
|
|
||||||
|
// input_buffer/input_size: input data to compress
|
||||||
|
// output_buffer/output_buffer_size: buffer to compress into
|
||||||
|
// compression_level: 0-9
|
||||||
|
// returns the size of the compressed data, even if it didn't fit into the output buffer
|
||||||
|
size_t upkr_compress(void* output_buffer, size_t output_buffer_size, void* input_buffer, size_t input_size, int compression_level);
|
||||||
|
|
||||||
|
// input_buffer/input_size: compressed data
|
||||||
|
// output_buffer/output_buffer_size: buffer to uncompress into
|
||||||
|
// return value:
|
||||||
|
// >= 0 : size of uncompressed data, even if it didn't fit into the output buffer
|
||||||
|
// < 0 : input data corrupt, unable to decompress
|
||||||
|
ptrdiff_t upkr_uncompress(void* output_buffer, size_t output_buffer_size, void* input_buffer, size_t input_size);
|
||||||
|
|
||||||
|
#ifdef __cplusplus
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
#endif
|
||||||
@@ -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 char u8;
|
||||||
typedef unsigned short u16;
|
typedef unsigned short u16;
|
||||||
typedef unsigned long u32;
|
typedef unsigned long u32;
|
||||||
@@ -14,6 +67,7 @@ u32 upkr_state;
|
|||||||
|
|
||||||
int upkr_decode_bit(int context_index) {
|
int upkr_decode_bit(int context_index) {
|
||||||
#ifdef UPKR_BITSTREAM
|
#ifdef UPKR_BITSTREAM
|
||||||
|
// shift in single bits until rANS state is >= 32768
|
||||||
while(upkr_state < 32768) {
|
while(upkr_state < 32768) {
|
||||||
if(upkr_bits_left == 0) {
|
if(upkr_bits_left == 0) {
|
||||||
upkr_current_byte = *upkr_data_ptr++;
|
upkr_current_byte = *upkr_data_ptr++;
|
||||||
@@ -24,6 +78,7 @@ int upkr_decode_bit(int context_index) {
|
|||||||
--upkr_bits_left;
|
--upkr_bits_left;
|
||||||
}
|
}
|
||||||
#else
|
#else
|
||||||
|
// shift in a full byte until rANS state is >= 4096
|
||||||
while(upkr_state < 4096) {
|
while(upkr_state < 4096) {
|
||||||
upkr_state = (upkr_state << 8) | *upkr_data_ptr++;
|
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 prob = upkr_probs[context_index];
|
||||||
int bit = (upkr_state & 255) < prob ? 1 : 0;
|
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) {
|
if(bit) {
|
||||||
upkr_state = prob * (upkr_state >> 8) + (upkr_state & 255);
|
upkr_state = prob * (upkr_state >> 8) + (upkr_state & 255);
|
||||||
prob += (256 - prob + 8) >> 4;
|
prob += (256 - prob + 8) >> 4;
|
||||||
@@ -60,6 +117,7 @@ void* upkr_unpack(void* destination, void* compressed_data) {
|
|||||||
#ifdef UPKR_BITSTREAM
|
#ifdef UPKR_BITSTREAM
|
||||||
upkr_bits_left = 0;
|
upkr_bits_left = 0;
|
||||||
#endif
|
#endif
|
||||||
|
// all contexts are initialized to 128 = equal probability of 0 and 1
|
||||||
for(int i = 0; i < sizeof(upkr_probs); ++i)
|
for(int i = 0; i < sizeof(upkr_probs); ++i)
|
||||||
upkr_probs[i] = 128;
|
upkr_probs[i] = 128;
|
||||||
|
|
||||||
@@ -68,10 +126,13 @@ void* upkr_unpack(void* destination, void* compressed_data) {
|
|||||||
int prev_was_match = 0;
|
int prev_was_match = 0;
|
||||||
int offset = 0;
|
int offset = 0;
|
||||||
for(;;) {
|
for(;;) {
|
||||||
|
// is match
|
||||||
if(upkr_decode_bit(0)) {
|
if(upkr_decode_bit(0)) {
|
||||||
|
// has offset
|
||||||
if(prev_was_match || upkr_decode_bit(256)) {
|
if(prev_was_match || upkr_decode_bit(256)) {
|
||||||
offset = upkr_decode_length(257) - 1;
|
offset = upkr_decode_length(257) - 1;
|
||||||
if(offset == 0) {
|
if(offset == 0) {
|
||||||
|
// a 0 offset signals the end of the compressed data
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -82,6 +143,9 @@ void* upkr_unpack(void* destination, void* compressed_data) {
|
|||||||
}
|
}
|
||||||
prev_was_match = 1;
|
prev_was_match = 1;
|
||||||
} else {
|
} 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;
|
int byte = 1;
|
||||||
while(byte < 256) {
|
while(byte < 256) {
|
||||||
int bit = upkr_decode_bit(byte);
|
int bit = upkr_decode_bit(byte);
|
||||||
|
|||||||
13
dos_unpacker/readme.txt
Normal file
13
dos_unpacker/readme.txt
Normal file
@@ -0,0 +1,13 @@
|
|||||||
|
16 bit DOS executable stubs
|
||||||
|
---------------------------
|
||||||
|
|
||||||
|
by pestis and TomCat
|
||||||
|
|
||||||
|
unpack_x86_16_DOS.asm:
|
||||||
|
maximum compatibility, relocates unpacked code to normal start address
|
||||||
|
unpack_x86_16_DOS_no_relocation.asm:
|
||||||
|
saves some bytes by not relocating, unpacked code needs to be assembled to
|
||||||
|
start at 0x3FFE
|
||||||
|
unpack_x86_16_DOS_no_repeated_offset.asm:
|
||||||
|
removes support for repeated offsets, potentially at the cost of some compression ratio.
|
||||||
|
most likely only a win in very narrow circumstances around the 1kb mark
|
||||||
160
dos_unpacker/unpack_x86_16_DOS.asm
Normal file
160
dos_unpacker/unpack_x86_16_DOS.asm
Normal file
@@ -0,0 +1,160 @@
|
|||||||
|
; Contributions from pestis, TomCat and exoticorn
|
||||||
|
;
|
||||||
|
; This is the 16-bit DOS x86 decompression stub for upkr, which is designed for
|
||||||
|
; maximum compatibility: it relocates the compressed data so it can be
|
||||||
|
; decompressed starting at the normal .COM starting address. In other words,
|
||||||
|
; many of the already existing .COM files should be compressable using this
|
||||||
|
; stub.
|
||||||
|
;
|
||||||
|
; How to use:
|
||||||
|
; 1) Pack your intro using upkr into data.bin with the --x86 command line
|
||||||
|
; argument:
|
||||||
|
;
|
||||||
|
; $ upkr --x86 intro.com data.bin
|
||||||
|
;
|
||||||
|
; 2) Compile this .asm file using nasm (or any compatible assembler):
|
||||||
|
;
|
||||||
|
; $ nasm unpack_x86_16_DOS.asm -fbin -o intropck.com
|
||||||
|
;
|
||||||
|
; The packed size of the intro+stub is limited by max_len (see below) bytes.
|
||||||
|
;
|
||||||
|
; In specific cases, the unpacker stub can be further optimized to save a byte
|
||||||
|
; or two:
|
||||||
|
; 1) You can remove CLC before RET, if you don't mind carry being set upon
|
||||||
|
; program entry
|
||||||
|
; 2) You can also move PUSHA before PUSH SI and put POPA as the first
|
||||||
|
; operation of the compressed code.
|
||||||
|
max_len equ 16384
|
||||||
|
prog_start equ (0x100+max_len+510+relocation-upkr_unpack)
|
||||||
|
probs equ (((prog_start+max_len+510)+255)/256)*256
|
||||||
|
|
||||||
|
org 0x100
|
||||||
|
|
||||||
|
; This is will be loaded at 0x100, but relocates the code and data to prog_start
|
||||||
|
relocation:
|
||||||
|
push si ; si = 0x100 at DOS start, so save it for later ret
|
||||||
|
pusha ; pusha to recall all registers before starting intro
|
||||||
|
push si ; for pop di to start writing the output
|
||||||
|
mov di, prog_start ; the depacker & data are relocated from 0x100 to prog_start
|
||||||
|
mov ch, max_len/512
|
||||||
|
rep movsw
|
||||||
|
jmp si ; jump to relocated upkr_unpack
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_unpack unpacks the code to 0x100 and runs it when done.
|
||||||
|
upkr_unpack:
|
||||||
|
xchg ax, bp ; position in input bitstream (bp) = 0
|
||||||
|
cwd ; upkr_state (dx) = 0;
|
||||||
|
xchg ax, cx ; cx = 0x9XX
|
||||||
|
mov al, 128 ; for(int i = 0; i < sizeof(upkr_probs); ++i) upkr_probs[i] = 128;
|
||||||
|
rep stosb
|
||||||
|
pop di ; u8* write_ptr = (u8*)destination;
|
||||||
|
.mainloop:
|
||||||
|
mov bx, probs
|
||||||
|
call upkr_decode_bit
|
||||||
|
jc .else ; if(upkr_decode_bit(0)) {
|
||||||
|
mov bh, (probs+256)/256
|
||||||
|
jcxz .skip_call
|
||||||
|
call upkr_decode_bit
|
||||||
|
jc .skipoffset
|
||||||
|
.skip_call:
|
||||||
|
stc
|
||||||
|
call upkr_decode_number ; offset = upkr_decode_length(258) - 1;
|
||||||
|
loop .notdone ; if(offset == 0)
|
||||||
|
popa
|
||||||
|
clc
|
||||||
|
ret
|
||||||
|
.notdone:
|
||||||
|
mov si, di
|
||||||
|
.sub:
|
||||||
|
dec si
|
||||||
|
loop .sub
|
||||||
|
.skipoffset:
|
||||||
|
mov bl, 128 ; int length = upkr_decode_length(384);
|
||||||
|
call upkr_decode_number
|
||||||
|
rep movsb ; *write_ptr = write_ptr[-offset];
|
||||||
|
jmp .mainloop
|
||||||
|
.byteloop:
|
||||||
|
call upkr_decode_bit ; int bit = upkr_decode_bit(byte);
|
||||||
|
.else:
|
||||||
|
adc bl, bl ; byte = (byte << 1) + bit;
|
||||||
|
jnc .byteloop
|
||||||
|
xchg ax, bx
|
||||||
|
stosb
|
||||||
|
inc si
|
||||||
|
mov cl, 1
|
||||||
|
jmp .mainloop ; prev_was_match = 0;
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_bit decodes one bit from the rANS entropy encoded bit stream.
|
||||||
|
; parameters:
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; returns:
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = bit
|
||||||
|
; trashes ax
|
||||||
|
upkr_load_bit:
|
||||||
|
bt [compressed_data-relocation+prog_start], bp
|
||||||
|
inc bp
|
||||||
|
adc dx, dx
|
||||||
|
upkr_decode_bit:
|
||||||
|
inc dx ; inc dx, dec dx is used to test the top (sign) bit of dx
|
||||||
|
dec dx
|
||||||
|
jns upkr_load_bit
|
||||||
|
movzx ax, byte [bx] ; u16 prob = upkr_probs[context_index]
|
||||||
|
neg byte [bx]
|
||||||
|
push ax ; save prob, tmp = prob
|
||||||
|
cmp dl, al ; int bit = (upkr_state & 255) < prob ? 1 : 0; (carry = bit)
|
||||||
|
pushf ; save bit flags
|
||||||
|
jc .bit ; (skip if bit)
|
||||||
|
xchg [bx], al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
shr byte [bx], 4 ; upkr_probs[context_index] = tmp + (256 - tmp + 8) >> 4;
|
||||||
|
adc [bx], al
|
||||||
|
mul dh ; upkr_state = tmp * (upkr_state >> 8) + (upkr_state & 255);
|
||||||
|
mov dh, 0
|
||||||
|
add dx, ax
|
||||||
|
popf
|
||||||
|
pop ax
|
||||||
|
jc .bit2 ; (skip if bit)
|
||||||
|
neg byte [bx] ; tmp = 256 - tmp;
|
||||||
|
sub dx, ax ; upkr_state -= prob; note that this will also leave carry always unset, which is what we want
|
||||||
|
.bit2:
|
||||||
|
ret ; return the bit in carry
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_number loads a variable length encoded number (up to 16 bits) from
|
||||||
|
; the compressed stream. Only numbers 1..65535 can be encoded. If the encoded
|
||||||
|
; number has 4 bits and is 1ABC, it is encoded using a kind of an "interleaved
|
||||||
|
; elias code": 0A0B0C1. The 1 in the end implies that no more bits are coming.
|
||||||
|
; parameters:
|
||||||
|
; cx = must be 0
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; carry = must be 1
|
||||||
|
; returns:
|
||||||
|
; cx = length
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = 1
|
||||||
|
; trashes bl, ax
|
||||||
|
upkr_decode_number_loop:
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
upkr_decode_number:
|
||||||
|
rcr cx, 1
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
jnc upkr_decode_number_loop ; 0 = there's more bits coming, 1 = no more bits
|
||||||
|
.loop2:
|
||||||
|
rcr cx, 1
|
||||||
|
jnc .loop2
|
||||||
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
compressed_data:
|
||||||
|
incbin "data.bin"
|
||||||
151
dos_unpacker/unpack_x86_16_DOS_no_relocation.asm
Normal file
151
dos_unpacker/unpack_x86_16_DOS_no_relocation.asm
Normal file
@@ -0,0 +1,151 @@
|
|||||||
|
; Contributions from pestis, TomCat and exoticorn
|
||||||
|
;
|
||||||
|
; This is the 16-bit DOS x86 decompression stub for upkr, which decompresses the
|
||||||
|
; code starting at address 0x3FFE (or whatever is defined by the entrypoint
|
||||||
|
; below). Thus, the packed code needs to be assembled with org 0x3FFE to work.
|
||||||
|
;
|
||||||
|
; How to use:
|
||||||
|
; 1) Put POPA as the first instruction of your compiled code and use org
|
||||||
|
; 0x3FFE
|
||||||
|
; 2) Pack your intro using upkr into data.bin with the --x86 command line
|
||||||
|
; argument:
|
||||||
|
;
|
||||||
|
; $ upkr --x86 intro.com data.bin
|
||||||
|
;
|
||||||
|
; 2) Compile this .asm file using nasm (or any compatible assembler) e.g.
|
||||||
|
;
|
||||||
|
; $ nasm unpack_x86_16_DOS_no_relocation.asm -fbin -o intropck.com
|
||||||
|
;
|
||||||
|
; In specific cases, the unpacker stub can be further optimized to save a byte
|
||||||
|
; or two:
|
||||||
|
; 1) If your stub+compressed code is 2k or smaller, you can save 1 byte by
|
||||||
|
; putting probs at 0x900 and initializing DI with SALC; XCHG AX, DI instead
|
||||||
|
; of MOV DI, probs
|
||||||
|
; 2) If you remove the PUSHA (and POPA in the compressed code), then you can
|
||||||
|
; assume the registers as follows: AX = 0x00XX, BX = probs + 0x1XX, CX = 0
|
||||||
|
; DX = (trash), SI = DI = right after your program, SP = as it was when the
|
||||||
|
; program started, flags = carry set
|
||||||
|
;
|
||||||
|
; Note that even with the PUSHA / POPA, carry will be set (!) unlike normal dos
|
||||||
|
; program.
|
||||||
|
entry equ 0x3FFE
|
||||||
|
probs equ entry - 0x1FE ; must be aligned to 256
|
||||||
|
|
||||||
|
org 0x100
|
||||||
|
|
||||||
|
|
||||||
|
; This is will be loaded at 0x100, but relocates the code and data to prog_start
|
||||||
|
upkr_unpack:
|
||||||
|
pusha
|
||||||
|
xchg ax, bp ; position in bitstream = 0
|
||||||
|
cwd ; upkr_state = 0;
|
||||||
|
mov di, probs
|
||||||
|
mov ax, 0x8080 ; for(int i = 0; i < sizeof(upkr_probs); ++i) upkr_probs[i] = 128;
|
||||||
|
rep stosw
|
||||||
|
push di
|
||||||
|
.mainloop:
|
||||||
|
mov bx, probs
|
||||||
|
call upkr_decode_bit
|
||||||
|
jc .else ; if(upkr_decode_bit(0)) {
|
||||||
|
mov bh, (probs+256)/256
|
||||||
|
jcxz .skip_call ; if(prev_was_match || upkr_decode_bit(257)) {
|
||||||
|
call upkr_decode_bit
|
||||||
|
jc .skipoffset
|
||||||
|
.skip_call:
|
||||||
|
stc
|
||||||
|
call upkr_decode_number ; offset = upkr_decode_number(258) - 1;
|
||||||
|
mov si, di
|
||||||
|
loop .sub ; if(offset == 0)
|
||||||
|
ret
|
||||||
|
.sub:
|
||||||
|
dec si
|
||||||
|
loop .sub
|
||||||
|
.skipoffset:
|
||||||
|
mov bl, 128 ; int length = upkr_decode_number(384);
|
||||||
|
call upkr_decode_number
|
||||||
|
rep movsb ; *write_ptr = write_ptr[-offset];
|
||||||
|
jmp .mainloop
|
||||||
|
.byteloop:
|
||||||
|
call upkr_decode_bit ; int bit = upkr_decode_bit(byte);
|
||||||
|
.else:
|
||||||
|
adc bl, bl ; byte = (byte << 1) + bit;
|
||||||
|
jnc .byteloop
|
||||||
|
xchg ax, bx
|
||||||
|
stosb
|
||||||
|
inc si
|
||||||
|
mov cl, 1
|
||||||
|
jmp .mainloop ; prev_was_match = 0;
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_bit decodes one bit from the rANS entropy encoded bit stream.
|
||||||
|
; parameters:
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; returns:
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = bit
|
||||||
|
; trashes ax
|
||||||
|
upkr_load_bit:
|
||||||
|
bt [compressed_data], bp
|
||||||
|
inc bp
|
||||||
|
adc dx, dx
|
||||||
|
upkr_decode_bit:
|
||||||
|
inc dx
|
||||||
|
dec dx ; inc dx, dec dx is used to test the top (sign) bit of dx
|
||||||
|
jns upkr_load_bit
|
||||||
|
movzx ax, byte [bx] ; u16 prob = upkr_probs[context_index]
|
||||||
|
neg byte [bx]
|
||||||
|
push ax ; save prob, tmp = prob
|
||||||
|
cmp dl, al ; int bit = (upkr_state & 255) < prob ? 1 : 0; (carry = bit)
|
||||||
|
pushf ; save bit flags
|
||||||
|
jc .bit ; (skip if bit)
|
||||||
|
xchg [bx], al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
shr byte [bx], 4 ; upkr_probs[context_index] = tmp + (256 - tmp + 8) >> 4;
|
||||||
|
adc [bx], al
|
||||||
|
mul dh ; upkr_state = tmp * (upkr_state >> 8) + (upkr_state & 255);
|
||||||
|
mov dh, 0
|
||||||
|
add dx, ax
|
||||||
|
popf
|
||||||
|
pop ax
|
||||||
|
jc .bit2 ; (skip if bit)
|
||||||
|
neg byte [bx] ; tmp = 256 - tmp;
|
||||||
|
sub dx, ax ; upkr_state -= prob; note that this will also leave carry always unset, which is what we want
|
||||||
|
.bit2:
|
||||||
|
ret ; flags = bit
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_number loads a variable length encoded number (up to 16 bits) from
|
||||||
|
; the compressed stream. Only numbers 1..65535 can be encoded. If the encoded
|
||||||
|
; number has 4 bits and is 1ABC, it is encoded using a kind of an "interleaved
|
||||||
|
; elias code": 0A0B0C1. The 1 in the end implies that no more bits are coming.
|
||||||
|
; parameters:
|
||||||
|
; cx = must be 0
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; carry = must be 1
|
||||||
|
; returns:
|
||||||
|
; cx = length
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = 1
|
||||||
|
; trashes bl, ax
|
||||||
|
upkr_decode_number_loop:
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
upkr_decode_number:
|
||||||
|
rcr cx, 1
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
jnc upkr_decode_number_loop ; while(upkr_decode_bit(context_index)) {
|
||||||
|
.loop2:
|
||||||
|
rcr cx, 1
|
||||||
|
jnc .loop2
|
||||||
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
compressed_data:
|
||||||
|
incbin "data.bin"
|
||||||
154
dos_unpacker/unpack_x86_16_DOS_no_repeated_offset.asm
Normal file
154
dos_unpacker/unpack_x86_16_DOS_no_repeated_offset.asm
Normal file
@@ -0,0 +1,154 @@
|
|||||||
|
; Contributions from pestis, TomCat and exoticorn
|
||||||
|
;
|
||||||
|
; This is the 16-bit DOS x86 decompression stub for upkr, which is designed for
|
||||||
|
; the --no-repeated-offsets option of upkr. The decompression stub is slightly
|
||||||
|
; smaller, but the compressed data might be bigger, so you have to test if
|
||||||
|
; --no-repeated-offsets pays off in the end. This stub relocates the compressed
|
||||||
|
; data so it can be decompressed starting at the normal .COM starting address.
|
||||||
|
;
|
||||||
|
; How to use:
|
||||||
|
; 1) Pack your intro using upkr into data.bin with the --x86b command line
|
||||||
|
; argument: (notice the --x86b, not --x86!)
|
||||||
|
;
|
||||||
|
; $ upkr --x86b intro.com data.bin
|
||||||
|
;
|
||||||
|
; 2) Compile this .asm file using nasm (or any compatible assembler):
|
||||||
|
;
|
||||||
|
; $ nasm unpack_x86_16_DOS_no_repeated_offsets.asm -fbin -o intropck.com
|
||||||
|
;
|
||||||
|
; The packed size of the intro+stub is limited by max_len (see below) bytes.
|
||||||
|
;
|
||||||
|
; In specific cases, the unpacker stub can be further optimized to save a byte
|
||||||
|
; or two:
|
||||||
|
; 1) You can remove CLC before RET, if you don't mind carry being set upon
|
||||||
|
; program entry
|
||||||
|
; 2) You can also move PUSHA before PUSH SI and put POPA as the first
|
||||||
|
; operation of the compressed code.
|
||||||
|
max_len equ 16384
|
||||||
|
prog_start equ (0x100+max_len+510+relocation-upkr_unpack)
|
||||||
|
probs equ (((prog_start+max_len+510)+255)/256)*256
|
||||||
|
|
||||||
|
org 0x100
|
||||||
|
|
||||||
|
|
||||||
|
; This is will be loaded at 0x100, but relocates the code and data to prog_start
|
||||||
|
relocation:
|
||||||
|
push si ; si = 0x100 at DOS start, so save it for later ret
|
||||||
|
pusha ; pusha to recall all registers before starting intro
|
||||||
|
push si ; for pop di to start writing the output
|
||||||
|
mov di, prog_start ; the depacker & data are relocated from 0x100 to prog_start
|
||||||
|
mov ch, max_len/512
|
||||||
|
rep movsw
|
||||||
|
jmp si ; jump to relocated upkr_unpack
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_unpack unpacks the code to 0x100 and runs it when done.
|
||||||
|
upkr_unpack:
|
||||||
|
xchg ax, bp ; position in bitstream = 0
|
||||||
|
cwd ; upkr_state = 0;
|
||||||
|
xchg cx, ax ; cx > 0x0200
|
||||||
|
mov al, 128 ; for(int i = 0; i < sizeof(upkr_probs); ++i) upkr_probs[i] = 128;
|
||||||
|
rep stosb
|
||||||
|
pop di ; u8* write_ptr = (u8*)destination;
|
||||||
|
.mainloop:
|
||||||
|
mov bx, probs
|
||||||
|
call upkr_decode_bit
|
||||||
|
jnc .else ; if(upkr_decode_bit(0)) {
|
||||||
|
inc bh
|
||||||
|
call upkr_decode_number ; offset = upkr_decode_number(258) - 1;
|
||||||
|
loop .notdone ; if(offset == 0)
|
||||||
|
popa
|
||||||
|
clc
|
||||||
|
ret
|
||||||
|
.notdone:
|
||||||
|
mov si, di
|
||||||
|
.sub:
|
||||||
|
dec si
|
||||||
|
loop .sub
|
||||||
|
mov bl, 128 ; int length = upkr_decode_number(384);
|
||||||
|
call upkr_decode_number
|
||||||
|
rep movsb ; *write_ptr = write_ptr[-offset];
|
||||||
|
jmp .mainloop
|
||||||
|
.else:
|
||||||
|
inc bx
|
||||||
|
.byteloop:
|
||||||
|
call upkr_decode_bit ; int bit = upkr_decode_bit(byte);
|
||||||
|
adc bl, bl ; byte = (byte << 1) + bit;
|
||||||
|
jnc .byteloop
|
||||||
|
xchg ax, bx
|
||||||
|
stosb
|
||||||
|
jmp .mainloop ; prev_was_match = 0;
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_bit decodes one bit from the rANS entropy encoded bit stream.
|
||||||
|
; parameters:
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; returns:
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = bit
|
||||||
|
; trashes ax
|
||||||
|
upkr_load_bit:
|
||||||
|
bt [compressed_data-relocation+prog_start], bp
|
||||||
|
inc bp
|
||||||
|
adc dx, dx
|
||||||
|
upkr_decode_bit:
|
||||||
|
inc dx
|
||||||
|
dec dx ; or whatever other test for the top bit there is
|
||||||
|
jns upkr_load_bit
|
||||||
|
movzx ax, byte [bx] ; u16 prob = upkr_probs[context_index]
|
||||||
|
neg byte [bx]
|
||||||
|
push ax ; save prob, tmp = prob
|
||||||
|
cmp dl, al ; int bit = (upkr_state & 255) < prob ? 1 : 0; (carry = bit)
|
||||||
|
pushf ; save bit flags
|
||||||
|
jc .bit ; (skip if bit)
|
||||||
|
xchg [bx], al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
shr byte [bx], 4 ; upkr_probs[context_index] = tmp + (256 - tmp + 8) >> 4;
|
||||||
|
adc [bx], al ; upkr_probs[context_index] = tmp;
|
||||||
|
mul dh ; upkr_state = tmp * (upkr_state >> 8) + (upkr_state & 255);
|
||||||
|
mov dh, 0
|
||||||
|
add dx, ax
|
||||||
|
popf
|
||||||
|
pop ax
|
||||||
|
jc .bit2 ; (skip if bit)
|
||||||
|
neg byte [bx] ; tmp = 256 - tmp;
|
||||||
|
sub dx, ax ; upkr_state -= prob; note that this will also leave carry always unset, which is what we want
|
||||||
|
.bit2:
|
||||||
|
ret ; flags = bit
|
||||||
|
|
||||||
|
|
||||||
|
; upkr_decode_number loads a variable length encoded number (up to 16 bits) from
|
||||||
|
; the compressed stream. Only numbers 1..65535 can be encoded. If the encoded
|
||||||
|
; number has 4 bits and is 1ABC, it is encoded using a kind of an "interleaved
|
||||||
|
; elias code": 0A0B0C1. The 1 in the end implies that no more bits are coming.
|
||||||
|
; parameters:
|
||||||
|
; cx = must be 0
|
||||||
|
; bx = memory address of the context probability
|
||||||
|
; dx = decoder state
|
||||||
|
; bp = bit position in input stream
|
||||||
|
; carry = must be 1
|
||||||
|
; returns:
|
||||||
|
; cx = length
|
||||||
|
; dx = new decoder state
|
||||||
|
; bp = new bit position in input stream
|
||||||
|
; carry = 1
|
||||||
|
; trashes bl, ax
|
||||||
|
upkr_decode_number_loop:
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
upkr_decode_number:
|
||||||
|
rcr cx, 1
|
||||||
|
inc bx
|
||||||
|
call upkr_decode_bit
|
||||||
|
jnc upkr_decode_number_loop ; 0 = there's more bits coming, 1 = no more bits
|
||||||
|
.loop2:
|
||||||
|
rcr cx, 1
|
||||||
|
jnc .loop2
|
||||||
|
ret
|
||||||
|
|
||||||
|
|
||||||
|
compressed_data:
|
||||||
|
incbin "data.bin"
|
||||||
5
release/.gitignore
vendored
Normal file
5
release/.gitignore
vendored
Normal file
@@ -0,0 +1,5 @@
|
|||||||
|
*.zip
|
||||||
|
*.tgz
|
||||||
|
upkr-linux/
|
||||||
|
upkr-windows/
|
||||||
|
upkr-windows-32/
|
||||||
51
release/Makefile
Normal file
51
release/Makefile
Normal file
@@ -0,0 +1,51 @@
|
|||||||
|
VERSION := $(shell cargo run --release -- --version)
|
||||||
|
|
||||||
|
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
|
||||||
|
cp ../README.md upkr-linux
|
||||||
|
cd .. && git archive HEAD c_unpacker | tar -xC release/upkr-linux
|
||||||
|
cd .. && git archive HEAD z80_unpacker | tar -xC release/upkr-linux
|
||||||
|
cd .. && git archive HEAD asm_unpackers | tar -xC release/upkr-linux
|
||||||
|
tar czf $@ upkr-linux
|
||||||
|
|
||||||
|
upkr-windows-$(VERSION).zip: upkr-windows/upkr.exe PHONY
|
||||||
|
cp ../README.md upkr-windows/
|
||||||
|
cd .. && git archive HEAD c_unpacker | tar -xC release/upkr-windows
|
||||||
|
cd .. && git archive HEAD z80_unpacker | tar -xC release/upkr-windows
|
||||||
|
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
|
||||||
|
cp ../target/x86_64-unknown-linux-musl/release/upkr upkr-linux/
|
||||||
|
strip upkr-linux/upkr
|
||||||
|
|
||||||
|
upkr-windows/upkr.exe:
|
||||||
|
cargo build --target x86_64-pc-windows-gnu --release -F terminal
|
||||||
|
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:
|
||||||
@@ -1,6 +1,6 @@
|
|||||||
use crate::{
|
use crate::{
|
||||||
rans::{ONE_PROB, PROB_BITS},
|
|
||||||
Config,
|
Config,
|
||||||
|
rans::{ONE_PROB, PROB_BITS},
|
||||||
};
|
};
|
||||||
|
|
||||||
const INIT_PROB: u16 = 1 << (PROB_BITS - 1);
|
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
|
(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 {
|
} else {
|
||||||
if bit ^ self.state.invert_bit_encoding {
|
old - ((old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
|
||||||
old + ((ONE_PROB - old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
|
|
||||||
} else {
|
|
||||||
old - ((old as u32 + UPDATE_ADD) >> UPDATE_RATE) as u8
|
|
||||||
}
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
213
src/heatmap.rs
Normal file
213
src/heatmap.rs
Normal file
@@ -0,0 +1,213 @@
|
|||||||
|
/// Heatmap information about a compressed block of data.
|
||||||
|
///
|
||||||
|
/// For each byte in the uncompressed data, the heatmap provides two pieces of intormation:
|
||||||
|
/// 1. whether this byte was encoded as a literal or as part of a match
|
||||||
|
/// 2. how many (fractional) bits where spend on encoding this byte
|
||||||
|
///
|
||||||
|
/// For the sake of the heatmap, the cost of literals are spread out across all matches
|
||||||
|
/// that reference the literal.
|
||||||
|
///
|
||||||
|
/// If the `terminal` feature is enabled, there is a function to write out the
|
||||||
|
/// heatmap as a colored hexdump.
|
||||||
|
pub struct Heatmap {
|
||||||
|
data: Vec<u8>,
|
||||||
|
cost: Vec<f32>,
|
||||||
|
raw_cost: Vec<f32>,
|
||||||
|
literal_index: Vec<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Heatmap {
|
||||||
|
pub(crate) fn new() -> Heatmap {
|
||||||
|
Heatmap {
|
||||||
|
data: Vec::new(),
|
||||||
|
cost: Vec::new(),
|
||||||
|
raw_cost: Vec::new(),
|
||||||
|
literal_index: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn add_literal(&mut self, byte: u8, cost: f32) {
|
||||||
|
self.data.push(byte);
|
||||||
|
self.cost.push(cost);
|
||||||
|
self.literal_index.push(self.literal_index.len());
|
||||||
|
}
|
||||||
|
|
||||||
|
pub(crate) fn add_match(&mut self, offset: usize, length: usize, mut cost: f32) {
|
||||||
|
cost /= length as f32;
|
||||||
|
for _ in 0..length {
|
||||||
|
self.data.push(self.data[self.data.len() - offset]);
|
||||||
|
self.literal_index
|
||||||
|
.push(self.literal_index[self.literal_index.len() - offset]);
|
||||||
|
self.cost.push(cost);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
|
||||||
|
let mut shifted = vec![];
|
||||||
|
for (&index, &cost) in self.literal_index.iter().zip(self.cost.iter()) {
|
||||||
|
let delta = (self.cost[index] - cost) / ref_count[index] as f32;
|
||||||
|
shifted.push(delta);
|
||||||
|
shifted[index] -= delta;
|
||||||
|
}
|
||||||
|
|
||||||
|
for (cost, delta) in self.cost.iter_mut().zip(shifted.into_iter()) {
|
||||||
|
*cost += delta;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Reverses the heatmap
|
||||||
|
pub fn reverse(&mut self) {
|
||||||
|
self.data.reverse();
|
||||||
|
self.cost.reverse();
|
||||||
|
self.literal_index.reverse();
|
||||||
|
for index in self.literal_index.iter_mut() {
|
||||||
|
*index = self.data.len() - *index;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
/// The number of (uncompressed) bytes of data in this heatmap
|
||||||
|
pub fn len(&self) -> usize {
|
||||||
|
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.
|
||||||
|
/// 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]
|
||||||
|
}
|
||||||
|
|
||||||
|
#[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::{
|
||||||
|
QueueableCommand,
|
||||||
|
style::{Attribute, Color, Print, SetAttribute, SetBackgroundColor},
|
||||||
|
};
|
||||||
|
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 = if report_raw_cost {
|
||||||
|
heatmap.raw_cost(index)
|
||||||
|
} else {
|
||||||
|
heatmap.cost(index)
|
||||||
|
};
|
||||||
|
if num_colors < 256 {
|
||||||
|
let colors = [
|
||||||
|
Color::Red,
|
||||||
|
Color::Yellow,
|
||||||
|
Color::Green,
|
||||||
|
Color::Cyan,
|
||||||
|
Color::Blue,
|
||||||
|
Color::DarkBlue,
|
||||||
|
Color::Black,
|
||||||
|
];
|
||||||
|
let color_index = (3. - cost.log2())
|
||||||
|
.round()
|
||||||
|
.max(0.)
|
||||||
|
.min((colors.len() - 1) as f32) as usize;
|
||||||
|
out.queue(SetBackgroundColor(colors[color_index]))?;
|
||||||
|
} else {
|
||||||
|
let colors = [
|
||||||
|
196, 166, 136, 106, 76, 46, 41, 36, 31, 26, 21, 20, 19, 18, 17, 16,
|
||||||
|
];
|
||||||
|
let color_index = ((3. - cost.log2()) * 2.5)
|
||||||
|
.round()
|
||||||
|
.max(0.)
|
||||||
|
.min((colors.len() - 1) as f32) as usize;
|
||||||
|
out.queue(SetBackgroundColor(Color::AnsiValue(colors[color_index])))?;
|
||||||
|
}
|
||||||
|
out.queue(SetAttribute(if heatmap.is_literal(index) {
|
||||||
|
Attribute::Underlined
|
||||||
|
} else {
|
||||||
|
Attribute::NoUnderline
|
||||||
|
}))?;
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
let num_colors = crossterm::style::available_color_count();
|
||||||
|
|
||||||
|
let term_width = crossterm::terminal::size()?.0.min(120) as usize;
|
||||||
|
let bytes_per_row = (term_width - 8) / 4;
|
||||||
|
|
||||||
|
for row_start in (0..self.data.len()).step_by(bytes_per_row) {
|
||||||
|
let row_range = row_start..self.data.len().min(row_start + bytes_per_row);
|
||||||
|
let mut stdout = stdout();
|
||||||
|
|
||||||
|
stdout.queue(Print(&format!("{:04x} ", row_start)))?;
|
||||||
|
|
||||||
|
for i in row_range.clone() {
|
||||||
|
set_color(&mut stdout, self, i, num_colors, report_raw_cost)?;
|
||||||
|
stdout.queue(Print(&format!("{:02x} ", self.data[i])))?;
|
||||||
|
}
|
||||||
|
|
||||||
|
let num_spaces = 1 + (bytes_per_row - (row_range.end - row_range.start)) * 3;
|
||||||
|
let gap: String = std::iter::repeat(' ').take(num_spaces).collect();
|
||||||
|
stdout
|
||||||
|
.queue(SetAttribute(Attribute::Reset))?
|
||||||
|
.queue(Print(&gap))?;
|
||||||
|
|
||||||
|
for i in row_range.clone() {
|
||||||
|
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)))?;
|
||||||
|
} else {
|
||||||
|
stdout.queue(Print("."))?;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
stdout
|
||||||
|
.queue(SetAttribute(Attribute::Reset))?
|
||||||
|
.queue(Print("\n"))?;
|
||||||
|
|
||||||
|
stdout.flush()?;
|
||||||
|
}
|
||||||
|
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
}
|
||||||
66
src/lib.rs
66
src/lib.rs
@@ -1,31 +1,75 @@
|
|||||||
|
#![deny(missing_docs)]
|
||||||
|
|
||||||
|
//! Compression and decompression of the upkr format and variants.
|
||||||
|
//!
|
||||||
|
//! Upkr is a compression format initially designed for the MicroW8 fantasy console,
|
||||||
|
//! with design goals being a competitive compression ratio, reasonable fast
|
||||||
|
//! decompression, low memory overhead and very small decompression code
|
||||||
|
//! when handoptimized in assembler. (An optimized DOS execuable decompressor is <140 bytes.)
|
||||||
|
|
||||||
mod context_state;
|
mod context_state;
|
||||||
mod greedy_packer;
|
mod greedy_packer;
|
||||||
|
mod heatmap;
|
||||||
mod lz;
|
mod lz;
|
||||||
mod match_finder;
|
mod match_finder;
|
||||||
mod parsing_packer;
|
mod parsing_packer;
|
||||||
mod rans;
|
mod rans;
|
||||||
|
|
||||||
pub use lz::{calculate_margin, unpack, UnpackError};
|
pub use heatmap::Heatmap;
|
||||||
|
pub use lz::{calculate_margin, create_heatmap, unpack, UnpackError};
|
||||||
|
|
||||||
|
/// The type of a callback function to be given to the `pack` function.
|
||||||
|
///
|
||||||
|
/// It will be periodically called with the number of bytes of the input already processed.
|
||||||
pub type ProgressCallback<'a> = &'a mut dyn FnMut(usize);
|
pub type ProgressCallback<'a> = &'a mut dyn FnMut(usize);
|
||||||
|
|
||||||
|
/// A configuration of which compression format variation to use.
|
||||||
|
///
|
||||||
|
/// Use `Config::default()` for the standard upkr format.
|
||||||
|
///
|
||||||
|
/// Compression format variants exist to help with micro-optimizations in uncompression
|
||||||
|
/// code on specific platforms.
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct Config {
|
pub struct Config {
|
||||||
|
/// Shift in bits from a bitstream into the rANS state, rather than whole bytes.
|
||||||
|
/// This decreases the size of the rNAS state to 16 bits which is very useful on
|
||||||
|
/// 8 bit platforms.
|
||||||
pub use_bitstream: bool,
|
pub use_bitstream: bool,
|
||||||
|
/// The number of parity contexts (usually 1, 2 or 4). This can improve compression
|
||||||
|
/// on data that consists of regular groups of 2 or 4 bytes. One example is 32bit ARM
|
||||||
|
/// code, where each instruction is 4 bytes, so `parity_contexts = 4` improves compression
|
||||||
|
/// quite a bit. Defaults to `1`.
|
||||||
pub parity_contexts: usize,
|
pub parity_contexts: usize,
|
||||||
|
|
||||||
|
/// Invert the encoding of bits in the rANS coder. `bit = state_lo >= prob` instead of
|
||||||
|
/// `bit = state_lo < prob`.
|
||||||
pub invert_bit_encoding: bool,
|
pub invert_bit_encoding: bool,
|
||||||
|
/// The boolean value which encodes a match. Defaults to `true`.
|
||||||
pub is_match_bit: bool,
|
pub is_match_bit: bool,
|
||||||
|
/// The boolean value which encodes a new offset (rather than re-using the previous offset).
|
||||||
|
/// Defaults to `true`.
|
||||||
pub new_offset_bit: bool,
|
pub new_offset_bit: bool,
|
||||||
|
/// The boolean value which encodes that there are more bits comming for length/offset values.
|
||||||
|
/// Defaults to `true`.
|
||||||
pub continue_value_bit: bool,
|
pub continue_value_bit: bool,
|
||||||
|
|
||||||
|
/// Reverses the bits in the bitstream.
|
||||||
pub bitstream_is_big_endian: bool,
|
pub bitstream_is_big_endian: bool,
|
||||||
|
/// A slightly less accurate, but slightly simpler variation of the prob update in the
|
||||||
|
/// rANS coder, Used for the z80 uncompressor.
|
||||||
pub simplified_prob_update: bool,
|
pub simplified_prob_update: bool,
|
||||||
|
|
||||||
|
/// Disables support for re-using the last offset in the compression format.
|
||||||
|
/// This might save a few bytes when working with very small data.
|
||||||
pub no_repeated_offsets: bool,
|
pub no_repeated_offsets: bool,
|
||||||
|
/// Standard upkr encodes the EOF marker in the offset. This encodes it in the match length
|
||||||
|
/// instead.
|
||||||
pub eof_in_length: bool,
|
pub eof_in_length: bool,
|
||||||
|
|
||||||
|
/// The maximum match offset value to encode when compressing.
|
||||||
pub max_offset: usize,
|
pub max_offset: usize,
|
||||||
|
/// The maximum match length value to encode when compressing.
|
||||||
pub max_length: usize,
|
pub max_length: usize,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -53,7 +97,7 @@ impl Default for Config {
|
|||||||
}
|
}
|
||||||
|
|
||||||
impl Config {
|
impl Config {
|
||||||
pub fn min_length(&self) -> usize {
|
fn min_length(&self) -> usize {
|
||||||
if self.eof_in_length {
|
if self.eof_in_length {
|
||||||
2
|
2
|
||||||
} else {
|
} else {
|
||||||
@@ -62,6 +106,21 @@ impl Config {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Compresses the given data.
|
||||||
|
///
|
||||||
|
/// # Arguments
|
||||||
|
/// - `data`: The data to compress
|
||||||
|
/// - `level`: The compression level (0-9). Increasing the level by one roughly halves the
|
||||||
|
/// compression speed.
|
||||||
|
/// - `config`: The compression format variant to use.
|
||||||
|
/// - `progress_callback`: An optional callback which will periodically be called with
|
||||||
|
/// the number of bytes already processed.
|
||||||
|
///
|
||||||
|
/// # Example
|
||||||
|
/// ```rust
|
||||||
|
/// let compressed_data = upkr::pack(b"Hello, World! Yellow world!", 0, &upkr::Config::default(), None);
|
||||||
|
/// assert!(compressed_data.len() < 27);
|
||||||
|
/// ```
|
||||||
pub fn pack(
|
pub fn pack(
|
||||||
data: &[u8],
|
data: &[u8],
|
||||||
level: u8,
|
level: u8,
|
||||||
@@ -75,6 +134,9 @@ pub fn pack(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Estimate the exact (fractional) size of upkr compressed data.
|
||||||
|
///
|
||||||
|
/// Note that this currently does NOT work for the bitstream variant.
|
||||||
pub fn compressed_size(mut data: &[u8]) -> f32 {
|
pub fn compressed_size(mut data: &[u8]) -> f32 {
|
||||||
let mut state = 0;
|
let mut state = 0;
|
||||||
while state < 4096 {
|
while state < 4096 {
|
||||||
|
|||||||
89
src/lz.rs
89
src/lz.rs
@@ -1,6 +1,7 @@
|
|||||||
use crate::context_state::ContextState;
|
|
||||||
use crate::rans::{EntropyCoder, RansDecoder};
|
|
||||||
use crate::Config;
|
use crate::Config;
|
||||||
|
use crate::context_state::ContextState;
|
||||||
|
use crate::heatmap::Heatmap;
|
||||||
|
use crate::rans::{EntropyCoder, RansDecoder};
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
#[derive(Copy, Clone, Debug)]
|
#[derive(Copy, Clone, Debug)]
|
||||||
@@ -12,8 +13,8 @@ pub enum Op {
|
|||||||
impl Op {
|
impl Op {
|
||||||
pub fn encode(&self, coder: &mut dyn EntropyCoder, state: &mut CoderState, config: &Config) {
|
pub fn encode(&self, coder: &mut dyn EntropyCoder, state: &mut CoderState, config: &Config) {
|
||||||
let literal_base = state.pos % state.parity_contexts * 256;
|
let literal_base = state.pos % state.parity_contexts * 256;
|
||||||
match self {
|
match *self {
|
||||||
&Op::Literal(lit) => {
|
Op::Literal(lit) => {
|
||||||
encode_bit(coder, state, literal_base, !config.is_match_bit);
|
encode_bit(coder, state, literal_base, !config.is_match_bit);
|
||||||
let mut context_index = 1;
|
let mut context_index = 1;
|
||||||
for i in (0..8).rev() {
|
for i in (0..8).rev() {
|
||||||
@@ -24,7 +25,7 @@ impl Op {
|
|||||||
state.prev_was_match = false;
|
state.prev_was_match = false;
|
||||||
state.pos += 1;
|
state.pos += 1;
|
||||||
}
|
}
|
||||||
&Op::Match { offset, len } => {
|
Op::Match { offset, len } => {
|
||||||
encode_bit(coder, state, literal_base, config.is_match_bit);
|
encode_bit(coder, state, literal_base, config.is_match_bit);
|
||||||
let mut new_offset = true;
|
let mut new_offset = true;
|
||||||
if !state.prev_was_match && !config.no_repeated_offsets {
|
if !state.prev_was_match && !config.no_repeated_offsets {
|
||||||
@@ -132,43 +133,92 @@ impl CoderState {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// The error type for the uncompressing related functions
|
||||||
#[derive(Error, Debug)]
|
#[derive(Error, Debug)]
|
||||||
pub enum UnpackError {
|
pub enum UnpackError {
|
||||||
|
/// a match offset pointing beyond the start of the unpacked data was encountered
|
||||||
#[error("match offset out of range: {offset} > {position}")]
|
#[error("match offset out of range: {offset} > {position}")]
|
||||||
OffsetOutOfRange { offset: usize, position: usize },
|
OffsetOutOfRange {
|
||||||
|
/// the match offset
|
||||||
|
offset: usize,
|
||||||
|
/// the current position in the uncompressed stream
|
||||||
|
position: usize,
|
||||||
|
},
|
||||||
|
/// The passed size limit was exceeded
|
||||||
#[error("Unpacked data over size limit: {size} > {limit}")]
|
#[error("Unpacked data over size limit: {size} > {limit}")]
|
||||||
OverSize { size: usize, limit: usize },
|
OverSize {
|
||||||
|
/// the size of the uncompressed data
|
||||||
|
size: usize,
|
||||||
|
/// the size limit passed into the function
|
||||||
|
limit: usize,
|
||||||
|
},
|
||||||
|
/// The end of the packed data was reached without an encoded EOF marker
|
||||||
#[error("Unexpected end of input data")]
|
#[error("Unexpected end of input data")]
|
||||||
UnexpectedEOF {
|
UnexpectedEOF {
|
||||||
#[from]
|
#[from]
|
||||||
|
/// the underlying EOF error in the rANS decoder
|
||||||
source: crate::rans::UnexpectedEOF,
|
source: crate::rans::UnexpectedEOF,
|
||||||
},
|
},
|
||||||
|
/// An offset or length value was found that exceeded 32bit
|
||||||
#[error("Overflow while reading value")]
|
#[error("Overflow while reading value")]
|
||||||
ValueOverflow,
|
ValueOverflow,
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Uncompress a piece of compressed data
|
||||||
|
///
|
||||||
|
/// Returns either the uncompressed data, or an `UnpackError`
|
||||||
|
///
|
||||||
|
/// # Parameters
|
||||||
|
///
|
||||||
|
/// - `packed_data`: the compressed data
|
||||||
|
/// - `config`: the exact compression format config used to compress the data
|
||||||
|
/// - `max_size`: the maximum size of uncompressed data to return. When this is exceeded,
|
||||||
|
/// `UnpackError::OverSize` is returned
|
||||||
pub fn unpack(
|
pub fn unpack(
|
||||||
packed_data: &[u8],
|
packed_data: &[u8],
|
||||||
config: &Config,
|
config: &Config,
|
||||||
max_size: usize,
|
max_size: usize,
|
||||||
) -> Result<Vec<u8>, UnpackError> {
|
) -> Result<Vec<u8>, UnpackError> {
|
||||||
let mut result = vec![];
|
let mut result = vec![];
|
||||||
let _ = unpack_internal(Some(&mut result), packed_data, config, max_size)?;
|
let _ = unpack_internal(Some(&mut result), None, packed_data, config, max_size)?;
|
||||||
Ok(result)
|
Ok(result)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/// Calculates the minimum margin when overlapping buffers.
|
||||||
|
///
|
||||||
|
/// Returns the minimum margin needed between the end of the compressed data and the
|
||||||
|
/// end of the uncompressed data when overlapping the two buffers to save on RAM.
|
||||||
pub fn calculate_margin(packed_data: &[u8], config: &Config) -> Result<isize, UnpackError> {
|
pub fn calculate_margin(packed_data: &[u8], config: &Config) -> Result<isize, UnpackError> {
|
||||||
unpack_internal(None, packed_data, config, usize::MAX)
|
unpack_internal(None, None, packed_data, config, usize::MAX)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn unpack_internal(
|
/// Calculates a `Heatmap` from compressed data.
|
||||||
|
///
|
||||||
|
/// # Parameters
|
||||||
|
///
|
||||||
|
/// - `packed_data`: the compressed data
|
||||||
|
/// - `config`: the exact compression format config used to compress the data
|
||||||
|
/// - `max_size`: the maximum size of the heatmap to return. When this is exceeded,
|
||||||
|
/// `UnpackError::OverSize` is returned
|
||||||
|
pub fn create_heatmap(
|
||||||
|
packed_data: &[u8],
|
||||||
|
config: &Config,
|
||||||
|
max_size: usize,
|
||||||
|
) -> Result<Heatmap, UnpackError> {
|
||||||
|
let mut heatmap = Heatmap::new();
|
||||||
|
let _ = unpack_internal(None, Some(&mut heatmap), packed_data, config, max_size)?;
|
||||||
|
Ok(heatmap)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn unpack_internal(
|
||||||
mut result: Option<&mut Vec<u8>>,
|
mut result: Option<&mut Vec<u8>>,
|
||||||
|
mut heatmap: Option<&mut Heatmap>,
|
||||||
packed_data: &[u8],
|
packed_data: &[u8],
|
||||||
config: &Config,
|
config: &Config,
|
||||||
max_size: usize,
|
max_size: usize,
|
||||||
) -> Result<isize, UnpackError> {
|
) -> Result<isize, UnpackError> {
|
||||||
let mut decoder = RansDecoder::new(packed_data, &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 contexts = ContextState::new((1 + 255) * config.parity_contexts + 1 + 64 + 64, config);
|
||||||
let mut offset = usize::MAX;
|
let mut offset = usize::MAX;
|
||||||
let mut position = 0usize;
|
let mut position = 0usize;
|
||||||
let mut prev_was_match = false;
|
let mut prev_was_match = false;
|
||||||
@@ -198,6 +248,7 @@ pub fn unpack_internal(
|
|||||||
}
|
}
|
||||||
|
|
||||||
loop {
|
loop {
|
||||||
|
let prev_decoder = decoder.clone();
|
||||||
margin = margin.max(position as isize - decoder.pos() as isize);
|
margin = margin.max(position as isize - decoder.pos() as isize);
|
||||||
let literal_base = position % config.parity_contexts * 256;
|
let literal_base = position % config.parity_contexts * 256;
|
||||||
if decoder.decode_with_context(&mut contexts.context_mut(literal_base))?
|
if decoder.decode_with_context(&mut contexts.context_mut(literal_base))?
|
||||||
@@ -213,7 +264,7 @@ pub fn unpack_internal(
|
|||||||
&mut decoder,
|
&mut decoder,
|
||||||
&mut contexts,
|
&mut contexts,
|
||||||
256 * config.parity_contexts + 1,
|
256 * config.parity_contexts + 1,
|
||||||
&config,
|
config,
|
||||||
)? - if config.eof_in_length { 0 } else { 1 };
|
)? - if config.eof_in_length { 0 } else { 1 };
|
||||||
if offset == 0 {
|
if offset == 0 {
|
||||||
break;
|
break;
|
||||||
@@ -223,7 +274,7 @@ pub fn unpack_internal(
|
|||||||
&mut decoder,
|
&mut decoder,
|
||||||
&mut contexts,
|
&mut contexts,
|
||||||
256 * config.parity_contexts + 65,
|
256 * config.parity_contexts + 65,
|
||||||
&config,
|
config,
|
||||||
)?;
|
)?;
|
||||||
if config.eof_in_length && length == 1 {
|
if config.eof_in_length && length == 1 {
|
||||||
break;
|
break;
|
||||||
@@ -231,6 +282,9 @@ pub fn unpack_internal(
|
|||||||
if offset > position {
|
if offset > position {
|
||||||
return Err(UnpackError::OffsetOutOfRange { offset, position });
|
return Err(UnpackError::OffsetOutOfRange { offset, position });
|
||||||
}
|
}
|
||||||
|
if let Some(ref mut heatmap) = heatmap {
|
||||||
|
heatmap.add_match(offset, length, decoder.cost(&prev_decoder));
|
||||||
|
}
|
||||||
if let Some(ref mut result) = result {
|
if let Some(ref mut result) = result {
|
||||||
for _ in 0..length {
|
for _ in 0..length {
|
||||||
if result.len() < max_size {
|
if result.len() < max_size {
|
||||||
@@ -251,6 +305,9 @@ pub fn unpack_internal(
|
|||||||
context_index = (context_index << 1) | bit as usize;
|
context_index = (context_index << 1) | bit as usize;
|
||||||
byte |= (bit as u8) << i;
|
byte |= (bit as u8) << i;
|
||||||
}
|
}
|
||||||
|
if let Some(ref mut heatmap) = heatmap {
|
||||||
|
heatmap.add_literal(byte, decoder.cost(&prev_decoder));
|
||||||
|
}
|
||||||
if let Some(ref mut result) = result {
|
if let Some(ref mut result) = result {
|
||||||
if result.len() < max_size {
|
if result.len() < max_size {
|
||||||
result.push(byte);
|
result.push(byte);
|
||||||
@@ -261,6 +318,10 @@ pub fn unpack_internal(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
if let Some(heatmap) = heatmap {
|
||||||
|
heatmap.finish();
|
||||||
|
}
|
||||||
|
|
||||||
if position > max_size {
|
if position > max_size {
|
||||||
return Err(UnpackError::OverSize {
|
return Err(UnpackError::OverSize {
|
||||||
size: position,
|
size: position,
|
||||||
|
|||||||
204
src/main.rs
204
src/main.rs
@@ -9,6 +9,10 @@ fn main() -> Result<()> {
|
|||||||
let mut reverse = false;
|
let mut reverse = false;
|
||||||
let mut unpack = false;
|
let mut unpack = false;
|
||||||
let mut calculate_margin = 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;
|
let mut level = 2;
|
||||||
let mut infile: Option<PathBuf> = None;
|
let mut infile: Option<PathBuf> = None;
|
||||||
let mut outfile: Option<PathBuf> = None;
|
let mut outfile: Option<PathBuf> = None;
|
||||||
@@ -56,76 +60,72 @@ fn main() -> Result<()> {
|
|||||||
level = 9;
|
level = 9;
|
||||||
}
|
}
|
||||||
|
|
||||||
Short('u') | Long("unpack") => unpack = true,
|
Short('u') | Long("unpack") | Short('d') | Long("decompress") => unpack = true,
|
||||||
Long("margin") => calculate_margin = 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()?,
|
Short('l') | Long("level") => level = parser.value()?.parse()?,
|
||||||
Short(n) if n.is_ascii_digit() => level = n as u8 - b'0',
|
Short(n) if n.is_ascii_digit() => level = n as u8 - b'0',
|
||||||
Short('h') | Long("help") => print_help(0),
|
Short('h') | Long("help") => print_help(0),
|
||||||
|
Long("version") => {
|
||||||
|
println!("{}", env!("CARGO_PKG_VERSION"));
|
||||||
|
process::exit(0);
|
||||||
|
}
|
||||||
Long("max-unpacked-size") => max_unpacked_size = parser.value()?.parse()?,
|
Long("max-unpacked-size") => max_unpacked_size = parser.value()?.parse()?,
|
||||||
Value(val) if infile.is_none() => infile = Some(val.try_into()?),
|
Value(val) if infile.is_none() => infile = Some(val.into()),
|
||||||
Value(val) if outfile.is_none() => outfile = Some(val.try_into()?),
|
Value(val) if outfile.is_none() => outfile = Some(val.into()),
|
||||||
_ => return Err(arg.unexpected().into()),
|
_ => return Err(arg.unexpected().into()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
let infile = infile.unwrap_or_else(|| print_help(1));
|
let infile = IoTarget::from_filename(infile);
|
||||||
let outfile = outfile.unwrap_or_else(|| {
|
let outfile = |tpe: OutFileType| infile.output(tpe, &outfile);
|
||||||
let mut name = infile.clone();
|
|
||||||
if unpack {
|
|
||||||
if name.extension().filter(|&e| e == "upk").is_some() {
|
|
||||||
name.set_extension("");
|
|
||||||
} else {
|
|
||||||
name.set_extension("bin");
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
let mut filename = name
|
|
||||||
.file_name()
|
|
||||||
.unwrap_or_else(|| OsStr::new(""))
|
|
||||||
.to_os_string();
|
|
||||||
filename.push(".upk");
|
|
||||||
name.set_file_name(filename);
|
|
||||||
}
|
|
||||||
name
|
|
||||||
});
|
|
||||||
|
|
||||||
if config.parity_contexts != 1 && config.parity_contexts != 2 && config.parity_contexts != 4 {
|
if config.parity_contexts != 1 && config.parity_contexts != 2 && config.parity_contexts != 4 {
|
||||||
eprintln!("--parity has to be 1, 2, or 4");
|
eprintln!("--parity has to be 1, 2, or 4");
|
||||||
process::exit(1);
|
process::exit(1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if !unpack && !calculate_margin {
|
if !unpack && !calculate_margin && !create_heatmap {
|
||||||
let mut data = vec![];
|
let mut data = infile.read()?;
|
||||||
File::open(infile)?.read_to_end(&mut data)?;
|
|
||||||
if reverse {
|
if reverse {
|
||||||
data.reverse();
|
data.reverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
let mut pb = pbr::ProgressBar::new(data.len() as u64);
|
#[cfg(feature = "terminal")]
|
||||||
pb.set_units(pbr::Units::Bytes);
|
let mut packed_data = {
|
||||||
let mut packed_data = upkr::pack(
|
let mut pb = pbr::ProgressBar::on(std::io::stderr(), data.len() as u64);
|
||||||
&data,
|
pb.set_units(pbr::Units::Bytes);
|
||||||
level,
|
let packed_data = upkr::pack(
|
||||||
&config,
|
&data,
|
||||||
Some(&mut |pos| {
|
level,
|
||||||
pb.set(pos as u64);
|
&config,
|
||||||
}),
|
Some(&mut |pos| {
|
||||||
);
|
pb.set(pos as u64);
|
||||||
pb.finish();
|
}),
|
||||||
|
);
|
||||||
|
pb.finish();
|
||||||
|
eprintln!();
|
||||||
|
packed_data
|
||||||
|
};
|
||||||
|
#[cfg(not(feature = "terminal"))]
|
||||||
|
let mut packed_data = upkr::pack(&data, level, &config, None);
|
||||||
|
|
||||||
if reverse {
|
if reverse {
|
||||||
packed_data.reverse();
|
packed_data.reverse();
|
||||||
}
|
}
|
||||||
|
|
||||||
println!(
|
eprintln!(
|
||||||
"Compressed {} bytes to {} bytes ({}%)",
|
"Compressed {} bytes to {} bytes ({}%)",
|
||||||
data.len(),
|
data.len(),
|
||||||
packed_data.len(),
|
packed_data.len(),
|
||||||
packed_data.len() as f32 * 100. / data.len() as f32
|
packed_data.len() as f32 * 100. / data.len() as f32
|
||||||
);
|
);
|
||||||
File::create(outfile)?.write_all(&packed_data)?;
|
outfile(OutFileType::Packed).write(&packed_data)?;
|
||||||
} else {
|
} else {
|
||||||
let mut data = vec![];
|
let mut data = infile.read()?;
|
||||||
File::open(infile)?.read_to_end(&mut data)?;
|
|
||||||
if reverse {
|
if reverse {
|
||||||
data.reverse();
|
data.reverse();
|
||||||
}
|
}
|
||||||
@@ -134,7 +134,36 @@ fn main() -> Result<()> {
|
|||||||
if reverse {
|
if reverse {
|
||||||
unpacked_data.reverse();
|
unpacked_data.reverse();
|
||||||
}
|
}
|
||||||
File::create(outfile)?.write_all(&unpacked_data)?;
|
outfile(OutFileType::Unpacked).write(&unpacked_data)?;
|
||||||
|
}
|
||||||
|
if create_heatmap {
|
||||||
|
let mut heatmap = upkr::create_heatmap(&data, &config, max_unpacked_size)?;
|
||||||
|
if reverse {
|
||||||
|
heatmap.reverse();
|
||||||
|
}
|
||||||
|
match do_hexdump {
|
||||||
|
#[cfg(feature = "crossterm")]
|
||||||
|
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 = 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)?;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if calculate_margin {
|
if calculate_margin {
|
||||||
println!("{}", upkr::calculate_margin(&data, &config)?);
|
println!("{}", upkr::calculate_margin(&data, &config)?);
|
||||||
@@ -144,19 +173,108 @@ fn main() -> Result<()> {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
enum OutFileType {
|
||||||
|
Packed,
|
||||||
|
Unpacked,
|
||||||
|
Heatmap,
|
||||||
|
}
|
||||||
|
|
||||||
|
enum IoTarget {
|
||||||
|
StdInOut,
|
||||||
|
File(PathBuf),
|
||||||
|
}
|
||||||
|
|
||||||
|
impl IoTarget {
|
||||||
|
fn from_filename(filename: Option<PathBuf>) -> IoTarget {
|
||||||
|
if let Some(path) = filename {
|
||||||
|
if path.as_os_str() == "-" {
|
||||||
|
IoTarget::StdInOut
|
||||||
|
} else {
|
||||||
|
IoTarget::File(path)
|
||||||
|
}
|
||||||
|
} else {
|
||||||
|
IoTarget::StdInOut
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
fn read(&self) -> Result<Vec<u8>> {
|
||||||
|
let mut buffer = vec![];
|
||||||
|
match *self {
|
||||||
|
IoTarget::StdInOut => std::io::stdin().read_to_end(&mut buffer)?,
|
||||||
|
IoTarget::File(ref path) => File::open(path)?.read_to_end(&mut buffer)?,
|
||||||
|
};
|
||||||
|
Ok(buffer)
|
||||||
|
}
|
||||||
|
|
||||||
|
fn write(&self, data: &[u8]) -> Result<()> {
|
||||||
|
match *self {
|
||||||
|
IoTarget::StdInOut => std::io::stdout().write_all(data)?,
|
||||||
|
IoTarget::File(ref path) => File::create(path)?.write_all(data)?,
|
||||||
|
};
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
fn output(&self, tpe: OutFileType, outname: &Option<PathBuf>) -> IoTarget {
|
||||||
|
if outname.is_some() {
|
||||||
|
return IoTarget::from_filename(outname.clone());
|
||||||
|
}
|
||||||
|
match *self {
|
||||||
|
IoTarget::StdInOut => IoTarget::StdInOut,
|
||||||
|
IoTarget::File(ref path) => {
|
||||||
|
let mut name = path.clone();
|
||||||
|
match tpe {
|
||||||
|
OutFileType::Packed => {
|
||||||
|
let mut filename = name
|
||||||
|
.file_name()
|
||||||
|
.unwrap_or_else(|| OsStr::new(""))
|
||||||
|
.to_os_string();
|
||||||
|
filename.push(".upk");
|
||||||
|
name.set_file_name(filename);
|
||||||
|
}
|
||||||
|
OutFileType::Unpacked => {
|
||||||
|
if name.extension().filter(|&e| e == "upk").is_some() {
|
||||||
|
name.set_extension("");
|
||||||
|
} else {
|
||||||
|
name.set_extension("bin");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
OutFileType::Heatmap => {
|
||||||
|
name.set_extension("heatmap");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
IoTarget::File(name)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
fn print_help(exit_code: i32) -> ! {
|
fn print_help(exit_code: i32) -> ! {
|
||||||
eprintln!("Usage:");
|
eprintln!("Usage:");
|
||||||
eprintln!(" upkr [-l level(0-9)] [config options] <infile> [<outfile>]");
|
eprintln!(" upkr [-l level(0-9)] [config options] <infile> [<outfile>]");
|
||||||
eprintln!(" upkr -u [config options] <infile> [<outfile>]");
|
eprintln!(" upkr -u [config options] <infile> [<outfile>]");
|
||||||
|
eprintln!(" upkr --heatmap [config options] <infile> [<outfile>]");
|
||||||
eprintln!(" upkr --margin [config options] <infile>");
|
eprintln!(" upkr --margin [config options] <infile>");
|
||||||
eprintln!();
|
eprintln!();
|
||||||
eprintln!(" -l, --level N compression level 0-9");
|
eprintln!(" -l, --level N compression level 0-9");
|
||||||
eprintln!(" -0, ..., -9 short form for setting compression level");
|
eprintln!(" -0, ..., -9 short form for setting compression level");
|
||||||
eprintln!(" -u, --unpack unpack infile");
|
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!(" --margin calculate margin for overlapped unpacking of a packed file");
|
||||||
eprintln!();
|
eprintln!();
|
||||||
|
eprintln!("When no infile is given, or the infile is '-', read from stdin.");
|
||||||
|
eprintln!(
|
||||||
|
"When no outfile is given and reading from stdin, or when outfile is '-', write to stdout."
|
||||||
|
);
|
||||||
|
eprintln!();
|
||||||
|
eprintln!("Version: {}", env!("CARGO_PKG_VERSION"));
|
||||||
|
eprintln!();
|
||||||
eprintln!("Config presets for specific unpackers:");
|
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!(
|
eprintln!(
|
||||||
" --x86 --bitstream --invert-is-match-bit --invert-continue-value-bit --invert-new-offset-bit"
|
" --x86 --bitstream --invert-is-match-bit --invert-continue-value-bit --invert-new-offset-bit"
|
||||||
);
|
);
|
||||||
|
|||||||
@@ -4,7 +4,7 @@ use std::rc::Rc;
|
|||||||
|
|
||||||
use crate::match_finder::MatchFinder;
|
use crate::match_finder::MatchFinder;
|
||||||
use crate::rans::{CostCounter, RansCoder};
|
use crate::rans::{CostCounter, RansCoder};
|
||||||
use crate::{lz, ProgressCallback};
|
use crate::{ProgressCallback, lz};
|
||||||
|
|
||||||
pub fn pack(
|
pub fn pack(
|
||||||
data: &[u8],
|
data: &[u8],
|
||||||
@@ -68,7 +68,7 @@ fn parse(
|
|||||||
});
|
});
|
||||||
let mut seen_offsets = HashSet::new();
|
let mut seen_offsets = HashSet::new();
|
||||||
let mut remaining = Vec::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 seen_offsets.insert(arr.state.last_offset()) {
|
||||||
if vec.len() < max_arrivals {
|
if vec.len() < max_arrivals {
|
||||||
vec.push(arr);
|
vec.push(arr);
|
||||||
|
|||||||
24
src/rans.rs
24
src/rans.rs
@@ -148,6 +148,7 @@ impl EntropyCoder for CostCounter {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Clone)]
|
||||||
pub struct RansDecoder<'a> {
|
pub struct RansDecoder<'a> {
|
||||||
data: &'a [u8],
|
data: &'a [u8],
|
||||||
pos: usize,
|
pos: usize,
|
||||||
@@ -166,8 +167,8 @@ const PROB_MASK: u32 = ONE_PROB - 1;
|
|||||||
pub struct UnexpectedEOF;
|
pub struct UnexpectedEOF;
|
||||||
|
|
||||||
impl<'a> RansDecoder<'a> {
|
impl<'a> RansDecoder<'a> {
|
||||||
pub fn new(data: &'a [u8], config: &Config) -> RansDecoder<'a> {
|
pub fn new(data: &'a [u8], config: &Config) -> Result<RansDecoder<'a>, UnexpectedEOF> {
|
||||||
RansDecoder {
|
let mut decoder = RansDecoder {
|
||||||
data,
|
data,
|
||||||
pos: 0,
|
pos: 0,
|
||||||
state: 0,
|
state: 0,
|
||||||
@@ -176,7 +177,9 @@ impl<'a> RansDecoder<'a> {
|
|||||||
bits_left: 0,
|
bits_left: 0,
|
||||||
invert_bit_encoding: config.invert_bit_encoding,
|
invert_bit_encoding: config.invert_bit_encoding,
|
||||||
bitstream_is_big_endian: config.bitstream_is_big_endian,
|
bitstream_is_big_endian: config.bitstream_is_big_endian,
|
||||||
}
|
};
|
||||||
|
decoder.refill()?;
|
||||||
|
Ok(decoder)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn pos(&self) -> usize {
|
pub fn pos(&self) -> usize {
|
||||||
@@ -189,8 +192,7 @@ impl<'a> RansDecoder<'a> {
|
|||||||
Ok(bit)
|
Ok(bit)
|
||||||
}
|
}
|
||||||
|
|
||||||
pub fn decode_bit(&mut self, prob: u16) -> Result<bool, UnexpectedEOF> {
|
fn refill(&mut self) -> Result<(), UnexpectedEOF> {
|
||||||
let prob = prob as u32;
|
|
||||||
if self.use_bitstream {
|
if self.use_bitstream {
|
||||||
while self.state < 32768 {
|
while self.state < 32768 {
|
||||||
if self.bits_left == 0 {
|
if self.bits_left == 0 {
|
||||||
@@ -219,6 +221,13 @@ impl<'a> RansDecoder<'a> {
|
|||||||
self.pos += 1;
|
self.pos += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Ok(())
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn decode_bit(&mut self, prob: u16) -> Result<bool, UnexpectedEOF> {
|
||||||
|
self.refill()?;
|
||||||
|
|
||||||
|
let prob = prob as u32;
|
||||||
|
|
||||||
let bit = (self.state & PROB_MASK) < prob;
|
let bit = (self.state & PROB_MASK) < prob;
|
||||||
|
|
||||||
@@ -231,4 +240,9 @@ impl<'a> RansDecoder<'a> {
|
|||||||
|
|
||||||
Ok(bit ^ self.invert_bit_encoding)
|
Ok(bit ^ self.invert_bit_encoding)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
pub fn cost(&self, prev: &RansDecoder) -> f32 {
|
||||||
|
f32::log2(prev.state as f32) - f32::log2(self.state as f32)
|
||||||
|
+ (self.pos - prev.pos) as f32 * 8.
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user