Actually update extab stuff (#110)

* Update cwextab * Update * Update ppc.rs * Make fmt shut up
encounter · Sep 24, 2024 · 35bbd40 · 35bbd40
1 parent c1cb4b0
commit 35bbd40
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git 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
@@ -303,9 +303,13 @@ fn decode_exception_info(file: &File<'_>) -> Result<Option<BTreeMap<usize, Excep
             continue;
         };
         let data = match decode_extab(extab_data) {
-            Some(decoded_data) => 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
@@ -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"