mirror of
https://github.com/exoticorn/upkr.git
synced 2026-01-21 20:06:43 +01:00
Compare commits
7 Commits
literal_le
...
7fa6be6ff4
| Author | SHA1 | Date | |
|---|---|---|---|
| 7fa6be6ff4 | |||
| cab51e06ff | |||
| c4fce626da | |||
| 0d7cda06bb | |||
|
140678ae20 | ||
| d7bdc8c1c7 | |||
| 887722a66b |
472
Cargo.lock
generated
472
Cargo.lock
generated
@@ -10,9 +10,15 @@ checksum = "38d9ff5d688f1c13395289f67db01d4826b46dd694e7580accdc3e8430f2d98e"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "autocfg"
|
name = "autocfg"
|
||||||
version = "1.0.1"
|
version = "1.1.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "cdb031dd78e28731d87d56cc8ffef4a8f36ca26c38fe2de700543e627f8a464a"
|
checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "bitflags"
|
||||||
|
version = "1.3.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cc"
|
name = "cc"
|
||||||
@@ -30,19 +36,34 @@ dependencies = [
|
|||||||
"sacabase",
|
"sacabase",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cfg-if"
|
||||||
|
version = "0.1.10"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4785bdd1c96b2a846b2bd7cc02e86b6b3dbf14e7e53446c4f54c92a361040822"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "cfg-if"
|
name = "cfg-if"
|
||||||
version = "1.0.0"
|
version = "1.0.0"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "cloudabi"
|
||||||
|
version = "0.0.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ddfc5b9aa5d4507acaf872de71051dfd0e309860e88966e1051e462a077aac4f"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "crossbeam-channel"
|
name = "crossbeam-channel"
|
||||||
version = "0.5.1"
|
version = "0.5.1"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
|
checksum = "06ed27e177f16d65f0f0c22a213e17c696ace5dd64b14258b52f9417ccb52db4"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if 1.0.0",
|
||||||
"crossbeam-utils",
|
"crossbeam-utils",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -52,10 +73,95 @@ version = "0.8.5"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
|
checksum = "d82cfc11ce7f2c3faef78d8a684447b40d503d9681acebed6cb728d45940c4db"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"cfg-if",
|
"cfg-if 1.0.0",
|
||||||
"lazy_static",
|
"lazy_static",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossterm"
|
||||||
|
version = "0.15.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "207a948d1b4ff59e5aec9bb9426cc4fd3d17b719e5c7b74e27f0a60c4cc2d095"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"crossterm_winapi 0.6.2",
|
||||||
|
"lazy_static",
|
||||||
|
"libc",
|
||||||
|
"mio 0.6.23",
|
||||||
|
"parking_lot 0.10.2",
|
||||||
|
"signal-hook 0.1.17",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossterm"
|
||||||
|
version = "0.25.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e64e6c0fbe2c17357405f7c758c1ef960fce08bdfb2c03d88d2a18d7e09c4b67"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"crossterm_winapi 0.9.0",
|
||||||
|
"libc",
|
||||||
|
"mio 0.8.4",
|
||||||
|
"parking_lot 0.12.1",
|
||||||
|
"signal-hook 0.3.14",
|
||||||
|
"signal-hook-mio",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossterm_winapi"
|
||||||
|
version = "0.6.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c2265c3f8e080075d9b6417aa72293fc71662f34b4af2612d8d1b074d29510db"
|
||||||
|
dependencies = [
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "crossterm_winapi"
|
||||||
|
version = "0.9.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2ae1b35a484aa10e07fe0638d02301c5ad24de82d310ccbd2f3693da5f09bf1c"
|
||||||
|
dependencies = [
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fuchsia-zircon"
|
||||||
|
version = "0.3.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2e9763c69ebaae630ba35f74888db465e49e259ba1bc0eda7d06f4a067615d82"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"fuchsia-zircon-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "fuchsia-zircon-sys"
|
||||||
|
version = "0.3.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3dcaa9ae7725d12cdb85b3ad99a434db70b468c09ded17e012d86b5c1010f7a7"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "iovec"
|
||||||
|
version = "0.1.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "b2b3ea6ff95e175473f8ffe6a7eb7c00d054240321b84c57051175fe3c1e075e"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "kernel32-sys"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
|
||||||
|
dependencies = [
|
||||||
|
"winapi 0.2.8",
|
||||||
|
"winapi-build",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "lazy_static"
|
name = "lazy_static"
|
||||||
version = "1.4.0"
|
version = "1.4.0"
|
||||||
@@ -70,9 +176,91 @@ checksum = "478ee9e62aaeaf5b140bd4138753d1f109765488581444218d3ddda43234f3e8"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "libc"
|
name = "libc"
|
||||||
version = "0.2.108"
|
version = "0.2.135"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8521a1b57e76b1ec69af7599e75e38e7b7fad6610f037db8c79b127201b5d119"
|
checksum = "68783febc7782c6c5cb401fbda4de5a9898be1762314da0bb2c10ced61f18b0c"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lock_api"
|
||||||
|
version = "0.3.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c4da24a77a3d8a6d4862d95f72e6fdb9c09a643ecdb402d754004a557f2bec75"
|
||||||
|
dependencies = [
|
||||||
|
"scopeguard",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "lock_api"
|
||||||
|
version = "0.4.9"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "435011366fe56583b16cf956f9df0095b405b82d76425bc8981c0e22e60ec4df"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
"scopeguard",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "log"
|
||||||
|
version = "0.4.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "abb12e687cfb44aa40f41fc3978ef76448f9b6038cad6aef4259d3c095a2382e"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 1.0.0",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mio"
|
||||||
|
version = "0.6.23"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4afd66f5b91bf2a3bc13fad0e21caedac168ca4c707504e75585648ae80e4cc4"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 0.1.10",
|
||||||
|
"fuchsia-zircon",
|
||||||
|
"fuchsia-zircon-sys",
|
||||||
|
"iovec",
|
||||||
|
"kernel32-sys",
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
|
"miow",
|
||||||
|
"net2",
|
||||||
|
"slab",
|
||||||
|
"winapi 0.2.8",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "mio"
|
||||||
|
version = "0.8.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "57ee1c23c7c63b0c9250c339ffdc69255f110b298b901b9f6c82547b7b87caaf"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"log",
|
||||||
|
"wasi 0.11.0+wasi-snapshot-preview1",
|
||||||
|
"windows-sys 0.36.1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "miow"
|
||||||
|
version = "0.2.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ebd808424166322d4a38da87083bfddd3ac4c131334ed55856112eb06d46944d"
|
||||||
|
dependencies = [
|
||||||
|
"kernel32-sys",
|
||||||
|
"net2",
|
||||||
|
"winapi 0.2.8",
|
||||||
|
"ws2_32-sys",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "net2"
|
||||||
|
version = "0.2.38"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "74d0df99cfcd2530b2e694f6e17e7f37b8e26bb23983ac530c0c97408837c631"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 0.1.10",
|
||||||
|
"libc",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "num-traits"
|
name = "num-traits"
|
||||||
@@ -83,6 +271,53 @@ dependencies = [
|
|||||||
"autocfg",
|
"autocfg",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "parking_lot"
|
||||||
|
version = "0.10.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d3a704eb390aafdc107b0e392f56a82b668e3a71366993b5340f5833fd62505e"
|
||||||
|
dependencies = [
|
||||||
|
"lock_api 0.3.4",
|
||||||
|
"parking_lot_core 0.7.2",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "parking_lot"
|
||||||
|
version = "0.12.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
|
||||||
|
dependencies = [
|
||||||
|
"lock_api 0.4.9",
|
||||||
|
"parking_lot_core 0.9.4",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "parking_lot_core"
|
||||||
|
version = "0.7.2"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d58c7c768d4ba344e3e8d72518ac13e259d7c7ade24167003b8488e10b6740a3"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 0.1.10",
|
||||||
|
"cloudabi",
|
||||||
|
"libc",
|
||||||
|
"redox_syscall 0.1.57",
|
||||||
|
"smallvec",
|
||||||
|
"winapi 0.3.9",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "parking_lot_core"
|
||||||
|
version = "0.9.4"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
|
||||||
|
dependencies = [
|
||||||
|
"cfg-if 1.0.0",
|
||||||
|
"libc",
|
||||||
|
"redox_syscall 0.2.16",
|
||||||
|
"smallvec",
|
||||||
|
"windows-sys 0.42.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "pbr"
|
name = "pbr"
|
||||||
version = "1.0.4"
|
version = "1.0.4"
|
||||||
@@ -92,7 +327,7 @@ dependencies = [
|
|||||||
"crossbeam-channel",
|
"crossbeam-channel",
|
||||||
"libc",
|
"libc",
|
||||||
"time",
|
"time",
|
||||||
"winapi",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -113,6 +348,21 @@ dependencies = [
|
|||||||
"proc-macro2",
|
"proc-macro2",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.1.57"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "41cc0f7e4d5d4544e8861606a285bb08d3e70712ccc7d2b84d7c0ccfaf4b05ce"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "redox_syscall"
|
||||||
|
version = "0.2.16"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fb5a58c1855b4b6819d59012155603f0b22ad30cad752600aadfcb695265519a"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "sacabase"
|
name = "sacabase"
|
||||||
version = "2.0.0"
|
version = "2.0.0"
|
||||||
@@ -122,6 +372,68 @@ dependencies = [
|
|||||||
"num-traits",
|
"num-traits",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "scopeguard"
|
||||||
|
version = "1.1.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "signal-hook"
|
||||||
|
version = "0.1.17"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "7e31d442c16f047a671b5a71e2161d6e68814012b7f5379d269ebd915fac2729"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"mio 0.6.23",
|
||||||
|
"signal-hook-registry",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "signal-hook"
|
||||||
|
version = "0.3.14"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a253b5e89e2698464fc26b545c9edceb338e18a89effeeecfea192c3025be29d"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"signal-hook-registry",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "signal-hook-mio"
|
||||||
|
version = "0.2.3"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "29ad2e15f37ec9a6cc544097b78a1ec90001e9f71b81338ca39f430adaca99af"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
"mio 0.8.4",
|
||||||
|
"signal-hook 0.3.14",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "signal-hook-registry"
|
||||||
|
version = "1.4.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e51e73328dc4ac0c7ccbda3a494dfa03df1de2f46018127f60c693f2648455b0"
|
||||||
|
dependencies = [
|
||||||
|
"libc",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "slab"
|
||||||
|
version = "0.4.7"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4614a76b2a8be0058caa9dbbaf66d988527d86d003c11a94fbd335d7661edcef"
|
||||||
|
dependencies = [
|
||||||
|
"autocfg",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "smallvec"
|
||||||
|
version = "1.10.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "a507befe795404456341dfab10cef66ead4c041f62b8b11bbb92bffe5d0953e0"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "syn"
|
name = "syn"
|
||||||
version = "1.0.101"
|
version = "1.0.101"
|
||||||
@@ -133,6 +445,16 @@ dependencies = [
|
|||||||
"unicode-ident",
|
"unicode-ident",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "terminal"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9cd146db3fbe90911d0bb5498a393abda0af71a2c11e287ecb9ae30cf5d43667"
|
||||||
|
dependencies = [
|
||||||
|
"bitflags",
|
||||||
|
"crossterm 0.15.0",
|
||||||
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "thiserror"
|
name = "thiserror"
|
||||||
version = "1.0.36"
|
version = "1.0.36"
|
||||||
@@ -160,8 +482,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
|||||||
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
checksum = "6db9e6914ab8b1ae1c260a4ae7a49b6c5611b40328a735b21862567685e73255"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"libc",
|
"libc",
|
||||||
"wasi",
|
"wasi 0.10.0+wasi-snapshot-preview1",
|
||||||
"winapi",
|
"winapi 0.3.9",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
@@ -172,12 +494,14 @@ checksum = "dcc811dc4066ac62f84f11307873c4850cb653bfa9b1719cee2bd2204a4bc5dd"
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "upkr"
|
name = "upkr"
|
||||||
version = "0.2.0-pre3"
|
version = "0.2.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"anyhow",
|
"anyhow",
|
||||||
"cdivsufsort",
|
"cdivsufsort",
|
||||||
|
"crossterm 0.25.0",
|
||||||
"lexopt",
|
"lexopt",
|
||||||
"pbr",
|
"pbr",
|
||||||
|
"terminal",
|
||||||
"thiserror",
|
"thiserror",
|
||||||
]
|
]
|
||||||
|
|
||||||
@@ -187,6 +511,18 @@ version = "0.10.0+wasi-snapshot-preview1"
|
|||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
checksum = "1a143597ca7c7793eff794def352d41792a93c481eb1042423ff7ff72ba2c31f"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "wasi"
|
||||||
|
version = "0.11.0+wasi-snapshot-preview1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi"
|
||||||
|
version = "0.2.8"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi"
|
name = "winapi"
|
||||||
version = "0.3.9"
|
version = "0.3.9"
|
||||||
@@ -197,6 +533,12 @@ dependencies = [
|
|||||||
"winapi-x86_64-pc-windows-gnu",
|
"winapi-x86_64-pc-windows-gnu",
|
||||||
]
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "winapi-build"
|
||||||
|
version = "0.1.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "winapi-i686-pc-windows-gnu"
|
name = "winapi-i686-pc-windows-gnu"
|
||||||
version = "0.4.0"
|
version = "0.4.0"
|
||||||
@@ -208,3 +550,113 @@ 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.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
|
||||||
|
dependencies = [
|
||||||
|
"windows_aarch64_msvc 0.36.1",
|
||||||
|
"windows_i686_gnu 0.36.1",
|
||||||
|
"windows_i686_msvc 0.36.1",
|
||||||
|
"windows_x86_64_gnu 0.36.1",
|
||||||
|
"windows_x86_64_msvc 0.36.1",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows-sys"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
|
||||||
|
dependencies = [
|
||||||
|
"windows_aarch64_gnullvm",
|
||||||
|
"windows_aarch64_msvc 0.42.0",
|
||||||
|
"windows_i686_gnu 0.42.0",
|
||||||
|
"windows_i686_msvc 0.42.0",
|
||||||
|
"windows_x86_64_gnu 0.42.0",
|
||||||
|
"windows_x86_64_gnullvm",
|
||||||
|
"windows_x86_64_msvc 0.42.0",
|
||||||
|
]
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_gnullvm"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_msvc"
|
||||||
|
version = "0.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_aarch64_msvc"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_gnu"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_msvc"
|
||||||
|
version = "0.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_i686_msvc"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnu"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_gnullvm"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.36.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "windows_x86_64_msvc"
|
||||||
|
version = "0.42.0"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
|
||||||
|
|
||||||
|
[[package]]
|
||||||
|
name = "ws2_32-sys"
|
||||||
|
version = "0.2.1"
|
||||||
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
|
checksum = "d59cefebd0c892fa2dd6de581e937301d8552cb44489cdff035c6187cb63fa5e"
|
||||||
|
dependencies = [
|
||||||
|
"winapi 0.2.8",
|
||||||
|
"winapi-build",
|
||||||
|
]
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
[package]
|
[package]
|
||||||
name = "upkr"
|
name = "upkr"
|
||||||
version = "0.2.0-pre3"
|
version = "0.2.0"
|
||||||
edition = "2021"
|
edition = "2021"
|
||||||
|
|
||||||
[profile.release]
|
[profile.release]
|
||||||
@@ -12,3 +12,5 @@ lexopt = "0.2.1"
|
|||||||
anyhow = "1"
|
anyhow = "1"
|
||||||
thiserror = "1.0.36"
|
thiserror = "1.0.36"
|
||||||
pbr = "1"
|
pbr = "1"
|
||||||
|
crossterm = { version = "0.25.0", default-features = false }
|
||||||
|
terminal = { version = "0.2.1", default-features = false, features = ["crossterm-backend"] }
|
||||||
|
|||||||
62
README.md
62
README.md
@@ -2,13 +2,69 @@
|
|||||||
|
|
||||||
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`)
|
||||||
|
|
||||||
|
## 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
|
||||||
|
-u, --unpack unpack infile
|
||||||
|
--heatmap calculate heatmap from compressed file
|
||||||
|
--margin calculate margin for overlapped unpacking of a packed file
|
||||||
|
|
||||||
|
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
|
||||||
|
```
|
||||||
|
|||||||
@@ -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
|
||||||
|
|
||||||
|
|||||||
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
|
||||||
161
dos_unpacker/unpack_x86_16_DOS.asm
Normal file
161
dos_unpacker/unpack_x86_16_DOS.asm
Normal file
@@ -0,0 +1,161 @@
|
|||||||
|
; 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]
|
||||||
|
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)
|
||||||
|
neg al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
mov [bx], al ; upkr_probs[context_index] = tmp + (256 - tmp + 8) >> 4;
|
||||||
|
neg byte [bx]
|
||||||
|
shr byte [bx], 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"
|
||||||
152
dos_unpacker/unpack_x86_16_DOS_no_relocation.asm
Normal file
152
dos_unpacker/unpack_x86_16_DOS_no_relocation.asm
Normal file
@@ -0,0 +1,152 @@
|
|||||||
|
; 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] ; int prob = upkr_probs[context_index]
|
||||||
|
push ax ; save prob
|
||||||
|
cmp dl, al ; int bit = (upkr_state & 255) < prob ? 1 : 0; (carry = bit)
|
||||||
|
pushf ; save bit flags
|
||||||
|
jc .bit ; (skip if bit)
|
||||||
|
neg al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
mov [bx], al ; tmp_new = tmp + (256 - tmp + 8) >> 4;
|
||||||
|
neg byte [bx]
|
||||||
|
shr byte [bx], 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"
|
||||||
155
dos_unpacker/unpack_x86_16_DOS_no_repeated_offset.asm
Normal file
155
dos_unpacker/unpack_x86_16_DOS_no_repeated_offset.asm
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
; 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] ; int prob = upkr_probs[context_index]
|
||||||
|
push ax ; save prob
|
||||||
|
cmp dl, al ; int bit = (upkr_state & 255) < prob ? 1 : 0; (carry = bit)
|
||||||
|
pushf ; save bit flags
|
||||||
|
jc .bit ; (skip if bit)
|
||||||
|
neg al ; tmp = 256 - tmp;
|
||||||
|
.bit:
|
||||||
|
mov [bx], al ; tmp += (256 - tmp + 8) >> 4;
|
||||||
|
neg byte [bx]
|
||||||
|
shr byte [bx],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"
|
||||||
4
release/.gitignore
vendored
Normal file
4
release/.gitignore
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
*.zip
|
||||||
|
*.tgz
|
||||||
|
upkr-linux/
|
||||||
|
upkr-windows/
|
||||||
35
release/Makefile
Normal file
35
release/Makefile
Normal file
@@ -0,0 +1,35 @@
|
|||||||
|
VERSION := $(shell cargo run --release -- --version)
|
||||||
|
|
||||||
|
all: clean upkr-linux-$(VERSION).tgz upkr-windows-$(VERSION).zip
|
||||||
|
|
||||||
|
clean:
|
||||||
|
rm -rf upkr-linux
|
||||||
|
rm -f upkr-linux*.tgz
|
||||||
|
rm -rf upkr-windows
|
||||||
|
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-linux/upkr:
|
||||||
|
cargo build --target x86_64-unknown-linux-musl --release
|
||||||
|
mkdir -p upkr-linux
|
||||||
|
cp ../target/x86_64-unknown-linux-musl/release/upkr upkr-linux/
|
||||||
|
|
||||||
|
upkr-windows/upkr.exe:
|
||||||
|
cargo build --target x86_64-pc-windows-gnu --release
|
||||||
|
mkdir -p upkr-windows
|
||||||
|
cp ../target/x86_64-pc-windows-gnu/release/upkr.exe upkr-windows/
|
||||||
|
|
||||||
|
PHONY:
|
||||||
@@ -12,8 +12,6 @@ pub fn pack(
|
|||||||
let mut rans_coder = RansCoder::new(config);
|
let mut rans_coder = RansCoder::new(config);
|
||||||
let mut state = lz::CoderState::new(config);
|
let mut state = lz::CoderState::new(config);
|
||||||
|
|
||||||
let mut literal = vec![];
|
|
||||||
|
|
||||||
let mut pos = 0;
|
let mut pos = 0;
|
||||||
while pos < data.len() {
|
while pos < data.len() {
|
||||||
if let Some(ref mut cb) = progress_callback {
|
if let Some(ref mut cb) = progress_callback {
|
||||||
@@ -24,10 +22,6 @@ pub fn pack(
|
|||||||
let max_offset = config.max_offset.min(1 << (m.length * 3 - 1).min(31));
|
let max_offset = config.max_offset.min(1 << (m.length * 3 - 1).min(31));
|
||||||
let offset = pos - m.pos;
|
let offset = pos - m.pos;
|
||||||
if offset < max_offset && m.length >= config.min_length() {
|
if offset < max_offset && m.length >= config.min_length() {
|
||||||
if !literal.is_empty() {
|
|
||||||
lz::Op::Literal(literal).encode(&mut rans_coder, &mut state, config);
|
|
||||||
literal = vec![];
|
|
||||||
}
|
|
||||||
let length = m.length.min(config.max_length);
|
let length = m.length.min(config.max_length);
|
||||||
lz::Op::Match {
|
lz::Op::Match {
|
||||||
offset: offset as u32,
|
offset: offset as u32,
|
||||||
@@ -49,10 +43,6 @@ pub fn pack(
|
|||||||
.count()
|
.count()
|
||||||
.min(config.max_length);
|
.min(config.max_length);
|
||||||
if length >= config.min_length() {
|
if length >= config.min_length() {
|
||||||
if !literal.is_empty() {
|
|
||||||
lz::Op::Literal(literal).encode(&mut rans_coder, &mut state, config);
|
|
||||||
literal = vec![];
|
|
||||||
}
|
|
||||||
lz::Op::Match {
|
lz::Op::Match {
|
||||||
offset: offset as u32,
|
offset: offset as u32,
|
||||||
len: length as u32,
|
len: length as u32,
|
||||||
@@ -65,14 +55,11 @@ pub fn pack(
|
|||||||
}
|
}
|
||||||
|
|
||||||
if !encoded_match {
|
if !encoded_match {
|
||||||
literal.push(data[pos]);
|
lz::Op::Literal(data[pos]).encode(&mut rans_coder, &mut state, config);
|
||||||
pos += 1;
|
pos += 1;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if !literal.is_empty() {
|
|
||||||
lz::Op::Literal(literal).encode(&mut rans_coder, &mut state, config);
|
|
||||||
}
|
|
||||||
lz::encode_eof(&mut rans_coder, &mut state, config);
|
lz::encode_eof(&mut rans_coder, &mut state, config);
|
||||||
rans_coder.finish()
|
rans_coder.finish()
|
||||||
}
|
}
|
||||||
|
|||||||
163
src/heatmap.rs
Normal file
163
src/heatmap.rs
Normal file
@@ -0,0 +1,163 @@
|
|||||||
|
pub struct Heatmap {
|
||||||
|
data: Vec<u8>,
|
||||||
|
cost: Vec<f32>,
|
||||||
|
literal_index: Vec<usize>,
|
||||||
|
}
|
||||||
|
|
||||||
|
impl Heatmap {
|
||||||
|
pub fn new() -> Heatmap {
|
||||||
|
Heatmap {
|
||||||
|
data: Vec::new(),
|
||||||
|
cost: Vec::new(),
|
||||||
|
literal_index: Vec::new(),
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub 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 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 fn finish(&mut self) {
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
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;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn len(&self) -> usize {
|
||||||
|
self.cost.len()
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn is_literal(&self, index: usize) -> bool {
|
||||||
|
self.literal_index[index] == index
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn cost(&self, index: usize) -> f32 {
|
||||||
|
self.cost[index]
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn byte(&self, index: usize) -> u8 {
|
||||||
|
self.data[index]
|
||||||
|
}
|
||||||
|
|
||||||
|
pub fn print_as_hex(&self) -> std::io::Result<()> {
|
||||||
|
use crossterm::{
|
||||||
|
style::{Attribute, Color, Print, SetAttribute, SetBackgroundColor},
|
||||||
|
QueueableCommand,
|
||||||
|
};
|
||||||
|
use std::io::{stdout, Write};
|
||||||
|
|
||||||
|
fn set_color(
|
||||||
|
mut out: impl QueueableCommand,
|
||||||
|
heatmap: &Heatmap,
|
||||||
|
index: usize,
|
||||||
|
num_colors: u16,
|
||||||
|
) -> std::io::Result<()> {
|
||||||
|
let cost = 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)?;
|
||||||
|
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)?;
|
||||||
|
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(())
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -1,11 +1,13 @@
|
|||||||
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};
|
||||||
|
|
||||||
pub type ProgressCallback<'a> = &'a mut dyn FnMut(usize);
|
pub type ProgressCallback<'a> = &'a mut dyn FnMut(usize);
|
||||||
|
|
||||||
|
|||||||
196
src/lz.rs
196
src/lz.rs
@@ -1,55 +1,39 @@
|
|||||||
use crate::context_state::ContextState;
|
use crate::context_state::ContextState;
|
||||||
|
use crate::heatmap::Heatmap;
|
||||||
use crate::rans::{EntropyCoder, RansDecoder};
|
use crate::rans::{EntropyCoder, RansDecoder};
|
||||||
use crate::Config;
|
use crate::Config;
|
||||||
use thiserror::Error;
|
use thiserror::Error;
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Copy, Clone, Debug)]
|
||||||
pub enum Op {
|
pub enum Op {
|
||||||
Literal(Vec<u8>),
|
Literal(u8),
|
||||||
Match { offset: u32, len: u32 },
|
Match { offset: u32, len: u32 },
|
||||||
}
|
}
|
||||||
|
|
||||||
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;
|
||||||
match self {
|
match self {
|
||||||
&Op::Literal(ref lit) => {
|
&Op::Literal(lit) => {
|
||||||
assert!(state.prev_was_match);
|
encode_bit(coder, state, literal_base, !config.is_match_bit);
|
||||||
encode_length(
|
let mut context_index = 1;
|
||||||
coder,
|
for i in (0..8).rev() {
|
||||||
state,
|
let bit = (lit >> i) & 1 != 0;
|
||||||
256 + state.pos % state.parity_contexts * 320,
|
encode_bit(coder, state, literal_base + context_index, bit);
|
||||||
lit.len() as u32 + 1,
|
context_index = (context_index << 1) | bit as usize;
|
||||||
config,
|
|
||||||
);
|
|
||||||
for lit in lit {
|
|
||||||
let literal_base = state.pos % state.parity_contexts * 320;
|
|
||||||
let mut context_index = 1;
|
|
||||||
for i in (0..8).rev() {
|
|
||||||
let bit = (lit >> i) & 1 != 0;
|
|
||||||
encode_bit(coder, state, literal_base + context_index, bit);
|
|
||||||
context_index = (context_index << 1) | bit as usize;
|
|
||||||
}
|
|
||||||
state.pos += 1;
|
|
||||||
}
|
}
|
||||||
state.prev_was_match = false;
|
state.prev_was_match = false;
|
||||||
|
state.pos += 1;
|
||||||
}
|
}
|
||||||
&Op::Match { offset, len } => {
|
&Op::Match { offset, len } => {
|
||||||
if state.prev_was_match {
|
encode_bit(coder, state, literal_base, config.is_match_bit);
|
||||||
encode_length(
|
|
||||||
coder,
|
|
||||||
state,
|
|
||||||
256 + state.pos % state.parity_contexts * 320,
|
|
||||||
1,
|
|
||||||
config,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
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 {
|
||||||
new_offset = offset != state.last_offset;
|
new_offset = offset != state.last_offset;
|
||||||
encode_bit(
|
encode_bit(
|
||||||
coder,
|
coder,
|
||||||
state,
|
state,
|
||||||
320 * state.parity_contexts,
|
256 * state.parity_contexts,
|
||||||
new_offset == config.new_offset_bit,
|
new_offset == config.new_offset_bit,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
@@ -58,14 +42,14 @@ impl Op {
|
|||||||
encode_length(
|
encode_length(
|
||||||
coder,
|
coder,
|
||||||
state,
|
state,
|
||||||
320 * state.parity_contexts + 1,
|
256 * state.parity_contexts + 1,
|
||||||
offset + if config.eof_in_length { 0 } else { 1 },
|
offset + if config.eof_in_length { 0 } else { 1 },
|
||||||
config,
|
config,
|
||||||
);
|
);
|
||||||
state.last_offset = offset;
|
state.last_offset = offset;
|
||||||
}
|
}
|
||||||
assert!(len as usize >= config.min_length() && len as usize <= config.max_length);
|
assert!(len as usize >= config.min_length() && len as usize <= config.max_length);
|
||||||
encode_length(coder, state, 320 * state.parity_contexts + 65, len, config);
|
encode_length(coder, state, 256 * state.parity_contexts + 65, len, config);
|
||||||
state.prev_was_match = true;
|
state.prev_was_match = true;
|
||||||
state.pos += len as usize;
|
state.pos += len as usize;
|
||||||
}
|
}
|
||||||
@@ -74,28 +58,25 @@ impl Op {
|
|||||||
}
|
}
|
||||||
|
|
||||||
pub fn encode_eof(coder: &mut dyn EntropyCoder, state: &mut CoderState, config: &Config) {
|
pub fn encode_eof(coder: &mut dyn EntropyCoder, state: &mut CoderState, config: &Config) {
|
||||||
if state.prev_was_match {
|
encode_bit(
|
||||||
encode_length(
|
coder,
|
||||||
coder,
|
state,
|
||||||
state,
|
state.pos % state.parity_contexts * 256,
|
||||||
256 + state.pos % state.parity_contexts * 320,
|
config.is_match_bit,
|
||||||
1,
|
);
|
||||||
config,
|
|
||||||
);
|
|
||||||
}
|
|
||||||
if !state.prev_was_match && !config.no_repeated_offsets {
|
if !state.prev_was_match && !config.no_repeated_offsets {
|
||||||
encode_bit(
|
encode_bit(
|
||||||
coder,
|
coder,
|
||||||
state,
|
state,
|
||||||
320 * state.parity_contexts,
|
256 * state.parity_contexts,
|
||||||
config.new_offset_bit ^ config.eof_in_length,
|
config.new_offset_bit ^ config.eof_in_length,
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
if !config.eof_in_length || state.prev_was_match || config.no_repeated_offsets {
|
if !config.eof_in_length || state.prev_was_match || config.no_repeated_offsets {
|
||||||
encode_length(coder, state, 320 * state.parity_contexts + 1, 1, config);
|
encode_length(coder, state, 256 * state.parity_contexts + 1, 1, config);
|
||||||
}
|
}
|
||||||
if config.eof_in_length {
|
if config.eof_in_length {
|
||||||
encode_length(coder, state, 320 * state.parity_contexts + 65, 1, config);
|
encode_length(coder, state, 256 * state.parity_contexts + 65, 1, config);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -139,9 +120,9 @@ pub struct CoderState {
|
|||||||
impl CoderState {
|
impl CoderState {
|
||||||
pub fn new(config: &Config) -> CoderState {
|
pub fn new(config: &Config) -> CoderState {
|
||||||
CoderState {
|
CoderState {
|
||||||
contexts: ContextState::new((64 + 256) * config.parity_contexts + 1 + 64 + 64, config),
|
contexts: ContextState::new((1 + 255) * config.parity_contexts + 1 + 64 + 64, config),
|
||||||
last_offset: 0,
|
last_offset: 0,
|
||||||
prev_was_match: true,
|
prev_was_match: false,
|
||||||
pos: 0,
|
pos: 0,
|
||||||
parity_contexts: config.parity_contexts,
|
parity_contexts: config.parity_contexts,
|
||||||
}
|
}
|
||||||
@@ -173,23 +154,33 @@ pub fn unpack(
|
|||||||
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)
|
||||||
}
|
}
|
||||||
|
|
||||||
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(
|
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 =
|
let mut contexts = ContextState::new((1 + 255) * config.parity_contexts + 1 + 64 + 64, &config);
|
||||||
ContextState::new((64 + 256) * 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;
|
||||||
@@ -219,15 +210,55 @@ 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_length = decode_length(
|
let literal_base = position % config.parity_contexts * 256;
|
||||||
&mut decoder,
|
if decoder.decode_with_context(&mut contexts.context_mut(literal_base))?
|
||||||
&mut contexts,
|
== config.is_match_bit
|
||||||
256 + position % config.parity_contexts * 320,
|
{
|
||||||
config,
|
if config.no_repeated_offsets
|
||||||
)? - 1;
|
|| prev_was_match
|
||||||
for _ in 0..literal_length {
|
|| decoder
|
||||||
let literal_base = position % config.parity_contexts * 320;
|
.decode_with_context(&mut contexts.context_mut(256 * config.parity_contexts))?
|
||||||
|
== config.new_offset_bit
|
||||||
|
{
|
||||||
|
offset = decode_length(
|
||||||
|
&mut decoder,
|
||||||
|
&mut contexts,
|
||||||
|
256 * config.parity_contexts + 1,
|
||||||
|
&config,
|
||||||
|
)? - if config.eof_in_length { 0 } else { 1 };
|
||||||
|
if offset == 0 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
let length = decode_length(
|
||||||
|
&mut decoder,
|
||||||
|
&mut contexts,
|
||||||
|
256 * config.parity_contexts + 65,
|
||||||
|
&config,
|
||||||
|
)?;
|
||||||
|
if config.eof_in_length && length == 1 {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
if 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 {
|
||||||
|
for _ in 0..length {
|
||||||
|
if result.len() < max_size {
|
||||||
|
result.push(result[result.len() - offset]);
|
||||||
|
} else {
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
position += length;
|
||||||
|
prev_was_match = true;
|
||||||
|
} else {
|
||||||
let mut context_index = 1;
|
let mut context_index = 1;
|
||||||
let mut byte = 0;
|
let mut byte = 0;
|
||||||
for i in (0..8).rev() {
|
for i in (0..8).rev() {
|
||||||
@@ -236,6 +267,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);
|
||||||
@@ -244,46 +278,10 @@ pub fn unpack_internal(
|
|||||||
position += 1;
|
position += 1;
|
||||||
prev_was_match = false;
|
prev_was_match = false;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if config.no_repeated_offsets
|
if let Some(heatmap) = heatmap {
|
||||||
|| prev_was_match
|
heatmap.finish();
|
||||||
|| decoder
|
|
||||||
.decode_with_context(&mut contexts.context_mut(320 * config.parity_contexts))?
|
|
||||||
== config.new_offset_bit
|
|
||||||
{
|
|
||||||
offset = decode_length(
|
|
||||||
&mut decoder,
|
|
||||||
&mut contexts,
|
|
||||||
320 * config.parity_contexts + 1,
|
|
||||||
&config,
|
|
||||||
)? - if config.eof_in_length { 0 } else { 1 };
|
|
||||||
if offset == 0 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
let length = decode_length(
|
|
||||||
&mut decoder,
|
|
||||||
&mut contexts,
|
|
||||||
320 * config.parity_contexts + 65,
|
|
||||||
&config,
|
|
||||||
)?;
|
|
||||||
if config.eof_in_length && length == 1 {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
if offset > position {
|
|
||||||
return Err(UnpackError::OffsetOutOfRange { offset, position });
|
|
||||||
}
|
|
||||||
if let Some(ref mut result) = result {
|
|
||||||
for _ in 0..length {
|
|
||||||
if result.len() < max_size {
|
|
||||||
result.push(result[result.len() - offset]);
|
|
||||||
} else {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
position += length;
|
|
||||||
prev_was_match = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if position > max_size {
|
if position > max_size {
|
||||||
|
|||||||
88
src/main.rs
88
src/main.rs
@@ -9,6 +9,8 @@ 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 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;
|
||||||
@@ -58,9 +60,15 @@ fn main() -> Result<()> {
|
|||||||
|
|
||||||
Short('u') | Long("unpack") => unpack = true,
|
Short('u') | Long("unpack") => unpack = true,
|
||||||
Long("margin") => calculate_margin = true,
|
Long("margin") => calculate_margin = true,
|
||||||
|
Long("heatmap") => create_heatmap = true,
|
||||||
|
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.try_into()?),
|
||||||
Value(val) if outfile.is_none() => outfile = Some(val.try_into()?),
|
Value(val) if outfile.is_none() => outfile = Some(val.try_into()?),
|
||||||
@@ -69,33 +77,46 @@ fn main() -> Result<()> {
|
|||||||
}
|
}
|
||||||
|
|
||||||
let infile = infile.unwrap_or_else(|| print_help(1));
|
let infile = infile.unwrap_or_else(|| print_help(1));
|
||||||
let outfile = outfile.unwrap_or_else(|| {
|
enum OutFileType {
|
||||||
let mut name = infile.clone();
|
Packed,
|
||||||
if unpack {
|
Unpacked,
|
||||||
if name.extension().filter(|&e| e == "upk").is_some() {
|
Heatmap,
|
||||||
name.set_extension("");
|
}
|
||||||
} else {
|
let outfile = |tpe: OutFileType| {
|
||||||
name.set_extension("bin");
|
outfile.clone().unwrap_or_else(|| {
|
||||||
|
let mut name = infile.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");
|
||||||
|
}
|
||||||
}
|
}
|
||||||
} else {
|
name
|
||||||
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 = vec![];
|
||||||
File::open(infile)?.read_to_end(&mut data)?;
|
File::open(&infile)?.read_to_end(&mut data)?;
|
||||||
if reverse {
|
if reverse {
|
||||||
data.reverse();
|
data.reverse();
|
||||||
}
|
}
|
||||||
@@ -122,10 +143,10 @@ fn main() -> Result<()> {
|
|||||||
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)?;
|
File::create(outfile(OutFileType::Packed))?.write_all(&packed_data)?;
|
||||||
} else {
|
} else {
|
||||||
let mut data = vec![];
|
let mut data = vec![];
|
||||||
File::open(infile)?.read_to_end(&mut data)?;
|
File::open(&infile)?.read_to_end(&mut data)?;
|
||||||
if reverse {
|
if reverse {
|
||||||
data.reverse();
|
data.reverse();
|
||||||
}
|
}
|
||||||
@@ -134,7 +155,26 @@ fn main() -> Result<()> {
|
|||||||
if reverse {
|
if reverse {
|
||||||
unpacked_data.reverse();
|
unpacked_data.reverse();
|
||||||
}
|
}
|
||||||
File::create(outfile)?.write_all(&unpacked_data)?;
|
File::create(outfile(OutFileType::Unpacked))?.write_all(&unpacked_data)?;
|
||||||
|
}
|
||||||
|
if create_heatmap {
|
||||||
|
let mut heatmap = upkr::create_heatmap(&data, &config, max_unpacked_size)?;
|
||||||
|
if reverse {
|
||||||
|
heatmap.reverse();
|
||||||
|
}
|
||||||
|
if do_hexdump {
|
||||||
|
heatmap.print_as_hex()?;
|
||||||
|
} else {
|
||||||
|
let mut heatmap_bin = Vec::with_capacity(heatmap.len());
|
||||||
|
for i in 0..heatmap.len() {
|
||||||
|
let cost = (heatmap.cost(i).log2() * 8. + 64.)
|
||||||
|
.round()
|
||||||
|
.max(0.)
|
||||||
|
.min(127.) as u8;
|
||||||
|
heatmap_bin.push((cost << 1) | heatmap.is_literal(i) as u8);
|
||||||
|
}
|
||||||
|
File::create(outfile(OutFileType::Heatmap))?.write_all(&heatmap_bin)?;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if calculate_margin {
|
if calculate_margin {
|
||||||
println!("{}", upkr::calculate_margin(&data, &config)?);
|
println!("{}", upkr::calculate_margin(&data, &config)?);
|
||||||
@@ -148,13 +188,17 @@ 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!(" -u, --unpack unpack infile");
|
||||||
|
eprintln!(" --heatmap calculate heatmap from compressed file");
|
||||||
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!("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!(
|
||||||
|
|||||||
@@ -15,7 +15,7 @@ pub fn pack(
|
|||||||
let mut parse = parse(data, Config::from_level(level), config, progress_cb);
|
let mut parse = parse(data, Config::from_level(level), config, progress_cb);
|
||||||
let mut ops = vec![];
|
let mut ops = vec![];
|
||||||
while let Some(link) = parse {
|
while let Some(link) = parse {
|
||||||
ops.push(link.op.clone());
|
ops.push(link.op);
|
||||||
parse = link.prev.clone();
|
parse = link.prev.clone();
|
||||||
}
|
}
|
||||||
let mut state = lz::CoderState::new(config);
|
let mut state = lz::CoderState::new(config);
|
||||||
@@ -32,15 +32,9 @@ struct Parse {
|
|||||||
op: lz::Op,
|
op: lz::Op,
|
||||||
}
|
}
|
||||||
|
|
||||||
struct LiteralPrefix {
|
|
||||||
arrival: Arrival,
|
|
||||||
prefix: Vec<u8>,
|
|
||||||
}
|
|
||||||
|
|
||||||
struct Arrival {
|
struct Arrival {
|
||||||
parse: Option<Rc<Parse>>,
|
parse: Option<Rc<Parse>>,
|
||||||
state: lz::CoderState,
|
state: lz::CoderState,
|
||||||
literal_prefix: Option<Box<LiteralPrefix>>,
|
|
||||||
cost: f64,
|
cost: f64,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -136,7 +130,6 @@ fn parse(
|
|||||||
op,
|
op,
|
||||||
})),
|
})),
|
||||||
state,
|
state,
|
||||||
literal_prefix: None,
|
|
||||||
cost: arrival.cost + cost_counter.cost(),
|
cost: arrival.cost + cost_counter.cost(),
|
||||||
},
|
},
|
||||||
max_arrivals,
|
max_arrivals,
|
||||||
@@ -148,7 +141,6 @@ fn parse(
|
|||||||
Arrival {
|
Arrival {
|
||||||
parse: None,
|
parse: None,
|
||||||
state: lz::CoderState::new(encoding_config),
|
state: lz::CoderState::new(encoding_config),
|
||||||
literal_prefix: None,
|
|
||||||
cost: 0.0,
|
cost: 0.0,
|
||||||
},
|
},
|
||||||
max_arrivals,
|
max_arrivals,
|
||||||
@@ -260,26 +252,19 @@ fn parse(
|
|||||||
}
|
}
|
||||||
|
|
||||||
cost_counter.reset();
|
cost_counter.reset();
|
||||||
let (arrival, mut prefix) = if let Some(prefix) = arrival.literal_prefix {
|
let mut state = arrival.state;
|
||||||
(prefix.arrival, prefix.prefix)
|
let op = lz::Op::Literal(data[pos]);
|
||||||
} else {
|
|
||||||
(arrival, vec![])
|
|
||||||
};
|
|
||||||
let mut state = arrival.state.clone();
|
|
||||||
prefix.push(data[pos]);
|
|
||||||
let op = lz::Op::Literal(prefix.clone());
|
|
||||||
op.encode(cost_counter, &mut state, encoding_config);
|
op.encode(cost_counter, &mut state, encoding_config);
|
||||||
add_arrival(
|
add_arrival(
|
||||||
&mut arrivals,
|
&mut arrivals,
|
||||||
pos + 1,
|
pos + 1,
|
||||||
Arrival {
|
Arrival {
|
||||||
parse: Some(Rc::new(Parse {
|
parse: Some(Rc::new(Parse {
|
||||||
prev: arrival.parse.clone(),
|
prev: arrival.parse,
|
||||||
op,
|
op,
|
||||||
})),
|
})),
|
||||||
state,
|
state,
|
||||||
cost: arrival.cost + cost_counter.cost(),
|
cost: arrival.cost + cost_counter.cost(),
|
||||||
literal_prefix: Some(Box::new(LiteralPrefix { arrival, prefix })),
|
|
||||||
},
|
},
|
||||||
max_arrivals,
|
max_arrivals,
|
||||||
);
|
);
|
||||||
|
|||||||
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