Reorganize files; start RSO support; config & split updates

Cargo.lock

@@ -2,6 +2,21 @@
 # It is not intended for manual editing.
 version = 3
 
+[[package]]
+name = "addr2line"
+version = "0.19.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
+dependencies = [
+ "gimli",
+]
+
+[[package]]
+name = "adler"
+version = "1.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+
 [[package]]
 name = "ahash"
 version = "0.8.2"
@@ -27,11 +42,14 @@ name = "anyhow"
 version = "1.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "216261ddc8289130e551ddcd5ce8a064710c0d064a4d2895c67151c92b5443f6"
+dependencies = [
+ "backtrace",
+]
 
 [[package]]
 name = "ar"
 version = "0.8.0"
-source = "git+https://github.com/bjorn3/rust-ar.git?branch=do_not_remove_cg_clif_ranlib#de9ab0e56bf3a208381d342aa5b60f9ff2891648"
+source = "git+https://github.com/bjorn3/rust-ar.git?branch=write_symbol_table#a61d6f5b84b0240f7afddf8cebc7e58ee1719829"
 
 [[package]]
 name = "argh"
@@ -68,6 +86,21 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"
 
+[[package]]
+name = "backtrace"
+version = "0.3.67"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "233d376d6d185f2a3093e58f283f60f880315b6c60075b01f36b3b85154564ca"
+dependencies = [
+ "addr2line",
+ "cc",
+ "cfg-if",
+ "libc",
+ "miniz_oxide",
+ "object",
+ "rustc-demangle",
+]
+
 [[package]]
 name = "base16ct"
 version = "0.1.1"
@@ -161,7 +194,7 @@ dependencies = [
 
 [[package]]
 name = "decomp-toolkit"
-version = "0.2.2"
+version = "0.3.0"
 dependencies = [
  "anyhow",
  "ar",
@@ -175,9 +208,9 @@ dependencies = [
  "filetime",
  "fixedbitset",
  "flagset",
+ "flate2",
  "hex",
  "indexmap",
- "lazy_static",
  "log",
  "memchr",
  "memmap2",
@@ -187,6 +220,7 @@ dependencies = [
  "once_cell",
  "ppc750cl",
  "regex",
+ "rmp-serde",
  "serde",
  "serde_repr",
  "serde_yaml",
@@ -276,6 +310,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "flate2"
+version = "1.0.25"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a8a2db397cb1c8772f31494cb8917e48cd1e64f0fa7efac59fbd741a0a8ce841"
+dependencies = [
+ "crc32fast",
+ "miniz_oxide",
+]
+
 [[package]]
 name = "generic-array"
 version = "0.14.6"
@@ -286,6 +330,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "gimli"
+version = "0.27.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dec7af912d60cdbd3677c1af9352ebae6fb8394d165568a2234df0fa00f87793"
+
 [[package]]
 name = "hashbrown"
 version = "0.12.3"
@@ -366,12 +416,6 @@ version = "1.0.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fad582f4b9e86b6caa621cabeb0963332d92eea04729ab12892c2533951e6440"
 
-[[package]]
-name = "lazy_static"
-version = "1.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
-
 [[package]]
 name = "libc"
 version = "0.2.137"
@@ -408,6 +452,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "miniz_oxide"
+version = "0.6.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
+dependencies = [
+ "adler",
+]
+
 [[package]]
 name = "multimap"
 version = "0.8.3"
@@ -465,6 +518,12 @@ version = "1.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6f61fba1741ea2b3d6a1e3178721804bb716a68a6aeba1149b5d52e3d464ea66"
 
+[[package]]
+name = "paste"
+version = "1.0.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d01a5bd0424d00070b0098dd17ebca6f961a959dead1dbcbbbc1d1cd8d3deeba"
+
 [[package]]
 name = "ppc750cl"
 version = "0.2.0"
@@ -529,6 +588,34 @@ version = "0.6.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "456c603be3e8d448b072f410900c09faf164fbce2d480456f50eea6e25f9c848"
 
+[[package]]
+name = "rmp"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44519172358fd6d58656c86ab8e7fbc9e1490c3e8f14d35ed78ca0dd07403c9f"
+dependencies = [
+ "byteorder",
+ "num-traits",
+ "paste",
+]
+
+[[package]]
+name = "rmp-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c5b13be192e0220b8afb7222aa5813cb62cc269ebb5cac346ca6487681d2913e"
+dependencies = [
+ "byteorder",
+ "rmp",
+ "serde",
+]
+
+[[package]]
+name = "rustc-demangle"
+version = "0.1.21"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ef03e0a2b150c7a90d01faf6254c9c48a41e95fb2a8c2ac1c6f0d2b9aefc342"
+
 [[package]]
 name = "rustix"
 version = "0.36.6"

Cargo.toml

@@ -3,7 +3,7 @@ name = "decomp-toolkit"
 description = "GameCube/Wii decompilation project tools."
 authors = ["Luke Street <luke@street.dev>"]
 license = "MIT OR Apache-2.0"
-version = "0.2.3"
+version = "0.3.0"
 edition = "2021"
 publish = false
 build = "build.rs"
@@ -21,8 +21,8 @@ panic = "abort"
 strip = "debuginfo"
 
 [dependencies]
-anyhow = "1.0.64"
-ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "do_not_remove_cg_clif_ranlib" }
+anyhow = { version = "1.0.64", features = ["backtrace"] }
+ar = { git = "https://github.com/bjorn3/rust-ar.git", branch = "write_symbol_table" }
 argh = "0.1.8"
 base16ct = "0.1.1"
 base64 = "0.21.0"
@@ -35,7 +35,6 @@ fixedbitset = "0.4.2"
 flagset = { version = "0.4.3", features = ["serde"] }
 hex = "0.4.3"
 indexmap = "1.9.2"
-lazy_static = "1.4.0"
 log = "0.4.17"
 memchr = "2.5.0"
 memmap2 = "0.5.7"
@@ -51,3 +50,14 @@ serde_yaml = "0.9.16"
 sha-1 = "0.10.0"
 smallvec = "1.10.0"
 topological-sort = "0.2.2"
+flate2 = "1.0.25"
+
+[build-dependencies]
+anyhow = { version = "1.0.64", features = ["backtrace"] }
+base64 = "0.21.0"
+flagset = { version = "0.4.3", features = ["serde"] }
+serde = "1.0.152"
+serde_repr = "0.1.10"
+serde_yaml = "0.9.16"
+rmp-serde = "1.1.1"
+flate2 = "1.0.25"