diff --git a/Cargo.lock b/Cargo.lock index 9504a1de..c4a12f12 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -938,11 +938,11 @@ checksum = "c2e06f9bce634a3c898eb1e5cb949ff63133cbb218af93cc9b38b31d6f3ea285" [[package]] name = "cwextab" -version = "0.2.3" +version = "0.3.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a92e840be31d11ead5f357b8fc503133d3657845d0ccf539afcc7d1212fad226" +checksum = "d0f1036150ed9aa3265b83b9755a14db1600231e0478e678241e4f4d7c30bcf6" dependencies = [ - "anyhow", + "thiserror", ] [[package]] @@ -4267,18 +4267,18 @@ dependencies = [ [[package]] name = "thiserror" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724" +checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84" dependencies = [ "thiserror-impl", ] [[package]] name = "thiserror-impl" -version = "1.0.63" +version = "1.0.64" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261" +checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3" dependencies = [ "proc-macro2", "quote", diff --git a/objdiff-core/Cargo.toml b/objdiff-core/Cargo.toml index 8ca6a843..591c241b 100644 --- a/objdiff-core/Cargo.toml +++ b/objdiff-core/Cargo.toml @@ -60,7 +60,7 @@ gimli = { version = "0.31", default-features = false, features = ["read-all"], o # ppc cwdemangle = { version = "1.0", optional = true } -cwextab = { version = "0.2", optional = true } +cwextab = { version = "0.3.1", optional = true } ppc750cl = { version = "0.3", optional = true } # mips diff --git a/objdiff-core/src/arch/ppc.rs b/objdiff-core/src/arch/ppc.rs index 3b5511e1..a9fffa5d 100644 --- a/objdiff-core/src/arch/ppc.rs +++ b/objdiff-core/src/arch/ppc.rs @@ -303,9 +303,13 @@ fn decode_exception_info(file: &File<'_>) -> Result decoded_data, - None => { - log::warn!("Exception table decoding failed for function {}", extab_func_name); + Ok(decoded_data) => decoded_data, + Err(e) => { + log::warn!( + "Exception table decoding failed for function {}, reason: {}", + extab_func_name, + e.to_string() + ); return Ok(None); } }; diff --git a/objdiff-gui/Cargo.toml b/objdiff-gui/Cargo.toml index a1ec834c..6361fba3 100644 --- a/objdiff-gui/Cargo.toml +++ b/objdiff-gui/Cargo.toml @@ -29,7 +29,7 @@ bytes = "1.7" cfg-if = "1.0" const_format = "0.2" cwdemangle = "1.0" -cwextab = "0.3" +cwextab = "0.3.1" dirs = "5.0" egui = "0.28" egui_extras = "0.28"